修改充电状态消息发送，优化蓝牙产测，自动灭屏时间函数

diff --git a/code/sdk/application/battery/service/battery_service.cpp b/code/sdk/application/battery/service/battery_service.cpp
index af7841c..0bc963a 100644 (file)
--- a/code/sdk/application/battery/service/battery_service.cpp
+++ b/code/sdk/application/battery/service/battery_service.cpp
@@ -170,15 +170,8 @@ static void battery_check_chargement(void)
     uint8_t percent = batteryservice_get_voltage(&voltage);
     //获取电池温度
     batteryservice_get_battery_temp(&bat_temp);
-    
-    int status = get_charge_stat();
-    if(oncharging_status != status)
-    {
-        oncharging_status = status;
-        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_ONCHARGING_CHANGE,&status);
-    }
 
-    if(status == 1){
+    if(get_charge_stat() == 1){
         
         PRINT("charging enable charge !  bat-temp %.2f Vs highest temp value %.2f !\n",bat_temp,BATTERY_DISABLE_CHARGE_HI_TEMP_VALUE);
         /**
@@ -306,10 +299,16 @@ static void battery_check_task(void *arg)
             }
         }else if (mail.comm.event == BATTERY_CMD_CHARGE_PLUG) {
             // PRINT("[battery][service] charger_plug_event_ui_sendmsg_toUI plugged \n");
+            oncharging_status = 1;
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_ONCHARGING_CHANGE,&oncharging_status);
+                
             battery_check_chargement();
             charger_plug_event_ui_sendmsg_toUI(1);
         }else if (mail.comm.event == BATTERY_CMD_CHARGE_UNPLUG) {
             // PRINT("[battery][service] charger_plug_event_ui_sendmsg_toUI unplugged \n");
+            oncharging_status = 0;
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_ONCHARGING_CHANGE,&oncharging_status);
+            
             disable_charge();
             charger_plug_event_ui_sendmsg_toUI(0);
         }

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 416d4f6..46097ba 100644 (file)
--- a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
@@ -894,8 +894,8 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 uint8_t send_data = 0;\r
                 uint32_t timeout = *data;\r
                 //修改自动灭屏时间\r
-                power_display_set_screen_auto_off_timeout(timeout);\r
-\r
+                uapi_setScreenDuration(timeout);\r
+                \r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_LCD,\r
                         0x05,\r

diff --git a/code/sdk/application/wearable/service/power_manager/include/power_display_service.h b/code/sdk/application/wearable/service/power_manager/include/power_display_service.h
index 332d870..efc7e49 100755 (executable)
--- a/code/sdk/application/wearable/service/power_manager/include/power_display_service.h
+++ b/code/sdk/application/wearable/service/power_manager/include/power_display_service.h
@@ -418,8 +418,6 @@ errcode_t power_display_task_init(void);
  */
 screen_context_t *power_display_get_screen_context(void);
 
-extern errcode_t power_display_set_screen_auto_off_timeout(uint32_t timeout);
-
 
 #ifdef __cplusplus
 #if __cplusplus

diff --git a/code/sdk/application/wearable/service/power_manager/src/power_display_service.c b/code/sdk/application/wearable/service/power_manager/src/power_display_service.c
index df57279..5db3374 100755 (executable)
--- a/code/sdk/application/wearable/service/power_manager/src/power_display_service.c
+++ b/code/sdk/application/wearable/service/power_manager/src/power_display_service.c
@@ -99,7 +99,7 @@ static screen_state_t power_display_get_screen_state(void)
     return g_screen_context.current_state;
 }
 
-errcode_t power_display_set_screen_auto_off_timeout(uint32_t timeout)
+static errcode_t power_display_set_screen_auto_off_timeout(uint32_t timeout)
 {
     if (g_screen_context.time_out_enable == false) {
         return ERRCODE_FAIL;