增加aod多国语音

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h
index e318efa..67ca8c2 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h
@@ -654,7 +654,10 @@ enum UIResourceTextId : uint16_t {
     STR_DEEPSEEK = 641,\r
     STR_AIMODES_LINGXI = 642,\r
     STR_WATERFALL_DISPLAY = 643,\r
-    STR_MAX_ID = 644,\r
+    STR_AOD_DIAL = 644,\r
+    STR_SCREEN_OFF_DISPLAY = 645,\r
+    STR_AOD_REMIND = 646,\r
+    STR_MAX_ID = 647,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp
index 79e665d..8f32943 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp
@@ -92,7 +92,7 @@ namespace OHOS
             Title->SetPosition(83, 50, 300, 40);
             Title->SetStyle(STYLE_TEXT_FONT, 30);
             Title->SetStyle(STYLE_LINE_HEIGHT, 35);
-            Title->SetText("AOD表盘"); /*AOD表盘*/
+            Title->SetTextId(STR_AOD_DIAL); /*AOD表盘*/
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             Title->SetRollSpeed(23);
@@ -117,7 +117,7 @@ namespace OHOS
             SetAodDialLabel->SetPosition(90, 153, 180, 40);
             SetAodDialLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SetAodDialLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-            SetAodDialLabel->SetText("息屏显示"); /*息屏显示*/
+            SetAodDialLabel->SetTextId(STR_SCREEN_OFF_DISPLAY); /*息屏显示*/
             SetAodDialLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);
             SetAodDialLabel->SetRollSpeed(23);
             SetAodDialLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
@@ -148,7 +148,7 @@ namespace OHOS
             note->SetStyle(STYLE_TEXT_FONT, 20);
             note->SetStyle(STYLE_LINE_HEIGHT, 40);
             note->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));
-            note->SetText("开启后，手表在在息屏状态下也会显示时间等信息,但同时会增加耗电"); // 开启后，手表在在息屏状态下也会显示时间等信息。
+            note->SetTextId(STR_AOD_REMIND); // 开启后，手表在在息屏状态下也会显示时间等信息。
             note->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
             note->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20);
             /* -------------------------------------------------------------------------- */

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp
index ccc559b..bd3dcd3 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp
@@ -41,7 +41,7 @@ namespace OHOS
         settings[index++] = {VIEW_SOUND_VIBRATION, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true};
         settings[index++] = {VIEW_THEME_STYLE, PNG_SETTINGS_DISPLAY_MODE, STR_DISPLAY_MODE, true};
         settings[index++] = {VIEW_MOTION_RECOGNITION, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true};
-        settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true};
+        settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_MOTION_RECOGNITION, STR_SCREEN_OFF_DISPLAY, true};
         settings[index++] = {VIEW_DNOTDISTURB, PNG_SETTINGS_DISTURB_IMAGE, STR_DO_NOT_DISTURB, true};
         settings[index++] = {VIEW_ADD_CARD, PNG_SETTINGS_CARDSET_IMAGE, STR_CARD_MANAGEMENT, true};
         settings[index++] = {VIEW_SET_DIAL_STYLE, PNG_SETTINGS_CHANGEDIAL_IMAGE, STR_DIAL_BROWSING_SPECIAL_EFFECTS, true};

diff --git a/code/sdk/files/fd230/fs/user/res/font/en.lang b/code/sdk/files/fd230/fs/user/res/font/en.lang
index 123fa43..0acaee3 100644 (file)
Binary files a/code/sdk/files/fd230/fs/user/res/font/en.lang and b/code/sdk/files/fd230/fs/user/res/font/en.lang differ

