1.增加整机测试工厂信息输入； 2. 增加前后板连接后自动发送获取设备版本信息指令； 3. 优化UI布局代码

FactoryTestTool/SourceCode/Json/JsonFile/backBoardTest.json

@@ -89,13 +89,13 @@
         "cmd": "VIDEO_TEST",
         "val": 0,
         "lable": "开启视频",
-        "timeout": 2000
+        "timeout": 0
     },
     {
         "cmd": "VIDEO_TEST",
         "val": 1,
         "lable": "关闭视频",
-        "timeout": 2000
+        "timeout": 0
     },
     {
         "cmd": "WIFI_SIGNAL_TEST",

FactoryTestTool/SourceCode/Json/JsonFile/backBoardUuid.json

@@ -1,19 +1,20 @@
 [
     {
         "cmd": "GET_BACK_MAC",
-        "val": 0,
+        "val": "0",
         "lable": "get_MAC_addr",
         "timeout": 0
     },
     {
         "cmd": "GET_BACK_UUID_SN",
-        "val": 0,
+        "val": "0",
         "lable": "get_UUID_SN",
         "timeout": 0
     },
     {
         "cmd": "WRITE_BACK_UUID_SN",
-        "val": 0,
+        "UUID": "123",
+        "SN": "123",
         "lable": "write_UUID_SN",
         "timeout": 0
     }

FactoryTestTool/SourceCode/Json/JsonFile/factoryProductInfo.json

@@ -0,0 +1,26 @@
+[
+    {
+        "cmd": "FACTORY_ID",
+        "val": "1",
+        "lable": "工厂ID:",
+        "timeout": 0
+    },
+    {
+        "cmd": "FACTORY_LABEL",
+        "val": "0",
+        "lable": "设备出厂标签:",
+        "timeout": 0
+    },
+    {
+        "cmd": "FACTORY_BATCH",
+        "val": "0",
+        "lable": "设备出厂批次:",
+        "timeout": 0
+    },
+    {
+        "cmd": "FACTORY_DEVICE_TYPE",
+        "val": "0",
+        "lable": "设备型号:",
+        "timeout": 0
+    }
+]

FactoryTestTool/SourceCode/Json/JsonFile/frontBoardOneClickTest.json

@@ -69,13 +69,13 @@
         "cmd": "GET_IMG",
         "val": 0,
         "lable": "左边镜头取图",
-        "timeout": 2000
+        "timeout": 0
     },
     {
         "cmd": "GET_IMG",
         "val": 1,
         "lable": "右边镜头取图",
-        "timeout": 2000
+        "timeout": 0
     },
     {
         "cmd": "TOUCH_TEST",

FactoryTestTool/SourceCode/Json/JsonFile/frontBoardTest.json

@@ -142,13 +142,13 @@
     {
         "cmd": "IR_LED",
         "val": 1,
-        "lable": "IR灯测试",
+        "lable": "IR灯开",
         "timeout": 2000
     },
     {
         "cmd": "IR_LED",
         "val": 0,
-        "lable": "IR灯测试",
+        "lable": "IR灯关",
         "timeout": 2000
     },
     {

FactoryTestTool/SourceCode/Json/readJsonFile.cpp

@@ -78,3 +78,7 @@ QJsonArray readJson_getPic() {
 QJsonArray readJson_getVideo() {
     return readJsonArrayFromFile("./SourceCode/Json/JsonFile/getVideo.json");
 }
+
+QJsonArray readJson_factoryProductInfo() {
+    return readJsonArrayFromFile("./SourceCode/Json/JsonFile/factoryProductInfo.json");
+}

FactoryTestTool/SourceCode/Json/readJsonFile.h

@@ -19,6 +19,8 @@ QJsonArray readJson_backBoardFuncConfig();
 QJsonArray readJson_backDevInfo();
 QJsonArray readJson_backUuid();
 
+QJsonArray readJson_factoryProductInfo();
+
 QJsonArray readJson_testConfig();
 QJsonArray readJson_funcConfig();