From: xue <2144439972@qq.com> Date: Mon, 30 Jun 2025 07:36:15 +0000 (+0800) Subject: 增加aod多国语音 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~210^2~34^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=98c2e758fde1a18b83670410ae6b44ad9f52adc9;p=mirrors%2FFD230.git 增加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 e318efa8c..67ca8c2be 100644 --- 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, STR_AIMODES_LINGXI = 642, STR_WATERFALL_DISPLAY = 643, - STR_MAX_ID = 644, + STR_AOD_DIAL = 644, + STR_SCREEN_OFF_DISPLAY = 645, + STR_AOD_REMIND = 646, + STR_MAX_ID = 647, }; // UIResourceTextId 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 79e665d53..8f32943c5 100644 --- 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 ccc559b44..bd3dcd364 100644 --- 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 123fa4325..0acaee39d 100644 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 e318efa8c..67ca8c2be 100644 --- 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, STR_AIMODES_LINGXI = 642, STR_WATERFALL_DISPLAY = 643, - STR_MAX_ID = 644, + STR_AOD_DIAL = 644, + STR_SCREEN_OFF_DISPLAY = 645, + STR_AOD_REMIND = 646, + STR_MAX_ID = 647, }; // UIResourceTextId 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 f9138db4f..4cbd51222 100644 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 c01835a88..f8f897af8 100644 --- 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 STR_DEEPSEEK$DeepSeek STR_AIMODES_LINGXI$jiutian -STR_WATERFALL_DISPLAY$Waterfall flow \ No newline at end of file +STR_WATERFALL_DISPLAY$Waterfall flow +STR_AOD_DIAL$AOD dial +STR_SCREEN_OFF_DISPLAY$Screen-off display +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 313911157..9485baf0d 100644 --- 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$清除全部记录 STR_DEEPSEEK$DeepSeek STR_AIMODES_LINGXI$九天大模型 -STR_WATERFALL_DISPLAY$瀑布流 \ No newline at end of file +STR_WATERFALL_DISPLAY$瀑布流 +STR_AOD_DIAL$AOD表盘 +STR_SCREEN_OFF_DISPLAY$息屏显示 +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 2667bdb44..190f46c80 100644 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 6252a36cc..f3f0e79df 100644 --- a/tools/language_tool/Language_xml/language_en.xml +++ b/tools/language_tool/Language_xml/language_en.xml @@ -645,4 +645,7 @@ + + + diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml index b0f7134c9..78d3dc296 100644 --- a/tools/language_tool/Language_xml/language_zh.xml +++ b/tools/language_tool/Language_xml/language_zh.xml @@ -645,4 +645,7 @@ + + + diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang index 123fa4325..0acaee39d 100644 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 e318efa8c..67ca8c2be 100644 --- 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, STR_AIMODES_LINGXI = 642, STR_WATERFALL_DISPLAY = 643, - STR_MAX_ID = 644, + STR_AOD_DIAL = 644, + STR_SCREEN_OFF_DISPLAY = 645, + STR_AOD_REMIND = 646, + STR_MAX_ID = 647, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang index f9138db4f..4cbd51222 100644 Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