From: luozheng <1732036298@qq.com> Date: Mon, 6 May 2024 03:48:53 +0000 (+0800) Subject: 修改网络与通话Slice适配多国语言 X-Git-Tag: release_V1.2.70_20241020_135402~1113^2~25 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=712bbadc187aa9dbf2f5e30786d059a9d6aaee71;p=mirrors%2FFD230.git 修改网络与通话Slice适配多国语言 --- 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 1f77e1e71..83559eea9 100644 --- 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 @@ -254,4 +254,9 @@ STR_15_SECONDS$15s STR_30_SECONDS$30s STR_60_SECONDS$60s STR_300_SECONDS$300s +STR_4G_CAPABILITY$4G capability +STR_VOLTE_CALL$VoLTE call +STR_MOBILE_DATA_OPTION$Mobile data option +STR_SYSTEM_UPDATE$System Update +STR_ONLINE_MUSIC$Online music 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 c3c284f06..011a1ef53 100644 --- 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 @@ -254,4 +254,9 @@ STR_15_SECONDS$15秒 STR_30_SECONDS$30秒 STR_60_SECONDS$60秒 STR_300_SECONDS$300秒 +STR_4G_CAPABILITY$4G能力 +STR_VOLTE_CALL$VoLTE 通话 +STR_MOBILE_DATA_OPTION$移动数据选项 +STR_SYSTEM_UPDATE$系统更新 +STR_ONLINE_MUSIC$在线音乐 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 fd48cb72a..1188d9244 100644 --- 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 @@ -255,5 +255,10 @@ + + + + + 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 ffcf84896..6e1440e93 100644 --- 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 @@ -255,5 +255,10 @@ + + + + + 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 ebadbc788..f7dcfdc56 100644 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 7b054fd74..d508778c6 100644 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 4ed67c03c..ce9b23661 100644 --- 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 @@ -269,8 +269,13 @@ enum UIResourceTextId : uint16_t { STR_30_SECONDS = 256, STR_60_SECONDS = 257, STR_300_SECONDS = 258, - STR_LANGUAGE = 259, - STR_MAX_ID = 260, + STR_4G_CAPABILITY = 259, + STR_VOLTE_CALL = 260, + STR_MOBILE_DATA_OPTION = 261, + STR_SYSTEM_UPDATE = 262, + STR_ONLINE_MUSIC = 263, + STR_LANGUAGE = 264, + STR_MAX_ID = 265, }; // UIResourceTextId 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 04be58f79..7cae968e2 100644 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/application/wearable/fd230app/nativeui/networkandcall/src/MobileDataOptionsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/MobileDataOptionsView.cpp index 60c80bed6..977a54b41 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/MobileDataOptionsView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/MobileDataOptionsView.cpp @@ -1,6 +1,7 @@ #include "networkandcall/include/MobileDataOptionsView.h" #include "networkandcall/include/NetworkAndCallPresenter.h" #include "wearable_log.h" +#include "language/font/ui_resource_string.h" namespace OHOS { @@ -57,15 +58,17 @@ namespace OHOS Title->SetPosition(83, 50, 300, 40); Title->SetStyle(STYLE_TEXT_FONT, 30); Title->SetStyle(STYLE_LINE_HEIGHT, 35); - Title->SetText("移动数据选项"); + //Title->SetText("移动数据选项"); + Title->SetTextId(STR_MOBILE_DATA_OPTION); Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(40); + //Title->SetRollSpeed(40); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); scrollView->Add(Title); /* -------------------------------------------------------------------------- */ int positionY_Img = 120; - const char *text[] = {"系统更新", "在线音乐"}; + //const char *text[] = {"系统更新", "在线音乐"}; + const UIResourceTextId textId[] = {STR_SYSTEM_UPDATE, STR_ONLINE_MUSIC}; for (int i = 0; i < 2; i++) { MobileDataOptionsImage[i] = new UIImageView(); // Create a new UIImageView for each iteration @@ -89,9 +92,10 @@ namespace OHOS MobileDataOptionsImageLabel[i]->SetPosition(90, 153 + (i * 120), 180, 40); // Adjust Y position based on iteration MobileDataOptionsImageLabel[i]->SetStyle(STYLE_TEXT_FONT, 30); MobileDataOptionsImageLabel[i]->SetStyle(STYLE_LINE_HEIGHT, 35); - MobileDataOptionsImageLabel[i]->SetText(text[i]); + //MobileDataOptionsImageLabel[i]->SetText(text[i]); + MobileDataOptionsImageLabel[i]->SetTextId(textId[i]); MobileDataOptionsImageLabel[i]->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); - MobileDataOptionsImageLabel[i]->SetRollSpeed(40); + //MobileDataOptionsImageLabel[i]->SetRollSpeed(40); MobileDataOptionsImageLabel[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); scrollView->Add(MobileDataOptionsImageLabel[i]); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp index 95bef1805..a04cc015d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp @@ -93,14 +93,16 @@ namespace OHOS Title->SetPosition(83, 50, 300, 40); Title->SetStyle(STYLE_TEXT_FONT, 30); Title->SetStyle(STYLE_LINE_HEIGHT, 35); - Title->SetText("网络与通话"); + //Title->SetText("网络与通话"); + Title->SetTextId(STR_NETWORKANDCALL); Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(40); + //Title->SetRollSpeed(40); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ int positionY_Img = 120; - const char *text[] = {"4G能力", "VoLTE 通话", "移动数据选项"}; + //const char *text[] = {"4G能力", "VoLTE 通话", "移动数据选项"}; + const UIResourceTextId textId[] = {STR_4G_CAPABILITY, STR_VOLTE_CALL, STR_MOBILE_DATA_OPTION}; for (int i = 0; i < ITEM_NUM; i++) { NetworkAndCallImage[i] = new UIImageView(); // Create a new UIImageView for each iteration @@ -123,10 +125,11 @@ namespace OHOS NetworkAndCallLabel[i]->SetPosition(90, 153 + (i * 120), 180, 40); // Adjust Y position based on iteration NetworkAndCallLabel[i]->SetStyle(STYLE_TEXT_FONT, 30); NetworkAndCallLabel[i]->SetStyle(STYLE_LINE_HEIGHT, 35); - NetworkAndCallLabel[i]->SetText(text[i]); + //NetworkAndCallLabel[i]->SetText(text[i]); + NetworkAndCallLabel[i]->SetTextId(textId[i]); NetworkAndCallLabel[i]->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); // NetworkAndCallLabel[i]->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - NetworkAndCallLabel[i]->SetRollSpeed(40); + //NetworkAndCallLabel[i]->SetRollSpeed(40); NetworkAndCallLabel[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } /* -------------------------------------------------------------------------- */ 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 ebadbc788..f7dcfdc56 100644 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 7b054fd74..d508778c6 100644 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 4ed67c03c..ce9b23661 100644 --- 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 @@ -269,8 +269,13 @@ enum UIResourceTextId : uint16_t { STR_30_SECONDS = 256, STR_60_SECONDS = 257, STR_300_SECONDS = 258, - STR_LANGUAGE = 259, - STR_MAX_ID = 260, + STR_4G_CAPABILITY = 259, + STR_VOLTE_CALL = 260, + STR_MOBILE_DATA_OPTION = 261, + STR_SYSTEM_UPDATE = 262, + STR_ONLINE_MUSIC = 263, + STR_LANGUAGE = 264, + STR_MAX_ID = 265, }; // UIResourceTextId 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 04be58f79..7cae968e2 100644 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