低电量自动关机UI修改

diff --git a/code/sdk/application/battery/service/battery_service.cpp b/code/sdk/application/battery/service/battery_service.cpp
index f181915..9560c83 100644 (file)
--- a/code/sdk/application/battery/service/battery_service.cpp
+++ b/code/sdk/application/battery/service/battery_service.cpp
@@ -82,7 +82,7 @@ static unsigned long g_app_queue;
 #define BATTERY_CMD_CHARGE_PLUG 0x13
 #define BATTERY_CMD_CHARGE_UNPLUG 0x14
 
-#define BATTERY_LOWPOWER_ALARM_POWERLEVEL 15
+#define BATTERY_LOWPOWER_ALARM_POWERLEVEL 10
 #define BATTERY_LOWPOWER_ALARM_SHUTDOWNLEVEL 5
 #define BATTERY_DISABLE_CHARGE_HI_TEMP_VALUE (50.0f)   //停止充电温度
 
@@ -443,6 +443,10 @@ errcode_t Play_shutdown_animation_notify(uint8_t alarm_level)
         low_power_flag_2=0;
         ChargerEventPublish(TOPIC_EVENT_LOWPOWER_ALARM,alarm_level);
     }
+    else
+    {
+        ChargerEventPublish(TOPIC_EVENT_LOWPOWER_ALARM,alarm_level);
+    }
    
 
     

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index d67039d..15c30fa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
@@ -558,12 +558,14 @@ enum UIResourceTextId : uint16_t {
     STR_GOAL_HINT = 545,\r
     STR_SLEEPMODE = 546,\r
     STR_SLEEP_MODE_PROMPT_ON = 547,\r
-    STR_MAX_ID = 548,\r
+    STR_LOW_POWER_NOTIF_1 = 548,\r
+    STR_LOW_POWER_NOTIF_2 = 549,\r
+    STR_MAX_ID = 550,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

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 77845d1..2040067 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
@@ -13,6 +13,11 @@
 #include "linux/delay.h"
 #include "components/ui_circle_progress.h"
 #include "battery_hal.h"
+#include "uicomponents/UIComponents.h"
+
+
+//#include "ui_resource_string.h"
+
 namespace OHOS
 {
     UIImageView *imageCharge = nullptr;
@@ -241,6 +246,7 @@ namespace OHOS
         UILabel_Chargeing->SetViewId("label4");// Set style
         UILabel_Chargeing->SetStyle(STYLE_TEXT_FONT, 30);
         UILabel_Chargeing->SetText("正在充电");
+        UILabel_Chargeing->SetTextId(STR_CHARGE);
         UILabel_Chargeing->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
         UILabel_Chargeing->SetTextColor(Color::GetColorFromRGBA(0x4F, 0xC3, 0x4C, 0xff));
         UILabel_Chargeing->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -302,7 +308,7 @@ namespace OHOS
         }
     }
 
-    static const char ** CreateImagePathsArray(const char *basePath, const char *fileExtension, int numImages)
+    static const char ** CreateImagePathsArray_(const char *basePath, const char *fileExtension, int numImages)
     {
         const char **imagePaths = new const char *[numImages];
         char buffer[256];
@@ -326,7 +332,7 @@ namespace OHOS
         group->SetPosition(0, 0, 466, 466);
 
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShutDownAnimatorView::ShowUpShutDownAnimatorView");
-        ShutDownPathsArray = CreateImagePathsArray(ShutDownPaths, "bin", SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES);
+        ShutDownPathsArray = CreateImagePathsArray_(ShutDownPaths, "bin", SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES);
 
         if (ShutDownImageAnimatorView == nullptr)
         {
@@ -416,16 +422,17 @@ namespace OHOS
         UIViewGroup_lowpower = nullptr;
         }
     }
