睡眠模式字符串图片资源；优化日程

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 bdb6d2d..d67039d 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
@@ -550,12 +550,20 @@ enum UIResourceTextId : uint16_t {
     STR_HANG_UP_OR_ANSWER = 537,\r
     STR_WATCH_CALL = 538,\r
     STR_PHONE_CALL = 539,\r
-    STR_MAX_ID = 540,\r
+    STR_STEPS_OF_THE_DAY = 540,\r
+    STR_MILEAGE = 541,\r
+    STR_FAT_BURNING_TIME = 542,\r
+    STR_NUMBER_OF_STANDS = 543,\r
+    STR_CONSUME_CALORIES = 544,\r
+    STR_GOAL_HINT = 545,\r
+    STR_SLEEPMODE = 546,\r
+    STR_SLEEP_MODE_PROMPT_ON = 547,\r
+    STR_MAX_ID = 548,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleView.h b/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleView.h
index 940fb0f..9a84175 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/include/ScheduleView.h
@@ -57,6 +57,7 @@ namespace OHOS
 \r
     private:\r
         UIViewGroup * InitNoDataScreen();\r
+        void DeinitNoDataScreen();\r
         UILabelExt * InitLabel(int16_t x, int16_t y, int16_t width, int16_t height,\r
                                 uint16_t line_height, uint8_t font_size, uint16_t text_id, uint32_t text_color);\r
 \r
@@ -68,12 +69,14 @@ namespace OHOS
 \r
 \r
         UIViewGroup * InitDataScreen();\r
+        void DeinitDataScreen();\r
         UIViewGroup * DataGroup_{nullptr};\r
         UIList * ScheduleList_{nullptr};\r
         ScheduleListAdapter * ScheduleListAdapter_{nullptr};\r
 \r
 \r
         UIScrollView * InitContentScreen();\r
+        void DeinitContentScreen();\r
         UIScrollView * ContentGroup_{nullptr};\r
         UILabelExt * ContentDateLabelExt_{nullptr};\r
         UILabelExt * ContentTopicLabelExt_{nullptr};\r
@@ -88,6 +91,7 @@ namespace OHOS
 \r
 \r
         UIViewGroup * InitDeleteScreen();\r
+        void DeinitDeleteScreen();\r
         UIViewGroup * DeleteGroup_{nullptr};\r
         UILabelExt * DeleteTitleLabelExt_{nullptr};\r
         UILabelExt * DeletePromptLabelExt_{nullptr};\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
index 2389dbf..546a190 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
@@ -81,102 +81,11 @@ namespace OHOS
         if (nullptr != container_)\r
         {\r
             container_->RemoveAll();\r
-            if (nullptr != NoDataGroup_)\r
-            {\r
-                NoDataGroup_->RemoveAll();\r
-                if (nullptr != LabelExt0_)\r
-                {\r
-                    delete LabelExt0_;\r
-                    LabelExt0_ = nullptr;\r
-                }\r
-                if (nullptr != ImageView_)\r
-                {\r
-                    delete ImageView_;\r
-                    ImageView_ = nullptr;\r
-                }\r
-                if (nullptr != LabelExt1_)\r
-                {\r
-                    delete LabelExt1_;\r
-                    LabelExt1_ = nullptr;\r
-                }\r
-                if (nullptr != LabelExt2_)\r
-                {\r
-                    delete LabelExt2_;\r
-                    LabelExt2_ = nullptr;\r
-                }\r
 \r
-                delete NoDataGroup_;\r
-                NoDataGroup_ = nullptr;\r
-            }\r
-            if (nullptr != DataGroup_)\r
-            {\r
-                DataGroup_->RemoveAll();\r
-                if (nullptr != ScheduleListAdapter_)\r
-                {\r
-                    delete ScheduleListAdapter_;\r
-                    ScheduleListAdapter_ = nullptr;\r
-                }\r
-                if (nullptr != ScheduleList_)\r
-                {\r
-                    delete ScheduleList_;\r
-                    ScheduleList_ = nullptr;\r
-                }\r
-\r
-                delete DataGroup_;\r
-                DataGroup_ = nullptr;\r
-            }\r
-            if(nullptr != ContentGroup_)\r
-            {\r
-                ContentGroup_->RemoveAll();\r
-                if(nullptr != ContentDateLabelExt_)\r
-                {\r
-                    delete ContentDateLabelExt_;\r
-                    ContentDateLabelExt_ = nullptr;\r
-                }\r
-                if(nullptr != ContentTopicLabelExt_)\r
-                {\r
-                    delete ContentTopicLabelExt_;\r
-                    ContentTopicLabelExt_ = nullptr;\r
-                }\r
-                if(nullptr != ContentTopicLabelExt1_)\r
-                {\r
-                    delete ContentTopicLabelExt1_;\r
-                    ContentTopicLabelExt1_ = nullptr;\r
-                }\r
-                if(nullptr != ContentTimeLabelExt_)\r
-                {\r
-                    delete ContentTimeLabelExt_;\r
-                    ContentTimeLabelExt_ = nullptr;\r
-                }\r
-                if(nullptr != ContentTimeLabelExt1_)\r
-                {\r
-                    delete ContentTimeLabelExt1_;\r
-                    ContentTimeLabelExt1_ = nullptr;\r
-                }\r
-                if(nullptr != ContentContentLabelExt_)\r
-                {\r
-                    delete ContentContentLabelExt_;\r
-                    ContentContentLabelExt_ = nullptr;\r
-                }\r
-                if(nullptr != ContentContentLabelExt1_)\r
-                {\r
-                    delete ContentContentLabelExt1_;\r
-                    ContentContentLabelExt1_ = nullptr;\r
-                }\r
-                if(nullptr != ContentDeleteButton_)\r
-                {\r
-                    delete ContentDeleteButton_;\r
-                    ContentDeleteButton_ = nullptr;\r
-                }\r
-                if(nullptr != ContentCloseButton_)\r
-                {\r
-                    delete ContentCloseButton_;\r
-                    ContentCloseButton_ = nullptr;\r
-                }\r
-                \r
-                delete ContentGroup_;\r
-                ContentGroup_ = nullptr;\r
-            }\r
+            DeinitNoDataScreen();\r
+            DeinitDataScreen();\r
+            DeinitContentScreen();\r
+            DeinitDeleteScreen();\r
 \r
             delete container_;\r
             container_ = nullptr;\r
@@ -272,6 +181,37 @@ namespace OHOS
         DisplaySelectScreen(ENUM_SCHEDULE_SCREEN_DELETE);\r
     }\r
 \r
+    void ScheduleView::DeinitNoDataScreen()\r
+    {\r
+        if (nullptr != NoDataGroup_)\r
+        {\r
+            NoDataGroup_->RemoveAll();\r
+            if (nullptr != LabelExt0_)\r
+            {\r
+                delete LabelExt0_;\r
+                LabelExt0_ = nullptr;\r
+            }\r
+            if (nullptr != ImageView_)\r
+            {\r
+                delete ImageView_;\r
+                ImageView_ = nullptr;\r
+            }\r
+            if (nullptr != LabelExt1_)\r
+            {\r
+                delete LabelExt1_;\r
+                LabelExt1_ = nullptr;\r
+            }\r
+            if (nullptr != LabelExt2_)\r
+            {\r
+                delete LabelExt2_;\r
+                LabelExt2_ = nullptr;\r
+            }\r
+\r
+            delete NoDataGroup_;\r
+            NoDataGroup_ = nullptr;\r
+        }\r
+    }\r
+\r
     UIViewGroup * ScheduleView::InitNoDataScreen()\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__);\r
