修改设置视图list与多国语言适配
authorluozheng <1732036298@qq.com>
Wed, 3 Apr 2024 06:15:08 +0000 (14:15 +0800)
committerluozheng <1732036298@qq.com>
Wed, 3 Apr 2024 06:15:08 +0000 (14:15 +0800)
23 files changed:
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang
code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp
code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItem.h
code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h
code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h
code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingPresenter.h
code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h
code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingAdapter.cpp
code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang

index 53d9d99..fe332eb 100644 (file)
@@ -235,4 +235,46 @@ STR_END_THIS_MOVEMENT$Whether to end this movement
 STR_GOAL_ACCOMPLISHMENT_DEGREE$Goal accomplishment degree\r
 STR_TRAINING_DURATION$Training duration\r
 STR_OFF$Off\r
-STR_MORE$More
\ No newline at end of file
+STR_MORE$More\r
+STR_SETTING$Setting\r
+STR_SCREEN_AND_BRIGHTNESS$Screen and Brightness\r
+STR_BRIGHTNESS_ADJUSTMENT$Brightness Adjustment\r
+STR_SCREEN_ON_DURATION$Screen On Duration\r
+STR_5_SECONDS$5 Seconds\r
+STR_10_SECONDS$10 Seconds\r
+STR_15_SECONDS$15 Seconds\r
+STR_30_SECONDS$30 Seconds\r
+STR_60_SECONDS$60 Seconds\r
+STR_300_SECONDS$300 Seconds\r
+STR_RAISE_TO_WAKE$Raise to Wake\r
+STR_BLUETOOTH$Bluetooth\r
+STR_BLUETOOTH_HEADPHONES$Bluetooth Headphones\r
+STR_TRADITIONAL_BLUETOOTH$Traditional Bluetooth\r
+STR_AUTO_OFF_BLUETOOTH_NOTE$Note: It will be automatically turned off if the connection is not successful for 10 minutes after opening, because the traditional Bluetooth will increase the power consumption for a long time, it is recommended to use when necessary \n\n(this function is mainly used for phone calls/notifications, music control/transmission, etc.)\r
+STR_SOUND_AND_VIBRATION$Sound and Vibration\r
+STR_SYSTEM_VOLUME$System Volume\r
+STR_ALARM_REMINDERS_FIND_WATCH$Alarms, Reminders, Find Watch\r
+STR_CALL_VOLUME$Call Volume\r
+STR_WATCH_CALLS$Watch Calls\r
+STR_MEDIA_VOLUME$Media Volume\r
+STR_MUSIC_RECORDINGS_WORKOUTS$Music, Recordings, Workouts\r
+STR_VIBRATION_REMINDER$Vibration Reminder\r
+STR_SILENT_MODE$Silent Mode\r
+STR_SYSTEM_VOLUME_UNAFFECTED$System Volume Unaffected\r
+STR_QUICK_ACCESS$Quick Access\r
+STR_ACCESSIBILITY$Accessibility\r
+STR_ACCESSIBILITY_BUTTON$Accessibility Button\r
+STR_QUICK_ACCESS_APP$This function can be set with the lower right button Quick access to the APP\r
+STR_HEART_RATE_MONITORING$Heart Rate Monitoring\r
+STR_BLOOD_OXYGEN_MONITORING$Blood Oxygen Monitoring\r
+STR_SYSTEM$System \r
+STR_ABOUT_WATCH$About Watch\r
+STR_REGULATORY_MODE$Regulatory Mode\r
+STR_SWITCH_LANGUAGE$Switch Language\r
+STR_LANGUAGE$Language\r
+STR_FACTORY_RESET$Factory Reset\r
+STR_SYSTEM_UPDATE$System Update\r
+STR_SHUTDOWN_AND_RESTART$Shutdown and Restart\r
+STR_RESTART$Restart\r
+STR_SHUTDOWN$Shutdown\r
+STR_4G_CAPABILITY$4G capability\r
index d51ffc1..b1dbddb 100644 (file)
@@ -235,4 +235,46 @@ STR_END_THIS_MOVEMENT$是否结束本次运动
 STR_GOAL_ACCOMPLISHMENT_DEGREE$目标完成度\r
 STR_TRAINING_DURATION$训练时长\r
 STR_OFF$关闭\r