diff --git a/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h
index e318efa..67ca8c2 100644 (file)
--- a/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h
@@ -654,7 +654,10 @@ enum UIResourceTextId : uint16_t {
     STR_DEEPSEEK = 641,\r
     STR_AIMODES_LINGXI = 642,\r
     STR_WATERFALL_DISPLAY = 643,\r
-    STR_MAX_ID = 644,\r
+    STR_AOD_DIAL = 644,\r
+    STR_SCREEN_OFF_DISPLAY = 645,\r
+    STR_AOD_REMIND = 646,\r
+    STR_MAX_ID = 647,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/files/fd230/fs/user/res/font/zh.lang b/code/sdk/files/fd230/fs/user/res/font/zh.lang
index f9138db..4cbd512 100644 (file)
Binary files a/code/sdk/files/fd230/fs/user/res/font/zh.lang and b/code/sdk/files/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 c01835a..f8f897a 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -643,4 +643,7 @@ STR_RECORD_MAX$The recording space is full
 STR_CLEAR_ALL_RECORDS$Clear all records\r
 STR_DEEPSEEK$DeepSeek\r
 STR_AIMODES_LINGXI$jiutian \r
-STR_WATERFALL_DISPLAY$Waterfall flow
\ No newline at end of file
+STR_WATERFALL_DISPLAY$Waterfall flow\r
+STR_AOD_DIAL$AOD dial\r
+STR_SCREEN_OFF_DISPLAY$Screen-off display\r
+STR_AOD_REMIND$After enabling, the watch will display time and other information in the screen-off state, but it will also increase power consumption.
\ 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 3139111..9485baf 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -643,4 +643,7 @@ STR_RECORD_MAX$录音空间已满
 STR_CLEAR_ALL_RECORDS$清除全部记录\r
 STR_DEEPSEEK$DeepSeek\r
 STR_AIMODES_LINGXI$九天大模型\r
-STR_WATERFALL_DISPLAY$瀑布流
\ No newline at end of file
+STR_WATERFALL_DISPLAY$瀑布流\r
+STR_AOD_DIAL$AOD表盘\r
+STR_SCREEN_OFF_DISPLAY$息屏显示\r
+STR_AOD_REMIND$开启后，手表在在息屏状态下也会显示时间等信息,但同时会增加耗电
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/language_custom.xlsx b/tools/language_tool/Language_xml/language_custom.xlsx
index 2667bdb..190f46c 100644 (file)
Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ

diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml
index 6252a36..f3f0e79 100644 (file)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -645,4 +645,7 @@
        <lanstr id="STR_DEEPSEEK" value="DeepSeek"/>
        <lanstr id="STR_AIMODES_LINGXI" value="jiutian"/>
        <lanstr id="STR_WATERFALL_DISPLAY" value="Waterfall flow"/>
+       <lanstr id="STR_AOD_DIAL" value="AOD dial"/>
+       <lanstr id="STR_SCREEN_OFF_DISPLAY" value="Screen-off display"/>
+       <lanstr id="STR_AOD_REMIND" value="After enabling, the watch will display time and other information in the screen-off state, but it will also increase power consumption."/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index b0f7134..78d3dc2 100644 (file)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -645,4 +645,7 @@
        <lanstr id="STR_DEEPSEEK" value="DeepSeek"/>
        <lanstr id="STR_AIMODES_LINGXI" value="九天大模型"/>
        <lanstr id="STR_WATERFALL_DISPLAY" value="瀑布流"/>
+       <lanstr id="STR_AOD_DIAL" value="AOD表盘"/>
+       <lanstr id="STR_SCREEN_OFF_DISPLAY" value="息屏显示"/>
+       <lanstr id="STR_AOD_REMIND" value="开启后，手表在在息屏状态下也会显示时间等信息,但同时会增加耗电"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index 123fa43..0acaee3 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 e318efa..67ca8c2 100644 (file)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -654,7 +654,10 @@ enum UIResourceTextId : uint16_t {
     STR_DEEPSEEK = 641,\r
     STR_AIMODES_LINGXI = 642,\r
     STR_WATERFALL_DISPLAY = 643,\r
-    STR_MAX_ID = 644,\r
+    STR_AOD_DIAL = 644,\r
+    STR_SCREEN_OFF_DISPLAY = 645,\r
+    STR_AOD_REMIND = 646,\r
+    STR_MAX_ID = 647,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index f9138db..4cbd512 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