@@ -337,6 +277,27 @@ namespace OHOS
         return NoDataGroup_;\r
     }\r
 \r
+    void ScheduleView::DeinitDataScreen()\r
+    {\r
+        if (nullptr != DataGroup_)\r
+        {\r
+            DataGroup_->RemoveAll();\r
+            if (nullptr != ScheduleListAdapter_)\r
+            {\r
+                delete ScheduleListAdapter_;\r
+                ScheduleListAdapter_ = nullptr;\r
+            }\r
+            if (nullptr != ScheduleList_)\r
+            {\r
+                delete ScheduleList_;\r
+                ScheduleList_ = nullptr;\r
+            }\r
+\r
+            delete DataGroup_;\r
+            DataGroup_ = nullptr;\r
+        }\r
+    }\r
+\r
     UIViewGroup * ScheduleView::InitDataScreen()\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__);\r
@@ -395,6 +356,62 @@ namespace OHOS
         return DataGroup_;\r
     }\r
 \r
+    void ScheduleView::DeinitContentScreen()\r
+    {\r
+        if(nullptr != ContentGroup_)\r
+        {\r
+            ContentGroup_->RemoveAll();\r
+            if(nullptr != ContentDateLabelExt_)\r
+            {\r
+                delete ContentDateLabelExt_;\r
+                ContentDateLabelExt_ = nullptr;\r
+            }\r
+            if(nullptr != ContentTopicLabelExt_)\r
+            {\r
+                delete ContentTopicLabelExt_;\r
+                ContentTopicLabelExt_ = nullptr;\r
+            }\r
+            if(nullptr != ContentTopicLabelExt1_)\r
+            {\r
+                delete ContentTopicLabelExt1_;\r
+                ContentTopicLabelExt1_ = nullptr;\r
+            }\r
+            if(nullptr != ContentTimeLabelExt_)\r
+            {\r
+                delete ContentTimeLabelExt_;\r
+                ContentTimeLabelExt_ = nullptr;\r
+            }\r
+            if(nullptr != ContentTimeLabelExt1_)\r
+            {\r
+                delete ContentTimeLabelExt1_;\r
+                ContentTimeLabelExt1_ = nullptr;\r
+            }\r
+            if(nullptr != ContentContentLabelExt_)\r
+            {\r
+                delete ContentContentLabelExt_;\r
+                ContentContentLabelExt_ = nullptr;\r
+            }\r
+            if(nullptr != ContentContentLabelExt1_)\r
+            {\r
+                delete ContentContentLabelExt1_;\r
+                ContentContentLabelExt1_ = nullptr;\r
+            }\r
+            if(nullptr != ContentDeleteButton_)\r
+            {\r
+                delete ContentDeleteButton_;\r
+                ContentDeleteButton_ = nullptr;\r
+            }\r
+            if(nullptr != ContentCloseButton_)\r
+            {\r
+                delete ContentCloseButton_;\r
+                ContentCloseButton_ = nullptr;\r
+            }\r
+            \r
+            delete ContentGroup_;\r
+            ContentGroup_ = nullptr;\r
+        }\r
+    }\r
+\r
     UIScrollView * ScheduleView::InitContentScreen()\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__);\r