-    static uint8_t timer_falg_low_power=5;
+    static uint8_t timer_falg_low_power=6;
     void low_power_TimerCallBack(int data)
     {
         //uapi_poweroff_device(); // 关机
         if(timer_falg_low_power)
         {
             timer_falg_low_power--;
-            char buf[34]={0};
-            sprintf(buf,"电量过低%ds后将自动关机",timer_falg_low_power);
-            alarm_UILabel->SetText(buf);
+           // char buf[34]={0};
+            // sprintf(buf,"电量过低%ds后将自动关机",timer_falg_low_power);
+            // alarm_UILabel->SetText(buf);
+            UpdateLabel(alarm_UILabel, timer_falg_low_power, STR_LOW_POWER_NOTIF_2);
             RootView::GetInstance()->Invalidate();
             if(timer_falg_low_power==0)
             {
@@ -469,12 +476,12 @@ namespace OHOS
         if (alarm_img == nullptr) {
             alarm_img = new UIImageView();
         }
-        alarm_img->SetPosition(183, 62);         // widget's left position and top position
+        alarm_img->SetPosition(171, 155);         // widget's left position and top position
         alarm_img->Resize(100, 100);          // widget's width and height
         alarm_img->SetViewId("image1");// Set style
 
         // Set additional property
-        const char *imageimagesPath = "/user/res/Attention.bin";
+        const char *imageimagesPath = "/user/res/lowpower.bin";
         alarm_img->SetSrc(imageimagesPath);
 
         // Add to rootView
@@ -488,23 +495,31 @@ namespace OHOS
         alarm_UILabel->SetPosition(101, 215);         // widget's left position and top position
         alarm_UILabel->Resize(466, 212);          // widget's width and height
         alarm_UILabel->SetViewId("label1");// Set style
-        alarm_UILabel->SetStyle(STYLE_TEXT_FONT, 33);
+        alarm_UILabel->SetStyle(STYLE_TEXT_FONT, 30);
 
         // Set additional property
         if(battery_falg==0)
         {
-            alarm_UILabel->SetText("请及时连接充电器");
-            alarm_UILabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
+            alarm_UILabel->SetPosition(110, 252);         // widget's left position and top position
+            alarm_UILabel->Resize(245, 70);          // widget's width and height
+
+            alarm_UILabel->SetText("当前电量低于10%请及时充电");
+            alarm_UILabel->SetTextId(STR_LOW_POWER_NOTIF_1);
+            
+            alarm_UILabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
             alarm_UILabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             alarm_UILabel->SetRollSpeed(0);
-            alarm_UILabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 33);
+            alarm_UILabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         }
         // Set additional property
         if(battery_falg==1)
         {
-            alarm_UILabel->SetPosition(50, 215); 
-            alarm_UILabel->SetText("电量过低5s后将自动关机");
-            alarm_UILabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
+            alarm_UILabel->SetPosition(110, 252);
+            alarm_UILabel->Resize(245, 70);          // widget's width and height
+            //alarm_UILabel->SetText("当前电量低于5%,将自动关机");
+            alarm_UILabel->SetTextId(STR_LOW_POWER_NOTIF_2);
+            UpdateLabel(alarm_UILabel, 5, STR_LOW_POWER_NOTIF_2);
+            alarm_UILabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
             alarm_UILabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             alarm_UILabel->SetRollSpeed(0);
             alarm_UILabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 33);
@@ -538,6 +553,7 @@ namespace OHOS
         alarm_labelbutton->SetImageSrc(ImgSrc, ImgSrc);
         // Set additional property
         alarm_labelbutton->SetText("确认");
+        alarm_labelbutton->SetTextId(STR_KONW);
         alarm_labelbutton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 44);
         alarm_labelbutton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);
 

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
index 65fbcad..ec7c766 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
index d67039d..15c30fa 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
@@ -558,12 +558,14 @@ enum UIResourceTextId : uint16_t {
     STR_GOAL_HINT = 545,\r
     STR_SLEEPMODE = 546,\r
     STR_SLEEP_MODE_PROMPT_ON = 547,\r
-    STR_MAX_ID = 548,\r
+    STR_LOW_POWER_NOTIF_1 = 548,\r
+    STR_LOW_POWER_NOTIF_2 = 549,\r
+    STR_MAX_ID = 550,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
index 94677db..b7ed3de 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c
index dfd0d2e..5aaec82 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c
@@ -1044,6 +1044,7 @@ static uint32_t PBAP_LS(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
 
 #include "bletest.h"
 #include "dial_sos_c.h"
+#include "battery_service.h"
 
 static uint32_t BLE_TEST(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
 {
@@ -1094,6 +1095,10 @@ static uint32_t BLE_TEST(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
     case 10:
         start_SOS_phone_dail();
         break;
+    case 11:
+        low_power_play_toUI(atoi( (char *)argv[1]));
+        break;
+        
     default:
         break;
     }

diff --git a/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt
index d6af906..8e742b9 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -545,4 +545,6 @@ STR_NUMBER_OF_STANDS$Number of stands
 STR_CONSUME_CALORIES$consume calories\r
 STR_GOAL_HINT$For goal Settings and more data, please visit the mobile APP\r
 STR_SLEEPMODE$Sleep mode\r
-STR_SLEEP_MODE_PROMPT_ON$Turn on sleep mode, and the watch will disable all reminders
\ No newline at end of file
+STR_SLEEP_MODE_PROMPT_ON$Turn on sleep mode, and the watch will disable all reminders\r
+STR_LOW_POWER_NOTIF_1$The current battery is below 10%, please charge it in time\r
+STR_LOW_POWER_NOTIF_2$When the battery is too low XXs will automatically shut down
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt
index 50bed8a..289a936 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -545,4 +545,6 @@ STR_NUMBER_OF_STANDS$站立次数
 STR_CONSUME_CALORIES$消耗卡路里\r
 STR_GOAL_HINT$目标设置及更多数据请前往手机APP查看\r
 STR_SLEEPMODE$睡眠模式\r
-STR_SLEEP_MODE_PROMPT_ON$开启睡眠模式，手表将禁用所有提醒并开启睡眠监测
\ No newline at end of file
+STR_SLEEP_MODE_PROMPT_ON$开启睡眠模式，手表将禁用所有提醒并开启睡眠监测\r
+STR_LOW_POWER_NOTIF_1$当前电量低于10%请及时充电\r
+STR_LOW_POWER_NOTIF_2$电量过低XXs后将自动关机
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/language.xlsx b/tools/language_tool/Language_xml/language.xlsx
index 999cdd3..2d718c1 100644 (file)
Binary files a/tools/language_tool/Language_xml/language.xlsx and b/tools/language_tool/Language_xml/language.xlsx differ

diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml
index f1ac1cf..97ff6df 100644 (file)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -547,4 +547,6 @@
        <lanstr id="STR_GOAL_HINT" value="For goal Settings and more data, please visit the mobile APP"/>
        <lanstr id="STR_SLEEPMODE" value="Sleep mode"/>
        <lanstr id="STR_SLEEP_MODE_PROMPT_ON" value="Turn on sleep mode, and the watch will disable all reminders"/>
+       <lanstr id="STR_LOW_POWER_NOTIF_1" value="The current battery is below 10%, please charge it in time"/>
+       <lanstr id="STR_LOW_POWER_NOTIF_2" value="When the battery is too low XXs will automatically shut down"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index e3658d8..3b55c48 100644 (file)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -547,4 +547,6 @@
        <lanstr id="STR_GOAL_HINT" value="目标设置及更多数据请前往手机APP查看"/>
        <lanstr id="STR_SLEEPMODE" value="睡眠模式"/>
        <lanstr id="STR_SLEEP_MODE_PROMPT_ON" value="开启睡眠模式，手表将禁用所有提醒并开启睡眠监测"/>
+       <lanstr id="STR_LOW_POWER_NOTIF_1" value="当前电量低于10%请及时充电"/>
+       <lanstr id="STR_LOW_POWER_NOTIF_2" value="电量过低XXs后将自动关机"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index 65fbcad..ec7c766 100644 (file)
Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ

diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h
index d67039d..15c30fa 100644 (file)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -558,12 +558,14 @@ enum UIResourceTextId : uint16_t {
     STR_GOAL_HINT = 545,\r
     STR_SLEEPMODE = 546,\r
     STR_SLEEP_MODE_PROMPT_ON = 547,\r
-    STR_MAX_ID = 548,\r
+    STR_LOW_POWER_NOTIF_1 = 548,\r
+    STR_LOW_POWER_NOTIF_2 = 549,\r
+    STR_MAX_ID = 550,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index 94677db..b7ed3de 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