From: luozheng <1732036298@qq.com> Date: Mon, 6 May 2024 03:24:41 +0000 (+0800) Subject: 屏幕与亮度适配多国语言 X-Git-Tag: release_V1.2.70_20241020_135402~1113^2~26 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=f6557c19bc7ec8591c85b893db26c285e8f219ec;p=mirrors%2FFD230.git 屏幕与亮度适配多国语言 --- 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 ed37cf36b..a05b48373 100644 --- 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 ad4f44e10..84b41b670 100644 --- 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; int16_t fontSize; // 字体大小 int16_t lineHeigh; // 行高 - std::string text; // 文本 + //std::string text; // 文本 + int16_t textId; uint8_t lineBreakMode; // 断行模式。 }; struct CheckBoxConfig 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 a5ba75b5e..0a04d4cda 100644 --- 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 * @Date: 2024-03-30 09:14:38 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-17 11:45:54 + * @LastEditTime: 2024-05-06 11:14:31 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h */ #ifndef SCREEN_DUATION_VIEW_H @@ -36,7 +36,8 @@ namespace OHOS int16_t height; int16_t fontSize; // 字体大小 int16_t lineHeigh; // 行高 - const char *text; // 文本 + //const char *text; // 文本 + int16_t textId; uint8_t lineBreakMode; // 断行模式。 }; struct RadioButtonConfig 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 f9b378212..5d22d9032 100644 --- 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 * @Date: 2024-03-30 09:14:38 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-18 15:54:44 + * @LastEditTime: 2024-05-06 11:06:27 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp */ #include "AppViewIDs.h" @@ -104,18 +104,18 @@ namespace OHOS return; } - const std::map durationMap = { - {SCREENDURATION_FIVE, "5秒"}, - {SCREENDURATION_TEN, "10秒"}, - {SCREENDURATION_FIFTEENTH, "15秒"}, - {SCREENDURATION_THIRTY, "30秒"}, - {SCREENDURATION_SIXTY, "60秒"}, - {SCREENDURATION_THREE_HUNDRED, "300秒"}}; + const std::map durationMap = { + {SCREENDURATION_FIVE, STR_5_SECONDS}, + {SCREENDURATION_TEN, STR_10_SECONDS}, + {SCREENDURATION_FIFTEENTH, STR_15_SECONDS}, + {SCREENDURATION_THIRTY, STR_30_SECONDS}, + {SCREENDURATION_SIXTY, STR_60_SECONDS}, + {SCREENDURATION_THREE_HUNDRED, STR_300_SECONDS}}; auto iter = durationMap.find(value); if (iter != durationMap.end()) { - p_DisplayBrightnessView->GetSelectScreenDurationLabel()->SetText(iter->second.c_str()); + p_DisplayBrightnessView->GetSelectScreenDurationLabel()->SetTextId(iter->second); } else { 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 35e43a755..d32cfff78 100644 --- 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); DisplayBrightnessTitleLabel->SetStyle(STYLE_TEXT_FONT, 30); DisplayBrightnessTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - DisplayBrightnessTitleLabel->SetText("屏幕与亮度"); + // DisplayBrightnessTitleLabel->SetText("屏幕与亮度"); + DisplayBrightnessTitleLabel->SetTextId(STR_SCREEN_AND_BRIGHTNESS); DisplayBrightnessTitleLabel->SetRollSpeed(40); DisplayBrightnessTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); DisplayBrightnessTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -183,9 +184,10 @@ namespace OHOS label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height); // 位置大小 label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); // 字体大小 label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); // 字体行高 - label->SetText(labelconfig.text.c_str()); // 内容 - label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 - label->SetRollSpeed(40); + // label->SetText(labelconfig.text.c_str()); // 内容 + label->SetTextId(labelconfig.textId); + label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 + //label->SetRollSpeed(40); // label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; @@ -203,7 +205,8 @@ namespace OHOS .height = 40, .fontSize = 30, .lineHeigh = 35, - .text = "亮度调节", + //.text = "亮度调节", + .textId = STR_BRIGHTNESS_ADJUSTMENT, .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; BringhtnessControlLabel = SetUpLabel(labelconfig); @@ -215,7 +218,8 @@ namespace OHOS /* -------------------------------------------------------------------------- */ labelconfig.top = 273; labelconfig.width = 180; - labelconfig.text = "亮屏时长"; + //labelconfig.text = "亮屏时长"; + labelconfig.textId = STR_SCREEN_ON_DURATION; ScreenDurationLabel = SetUpLabel(labelconfig); if (ScreenDurationLabel == nullptr) { @@ -224,7 +228,8 @@ namespace OHOS } /* -------------------------------------------------------------------------- */ labelconfig.top = 393; - labelconfig.text = "抬腕亮屏"; + //labelconfig.text = "抬腕亮屏"; + labelconfig.textId = STR_RAISE_TO_WAKE; RaiseToBrightnessLabel = SetUpLabel(labelconfig); if (RaiseToBrightnessLabel == nullptr) { @@ -239,7 +244,8 @@ namespace OHOS .height = 40, .fontSize = 30, .lineHeigh = 35, - .text = "", + //.text = "", + .textId = 0, .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; selectScreenDurationLabel = SetUpLabel(labelconfig); 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 c043c8a1f..e3f14d38a 100644 --- 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) { ScreenDurationScrollView->RemoveAll(); - + delete ScreenDurationTitleLabel; ScreenDurationTitleLabel = nullptr; @@ -79,8 +79,9 @@ namespace OHOS label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height); // 位置大小 label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); // 字体大小 label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); // 字体行高 - label->SetText(labelconfig.text); // 内容 - label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 + // label->SetText(labelconfig.text); // 内容 + label->SetTextId(labelconfig.textId); // 内容 + label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; @@ -160,7 +161,8 @@ namespace OHOS .height = 40, .fontSize = 30, .lineHeigh = 35, - .text = "亮屏时长", + //.text = "亮屏时长", + .textId = STR_SCREEN_ON_DURATION, .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; @@ -179,12 +181,14 @@ namespace OHOS .lineBreakMode = UILabel::LINE_BREAK_ADAPT, }; - const char *durations[DURATIONS] = {"5秒", "10秒", "15秒", "30秒", "60秒", "300秒"}; + // const char *durations[DURATIONS] = {"5秒", "10秒", "15秒", "30秒", "60秒", "300秒"}; + UIResourceTextId durations[DURATIONS] = {STR_5_SECONDS, STR_10_SECONDS, STR_15_SECONDS, STR_30_SECONDS, STR_60_SECONDS, STR_300_SECONDS}; for (int i = 0; i < DURATIONS; i++) { labelconfig.top = 153 + (i * 120); - labelconfig.text = durations[i]; + // labelconfig.text = durations[i]; + labelconfig.textId = durations[i]; ScreenDurationLabel[i] = SetUpLabel(labelconfig); if (ScreenDurationLabel[i] == nullptr) { 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 7e54217b0..1f77e1e71 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 @@ -245,4 +245,13 @@ STR_DISPLAY_MODE$Display Mode STR_MOTION_RECOGNITION$Motion Recognition STR_SYSTEM$System STR_SHUTDOWN_AND_RESTART$Shutdown and Restart +STR_BRIGHTNESS_ADJUSTMENT$Brightness Adjustment +STR_SCREEN_ON_DURATION$Screen On Duration +STR_RAISE_TO_WAKE$Raise to Wake +STR_5_SECONDS$5s +STR_10_SECONDS$10s +STR_15_SECONDS$15s +STR_30_SECONDS$30s +STR_60_SECONDS$60s +STR_300_SECONDS$300s 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 fa04d2891..c3c284f06 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 @@ -245,4 +245,13 @@ STR_DISPLAY_MODE$显示方式 STR_MOTION_RECOGNITION$运动识别 STR_SYSTEM$系统 STR_SHUTDOWN_AND_RESTART$关机和重启 +STR_BRIGHTNESS_ADJUSTMENT$亮度调节 +STR_SCREEN_ON_DURATION$亮屏时长 +STR_RAISE_TO_WAKE$抬腕亮屏 +STR_5_SECONDS$5秒 +STR_10_SECONDS$10秒 +STR_15_SECONDS$15秒 +STR_30_SECONDS$30秒 +STR_60_SECONDS$60秒 +STR_300_SECONDS$300秒 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 e8e06175e..fd48cb72a 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 @@ -246,5 +246,14 @@ + + + + + + + + + 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 b9ec11c70..ffcf84896 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 @@ -246,5 +246,14 @@ + + + + + + + + + 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 a97bfae19..ebadbc788 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 12211a0c0..7b054fd74 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 73166d395..4ed67c03c 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 @@ -260,8 +260,17 @@ enum UIResourceTextId : uint16_t { STR_MOTION_RECOGNITION = 247, STR_SYSTEM = 248, STR_SHUTDOWN_AND_RESTART = 249, - STR_LANGUAGE = 250, - STR_MAX_ID = 251, + STR_BRIGHTNESS_ADJUSTMENT = 250, + STR_SCREEN_ON_DURATION = 251, + STR_RAISE_TO_WAKE = 252, + STR_5_SECONDS = 253, + STR_10_SECONDS = 254, + STR_15_SECONDS = 255, + STR_30_SECONDS = 256, + STR_60_SECONDS = 257, + STR_300_SECONDS = 258, + STR_LANGUAGE = 259, + STR_MAX_ID = 260, }; // 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 2624d3afa..04be58f79 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/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 a97bfae19..ebadbc788 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 12211a0c0..7b054fd74 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 73166d395..4ed67c03c 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 @@ -260,8 +260,17 @@ enum UIResourceTextId : uint16_t { STR_MOTION_RECOGNITION = 247, STR_SYSTEM = 248, STR_SHUTDOWN_AND_RESTART = 249, - STR_LANGUAGE = 250, - STR_MAX_ID = 251, + STR_BRIGHTNESS_ADJUSTMENT = 250, + STR_SCREEN_ON_DURATION = 251, + STR_RAISE_TO_WAKE = 252, + STR_5_SECONDS = 253, + STR_10_SECONDS = 254, + STR_15_SECONDS = 255, + STR_30_SECONDS = 256, + STR_60_SECONDS = 257, + STR_300_SECONDS = 258, + STR_LANGUAGE = 259, + STR_MAX_ID = 260, }; // 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 2624d3afa..04be58f79 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