From 6c106b1d365e707b2d13cb37a78845dea3f589f9 Mon Sep 17 00:00:00 2001 From: 1624952103 Date: Fri, 6 Mar 2026 14:18:44 +0800 Subject: [PATCH] =?utf8?q?=E8=80=81=E5=8C=96=E6=B5=8B=E8=AF=95=E6=94=AF?= =?utf8?q?=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../UI/producttest/src/testPresenter.cpp | 2 +- .../factorytest_service/factorytest_protocol.c | 18 ++++++++++++++---- .../factorytest_service/factorytest_protocol.h | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp index 1e21e8b1d..cc25dba79 100644 --- 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 6d7dd9c28..2c29cbe57 100644 --- 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) static uint8_t aging_start_flag = 0; -void factorytest_start_aging_test(void) +void factorytest_start_aging_test(uint32_t time) { - if(aging_start_flag == 1) + if(aging_start_flag == 1 || !time) return; aging_start_flag = 1; memset(&aging_t, 0, sizeof(ble_aging_t)); - aging_t.target_time = 3 * 60 * 60; //老化时间6小时 + + printf("time : %d\n",time); + + aging_t.target_time = time * 60 * 60; //老化时间6小时 + aging_time = aging_t.target_time; aging_t.left_time = aging_time; do_custom_fileoperate_service_check_msg(CUSTOM_FILEOPERATE_MSG_TYPE_AGING_DATA_SAVE, NULL, 0); @@ -1394,7 +1398,13 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint { //进入老化命令 uint8_t send_data = 0x00; - factorytest_start_aging_test(); + uint32_t timeout = 0; + if (data) + { + timeout = *data; + } + PRINT("factorytest_start_aging_test timeout : %d \r\n",timeout); + factorytest_start_aging_test(timeout); factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST, 0x01, diff --git a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.h b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.h index 0c3929080..bb43647f3 100644 --- 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); -- 2.17.1