-STR_MORE$更多
\ No newline at end of file
+STR_MORE$更多\r
+STR_SETTING$设置\r
+STR_SCREEN_AND_BRIGHTNESS$屏幕与亮度\r
+STR_BRIGHTNESS_ADJUSTMENT$亮度调节\r
+STR_SCREEN_ON_DURATION$亮屏时长\r
+STR_5_SECONDS$5秒\r
+STR_10_SECONDS$10秒\r
+STR_15_SECONDS$15秒\r
+STR_30_SECONDS$30秒\r
+STR_60_SECONDS$60秒\r
+STR_300_SECONDS$300秒\r
+STR_RAISE_TO_WAKE$抬腕亮屏\r
+STR_BLUETOOTH$蓝牙\r
+STR_BLUETOOTH_HEADPHONES$蓝牙耳机\r
+STR_TRADITIONAL_BLUETOOTH$传统蓝牙\r
+STR_AUTO_OFF_BLUETOOTH_NOTE$注:开启后10分钟没连接成功会自动关闭,因为传统蓝牙长时间打开会增加电耗,建议在有需要的时候使用\n\n(该功能主要用于电话拨打/通知、音乐控制/传输等)\r
+STR_SOUND_AND_VIBRATION$声音与震动\r
+STR_SYSTEM_VOLUME$系统音量\r
+STR_ALARM_REMINDERS_FIND_WATCH$闹钟、提醒、查找手表\r
+STR_CALL_VOLUME$通话音量\r
+STR_WATCH_CALLS$手表通话\r
+STR_MEDIA_VOLUME$媒体音量\r
+STR_MUSIC_RECORDINGS_WORKOUTS$音乐、录音、训练\r
+STR_VIBRATION_REMINDER$震动提醒\r
+STR_SILENT_MODE$静音模式\r
+STR_SYSTEM_VOLUME_UNAFFECTED$系统音量不受影响\r
+STR_QUICK_ACCESS$快速访问\r
+STR_ACCESSIBILITY$辅助功能\r
+STR_ACCESSIBILITY_BUTTON$辅助按钮\r
+STR_QUICK_ACCESS_APP$此功能可设置右下方按钮\n快速访问的APP\r
+STR_HEART_RATE_MONITORING$心率监测\r
+STR_BLOOD_OXYGEN_MONITORING$血氧监测\r
+STR_SYSTEM$系统\r
+STR_ABOUT_WATCH$关于手表\r
+STR_REGULATORY_MODE$监管模式\r
+STR_SWITCH_LANGUAGE$切换语言\r
+STR_LANGUAGE$语言\r
+STR_FACTORY_RESET$恢复出厂\r
+STR_SYSTEM_UPDATE$系统升级\r
+STR_SHUTDOWN_AND_RESTART$关机和重启\r
+STR_RESTART$重启\r
+STR_SHUTDOWN$关机\r
+STR_4G_CAPABILITY$4G能力
\ No newline at end of file
index 38a0890..c88f33d 100644 (file)
        <lanstr id="STR_TRAINING_DURATION" value="Training duration"/>
        <lanstr id="STR_OFF" value="Off"/>
        <lanstr id="STR_MORE" value="More"/>
+       <lanstr id="STR_SETTING" value="Setting"/>
+       <lanstr id="STR_SCREEN_AND_BRIGHTNESS" value="Screen and Brightness"/>
+       <lanstr id="STR_BRIGHTNESS_ADJUSTMENT" value="Brightness Adjustment"/>
+       <lanstr id="STR_SCREEN_ON_DURATION" value="Screen On Duration"/>
+       <lanstr id="STR_5_SECONDS" value="5 Seconds"/>
+       <lanstr id="STR_10_SECONDS" value="10 Seconds"/>
+       <lanstr id="STR_15_SECONDS" value="15 Seconds"/>
+       <lanstr id="STR_30_SECONDS" value="30 Seconds"/>
+       <lanstr id="STR_60_SECONDS" value="60 Seconds"/>
+       <lanstr id="STR_300_SECONDS" value="300 Seconds"/>
+       <lanstr id="STR_RAISE_TO_WAKE" value="Raise to Wake"/>
+       <lanstr id="STR_BLUETOOTH" value="Bluetooth"/>
+       <lanstr id="STR_BLUETOOTH_HEADPHONES" value="Bluetooth Headphones"/>
+       <lanstr id="STR_TRADITIONAL_BLUETOOTH" value="Traditional Bluetooth"/>
+       <lanstr id="STR_AUTO_OFF_BLUETOOTH_NOTE" value="Note: It will be automatically turned off if the connection is not successful for 10 minutes after opening, because the traditional Bluetooth will increase the power consumption for a long time, it is recommended to use when necessary \n\n(this function is mainly used for phone calls/notifications, music control/transmission, etc.)"/>
+       <lanstr id="STR_SOUND_AND_VIBRATION" value="Sound and Vibration"/>
+       <lanstr id="STR_SYSTEM_VOLUME" value="System Volume"/>
+       <lanstr id="STR_ALARM_REMINDERS_FIND_WATCH" value="Alarms, Reminders, Find Watch"/>
+       <lanstr id="STR_CALL_VOLUME" value="Call Volume"/>
+       <lanstr id="STR_WATCH_CALLS" value="Watch Calls"/>
+       <lanstr id="STR_MEDIA_VOLUME" value="Media Volume"/>
+       <lanstr id="STR_MUSIC_RECORDINGS_WORKOUTS" value="Music, Recordings, Workouts"/>
+       <lanstr id="STR_VIBRATION_REMINDER" value="Vibration Reminder"/>
+       <lanstr id="STR_SILENT_MODE" value="Silent Mode"/>
+       <lanstr id="STR_SYSTEM_VOLUME_UNAFFECTED" value="System Volume Unaffected"/>
+       <lanstr id="STR_QUICK_ACCESS" value="Quick Access"/>
+       <lanstr id="STR_ACCESSIBILITY" value="Accessibility"/>
+       <lanstr id="STR_ACCESSIBILITY_BUTTON" value="Accessibility Button"/>
+       <lanstr id="STR_QUICK_ACCESS_APP" value="This function can be set with the lower right button Quick access to the APP"/>
+       <lanstr id="STR_HEART_RATE_MONITORING" value="Heart Rate Monitoring"/>
+       <lanstr id="STR_BLOOD_OXYGEN_MONITORING" value="Blood Oxygen Monitoring"/>
+       <lanstr id="STR_SYSTEM" value="System"/>
+       <lanstr id="STR_ABOUT_WATCH" value="About Watch"/>
+       <lanstr id="STR_REGULATORY_MODE" value="Regulatory Mode"/>
+       <lanstr id="STR_SWITCH_LANGUAGE" value="Switch Language"/>
+       <lanstr id="STR_LANGUAGE" value="Language"/>
+       <lanstr id="STR_FACTORY_RESET" value="Factory Reset"/>
+       <lanstr id="STR_SYSTEM_UPDATE" value="System Update"/>
+       <lanstr id="STR_SHUTDOWN_AND_RESTART" value="Shutdown and Restart"/>
+       <lanstr id="STR_RESTART" value="Restart"/>
+       <lanstr id="STR_SHUTDOWN" value="Shutdown"/>
+       <lanstr id="STR_4G_CAPABILITY" value="4G capability"/>
 </language>
