Merge #1165 into sdk602patch0911 from refs/changes/1165/head

Code review from 彭磊

* refs/changes/1165/head: (4 commits squashed)

  - 更新gsensor dml库，修复FATAL ERROR bug与运动数据bug

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 修复低电量不触发弹窗的BUG

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1165

diff --git a/code/sdk/application/battery/service/battery_service.cpp b/code/sdk/application/battery/service/battery_service.cpp
index cb16d6c..f8b7d2d 100644 (file)
--- a/code/sdk/application/battery/service/battery_service.cpp
+++ b/code/sdk/application/battery/service/battery_service.cpp
@@ -430,17 +430,27 @@ errcode_t charger_plug_event_notify(uint8_t plugged)
    return 0;
 }
 
+void set_lowpower_show( uint8_t type,uint8_t data)
+{
+    if(type)
+    {
+        low_power_flag_2=data;
+    }
+    else
+    {
+        low_power_flag_1=data;
+    }
+}
 errcode_t Play_shutdown_animation_notify(uint8_t alarm_level)
 {
-
+    //PRINT("alarm_level[%d],low_power_flag_1[%d],low_power_flag_2[%d]\n",alarm_level,low_power_flag_1,low_power_flag_2);
     if(alarm_level==0 && low_power_flag_1)
-    {   low_power_flag_1=0;
+    {   //low_power_flag_1=0;
         ChargerEventPublish(TOPIC_EVENT_LOWPOWER_ALARM,alarm_level);
     }
-
     else if(alarm_level==1 && low_power_flag_2)
     {
-        low_power_flag_2=0;
+        //low_power_flag_2=0;
         ChargerEventPublish(TOPIC_EVENT_LOWPOWER_ALARM,alarm_level);
     }
     else if(alarm_level!=0 && alarm_level!=1)

diff --git a/code/sdk/application/battery/service/battery_service.h b/code/sdk/application/battery/service/battery_service.h
index 028a1a3..d30d190 100644 (file)
--- a/code/sdk/application/battery/service/battery_service.h
+++ b/code/sdk/application/battery/service/battery_service.h
@@ -31,6 +31,7 @@ void enable_02c(void);
 void disable_02c(void);
 void enable_charge(void);
 void disable_charge(void);
+void set_lowpower_show( uint8_t type,uint8_t data);
 
 //0 停止充电 , 1 低电流充电, 2 正常电流充电
 int get_charge_current_status(void);

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp
index 85dcdd5..5facc50 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp
@@ -462,7 +462,7 @@ namespace OHOS
             return ;
         }
         ShutDownImageAnimatorView->Start();
-
+        set_lowpower_show(1,0);
         start_shutdown_or_reboot();
         shutdown_reboot_prejobs();
         
@@ -514,6 +514,7 @@ namespace OHOS
             alarm_UILabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             alarm_UILabel->SetRollSpeed(0);
             alarm_UILabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+            set_lowpower_show(0,0);
         }
         // Set additional property
         if(battery_falg==1)