From 9a6e44d79a61658c3704b5f37a7def40ba9fb7ff Mon Sep 17 00:00:00 2001
From: penglei <1624952103@qq.com>
Date: Wed, 17 Jul 2024 10:44:02 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E8=93=9D=E7=89=99=E4=BA=A7?=
 =?utf8?q?=E6=B5=8B=E5=BF=83=E7=8E=87=E8=A1=80=E6=B0=A7=E6=BC=8F=E5=85=89?=
 =?utf8?q?=E6=B5=8B=E8=AF=95=E4=B8=8ELCD=20TP=20CROWN=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../factorytest_service/factorytest_protocol.c       | 12 ++++++++----
 .../drivers/peripheral/utils/custom_cmd_service.c    |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
index 4f55404fc..102de9603 100644
--- a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
@@ -999,8 +999,8 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {
                 //退出lcd测试
                 uint8_t send_data = 0;
-                uint8_t cmd = 0;
-                do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_LCD_TEST,&cmd,sizeof(cmd));
+                //uint8_t cmd = 0;
+                //do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_LCD_TEST,&cmd,sizeof(cmd));
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_LCD,
                         0x07,
@@ -1058,8 +1058,8 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {
                 //退出触摸测试
                 uint8_t send_data = 0;
-                uint8_t cmd = 0;
-                do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_TP_TEST,&cmd,sizeof(cmd));
+                //uint8_t cmd = 0;
+                //do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_TP_TEST,&cmd,sizeof(cmd));
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_TP,
                         0x04,
@@ -1173,6 +1173,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {
                 //打开心率检测
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_SINGLE_CHECK_MODE_TEST);
+                LOS_Msleep(500);
                 FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST);
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);
                 uint8_t databuf[4] = {0};
@@ -1194,6 +1195,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {
                 //打开血氧检测
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_SINGLE_CHECK_MODE_TEST);
+                LOS_Msleep(500);
                 FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST);
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);
                 uint8_t databuf[4] = {0};
@@ -1215,6 +1217,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {
                 //灰卡测试
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_GRAYCARD_TEST);
+                LOS_Msleep(500);
                 FT_RESULTS_t ft_result = hx3695_factroy_test(GRAY_CARD_TEST);
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);
                 uint8_t databuf[12] = {0};
@@ -1251,6 +1254,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {
                 //漏光测试
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_LEAKLIGHT_TEST);
+                LOS_Msleep(500);
                 FT_RESULTS_t ft_result = hx3695_factroy_test(LEAK_LIGHT_TEST);
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);
                 uint8_t databuf[12] = {0};
diff --git a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
index 85c675f11..5618ec9ac 100644
--- a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
+++ b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
@@ -168,8 +168,8 @@ static void custom_cmd_service_check_task(void const *arg)
         case CUSTOM_CMD_MSG_TYPE_TP_TEST:
             if(mail.data[0] == 1)
             {
-                uapi_set_screen_on_api();
-                uapi_factorytest_enter_test_view(1);
+                //uapi_set_screen_on_api();
+                //uapi_factorytest_enter_test_view(1);
                 uapi_factorytest_enter_test_tp_view();
                 uapi_factorytest_hide_test_tp_button();
             }
@@ -181,8 +181,8 @@ static void custom_cmd_service_check_task(void const *arg)
         case CUSTOM_CMD_MSG_TYPE_CROWN_TEST:
             if(mail.data[0] == 1)
             {
-                uapi_set_screen_on_api();
-                uapi_factorytest_enter_test_view(1);
+                //uapi_set_screen_on_api();
+                //uapi_factorytest_enter_test_view(1);
                 uapi_factorytest_enter_test_button_view();
             }
             else
-- 
2.17.1