index d8aff3e..2b50734 100644 (file)
        <lanstr id="STR_TRAINING_DURATION" value="训练时长"/>
        <lanstr id="STR_OFF" value="关闭"/>
        <lanstr id="STR_MORE" value="更多"/>
+       <lanstr id="STR_SETTING" value="设置"/>
+       <lanstr id="STR_SCREEN_AND_BRIGHTNESS" value="屏幕与亮度"/>
+       <lanstr id="STR_BRIGHTNESS_ADJUSTMENT" value="亮度调节"/>
+       <lanstr id="STR_SCREEN_ON_DURATION" value="亮屏时长"/>
+       <lanstr id="STR_5_SECONDS" value="5秒"/>
+       <lanstr id="STR_10_SECONDS" value="10秒"/>
+       <lanstr id="STR_15_SECONDS" value="15秒"/>
+       <lanstr id="STR_30_SECONDS" value="30秒"/>
+       <lanstr id="STR_60_SECONDS" value="60秒"/>
+       <lanstr id="STR_300_SECONDS" value="300秒"/>
+       <lanstr id="STR_RAISE_TO_WAKE" value="抬腕亮屏"/>
+       <lanstr id="STR_BLUETOOTH" value="蓝牙"/>
+       <lanstr id="STR_BLUETOOTH_HEADPHONES" value="蓝牙耳机"/>
+       <lanstr id="STR_TRADITIONAL_BLUETOOTH" value="传统蓝牙"/>
+       <lanstr id="STR_AUTO_OFF_BLUETOOTH_NOTE" value="注:开启后10分钟没连接成功会自动关闭,因为传统蓝牙长时间打开会增加电耗,建议在有需要的时候使用\n\n(该功能主要用于电话拨打/通知、音乐控制/传输等)"/>
+       <lanstr id="STR_SOUND_AND_VIBRATION" value="声音与震动"/>
+       <lanstr id="STR_SYSTEM_VOLUME" value="系统音量"/>
+       <lanstr id="STR_ALARM_REMINDERS_FIND_WATCH" value="闹钟、提醒、查找手表"/>
+       <lanstr id="STR_CALL_VOLUME" value="通话音量"/>
+       <lanstr id="STR_WATCH_CALLS" value="手表通话"/>
+       <lanstr id="STR_MEDIA_VOLUME" value="媒体音量"/>
+       <lanstr id="STR_MUSIC_RECORDINGS_WORKOUTS" value="音乐、录音、训练"/>
+       <lanstr id="STR_VIBRATION_REMINDER" value="震动提醒"/>
+       <lanstr id="STR_SILENT_MODE" value="静音模式"/>
+       <lanstr id="STR_SYSTEM_VOLUME_UNAFFECTED" value="系统音量不受影响"/>
+       <lanstr id="STR_QUICK_ACCESS" value="快速访问"/>
+       <lanstr id="STR_ACCESSIBILITY" value="辅助功能"/>
+       <lanstr id="STR_ACCESSIBILITY_BUTTON" value="辅助按钮"/>
+       <lanstr id="STR_QUICK_ACCESS_APP" value="此功能可设置右下方按钮\n快速访问的APP"/>
+       <lanstr id="STR_HEART_RATE_MONITORING" value="心率监测"/>
+       <lanstr id="STR_BLOOD_OXYGEN_MONITORING" value="血氧监测"/>
+       <lanstr id="STR_SYSTEM" value="系统"/>
+       <lanstr id="STR_ABOUT_WATCH" value="关于手表"/>
+       <lanstr id="STR_REGULATORY_MODE" value="监管模式"/>
+       <lanstr id="STR_SWITCH_LANGUAGE" value="切换语言"/>
+       <lanstr id="STR_LANGUAGE" value="语言"/>
+       <lanstr id="STR_FACTORY_RESET" value="恢复出厂"/>
+       <lanstr id="STR_SYSTEM_UPDATE" value="系统升级"/>
+       <lanstr id="STR_SHUTDOWN_AND_RESTART" value="关机和重启"/>
+       <lanstr id="STR_RESTART" value="重启"/>
+       <lanstr id="STR_SHUTDOWN" value="关机"/>
+       <lanstr id="STR_4G_CAPABILITY" value="4G能力"/>
 </language>
