Merge branch 'master' of http://47.92.195.73:8081/project_boditech_vidas_a8000_v3/a8k_app

1 year ago · 8352a34942
7 changed files with 24 additions and 1 deletions
--- a/src/main/java/a8k/hardware/controler/Controler.java
+++ b/src/main/java/a8k/hardware/controler/Controler.java
@ -185,6 +185,7 @@ public class Controler {
 			action.put("key", method.getName());
 			action.put("name", actionAnnotation.name());
 			action.put("group", actionAnnotation.group());
+			action.put("groupOrder", actionAnnotation.groupOrder());
 			action.put("order", actionAnnotation.order());
 			action.put("newline", actionAnnotation.newline());

@ -256,6 +257,9 @@ public class Controler {
 				var methodValueOf = parameter.getType().getMethod("valueOf", String.class);
 				var value = methodValueOf.invoke(null, actionParams.get(i));
 				actionParams.set(i, value);
+			} else if ( parameter.getType().equals(HardwareParamFile.class) ) {
+				String value = (String) actionParams.get(i);
+				actionParams.set(i, HardwareParamFile.fromBase64(value));
 			}
 		}

--- a/src/main/java/a8k/utils/HardwareParamFile.java
+++ b/src/main/java/a8k/utils/HardwareParamFile.java
@ -0,0 +1,12 @@
+package a8k.utils;
+import java.util.Base64;
+public class HardwareParamFile {
+	private byte[] bytes;
+
+	public static HardwareParamFile fromBase64( String base64 ) {
+		Base64.Decoder decoder = Base64.getDecoder();
+		var file = new HardwareParamFile();
+		file.bytes = decoder.decode( base64 );
+		return file;
+	}
+}
--- a/src/main/java/a8k/utils/HardwareServiceAction.java
+++ b/src/main/java/a8k/utils/HardwareServiceAction.java
@ -8,6 +8,7 @@ import java.lang.annotation.Target;
 public @interface HardwareServiceAction {
 	String name();
 	String group() default "";
+	int groupOrder() default 0;
 	int order() default 0;
 	boolean newline() default false;
 	String beforeExecute() default "";
--- a/src/main/resources/static/test/css/app.d5f9ba8f.css
+++ b/src/main/resources/static/test/css/app.d5f9ba8f.css
--- a/src/main/resources/static/test/index.html
+++ b/src/main/resources/static/test/index.html
@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.0bbc0a44.js"></script><script defer="defer" src="js/app.fda93638.js"></script><link href="css/app.034f9cb3.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.0bbc0a44.js"></script><script defer="defer" src="js/app.de139c1f.js"></script><link href="css/app.d5f9ba8f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
--- a/src/main/resources/static/test/js/app.de139c1f.js
+++ b/src/main/resources/static/test/js/app.de139c1f.js
--- a/src/main/resources/static/test/js/app.de139c1f.js.map
+++ b/src/main/resources/static/test/js/app.de139c1f.js.map