屏幕与亮度适配多国语言

diff --git a/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h b/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
index ed37cf3..a05b483 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
@@ -8,7 +8,7 @@
 #include "wearable_log.h"
 #include "components/ui_image_animator.h"
 #include "vector"
-
+#include "language/font/ui_resource_string.h"
 struct dial_config
 {
     std::string dialname;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h
index ad4f44e..84b41b6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h
@@ -45,7 +45,8 @@ namespace OHOS
             int16_t height;\r
             int16_t fontSize;      // 字体大小\r
             int16_t lineHeigh;     // 行高\r
-            std::string text;      // 文本\r
+            //std::string text;      // 文本\r
+            int16_t textId;\r
             uint8_t lineBreakMode; // 断行模式。\r
         };\r
         struct CheckBoxConfig\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h
index a5ba75b..0a04d4c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-03-30 09:14:38\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-04-17 11:45:54\r
+ * @LastEditTime: 2024-05-06 11:14:31\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h\r
  */\r
 #ifndef SCREEN_DUATION_VIEW_H\r
@@ -36,7 +36,8 @@ namespace OHOS
             int16_t height;\r
             int16_t fontSize;      // 字体大小\r
             int16_t lineHeigh;     // 行高\r
-            const char *text;      // 文本\r
+            //const char *text;      // 文本\r
+            int16_t textId;\r
             uint8_t lineBreakMode; // 断行模式。\r
         };\r
         struct RadioButtonConfig\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
index f9b3782..5d22d90 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-03-30 09:14:38\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-04-18 15:54:44\r
+ * @LastEditTime: 2024-05-06 11:06:27\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp\r
  */\r
 #include "AppViewIDs.h"\r
@@ -104,18 +104,18 @@ namespace OHOS
             return;\r
         }\r
 \r
-        const std::map<uint32_t, std::string> durationMap = {\r
-            {SCREENDURATION_FIVE, "5秒"},\r
-            {SCREENDURATION_TEN, "10秒"},\r
-            {SCREENDURATION_FIFTEENTH, "15秒"},\r
-            {SCREENDURATION_THIRTY, "30秒"},\r
-            {SCREENDURATION_SIXTY, "60秒"},\r
-            {SCREENDURATION_THREE_HUNDRED, "300秒"}};\r
+        const std::map<uint32_t, int16_t> durationMap = {\r
+            {SCREENDURATION_FIVE, STR_5_SECONDS},\r
+            {SCREENDURATION_TEN, STR_10_SECONDS},\r
+            {SCREENDURATION_FIFTEENTH, STR_15_SECONDS},\r
+            {SCREENDURATION_THIRTY, STR_30_SECONDS},\r
+            {SCREENDURATION_SIXTY, STR_60_SECONDS},\r
+            {SCREENDURATION_THREE_HUNDRED, STR_300_SECONDS}};\r
 \r
         auto iter = durationMap.find(value);\r
         if (iter != durationMap.end())\r
         {\r
-            p_DisplayBrightnessView->GetSelectScreenDurationLabel()->SetText(iter->second.c_str());\r
+            p_DisplayBrightnessView->GetSelectScreenDurationLabel()->SetTextId(iter->second);\r
         }\r
         else\r
         {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
index 35e43a7..d32cfff 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
@@ -109,7 +109,8 @@ namespace OHOS
         DisplayBrightnessTitleLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
         DisplayBrightnessTitleLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
         DisplayBrightnessTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-        DisplayBrightnessTitleLabel->SetText("屏幕与亮度");\r
+        // DisplayBrightnessTitleLabel->SetText("屏幕与亮度");\r
+        DisplayBrightnessTitleLabel->SetTextId(STR_SCREEN_AND_BRIGHTNESS);\r
         DisplayBrightnessTitleLabel->SetRollSpeed(40);\r
         DisplayBrightnessTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
         DisplayBrightnessTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
@@ -183,9 +184,10 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height); // 位置大小\r
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);                                       // 字体大小\r
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);                                    // 字体行高\r
-        label->SetText(labelconfig.text.c_str());                                                     // 内容\r
-        label->SetLineBreakMode(labelconfig.lineBreakMode);                                           // 断行模式。\r
-        label->SetRollSpeed(40);\r
+        // label->SetText(labelconfig.text.c_str());                                                     // 内容\r
+        label->SetTextId(labelconfig.textId);\r
+        label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。\r
+        //label->SetRollSpeed(40);\r
         // label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);\r
         return label;\r
@@ -203,7 +205,8 @@ namespace OHOS
             .height = 40,\r
             .fontSize = 30,\r
             .lineHeigh = 35,\r
-            .text = "亮度调节",\r
+            //.text = "亮度调节",\r
+            .textId = STR_BRIGHTNESS_ADJUSTMENT,\r
             .lineBreakMode = UILabel::LINE_BREAK_MARQUEE,\r
         };\r
         BringhtnessControlLabel = SetUpLabel(labelconfig);\r