index c011d79..263ee97 100644 (file)
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
index 0cbfc10..137b62e 100644 (file)
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
index 08b42bd..70d6100 100644 (file)
@@ -1,15 +1,15 @@
-/*
-* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
-* Description: language
-* Author: Graphic develop team
-* Create: 2021-07-06
-*/
-
-#ifndef UI_RESOURCE_STRING_H
-#define UI_RESOURCE_STRING_H
-#include <cstdint>
-namespace OHOS {
-enum UIResourceTextId : uint16_t {
+/*\r
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.\r
+* Description: language\r
+* Author: Graphic develop team\r
+* Create: 2021-07-06\r
+*/\r
+\r
+#ifndef UI_RESOURCE_STRING_H\r
+#define UI_RESOURCE_STRING_H\r
+#include <cstdint>\r
+namespace OHOS {\r
+enum UIResourceTextId : uint16_t {\r
     STR_EXERCISE_GENERAL = 0,\r
     STR_EXERCISE_FREETRAINING = 1,\r
     STR_EXERCISE_RESISTANCETRAINING = 2,\r
@@ -251,10 +251,52 @@ enum UIResourceTextId : uint16_t {
     STR_EXERCISE_KETTLEBELLTRAINING = 238,\r
     STR_EXTREME_ORIENTEERING = 239,\r
     STR_INSUFFICIENT_EXERCISE_AMOUNT = 240,\r
-    STR_MAX_ID = 241,\r
+    STR_SETTING = 241,\r
+    STR_SCREEN_AND_BRIGHTNESS = 242,\r
+    STR_BRIGHTNESS_ADJUSTMENT = 243,\r
+    STR_SCREEN_ON_DURATION = 244,\r
+    STR_5_SECONDS = 245,\r
+    STR_10_SECONDS = 246,\r
+    STR_15_SECONDS = 247,\r
+    STR_30_SECONDS = 248,\r
+    STR_60_SECONDS = 249,\r
+    STR_300_SECONDS = 250,\r
+    STR_RAISE_TO_WAKE = 251,\r
+    STR_BLUETOOTH = 252,\r
+    STR_BLUETOOTH_HEADPHONES = 253,\r
+    STR_TRADITIONAL_BLUETOOTH = 254,\r
+    STR_AUTO_OFF_BLUETOOTH_NOTE = 255,\r
+    STR_SOUND_AND_VIBRATION = 256,\r
+    STR_SYSTEM_VOLUME = 257,\r
+    STR_ALARM_REMINDERS_FIND_WATCH = 258,\r
+    STR_CALL_VOLUME = 259,\r
+    STR_WATCH_CALLS = 260,\r
+    STR_MEDIA_VOLUME = 261,\r
+    STR_MUSIC_RECORDINGS_WORKOUTS = 262,\r
+    STR_VIBRATION_REMINDER = 263,\r
+    STR_SILENT_MODE = 264,\r
+    STR_SYSTEM_VOLUME_UNAFFECTED = 265,\r
+    STR_QUICK_ACCESS = 266,\r
+    STR_ACCESSIBILITY = 267,\r
+    STR_ACCESSIBILITY_BUTTON = 268,\r
+    STR_QUICK_ACCESS_APP = 269,\r
+    STR_HEART_RATE_MONITORING = 270,\r
+    STR_BLOOD_OXYGEN_MONITORING = 271,\r
+    STR_SYSTEM = 272,\r
+    STR_ABOUT_WATCH = 273,\r
+    STR_REGULATORY_MODE = 274,\r
+    STR_SWITCH_LANGUAGE = 275,\r
+    STR_LANGUAGE = 276,\r
+    STR_FACTORY_RESET = 277,\r
+    STR_SYSTEM_UPDATE = 278,\r
+    STR_SHUTDOWN_AND_RESTART = 279,\r
+    STR_RESTART = 280,\r
+    STR_SHUTDOWN = 281,\r
+    STR_4G_CAPABILITY = 282,\r
+    STR_MAX_ID = 283,\r
 }; // UIResourceTextId\r
-
-enum FontLanguageId : uint8_t {
+\r
+enum FontLanguageId : uint8_t {\r
     LANGUAGE_ID_JA,\r
     LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
index cd291d4..b8c4591 100644 (file)
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
index ba11143..6a10bd5 100644 (file)
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-28 14:17:43
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-04-01 14:41:00
+ * @LastEditTime: 2024-04-02 17:17:55
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp
  */
 #include "AppViewIDs.h"
@@ -114,7 +114,7 @@ namespace OHOS
         else
         {
             g_planguage->ChangeLanguage(p_LanguageSwitchModel->GetCurLanguageCode());
-            //m_labelext->SetTextId(STR_LANGUAGE);
+            m_labelext->SetTextId(STR_LANGUAGE);
             m_labelext->ForceResetText(); // 强制刷新
 
             p_UILabelButtonExt->SetImageSrc(SelectedImg, SelectedImg);
index 6c0b511..30827aa 100644 (file)
@@ -94,7 +94,8 @@ namespace OHOS
         LanguageSwitchViewTitleLabel->SetStyle(STYLE_TEXT_FONT, TITLE_LABEL_TEXT_FONT);
         LanguageSwitchViewTitleLabel->SetStyle(STYLE_LINE_HEIGHT, TITLE_LABEL_LINE_HEIGHT);
         // LanguageSwitchViewTitleLabel->SetText("语言");
-        // LanguageSwitchViewTitleLabel->SetTextId(STR_LANGUAGE);
+        LanguageSwitchViewTitleLabel->SetTextId(STR_LANGUAGE);
+        LanguageSwitchViewTitleLabel->ForceResetText();
         LanguageSwitchViewTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);
         LanguageSwitchViewTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         LanguageSwitchViewTitleLabel->SetRollSpeed(TITLE_LABEL_TEXT_ROLLSPEED);
index 1e3f4a0..85d50a1 100644 (file)
@@ -1,15 +1,15 @@
 /*
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
- * Description: SettingItem.h
- * Author:
- * Create: 2021-11-23
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-01-29 15:37:44
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-04-03 09:32:07
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItem.h
  */
-
 #ifndef SETTING_ITEM_H
 #define SETTING_ITEM_H
 
 #include <cstdint>
-
+#include "language/font/ui_resource_string.h"
 namespace OHOS
 {
     /*
@@ -30,7 +30,7 @@ namespace OHOS
     {
         SettingIndex index;
         const char *icon;
-        const char *label;
+        UIResourceTextId textId;
         bool hasSecondMenu;
     } SettingItem;
 }
index 0e0de32..fe4c0a0 100644 (file)
@@ -1,3 +1,10 @@
+/*
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-03-30 09:14:38
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-04-02 20:04:15
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h
+ */
 /*
  * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
  * Description: SettingItemView.h
 #ifndef SETTING_ITEM_VIEW_H
 #define SETTING_ITEM_VIEW_H
 
-#include "components/ui_label.h"
-#include "components/ui_label_ext.h"
 #include "components/ui_view_group.h"
-#include "components/ui_image_view.h"
-
 #include "UiConfig.h"
 #include "SettingModel.h"
-
+#include "components/ui_label_button_ext.h"
+#include "components/ui_image_view.h"
 namespace OHOS
 {
     class SettingItemView : public UIViewGroup
@@ -29,11 +33,9 @@ namespace OHOS
 
     private:
         SettingItemView(const SettingItemView &);
-        UIImageView sBackground;
-        UIImageView sIcon;
-        UILabel sLabel;
-        UIImageView sNextImage;
-        SettingItem sItemInfo = {SETTING_ITEM_ZERO, nullptr, nullptr, false};
+        UIImageView Icon;
+        UILabelButtonExt settingLabelButtonExt;
+        SettingItem sItemInfo = {SETTING_ITEM_ZERO, nullptr, STR_EXERCISE_GENERAL, false};
     };
 }
 
index 385566a..18d64c2 100644 (file)
@@ -1,8 +1,9 @@
 /*
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
- * Description: SettingModel.h
- * Author:
- * Create: 2021-11-23
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-03-30 09:14:38
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-04-03 09:32:37
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h
  */
 
 #ifndef SETTING_MODEL_H
@@ -12,7 +13,6 @@
 #include <map>
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
-#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "SettingItem.h"
 #include "SettingPresenter.h"
@@ -32,11 +32,11 @@ namespace OHOS
 
     private:
         SettingModel();
-        SettingModel(const SettingModel &);
-        SettingModel &operator=(const SettingModel &);
+        SettingModel(const SettingModel &) = delete;
+        SettingModel &operator=(const SettingModel &) = delete;
         virtual ~SettingModel();
         static const uint16_t SETTING_ITEM_LEN = 6;
-        SettingItem settings[SETTING_ITEM_LEN] = {SETTING_ITEM_ZERO, nullptr, nullptr, false};
+        SettingItem settings[SETTING_ITEM_LEN] = {SETTING_ITEM_ZERO, nullptr, STR_EXERCISE_GENERAL, false};
         std::map<SettingIndex, AppViewId> settingIdToViewId;
         bool btConnectStatus{false};
     };
index 6fd77ee..1dc7a16 100644 (file)
@@ -1,17 +1,16 @@
 /*
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
- * Description: SettingPresenter.h
- * Author:
- * Create: 2021-11-23
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-02-19 11:58:05
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-04-03 09:36:58
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingPresenter.h
  */
-
 #ifndef SETTING_PRESENTER_H
 #define SETTING_PRESENTER_H
 
 #include "Presenter.h"
 #include "components/ui_view.h"
-#include "KeyInputListener.h"
-
+#include "View.h"
 namespace OHOS
 {
     class SettingView;
index e859137..5f327fa 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
- * Description: SettingView.h
- * Author:
- * Create: 2021-11-23
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-03-30 09:14:38
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-04-02 16:39:44
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h
  */
-
 #ifndef SETTING_VIEW_H
 #define SETTING_VIEW_H
 
@@ -12,7 +12,6 @@
 #include "components/root_view.h"
 #include "components/ui_view_group.h"
 #include "components/ui_scroll_view.h"
-#include "components/ui_label.h"
 #include "components/ui_label_ext.h"
 #include "components/ui_list.h"
 #include "window/window.h"
@@ -38,7 +37,7 @@ namespace OHOS
         SettingAdapter *listAdapter{nullptr};
         UIScrollView *scrollView{nullptr};
         UIList *contentList{nullptr};
-        UILabel *title{nullptr};
+        UILabelExt *title{nullptr};
         UIView::OnDragListener *dragListener{nullptr};
     };
 }
index e04e1fb..fab0263 100644 (file)
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
- * Description: SettingAdapter.cpp
- * Author:
- * Create: 2021-11-23
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-01-29 15:37:44
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-04-03 14:11:14
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingAdapter.cpp
  */
-
 #include "SettingAdapter.h"
-
 namespace OHOS
 {
     SettingAdapter::SettingAdapter() {}
@@ -36,6 +35,7 @@ namespace OHOS
 
     UIView *SettingAdapter::GetView(UIView *inView, int16_t index)
     {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingAdapter::GetView:%d",index);
         if (listData.empty())
         {
             return nullptr;
index 50a8d9d..4a3b850 100644 (file)
@@ -1,20 +1,14 @@
-/*** 
- * @Author: Caisking 3449750381@qq.com
- * @Date: 2024-01-29 19:58:37
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-03-26 21:02:12
- * @FilePath: /sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 /*
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
- * Description: SettingItemView.cpp
- * Author:
- * Create: 2021-11-23
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-03-27 19:48:49
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-04-03 14:11:23
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp
  */
 
 #include "wearable_log.h"
 #include "SettingItemView.h"
+#include "common/image_cache_manager.h"
 
 namespace OHOS
 {
@@ -32,50 +26,45 @@ namespace OHOS
 
     SettingItemView::SettingItemView()
     {
-        SetPosition(0, 0, 380, 120);
+        SetPosition(0, 120, 380, 120);
         SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
         SetStyle(STYLE_BACKGROUND_OPA, UN_OPACITY);
         SetTouchable(true);
         SetUpChild();
-
-        Add(&sBackground);
-        Add(&sIcon);
-        Add(&sLabel);
-        Add(&sNextImage);
+        Add(&settingLabelButtonExt);
+        Add(&Icon);
     }
 
     SettingItemView::~SettingItemView()
     {
-        Remove(&sBackground);
-        Remove(&sIcon);
-        Remove(&sLabel);
-        Remove(&sNextImage);
+        Remove(&settingLabelButtonExt);
+        Remove(&Icon);
     }
 
     void SettingItemView::SetItemInfo(const SettingItem itemInfo)
     {
         sItemInfo = itemInfo;
-        sIcon.SetSrc(itemInfo.icon);
-        sLabel.SetText(itemInfo.label);
-        sNextImage.SetVisible(itemInfo.hasSecondMenu);
+        Icon.SetSrc(itemInfo.icon);
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d", itemInfo.textId);
+        settingLabelButtonExt.SetTextId(itemInfo.textId);
     }
 
     void SettingItemView::SetUpChild()
     {
-        sBackground.SetSrc(PNG_SETTING_BACKGROUND_IMAGE);
-
-        sIcon.SetPosition(SETTING_ICON_X, SETTING_SICON_Y);
-        sIcon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
-
-        sLabel.SetPosition(SETTING_SLABEL_X, SETTING_SLABEL_Y, SETTING_SLABEL_W, SETTING_SLABEL_H);
-        sLabel.SetStyle(STYLE_TEXT_FONT, SETTING_SLABEL_FONT_SIZE);
-        sLabel.SetStyle(STYLE_LINE_HEIGHT, SETTING_SLABEL_FONT_HEIGHT);
-        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTING_SLABEL_FONT_SIZE);
+        Icon.SetPosition(SETTING_ICON_X, SETTING_SICON_Y);
+        Icon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sNextImage.SetSrc(PNG_SETTING_NEXT_IMAGE);
-        sNextImage.SetPosition(SETTING_SNEXTIMAGE_X, (SETTING_SBACKGROUND_HEIGHT - sNextImage.GetHeight()) / NUMS_2);
-        sNextImage.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
+        settingLabelButtonExt.SetPosition(0, 0, 380, 100);
+        settingLabelButtonExt.SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
+        settingLabelButtonExt.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+        settingLabelButtonExt.SetStyle(STYLE_LINE_HEIGHT, 35);
+        settingLabelButtonExt.SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED);
+        settingLabelButtonExt.SetAlign(TEXT_ALIGNMENT_LEFT);
+        settingLabelButtonExt.SetLabelPosition(115, 0);
+        settingLabelButtonExt.SetImagePosition(326, 37);
+        settingLabelButtonExt.SetTouchable(false);
+        ImageInfo *img = ImageCacheManager::GetInstance().LoadSingleRes(PNG_SETTING_NEXT_IMAGE);
+        settingLabelButtonExt.SetImageSrc(img, img);
     }
 
     SettingIndex SettingItemView::GetSettingIndex()
index 06bc047..6490b17 100644 (file)
@@ -1,13 +1,13 @@
 /*
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
- * Description: SettingModel.cpp
- * Author:
- * Create: 2021-11-23
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-02-18 09:09:13
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-04-03 09:38:57
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
  */
-
 #include "SettingModel.h"
 #include "PullUpDownView.h"
-
+#include "language/font/ui_resource_string.h"
 namespace OHOS
 {
     SettingModel::SettingModel() {}
@@ -22,12 +22,12 @@ namespace OHOS
 
     void SettingModel::InitSettingItem()
     {
-        settings[0] = {SETTING_ITEM_ZERO, PNG_SETTINGS_DISPLAY_BRIGHTNESS, "屏幕与亮度", true};
-        settings[1] = {SETTING_ITEM_ONE, PNG_SETTINGS_BLUETOOTH, "蓝牙", true};
-        settings[2] = {SETTING_ITEM_TWO, PNG_SETTINGS_SOUND_VIBRATION, "声音与震动", true};
-        settings[3] = {SETTING_ITEM_THREE, PNG_SETTINGS_SECONDARY_FUNCTION, "辅助功能", true};
-        settings[4] = {SETTING_ITEM_FOUR, PNG_SETTINGS_SYSTEM, "系统", true};
-        settings[5] = {SETTING_ITEM_FIVE, PNG_SETTINGS_SETTINGS_POWER_CONTROL, "关机和重启", true};
+        settings[0] = {SETTING_ITEM_ZERO, PNG_SETTINGS_DISPLAY_BRIGHTNESS, STR_SCREEN_AND_BRIGHTNESS, true};
+        settings[1] = {SETTING_ITEM_ONE, PNG_SETTINGS_BLUETOOTH, STR_BLUETOOTH, true};
+        settings[2] = {SETTING_ITEM_TWO, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true};
+        settings[3] = {SETTING_ITEM_THREE, PNG_SETTINGS_SECONDARY_FUNCTION, STR_QUICK_ACCESS, true};
+        settings[4] = {SETTING_ITEM_FOUR, PNG_SETTINGS_SYSTEM, STR_SYSTEM, true};
+        settings[5] = {SETTING_ITEM_FIVE, PNG_SETTINGS_SETTINGS_POWER_CONTROL, STR_SHUTDOWN_AND_RESTART, true};
         settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ZERO, VIEW_DISPLAY_BRIGHTNESS));
         settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ONE, VIEW_CLASSIC_BLUETOOTH));
         settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_TWO, VIEW_SOUND_VIBRATION));
index 327fae1..6059b6e 100644 (file)
 #include "SettingView.h"
 #include "SettingItem.h"
 #include "SettingPresenter.h"
-
+#include "language/font/ui_resource_string.h"
 namespace OHOS
 {
     /* ---------------------------------- 设置标签 ---------------------------------- */
-    static constexpr int16_t SETTING_TITLE_POSITION_X = 203; 
+    static constexpr int16_t SETTING_TITLE_POSITION_X = 83;
     static constexpr int16_t SETTING_TITLE_POSITION_Y = 52;
-    static constexpr int16_t SETTING_TITLE_SIZE_WIDTH = 60;
-    static constexpr int16_t SETTING_TITLE_SIZE_HEIGHT = 35;
+    static constexpr int16_t SETTING_TITLE_SIZE_WIDTH = 300;
+    static constexpr int16_t SETTING_TITLE_SIZE_HEIGHT = 40;
     static constexpr uint8_t SETTINGS_TITLE_FONT_SIZE = 30;   // 字体大小
     static constexpr uint8_t SETTINGS_TITLE_FONT_HEIGHT = 35; // 字体高度
     /* --------------------------------- 设置List --------------------------------- */
     static constexpr int16_t SETTING_LIST_POSITION_X = 43;
     static constexpr int16_t SETTING_LIST_POSITION_Y = 120;
-    static constexpr int16_t SETTING_SCROLLBLANKSIZE = 35; //设置此滚动视图的空白大小。
+    static constexpr int16_t SETTING_SCROLLBLANKSIZE = 35; // 设置此滚动视图的空白大小。
     static constexpr int16 MAX_SCR_DIS = 1000;
     static constexpr int16 LIST_POS = 20;
     static constexpr int16 SNUM_2 = 2;
+    static constexpr int16 ROLLSPEED = 40;
+    static constexpr int16 REBOUNDSIZE = 30;
 
     SettingView::SettingView()
     {
@@ -60,24 +62,19 @@ namespace OHOS
 
         BaseView::RootView(Color::Black().full);
 
-        listAdapter = new SettingAdapter();
-        if (listAdapter == nullptr)
-        {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingView::OnStart::listAdapter is nullptr");
-            return;
-        }
-        listAdapter->SetItemClickListener(presenter_);
-
-        title = new UILabel();
+        title = new UILabelExt();
         if (title == nullptr)
         {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingView::OnStart::title is nullptr");
             return;
         }
         title->SetPosition(SETTING_TITLE_POSITION_X, SETTING_TITLE_POSITION_Y, SETTING_TITLE_SIZE_WIDTH, SETTING_TITLE_SIZE_HEIGHT);
-        title->SetText("设置");
+        // title->SetText("设置");
+        title->SetTextId(STR_SETTING);
         title->SetStyle(STYLE_TEXT_FONT, SETTINGS_TITLE_FONT_SIZE);
         title->SetStyle(STYLE_LINE_HEIGHT, SETTINGS_TITLE_FONT_HEIGHT);
+        title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);
+        title->SetRollSpeed(ROLLSPEED);
         title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTINGS_TITLE_FONT_SIZE);
         title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         title->SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE);
@@ -85,20 +82,29 @@ namespace OHOS
         title->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
         title->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
 
-        contentList = new UIList();
+        listAdapter = new SettingAdapter();
+        if (listAdapter == nullptr)
+        {
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingView::OnStart::listAdapter is nullptr");
+            return;
+        }
+        UIView::OnClickListener *clicklistener = static_cast<UIView::OnClickListener *>(SettingPresenter::GetInstance());
+        listAdapter->SetItemClickListener(clicklistener);
+        contentList = new UIList(UIList::VERTICAL);
         if (contentList == nullptr)
         {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingView::OnStart::contentList is nullptr");
             return;
         }
-        contentList->SetPosition(SETTING_LIST_POSITION_X, SETTING_LIST_POSITION_Y);
-        contentList->Resize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);
+        contentList->SetPosition(SETTING_LIST_POSITION_X, SETTING_LIST_POSITION_Y, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);
+        contentList->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);
         contentList->SetScrollBlankSize(SETTING_SCROLLBLANKSIZE);
         contentList->SetSelectPosition(HORIZONTAL_RESOLUTION / SNUM_2); // middle position
         contentList->SetDraggable(true);
         contentList->SetThrowDrag(false);
         contentList->EnableAutoAlign(true);