@@ -593,6 +610,37 @@ namespace OHOS
         return ContentGroup_;\r
     }\r
 \r
+    void ScheduleView::DeinitDeleteScreen()\r
+    {\r
+        if(nullptr != DeleteGroup_)\r
+        {\r
+            DeleteGroup_->RemoveAll();\r
+            if(nullptr != DeleteTitleLabelExt_)\r
+            {\r
+                delete DeleteTitleLabelExt_;\r
+                DeleteTitleLabelExt_ = nullptr;\r
+            }\r
+            if(nullptr != DeletePromptLabelExt_)\r
+            {\r
+                delete DeletePromptLabelExt_;\r
+                DeletePromptLabelExt_ = nullptr;\r
+            }\r
+            if(nullptr != DeleteCancelButton_)\r
+            {\r
+                delete DeleteCancelButton_;\r
+                DeleteCancelButton_ = nullptr;\r
+            }\r
+            if(nullptr != DeleteOKButton_)\r
+            {\r
+                delete DeleteOKButton_;\r
+                DeleteOKButton_ = nullptr;\r
+            }\r
+            \r
+            delete DeleteGroup_;\r
+            DeleteGroup_ = nullptr;\r
+        }\r
+    }\r
+\r
     UIViewGroup * ScheduleView::InitDeleteScreen()\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__);\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Sleepmode/sleepmode.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Sleepmode/sleepmode.bin