@@ -215,7 +218,8 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         labelconfig.top = 273;\r
         labelconfig.width = 180;\r
-        labelconfig.text = "亮屏时长";\r
+        //labelconfig.text = "亮屏时长";\r
+        labelconfig.textId = STR_SCREEN_ON_DURATION;\r
         ScreenDurationLabel = SetUpLabel(labelconfig);\r
         if (ScreenDurationLabel == nullptr)\r
         {\r
@@ -224,7 +228,8 @@ namespace OHOS
         }\r
         /* -------------------------------------------------------------------------- */\r
         labelconfig.top = 393;\r
-        labelconfig.text = "抬腕亮屏";\r
+        //labelconfig.text = "抬腕亮屏";\r
+        labelconfig.textId = STR_RAISE_TO_WAKE;\r
         RaiseToBrightnessLabel = SetUpLabel(labelconfig);\r
         if (RaiseToBrightnessLabel == nullptr)\r
         {\r
@@ -239,7 +244,8 @@ namespace OHOS
             .height = 40,\r
             .fontSize = 30,\r
             .lineHeigh = 35,\r
-            .text = "",\r
+            //.text = "",\r
+            .textId = 0,\r
             .lineBreakMode = UILabel::LINE_BREAK_MARQUEE,\r
         };\r
         selectScreenDurationLabel = SetUpLabel(labelconfig);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp
index c043c8a..e3f14d3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp
@@ -30,7 +30,7 @@ namespace OHOS
         if (initViewStatus == true)\r
         {\r
             ScreenDurationScrollView->RemoveAll();\r
-            \r
+\r
             delete ScreenDurationTitleLabel;\r
             ScreenDurationTitleLabel = nullptr;\r
 \r
@@ -79,8 +79,9 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height); // 位置大小\r
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);                                       // 字体大小\r
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);                                    // 字体行高\r
-        label->SetText(labelconfig.text);                                                             // 内容\r
-        label->SetLineBreakMode(labelconfig.lineBreakMode);                                           // 断行模式。\r
+        // label->SetText(labelconfig.text);                                                             // 内容\r
+        label->SetTextId(labelconfig.textId);                 // 内容\r
+        label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。\r
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);\r
         return label;\r
@@ -160,7 +161,8 @@ namespace OHOS
             .height = 40,\r
             .fontSize = 30,\r
             .lineHeigh = 35,\r
-            .text = "亮屏时长",\r
+            //.text = "亮屏时长",\r
+            .textId = STR_SCREEN_ON_DURATION,\r
             .lineBreakMode = UILabel::LINE_BREAK_MARQUEE,\r
         };\r
 \r
@@ -179,12 +181,14 @@ namespace OHOS
             .lineBreakMode = UILabel::LINE_BREAK_ADAPT,\r
         };\r
 \r