-        contentList->SetMaxScrollDistance(MAX_SCR_DIS);
+        contentList->SetReboundSize(REBOUNDSIZE);
+        contentList->SetMaxScrollDistance(MAX_SCR_DIS / SNUM_2);
 
         scrollView = new UIScrollView();
         if (scrollView == nullptr)
@@ -110,8 +116,7 @@ namespace OHOS
         scrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
         scrollView->SetStyle(STYLE_BACKGROUND_OPA, UN_OPACITY);
         scrollView->SetScrollBlankSize(SETTING_SCROLLBLANKSIZE);
-        scrollView->SetReboundSize(50);
-        scrollView->SetDirection(1);
+        scrollView->SetHorizontalScrollState(false);
         scrollView->SetTouchable(true);
         scrollView->SetThrowDrag(true);
 
@@ -119,7 +124,7 @@ namespace OHOS
         RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::SettingPresenter::GetInstance();
         RootView::GetInstance()->SetOnKeyActListener(keyactListener);
         RootView::GetInstance()->SetIntercept(true);
-        
+
         dragListener = new SettingPresenter();
         if (dragListener == nullptr)
         {
@@ -141,9 +146,7 @@ namespace OHOS
         scrollView->Add(title);
         scrollView->Add(contentList);
         RootView::GetInstance()->Add(scrollView);
-       
         contentList->SetAdapter(listAdapter);
-
         Draw();
         return;
     }
