From: luozheng <1732036298@qq.com> Date: Mon, 6 May 2024 09:39:38 +0000 (+0800) Subject: 修改applist以适配多国语言 X-Git-Tag: release_V1.2.70_20241020_135402~1113^2~22 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=eb4ba945591e17309be88bfab6f6451274fe8306;p=mirrors%2FFD230.git 修改applist以适配多国语言 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/AppItemView.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/AppItemView.h index 6e5dc5e85..1fe0c816e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/AppItemView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/AppItemView.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-08 16:43:48 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-05-06 16:52:38 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/applist/include/AppItemView.h + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. @@ -32,8 +39,10 @@ private: AppItemView &operator = (const AppItemView &); UIImageView icon_; - UILabel label_; - AppItem itemInfo_ = { VIEW_INVALID, nullptr, nullptr, nullptr, nullptr }; + //UILabel label_; + //AppItem itemInfo_ = { VIEW_INVALID, nullptr, nullptr, nullptr, nullptr }; + UILabelExt labelExt_; + AppItem itemInfo_ = { VIEW_INVALID, nullptr, nullptr, nullptr,STR_EXERCISE_GENERAL, nullptr }; }; class HexagonsItemView : public UIImageView { @@ -46,7 +55,7 @@ public: private: HexagonsItemView(const HexagonsItemView &); HexagonsItemView &operator = (const HexagonsItemView &); - AppItem itemInfo_ = { VIEW_INVALID, nullptr, nullptr, nullptr, nullptr }; + AppItem itemInfo_ = { VIEW_INVALID, nullptr, nullptr, nullptr,STR_EXERCISE_GENERAL, nullptr }; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h index 0f888a720..1aa5a8738 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h @@ -1,10 +1,9 @@ -/*** - * @Author: Caisking 3449750381@qq.com - * @Date: 2024-02-01 15:18:45 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-03-26 19:45:28 - * @FilePath: /sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h - * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-08 16:43:48 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-05-06 16:57:20 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. @@ -30,6 +29,7 @@ typedef struct { const char *iconLarge; const char *iconSmall; const char *label; + uint16_t TextId; const char *uid; } AppItem; @@ -56,7 +56,7 @@ private: virtual ~ApplistModel(); ApplistPresenter *presenter{nullptr}; - AppItem applist[APP_MAX_NUM] = { VIEW_INVALID, nullptr, nullptr, nullptr, nullptr }; + AppItem applist[APP_MAX_NUM] = { VIEW_INVALID, nullptr, nullptr, nullptr,STR_EXERCISE_GENERAL, nullptr }; BundleInfo *bundleInfos = nullptr; int32 bundleLen = 0; uint8 appLen = 0; diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/AppItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/AppItemView.cpp index cd35ebb0f..ae1aed091 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/AppItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/AppItemView.cpp @@ -16,7 +16,7 @@ namespace OHOS { static constexpr int16 APP_ITEM_LABEL_HEIGHT = 110; static constexpr int16 NUM_20 = 20; - static constexpr int16 APP_ITEM_FONT_SIZE = 40; + static constexpr int16 APP_ITEM_FONT_SIZE = 36; static constexpr int16 APP_ITEM_SELECTED_FONT_SIZE = 44; AppItemView::AppItemView() @@ -26,13 +26,15 @@ namespace OHOS { SetTouchable(true); SetUpChild(); Add(&icon_); - Add(&label_); + //Add(&label_); + Add(&labelExt_); } AppItemView::~AppItemView() { Remove(&icon_); - Remove(&label_); + //Remove(&label_); + Remove(&labelExt_); } void AppItemView::SetUpChild() @@ -44,20 +46,32 @@ namespace OHOS { icon_.SetResizeMode(UIImageView::CENTER); icon_.SetAutoEnable(false); - label_.SetPosition(ICON_X + APP_ITEM_BUTTON_WIDTH + NUM_20, 0); - label_.Resize(APP_ITEM_LABEL_WIDTH, APP_ITEM_LABEL_HEIGHT); - label_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, APP_ITEM_FONT_SIZE); - label_.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); - label_.SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); - label_.SetStyle(STYLE_TEXT_COLOR, Color::Gray().full); - label_.SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); + // label_.SetPosition(ICON_X + APP_ITEM_BUTTON_WIDTH + NUM_20, 0); + // label_.Resize(APP_ITEM_LABEL_WIDTH, APP_ITEM_LABEL_HEIGHT); + // label_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, APP_ITEM_FONT_SIZE); + // label_.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); + // label_.SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); + // label_.SetStyle(STYLE_TEXT_COLOR, Color::Gray().full); + // label_.SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); + + labelExt_.SetPosition(ICON_X + APP_ITEM_BUTTON_WIDTH + NUM_20, 0); + labelExt_.Resize(APP_ITEM_LABEL_WIDTH, APP_ITEM_LABEL_HEIGHT); + labelExt_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, APP_ITEM_FONT_SIZE); + labelExt_.SetStyle(STYLE_TEXT_FONT, 36); + labelExt_.SetStyle(STYLE_LINE_HEIGHT, 40); + labelExt_.SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + labelExt_.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); + labelExt_.SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); + labelExt_.SetStyle(STYLE_TEXT_COLOR, Color::Gray().full); + labelExt_.SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); } void AppItemView::SetItemInfo(const AppItem &itemInfo) { itemInfo_ = itemInfo; icon_.SetSrc(itemInfo.iconSmall); - label_.SetText(itemInfo.label); + //label_.SetText(itemInfo.label); + labelExt_.SetTextId(itemInfo.TextId); } AppViewId AppItemView::GetViewId() @@ -72,13 +86,15 @@ namespace OHOS { void AppItemView::SelectedChange() { - label_.SetTextColor(Color::White()); + //label_.SetTextColor(Color::White()); + labelExt_.SetTextColor(Color::White()); icon_.Scale(Vector2{1.1, 1.1}, Vector2{0, 0}); } void AppItemView::Reset() { - label_.SetTextColor(Color::Gray()); + //label_.SetTextColor(Color::Gray()); + labelExt_.SetTextColor(Color::Gray()); icon_.ResetTransParameter(); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp index 9af296267..d1504fed9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp @@ -24,32 +24,32 @@ namespace OHOS { const AppItem g_nativeAppList[] = { - {VIEW_MAIN_ALARM, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, "闹钟", nullptr}, - {VIEW_COMPASS, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_COMPASS_IMAGE, "指南针", nullptr}, - {VIEW_BLOODOXY, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_SPO2_IMAGE, "血氧饱和度", nullptr}, - {VIEW_HEART, PNG_APPLIST_HEART_IMAGE, PNG_APPLIST_HEART_IMAGE, "心率检测", nullptr}, - {VIEW_WEATHER, PNG_APPLIST_WEATHER_IMAGE, PNG_APPLIST_WEATHER_IMAGE, "天气", nullptr}, - {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_TRAINING_IMAGE, "体能训练", nullptr}, - {VIEW_TRAINING_RECORD, PNG_APPLIST_TRAINING_RECORD_IMAGE, PNG_APPLIST_TRAINING_RECORD_IMAGE, "训练记录", nullptr}, - {VIEW_RECORD, PNG_APPLIST_RECORD_IMAGE, PNG_APPLIST_RECORD_IMAGE, "录音", nullptr}, - {VIEW_CALLER_LOG, PNG_APPLIST_CALLLOG_IMAGE, PNG_APPLIST_CALLLOG_IMAGE, "通话记录", nullptr}, - {VIEW_MAIN_PHONE, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_CALLER_IMAGE, "电话", nullptr}, - {VIEW_MAIN_STOPWATCH, PNG_APPLIST_STOPWATCH_IMAGE, PNG_APPLIST_STOPWATCH_IMAGE, "秒表", nullptr}, - {VIEW_MAIN_COUNTDOWN, PNG_APPLIST_COUNTDOWN_IMAGE, PNG_APPLIST_COUNTDOWN_IMAGE, "计时器", nullptr}, - {VIEW_FIND_PHONE, PNG_APPLIST_FINDPHONE_IMAGE, PNG_APPLIST_FINDPHONE_IMAGE, "查找手机", nullptr}, - {VIEW_SET_DESKTOP, PNG_APPLIST_THEME_IMAGE, PNG_APPLIST_THEME_IMAGE, "主题样式", nullptr}, - {VIEW_SET_CARD, PNG_APPLIST_CARDSET_IMAGE, PNG_APPLIST_CARDSET_IMAGE, "卡片管理", nullptr}, - {VIEW_SET_DIAL, PNG_APPLIST_CHANGEDIAL_IMAGE, PNG_APPLIST_CHANGEDIAL_IMAGE, "切换表盘", nullptr}, - {VIEW_CLASSIC_BLUETOOTH, PNG_APPLIST_BLUETOOTH_IMAGE, PNG_APPLIST_BLUETOOTH_IMAGE, "蓝牙", nullptr}, - {VIEW_DNOTDISTURB, PNG_APPLIST_DISTURB_IMAGE, PNG_APPLIST_DISTURB_IMAGE, "勿扰模式", nullptr}, - {VIEW_FLASHLIGHT, PNG_APPLIST_FLASHLIGHT_IMAGE, PNG_APPLIST_FLASHLIGHT_IMAGE, "手电筒", nullptr}, - {VIEW_BRIGHTNESSLEVEL, PNG_APPLIST_BRIGHTNESSLEVEL_IMAGE, PNG_APPLIST_BRIGHTNESSLEVEL_IMAGE, "亮度调节", nullptr}, - {VIEW_SAVEELE, PNG_APPLIST_SAVEELE_IMAGE, PNG_APPLIST_SAVEELE_IMAGE, "省电模式", nullptr}, - {VIEW_MESSAGE, PNG_APPLIST_MESSAGE_IMAGE, PNG_APPLIST_MESSAGE_IMAGE, "消息通知", nullptr}, + {VIEW_MAIN_ALARM, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, "闹钟",STR_ALARM, nullptr}, + {VIEW_COMPASS, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_COMPASS_IMAGE, "指南针",STR_COMPASS, nullptr}, + {VIEW_BLOODOXY, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_SPO2_IMAGE, "血氧",STR_BLOOD_OXYGEN, nullptr}, + {VIEW_HEART, PNG_APPLIST_HEART_IMAGE, PNG_APPLIST_HEART_IMAGE, "心率",STR_HEART_RATE, nullptr}, + {VIEW_WEATHER, PNG_APPLIST_WEATHER_IMAGE, PNG_APPLIST_WEATHER_IMAGE, "天气",STR_WEATHER, nullptr}, + {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_TRAINING_IMAGE, "训练",STR_TRAINING, nullptr}, + {VIEW_TRAINING_RECORD, PNG_APPLIST_TRAINING_RECORD_IMAGE, PNG_APPLIST_TRAINING_RECORD_IMAGE, "训练记录",STR_TRAINING_RECORD, nullptr}, + {VIEW_RECORD, PNG_APPLIST_RECORD_IMAGE, PNG_APPLIST_RECORD_IMAGE, "录音",STR_RECORDING, nullptr}, + {VIEW_CALLER_LOG, PNG_APPLIST_CALLLOG_IMAGE, PNG_APPLIST_CALLLOG_IMAGE, "常用联系人",STR_FAVORITE_CONTACTS, nullptr}, + {VIEW_MAIN_PHONE, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_CALLER_IMAGE, "电话",STR_PHONE, nullptr}, + {VIEW_MAIN_STOPWATCH, PNG_APPLIST_STOPWATCH_IMAGE, PNG_APPLIST_STOPWATCH_IMAGE, "秒表",STR_STOPWATCH, nullptr}, + {VIEW_MAIN_COUNTDOWN, PNG_APPLIST_COUNTDOWN_IMAGE, PNG_APPLIST_COUNTDOWN_IMAGE, "计时器",STR_TIMER, nullptr}, + {VIEW_FIND_PHONE, PNG_APPLIST_FINDPHONE_IMAGE, PNG_APPLIST_FINDPHONE_IMAGE, "查找手机",STR_FIND_PHONE, nullptr}, + {VIEW_SET_DESKTOP, PNG_APPLIST_THEME_IMAGE, PNG_APPLIST_THEME_IMAGE, "显示方式",STR_DISPLAY_MODE, nullptr}, + {VIEW_SET_CARD, PNG_APPLIST_CARDSET_IMAGE, PNG_APPLIST_CARDSET_IMAGE, "卡片管理",STR_CARD_MANAGEMENT, nullptr}, + {VIEW_SET_DIAL, PNG_APPLIST_CHANGEDIAL_IMAGE, PNG_APPLIST_CHANGEDIAL_IMAGE,"更换表盘", STR_WATCH_FACE, nullptr}, + {VIEW_CLASSIC_BLUETOOTH, PNG_APPLIST_BLUETOOTH_IMAGE, PNG_APPLIST_BLUETOOTH_IMAGE, "蓝牙",STR_BLUETOOTH, nullptr}, + {VIEW_DNOTDISTURB, PNG_APPLIST_DISTURB_IMAGE, PNG_APPLIST_DISTURB_IMAGE, "勿扰模式",STR_DO_NOT_DISTURB, nullptr}, + {VIEW_FLASHLIGHT, PNG_APPLIST_FLASHLIGHT_IMAGE, PNG_APPLIST_FLASHLIGHT_IMAGE, "手电筒",STR_FLASHLIGHT, nullptr}, + {VIEW_BRIGHTNESSLEVEL, PNG_APPLIST_BRIGHTNESSLEVEL_IMAGE, PNG_APPLIST_BRIGHTNESSLEVEL_IMAGE, "亮度调节",STR_BRIGHTNESS_ADJUSTMENT, nullptr}, + {VIEW_SAVEELE, PNG_APPLIST_SAVEELE_IMAGE, PNG_APPLIST_SAVEELE_IMAGE, "省电模式",STR_POWER_SAVE_MODE, nullptr}, + {VIEW_MESSAGE, PNG_APPLIST_MESSAGE_IMAGE, PNG_APPLIST_MESSAGE_IMAGE, "消息通知",STR_MESSAGE_NOTIFICATION, nullptr}, #ifdef SUPPORT_ALIPAY_SEC - {VIEW_MAIN_ALIPAY, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_ALIPAY_IMAGE, "支付宝", nullptr}, + {VIEW_MAIN_ALIPAY, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_ALIPAY_IMAGE, "支付宝",STR_ALIPAY, nullptr}, #endif - {VIEW_SETTING, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_SETTING_IMAGE, "设置", nullptr}, + {VIEW_SETTING, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_SETTING_IMAGE, "设置",STR_SETTINGS, nullptr}, #if 0 {VIEW_LANGUAGE_SWITCH, PNG_CONNECT_PHONE_IMAGE, PNG_CONNECT_PHONE_IMAGE, "语言切换", nullptr}, {VIEW_MAIN_TEMP, PNG_APPLIST_TEMP_IMAGE, PNG_APPLIST_TEMP_IMAGE, "体温", nullptr}, @@ -130,12 +130,12 @@ namespace OHOS } while (len--) { - applist[appLen] = { - VIEW_EXTERN_APP, - bundleInfos[len].smallIconPath, - bundleInfos[len].smallIconPath, - bundleInfos[len].label, - bundleInfos[len].bundleName}; + applist[appLen].id = VIEW_EXTERN_APP; + applist[appLen].iconLarge = bundleInfos[len].smallIconPath; + applist[appLen].iconSmall = bundleInfos[len].smallIconPath; + applist[appLen].label = bundleInfos[len].label; + applist[appLen].uid = bundleInfos[len].bundleName; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems bundleName is %s \r", bundleInfos[len].bundleName); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems label is %s \r", bundleInfos[len].label); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ResolvingJSAppItems smallIconPath is %s \r", bundleInfos[len].smallIconPath); 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 52e36d188..27331c392 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 @@ -236,16 +236,44 @@ STR_GOAL_ACCOMPLISHMENT_DEGREE$Goal accomplishment degree STR_TRAINING_DURATION$Training duration STR_OFF$Off STR_MORE$More -STR_SETTING$Setting +STR_HEART_RATE$Heart Rate +STR_BLOOD_OXYGEN$Blood Oxygen +STR_TRAINING$Training +STR_TRAINING_RECORD$Training Record +STR_COMPASS$Compass +STR_PHONE$Phone +STR_FAVORITE_CONTACTS$Favorite Contacts +STR_WEATHER$Weather +STR_ACTIVITY$Activity +STR_WATCH_FACE$Watch Face +STR_DISPLAY_MODE$Display Mode +STR_CARD_MANAGEMENT$Card Management +STR_MUSIC$Music +STR_SLEEP$Sleep +STR_RECORDING$Recording +STR_BREATH_TRAINING$Breath Training +STR_REMOTE_SHOOTING$Remote Shooting +STR_VOICE_ASSISTANT$Voice Assistant +STR_ALIPAY$Alipay +STR_TIMER$Timer +STR_ALARM$Alarm +STR_STOPWATCH$Stopwatch +STR_CALCULATOR$Calculator +STR_FIND_PHONE$Find Phone +STR_BRIGHTNESS_ADJUSTMENT$Brightness Adjustment +STR_SOUND$Sound +STR_BLUETOOTH$Bluetooth +STR_DO_NOT_DISTURB$Do Not Disturb +STR_MESSAGE_NOTIFICATION$Message Notification +STR_POWER_SAVE_MODE$Power Save Mode +STR_FLASHLIGHT$Flashlight +STR_SETTINGS$Settings STR_SCREEN_AND_BRIGHTNESS$Screen and Brightness STR_NETWORKANDCALL$NetworkAndCall -STR_BLUETOOTH$Bluetooth STR_SOUND_AND_VIBRATION$Sound and Vibration -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 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 880204d3d..fee9516de 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 @@ -236,16 +236,44 @@ STR_GOAL_ACCOMPLISHMENT_DEGREE$目标完成度 STR_TRAINING_DURATION$训练时长 STR_OFF$关闭 STR_MORE$更多 -STR_SETTING$设置 +STR_HEART_RATE$心率 +STR_BLOOD_OXYGEN$血氧 +STR_TRAINING$训练 +STR_TRAINING_RECORD$训练记录 +STR_COMPASS$指南针 +STR_PHONE$电话 +STR_FAVORITE_CONTACTS$常用联系人 +STR_WEATHER$天气 +STR_ACTIVITY$活动 +STR_WATCH_FACE$更换表盘 +STR_DISPLAY_MODE$显示方式 +STR_CARD_MANAGEMENT$卡片管理 +STR_MUSIC$音乐 +STR_SLEEP$睡眠 +STR_RECORDING$录音 +STR_BREATH_TRAINING$呼吸训练 +STR_REMOTE_SHOOTING$遥控拍照 +STR_VOICE_ASSISTANT$语音助手 +STR_ALIPAY$支付宝 +STR_TIMER$计时器 +STR_ALARM$闹钟 +STR_STOPWATCH$秒表 +STR_CALCULATOR$计算器 +STR_FIND_PHONE$查找手机 +STR_BRIGHTNESS_ADJUSTMENT$亮度调节 +STR_SOUND$声音 +STR_BLUETOOTH$蓝牙 +STR_DO_NOT_DISTURB$勿扰模式 +STR_MESSAGE_NOTIFICATION$消息通知 +STR_POWER_SAVE_MODE$省电模式 +STR_FLASHLIGHT$手电筒 +STR_SETTINGS$设置 STR_SCREEN_AND_BRIGHTNESS$屏幕与亮度 STR_NETWORKANDCALL$网络与通话 -STR_BLUETOOTH$蓝牙 STR_SOUND_AND_VIBRATION$声音与震动 -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秒 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 a841ce10f..a2dffb09c 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 @@ -237,16 +237,44 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - 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 9beb267fd..a99f7d62d 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 @@ -237,16 +237,44 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - 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 a37dcefb5..0969d9af6 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 18363434e..4a063d757 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 10c1947a3..7968d6a35 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 @@ -251,41 +251,67 @@ enum UIResourceTextId : uint16_t { STR_EXERCISE_KETTLEBELLTRAINING = 238, STR_EXTREME_ORIENTEERING = 239, STR_INSUFFICIENT_EXERCISE_AMOUNT = 240, - STR_SETTING = 241, - STR_SCREEN_AND_BRIGHTNESS = 242, - STR_NETWORKANDCALL = 243, - STR_BLUETOOTH = 244, - STR_SOUND_AND_VIBRATION = 245, - STR_DISPLAY_MODE = 246, - STR_MOTION_RECOGNITION = 247, - STR_SYSTEM = 248, - STR_SHUTDOWN_AND_RESTART = 249, - 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_4G_CAPABILITY = 259, - STR_VOLTE_CALL = 260, - STR_MOBILE_DATA_OPTION = 261, - STR_SYSTEM_UPDATE = 262, - STR_ONLINE_MUSIC = 263, - STR_BLUETOOTH_HEADPHONES = 264, - STR_TRADITIONAL_BLUETOOTH = 265, - STR_AUTO_OFF_BLUETOOTH_NOTE = 266, - STR_BLUETOOTH_SERVICE_OPTIONS = 267, - STR_HFP = 268, - STR_A2DP = 269, - STR_SYSTEM_VOLUME = 270, - STR_MEDIA_VOLUME = 271, - STR_VIBRATION_MODE = 272, - STR_SILENT_MODE = 273, - STR_LANGUAGE = 274, - STR_MAX_ID = 275, + STR_BLOOD_OXYGEN = 241, + STR_TRAINING_RECORD = 242, + STR_COMPASS = 243, + STR_PHONE = 244, + STR_FAVORITE_CONTACTS = 245, + STR_WEATHER = 246, + STR_ACTIVITY = 247, + STR_WATCH_FACE = 248, + STR_DISPLAY_MODE = 249, + STR_CARD_MANAGEMENT = 250, + STR_MUSIC = 251, + STR_SLEEP = 252, + STR_RECORDING = 253, + STR_BREATH_TRAINING = 254, + STR_REMOTE_SHOOTING = 255, + STR_VOICE_ASSISTANT = 256, + STR_ALIPAY = 257, + STR_TIMER = 258, + STR_ALARM = 259, + STR_STOPWATCH = 260, + STR_CALCULATOR = 261, + STR_FIND_PHONE = 262, + STR_BRIGHTNESS_ADJUSTMENT = 263, + STR_SOUND = 264, + STR_BLUETOOTH = 265, + STR_DO_NOT_DISTURB = 266, + STR_MESSAGE_NOTIFICATION = 267, + STR_POWER_SAVE_MODE = 268, + STR_FLASHLIGHT = 269, + STR_SETTINGS = 270, + STR_SCREEN_AND_BRIGHTNESS = 271, + STR_NETWORKANDCALL = 272, + STR_SOUND_AND_VIBRATION = 273, + STR_MOTION_RECOGNITION = 274, + STR_SYSTEM = 275, + STR_SHUTDOWN_AND_RESTART = 276, + STR_SCREEN_ON_DURATION = 277, + STR_RAISE_TO_WAKE = 278, + STR_5_SECONDS = 279, + STR_10_SECONDS = 280, + STR_15_SECONDS = 281, + STR_30_SECONDS = 282, + STR_60_SECONDS = 283, + STR_300_SECONDS = 284, + STR_4G_CAPABILITY = 285, + STR_VOLTE_CALL = 286, + STR_MOBILE_DATA_OPTION = 287, + STR_SYSTEM_UPDATE = 288, + STR_ONLINE_MUSIC = 289, + STR_BLUETOOTH_HEADPHONES = 290, + STR_TRADITIONAL_BLUETOOTH = 291, + STR_AUTO_OFF_BLUETOOTH_NOTE = 292, + STR_BLUETOOTH_SERVICE_OPTIONS = 293, + STR_HFP = 294, + STR_A2DP = 295, + STR_SYSTEM_VOLUME = 296, + STR_MEDIA_VOLUME = 297, + STR_VIBRATION_MODE = 298, + STR_SILENT_MODE = 299, + STR_LANGUAGE = 300, + STR_MAX_ID = 301, }; // 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 ed6997f92..10bbbaa29 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/settings/src/SettingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp index a76060ef1..52f28c241 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp @@ -70,7 +70,7 @@ namespace OHOS } title->SetPosition(SETTING_TITLE_POSITION_X, SETTING_TITLE_POSITION_Y, SETTING_TITLE_SIZE_WIDTH, SETTING_TITLE_SIZE_HEIGHT); // title->SetText("设置"); - title->SetTextId(STR_SETTING); + title->SetTextId(STR_SETTINGS); title->SetStyle(STYLE_TEXT_FONT, SETTINGS_TITLE_FONT_SIZE); title->SetStyle(STYLE_LINE_HEIGHT, SETTINGS_TITLE_FONT_HEIGHT); title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); 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 a37dcefb5..0969d9af6 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 18363434e..4a063d757 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 10c1947a3..7968d6a35 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 @@ -251,41 +251,67 @@ enum UIResourceTextId : uint16_t { STR_EXERCISE_KETTLEBELLTRAINING = 238, STR_EXTREME_ORIENTEERING = 239, STR_INSUFFICIENT_EXERCISE_AMOUNT = 240, - STR_SETTING = 241, - STR_SCREEN_AND_BRIGHTNESS = 242, - STR_NETWORKANDCALL = 243, - STR_BLUETOOTH = 244, - STR_SOUND_AND_VIBRATION = 245, - STR_DISPLAY_MODE = 246, - STR_MOTION_RECOGNITION = 247, - STR_SYSTEM = 248, - STR_SHUTDOWN_AND_RESTART = 249, - 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_4G_CAPABILITY = 259, - STR_VOLTE_CALL = 260, - STR_MOBILE_DATA_OPTION = 261, - STR_SYSTEM_UPDATE = 262, - STR_ONLINE_MUSIC = 263, - STR_BLUETOOTH_HEADPHONES = 264, - STR_TRADITIONAL_BLUETOOTH = 265, - STR_AUTO_OFF_BLUETOOTH_NOTE = 266, - STR_BLUETOOTH_SERVICE_OPTIONS = 267, - STR_HFP = 268, - STR_A2DP = 269, - STR_SYSTEM_VOLUME = 270, - STR_MEDIA_VOLUME = 271, - STR_VIBRATION_MODE = 272, - STR_SILENT_MODE = 273, - STR_LANGUAGE = 274, - STR_MAX_ID = 275, + STR_BLOOD_OXYGEN = 241, + STR_TRAINING_RECORD = 242, + STR_COMPASS = 243, + STR_PHONE = 244, + STR_FAVORITE_CONTACTS = 245, + STR_WEATHER = 246, + STR_ACTIVITY = 247, + STR_WATCH_FACE = 248, + STR_DISPLAY_MODE = 249, + STR_CARD_MANAGEMENT = 250, + STR_MUSIC = 251, + STR_SLEEP = 252, + STR_RECORDING = 253, + STR_BREATH_TRAINING = 254, + STR_REMOTE_SHOOTING = 255, + STR_VOICE_ASSISTANT = 256, + STR_ALIPAY = 257, + STR_TIMER = 258, + STR_ALARM = 259, + STR_STOPWATCH = 260, + STR_CALCULATOR = 261, + STR_FIND_PHONE = 262, + STR_BRIGHTNESS_ADJUSTMENT = 263, + STR_SOUND = 264, + STR_BLUETOOTH = 265, + STR_DO_NOT_DISTURB = 266, + STR_MESSAGE_NOTIFICATION = 267, + STR_POWER_SAVE_MODE = 268, + STR_FLASHLIGHT = 269, + STR_SETTINGS = 270, + STR_SCREEN_AND_BRIGHTNESS = 271, + STR_NETWORKANDCALL = 272, + STR_SOUND_AND_VIBRATION = 273, + STR_MOTION_RECOGNITION = 274, + STR_SYSTEM = 275, + STR_SHUTDOWN_AND_RESTART = 276, + STR_SCREEN_ON_DURATION = 277, + STR_RAISE_TO_WAKE = 278, + STR_5_SECONDS = 279, + STR_10_SECONDS = 280, + STR_15_SECONDS = 281, + STR_30_SECONDS = 282, + STR_60_SECONDS = 283, + STR_300_SECONDS = 284, + STR_4G_CAPABILITY = 285, + STR_VOLTE_CALL = 286, + STR_MOBILE_DATA_OPTION = 287, + STR_SYSTEM_UPDATE = 288, + STR_ONLINE_MUSIC = 289, + STR_BLUETOOTH_HEADPHONES = 290, + STR_TRADITIONAL_BLUETOOTH = 291, + STR_AUTO_OFF_BLUETOOTH_NOTE = 292, + STR_BLUETOOTH_SERVICE_OPTIONS = 293, + STR_HFP = 294, + STR_A2DP = 295, + STR_SYSTEM_VOLUME = 296, + STR_MEDIA_VOLUME = 297, + STR_VIBRATION_MODE = 298, + STR_SILENT_MODE = 299, + STR_LANGUAGE = 300, + STR_MAX_ID = 301, }; // 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 ed6997f92..10bbbaa29 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