-        const char *durations[DURATIONS] = {"5秒", "10秒", "15秒", "30秒", "60秒", "300秒"};\r
+        // const char *durations[DURATIONS] = {"5秒", "10秒", "15秒", "30秒", "60秒", "300秒"};\r
+        UIResourceTextId durations[DURATIONS] = {STR_5_SECONDS, STR_10_SECONDS, STR_15_SECONDS, STR_30_SECONDS, STR_60_SECONDS, STR_300_SECONDS};\r
 \r
         for (int i = 0; i < DURATIONS; i++)\r
         {\r
             labelconfig.top = 153 + (i * 120);\r
-            labelconfig.text = durations[i];\r
+            // labelconfig.text = durations[i];\r
+            labelconfig.textId = durations[i];\r
             ScreenDurationLabel[i] = SetUpLabel(labelconfig);\r
             if (ScreenDurationLabel[i] == nullptr)\r
             {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt
index 7e54217..1f77e1e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt
@@ -245,4 +245,13 @@ STR_DISPLAY_MODE$Display Mode
 STR_MOTION_RECOGNITION$Motion Recognition\r
 STR_SYSTEM$System\r
 STR_SHUTDOWN_AND_RESTART$Shutdown and Restart\r
+STR_BRIGHTNESS_ADJUSTMENT$Brightness Adjustment\r
+STR_SCREEN_ON_DURATION$Screen On Duration\r
+STR_RAISE_TO_WAKE$Raise to Wake\r
+STR_5_SECONDS$5s\r
+STR_10_SECONDS$10s\r
+STR_15_SECONDS$15s\r
+STR_30_SECONDS$30s\r
+STR_60_SECONDS$60s\r
+STR_300_SECONDS$300s\r
 STR_LANGUAGE$Language 
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
index fa04d28..c3c284f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
@@ -245,4 +245,13 @@ STR_DISPLAY_MODE$显示方式
 STR_MOTION_RECOGNITION$运动识别\r
 STR_SYSTEM$系统\r
 STR_SHUTDOWN_AND_RESTART$关机和重启\r
+STR_BRIGHTNESS_ADJUSTMENT$亮度调节\r
+STR_SCREEN_ON_DURATION$亮屏时长\r
+STR_RAISE_TO_WAKE$抬腕亮屏\r
+STR_5_SECONDS$5秒\r
+STR_10_SECONDS$10秒\r
+STR_15_SECONDS$15秒\r
+STR_30_SECONDS$30秒\r
+STR_60_SECONDS$60秒\r
+STR_300_SECONDS$300秒\r
 STR_LANGUAGE$语言
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml
index e8e0617..fd48cb7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml
@@ -246,5 +246,14 @@
        <lanstr id="STR_MOTION_RECOGNITION" value="Motion Recognition"/>
        <lanstr id="STR_SYSTEM" value="System"/>
        <lanstr id="STR_SHUTDOWN_AND_RESTART" value="Shutdown and Restart"/>
+       <lanstr id="STR_BRIGHTNESS_ADJUSTMENT" value="Brightness Adjustment"/>
+       <lanstr id="STR_SCREEN_ON_DURATION" value="Screen On Duration"/>
+       <lanstr id="STR_RAISE_TO_WAKE" value="Raise to Wake"/>
+       <lanstr id="STR_5_SECONDS" value="5s"/>
+       <lanstr id="STR_10_SECONDS" value="10s"/>
+       <lanstr id="STR_15_SECONDS" value="15s"/>
+       <lanstr id="STR_30_SECONDS" value="30s"/>
+       <lanstr id="STR_60_SECONDS" value="60s"/>
+       <lanstr id="STR_300_SECONDS" value="300s"/>
        <lanstr id="STR_LANGUAGE" value="Language"/>
 </language>

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
index b9ec11c..ffcf848 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
@@ -246,5 +246,14 @@
        <lanstr id="STR_MOTION_RECOGNITION" value="运动识别"/>
        <lanstr id="STR_SYSTEM" value="系统"/>
        <lanstr id="STR_SHUTDOWN_AND_RESTART" value="关机和重启"/>
+       <lanstr id="STR_BRIGHTNESS_ADJUSTMENT" value="亮度调节"/>
+       <lanstr id="STR_SCREEN_ON_DURATION" value="亮屏时长"/>
+       <lanstr id="STR_RAISE_TO_WAKE" value="抬腕亮屏"/>
+       <lanstr id="STR_5_SECONDS" value="5秒"/>
+       <lanstr id="STR_10_SECONDS" value="10秒"/>
+       <lanstr id="STR_15_SECONDS" value="15秒"/>
+       <lanstr id="STR_30_SECONDS" value="30秒"/>
+       <lanstr id="STR_60_SECONDS" value="60秒"/>
+       <lanstr id="STR_300_SECONDS" value="300秒"/>
        <lanstr id="STR_LANGUAGE" value="语言"/>
 </language>

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
index a97bfae..ebadbc7 100644 (file)
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang
index 12211a0..7b054fd 100644 (file)
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang differ

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
index 73166d3..4ed67c0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
@@ -260,8 +260,17 @@ enum UIResourceTextId : uint16_t {
     STR_MOTION_RECOGNITION = 247,\r
     STR_SYSTEM = 248,\r
     STR_SHUTDOWN_AND_RESTART = 249,\r
-    STR_LANGUAGE = 250,\r
-    STR_MAX_ID = 251,\r
+    STR_BRIGHTNESS_ADJUSTMENT = 250,\r
+    STR_SCREEN_ON_DURATION = 251,\r
+    STR_RAISE_TO_WAKE = 252,\r
+    STR_5_SECONDS = 253,\r
+    STR_10_SECONDS = 254,\r
+    STR_15_SECONDS = 255,\r
+    STR_30_SECONDS = 256,\r
+    STR_60_SECONDS = 257,\r
+    STR_300_SECONDS = 258,\r
+    STR_LANGUAGE = 259,\r
+    STR_MAX_ID = 260,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
index 2624d3a..04be58f 100644 (file)
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ

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 a97bfae..ebadbc7 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/ja.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang
index 12211a0..7b054fd 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.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 73166d3..4ed67c0 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
@@ -260,8 +260,17 @@ enum UIResourceTextId : uint16_t {
     STR_MOTION_RECOGNITION = 247,\r
     STR_SYSTEM = 248,\r
     STR_SHUTDOWN_AND_RESTART = 249,\r
-    STR_LANGUAGE = 250,\r
-    STR_MAX_ID = 251,\r
+    STR_BRIGHTNESS_ADJUSTMENT = 250,\r
+    STR_SCREEN_ON_DURATION = 251,\r
+    STR_RAISE_TO_WAKE = 252,\r
+    STR_5_SECONDS = 253,\r
+    STR_10_SECONDS = 254,\r
+    STR_15_SECONDS = 255,\r
+    STR_30_SECONDS = 256,\r
+    STR_60_SECONDS = 257,\r
+    STR_300_SECONDS = 258,\r
+    STR_LANGUAGE = 259,\r
+    STR_MAX_ID = 260,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

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 2624d3a..04be58f 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