index c011d79..263ee97 100644 (file)
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
index 0cbfc10..137b62e 100644 (file)
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
index 08b42bd..70d6100 100644 (file)
@@ -1,15 +1,15 @@
-/*
-* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
-* Description: language
-* Author: Graphic develop team
-* Create: 2021-07-06
-*/
-
-#ifndef UI_RESOURCE_STRING_H
-#define UI_RESOURCE_STRING_H
-#include <cstdint>
-namespace OHOS {
-enum UIResourceTextId : uint16_t {
+/*\r
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.\r
+* Description: language\r
+* Author: Graphic develop team\r
+* Create: 2021-07-06\r
+*/\r
+\r
+#ifndef UI_RESOURCE_STRING_H\r
+#define UI_RESOURCE_STRING_H\r
+#include <cstdint>\r
+namespace OHOS {\r
+enum UIResourceTextId : uint16_t {\r
     STR_EXERCISE_GENERAL = 0,\r
     STR_EXERCISE_FREETRAINING = 1,\r
     STR_EXERCISE_RESISTANCETRAINING = 2,\r
@@ -251,10 +251,52 @@ enum UIResourceTextId : uint16_t {
     STR_EXERCISE_KETTLEBELLTRAINING = 238,\r
     STR_EXTREME_ORIENTEERING = 239,\r
     STR_INSUFFICIENT_EXERCISE_AMOUNT = 240,\r
-    STR_MAX_ID = 241,\r
+    STR_SETTING = 241,\r
+    STR_SCREEN_AND_BRIGHTNESS = 242,\r
+    STR_BRIGHTNESS_ADJUSTMENT = 243,\r
+    STR_SCREEN_ON_DURATION = 244,\r
+    STR_5_SECONDS = 245,\r
+    STR_10_SECONDS = 246,\r
+    STR_15_SECONDS = 247,\r
+    STR_30_SECONDS = 248,\r
+    STR_60_SECONDS = 249,\r
+    STR_300_SECONDS = 250,\r
+    STR_RAISE_TO_WAKE = 251,\r
+    STR_BLUETOOTH = 252,\r
+    STR_BLUETOOTH_HEADPHONES = 253,\r
+    STR_TRADITIONAL_BLUETOOTH = 254,\r
+    STR_AUTO_OFF_BLUETOOTH_NOTE = 255,\r
+    STR_SOUND_AND_VIBRATION = 256,\r
+    STR_SYSTEM_VOLUME = 257,\r
+    STR_ALARM_REMINDERS_FIND_WATCH = 258,\r
+    STR_CALL_VOLUME = 259,\r
+    STR_WATCH_CALLS = 260,\r
+    STR_MEDIA_VOLUME = 261,\r
+    STR_MUSIC_RECORDINGS_WORKOUTS = 262,\r
+    STR_VIBRATION_REMINDER = 263,\r
+    STR_SILENT_MODE = 264,\r
+    STR_SYSTEM_VOLUME_UNAFFECTED = 265,\r
+    STR_QUICK_ACCESS = 266,\r
+    STR_ACCESSIBILITY = 267,\r
+    STR_ACCESSIBILITY_BUTTON = 268,\r
+    STR_QUICK_ACCESS_APP = 269,\r
+    STR_HEART_RATE_MONITORING = 270,\r
+    STR_BLOOD_OXYGEN_MONITORING = 271,\r
+    STR_SYSTEM = 272,\r
+    STR_ABOUT_WATCH = 273,\r
+    STR_REGULATORY_MODE = 274,\r
+    STR_SWITCH_LANGUAGE = 275,\r
+    STR_LANGUAGE = 276,\r
+    STR_FACTORY_RESET = 277,\r
+    STR_SYSTEM_UPDATE = 278,\r
+    STR_SHUTDOWN_AND_RESTART = 279,\r
+    STR_RESTART = 280,\r
+    STR_SHUTDOWN = 281,\r
+    STR_4G_CAPABILITY = 282,\r
+    STR_MAX_ID = 283,\r
 }; // UIResourceTextId\r
-
-enum FontLanguageId : uint8_t {
+\r
+enum FontLanguageId : uint8_t {\r
     LANGUAGE_ID_JA,\r
     LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
index cd291d4..b8c4591 100644 (file)
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