老化测试支持自定义时间

diff --git a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
index 1e21e8b..cc25dba 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
@@ -369,7 +369,7 @@ namespace OHOS
                 uapi_set4GCapability(false);
 #endif
             #ifdef SUPPORT_FACTORY_SERVICE
-                factorytest_start_aging_test();
+                factorytest_start_aging_test(3);
             #endif
         }
         if(strcmp(view.GetViewId(),"stop") == 0)

diff --git a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c
index 6d7dd9c..2c29cbe 100644 (file)
--- a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c
@@ -386,15 +386,19 @@ void gps_test_timer_callback(void)
 \r
 static uint8_t aging_start_flag = 0;\r
 \r
-void factorytest_start_aging_test(void)\r
+void factorytest_start_aging_test(uint32_t time)\r
 {\r
-    if(aging_start_flag == 1)\r
+    if(aging_start_flag == 1 || !time)\r
         return;\r
     \r
     aging_start_flag = 1;\r
 \r
     memset(&aging_t, 0, sizeof(ble_aging_t));\r
-    aging_t.target_time = 3 * 60 * 60; //老化时间6小时\r
+\r
+    printf("time : %d\n",time);\r
+\r
+    aging_t.target_time = time * 60 * 60; //老化时间6小时\r
+\r
     aging_time = aging_t.target_time;\r
     aging_t.left_time = aging_time;\r
     do_custom_fileoperate_service_check_msg(CUSTOM_FILEOPERATE_MSG_TYPE_AGING_DATA_SAVE, NULL, 0);\r
@@ -1394,7 +1398,13 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {\r
                 //进入老化命令\r
                 uint8_t send_data = 0x00;\r
-                factorytest_start_aging_test();\r
+                uint32_t timeout = 0;\r
+                if (data)\r
+                {\r
+                    timeout = *data;\r
+                }\r
+                PRINT("factorytest_start_aging_test timeout : %d \r\n",timeout);\r
+                factorytest_start_aging_test(timeout);\r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST,\r
                         0x01,\r

diff --git a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.h b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.h
index 0c39290..bb43647 100644 (file)
--- a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.h
+++ b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.h
@@ -154,7 +154,7 @@ void factorytest_read_aging_data(void);
 
 void factorytest_get_aging_data(ble_aging_t *data);
 
-void factorytest_start_aging_test(void);
+void factorytest_start_aging_test(uint32_t time);
 
 void factorytest_stop_aging_test(void);