new file mode 100644 (file)
index 0000000..10f3393
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Sleepmode/sleepmode.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c80c3e9c5e7b5479fe122d89304854ef0254a81e18cd1224b1a98243bfddf5da
+size 6824

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 a84c78c..65fbcad 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 bdb6d2d..d67039d 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
@@ -550,12 +550,20 @@ enum UIResourceTextId : uint16_t {
     STR_HANG_UP_OR_ANSWER = 537,\r
     STR_WATCH_CALL = 538,\r
     STR_PHONE_CALL = 539,\r
-    STR_MAX_ID = 540,\r
+    STR_STEPS_OF_THE_DAY = 540,\r
+    STR_MILEAGE = 541,\r
+    STR_FAT_BURNING_TIME = 542,\r
+    STR_NUMBER_OF_STANDS = 543,\r
+    STR_CONSUME_CALORIES = 544,\r
+    STR_GOAL_HINT = 545,\r
+    STR_SLEEPMODE = 546,\r
+    STR_SLEEP_MODE_PROMPT_ON = 547,\r
+    STR_MAX_ID = 548,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\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 f0c85b5..1492dc2 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/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt
index 80e6512..d6af906 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -543,4 +543,6 @@ STR_MILEAGE$Mileage (KM)
 STR_FAT_BURNING_TIME$Fat burning time\r
 STR_NUMBER_OF_STANDS$Number of stands\r
 STR_CONSUME_CALORIES$consume calories\r
-STR_GOAL_HINT$For goal Settings and more data, please visit the mobile APP
\ No newline at end of file
+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

diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt
index 00da13b..00a6ccf 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -543,4 +543,6 @@ STR_MILEAGE$里程(KM)
 STR_FAT_BURNING_TIME$燃脂时间\r
 STR_NUMBER_OF_STANDS$站立次数\r
 STR_CONSUME_CALORIES$消耗卡路里\r
-STR_GOAL_HINT$目标设置及更多数据请前往手机APP查看
\ No newline at end of file
+STR_GOAL_HINT$目标设置及更多数据请前往手机APP查看\r
+STR_SLEEPMODE$睡眠模式\r
+STR_SLEEP_MODE_PROMPT_ON$开启睡眠模式，手表将禁用所有提醒并开启睡眠监测
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml
index ed8e33b..f1ac1cf 100644 (file)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -545,4 +545,6 @@
        <lanstr id="STR_NUMBER_OF_STANDS" value="Number of stands"/>
        <lanstr id="STR_CONSUME_CALORIES" value="consume calories"/>
        <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"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index 12f9187..ae3b258 100644 (file)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -545,4 +545,6 @@
        <lanstr id="STR_NUMBER_OF_STANDS" value="站立次数"/>
        <lanstr id="STR_CONSUME_CALORIES" value="消耗卡路里"/>
        <lanstr id="STR_GOAL_HINT" value="目标设置及更多数据请前往手机APP查看"/>
+       <lanstr id="STR_SLEEPMODE" value="睡眠模式"/>
+       <lanstr id="STR_SLEEP_MODE_PROMPT_ON" value="开启睡眠模式，手表将禁用所有提醒并开启睡眠监测"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index a84c78c..65fbcad 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 bdb6d2d..d67039d 100644 (file)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -550,12 +550,20 @@ enum UIResourceTextId : uint16_t {
     STR_HANG_UP_OR_ANSWER = 537,\r
     STR_WATCH_CALL = 538,\r
     STR_PHONE_CALL = 539,\r
-    STR_MAX_ID = 540,\r
+    STR_STEPS_OF_THE_DAY = 540,\r
+    STR_MILEAGE = 541,\r
+    STR_FAT_BURNING_TIME = 542,\r
+    STR_NUMBER_OF_STANDS = 543,\r
+    STR_CONSUME_CALORIES = 544,\r
+    STR_GOAL_HINT = 545,\r
+    STR_SLEEPMODE = 546,\r
+    STR_SLEEP_MODE_PROMPT_ON = 547,\r
+    STR_MAX_ID = 548,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\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 f0c85b5..1492dc2 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