Merge #365 into sdk602patch0521 from refs/changes/365/head
author袁清梦 <3449750381@qq.com>
Sat, 22 Jun 2024 10:21:05 +0000 (10:21 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sat, 22 Jun 2024 10:21:05 +0000 (10:21 +0000)
Code review from 袁清梦

* refs/changes/365/head: (9 commits squashed)

  - 删除单项信息数据

  - 优化message部分显示逻辑

  - Merge branch &#39;sdk602patch0521&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

  - Merge branches &#39;sdk602patch0521&#39; and &#39;sdk602patch0521&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

  - Merge branch &#39;sdk602patch0521&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

  - 更新语言文件

  - 增加主界面消息列表点击详情

  - 同步资源文件

  - Merge branch &#39;sdk602patch0521&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/365
22 files changed:
code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
code/sdk/application/wearable/fd230app/CMakeLists.txt
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/message/include/MessageCardView.h
code/sdk/application/wearable/fd230app/nativeui/message/include/MessageControlPresenter.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.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 5d7d0da..e8d5680 100644 (file)
@@ -134,7 +134,7 @@ namespace OHOS
         button->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR, UIButton::PRESSED);
         button->SetStyleForState(STYLE_BORDER_COLOR, PRESSED_BORDER_COLOR, UIButton::PRESSED);
         button->SetVisible(true);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitButton is succeed");
+        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitButton is succeed");
         return true;
     }
     /* -------------------------------------------------------------------------- */
index 880e468..c7393c3 100644 (file)
@@ -511,6 +511,7 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/message/src/MessageCardView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/message/src/MessageLackView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/message/src/MessageControlView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/message/src/MessageControlPresenter.cpp
 
     #遥控拍照
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/takephotos/src/TakephotosPresenter.cpp
index 8256ed8..8703cc2 100644 (file)
@@ -188,7 +188,7 @@ STR_OTHER_TITLE$Other Sport
 STR_EXERCISE_TITLE$Exercise Sport\r
 STR_TRAINING$Training\r
 STR_RAPID_TRAINING$Rapid training\r
-STR_SET_GOALS$Set goals >\r
+STR_SET_GOALS$Set goals\r
 STR_DURATION$duration\r
 STR_DURATION_SETTING$Duration setting\r
 STR_MINUTES$minutes\r
@@ -236,6 +236,54 @@ STR_GOAL_ACCOMPLISHMENT_DEGREE$Goal accomplishment degree
 STR_TRAINING_DURATION$Training duration\r
 STR_OFF$Off\r
 STR_MORE$More\r
+STR_MORE_APP$Check out the APP for more\r
+STR_SAVENOTE$Turning on power-saving mode turns off non-essential Bluetooth connections, as well as features such as sensor monitoring\r
+STR_SAVEBACK$Press and hold the screen for more than 3 seconds or charge to exit the power saving mode\r
+STR_SAVEASK$Enable or not\r
+STR_BLOOD$bloodoxygen \r
+STR_CHECK$detection\r
+STR_CHECKNEW$Just detected\r
+STR_CHECKTIME$Detected XX minutes ago\r
+STR_CHECKLONG$Detected over 1 hour ago\r
+STR_CHECKNO$No detection records available\r
+STR_CHECKNOTE$Wear it snugly and stay still\r
+STR_CHECKON$Detecting\r
+STR_CHECKSTOP$Stop detection\r
+STR_CHECKERROR$Unable to detect results\r
+STR_WAERKEEP$Please ensure the watch is worn and remain still\r
+STR_WEARRE$Perform a retest\r
+STR_WEARREADY$Click the button below when ready\r
+STR_RECHECK$Retest\r
+STR_CHECKEWARN$Blood Oxygen Alert\r
+STR_BLOODSHORT$Current blood oxygen level is below XX%\r
+STR_HEARTNOTE$Please take care of your health\r
+STR_KONW$Got it\r
+STR_EXPLAIN$Explanation\r
+STR_HEARTREST$Resting\r
+STR_HEARTDATA$Heart rate detection result\r
+STR_HEARTTITLE$Heart rate alert\r
+STR_HEARTMAX$Current heart rate is higher than XX\r
+STR_HEARTMIN$Current heart rate is lower than XX\r
+STR_TRAINGNO$no record\r
+STR_TRAINGGO$Go to training$\r
+STR_MESSAGE$Message Notification\r
+STR_MESSAGENO$No content currently\r
+STR_CLEAN$Clear\r
+STR_CLEANALL$Clear all\r
+STR_SLEEP$Last Night's Sleep\r
+STR_SLEEPHOUR$Hours\r
+STR_SLEEPMGOAL$Goal\r
+STR_REATTIME$Schedule\r
+STR_SLEEPTIME$Bedtime\r
+STR_WALKTIME$Wake-up Time\r
+STR_DISTURB$The watch will enter Do Not Disturb mode in 20 minutes. To turn it off, please go to the Control Center.\r
+STR_DISTURBNOTE$Do Not Disturb mode is enabled, thus the watch won't vibrate or ring.\r
+STR_MORNNING$Good morning\r
+STR_NOW$Current\r
+STR_NAP$Nap (5 minutes)$\r
+STR_TACK$Please open the app first, go to "Device" - "Camera"\r
+STR_CLICK$click on "Take a Photo\r
+STR_TACKNUM$Number of photos taken: XX\r
 STR_HEART_RATE$Heart Rate\r
 STR_BLOOD_OXYGEN$Blood Oxygen\r
 STR_TRAINING$Training\r
index 0b67237..d5e2cce 100644 (file)
@@ -187,7 +187,7 @@ STR_BALL_LIST_TITLE$球类运动
 STR_OTHER_TITLE$其他运动\r
 STR_EXERCISE_TITLE$健身运动\r
 STR_RAPID_TRAINING$快速训练\r
-STR_SET_GOALS$设置目标 >\r
+STR_SET_GOALS$设置目标 \r
 STR_DURATION$时长\r
 STR_DURATION_SETTING$时长(分钟)\r
 STR_CALORIE$卡路里\r
@@ -252,12 +252,10 @@ STR_HEARTMAX$当前心率值高于XX
 STR_HEARTMIN$当前心率值低于XX\r
 STR_TRAINGNO$无记录\r
 STR_TRAINGGO$去训练\r
-STR_MESSAGE$通知\r
+STR_MESSAGE$消息通知\r
 STR_MESSAGENO$暂无内容\r
-STR_STEP$今日步数\r
-STR_DIS$里程(KM)\r
-STR_DUR$燃脂时间\r
-STR_STANDUP$站立次数\r
+STR_CLEAN$清除\r
+STR_CLEANALL$全部清除\r
 STR_SLEEP$昨夜睡眠\r
 STR_SLEEPHOUR$小时\r
 STR_SLEEPMGOAL$目标\r
index abb51b6..79683a1 100644 (file)
        <lanstr id="STR_EXERCISE_TITLE" value="Exercise Sport"/>
        <lanstr id="STR_TRAINING" value="Training"/>
        <lanstr id="STR_RAPID_TRAINING" value="Rapid training"/>
-       <lanstr id="STR_SET_GOALS" value="Set goals &gt;"/>
+       <lanstr id="STR_SET_GOALS" value="Set goals"/>
        <lanstr id="STR_DURATION" value="duration"/>
        <lanstr id="STR_DURATION_SETTING" value="Duration setting"/>
        <lanstr id="STR_MINUTES" value="minutes"/>
        <lanstr id="STR_TRAINING_DURATION" value="Training duration"/>
        <lanstr id="STR_OFF" value="Off"/>
        <lanstr id="STR_MORE" value="More"/>
+       <lanstr id="STR_MORE_APP" value="Check out the APP for more"/>
+       <lanstr id="STR_SAVENOTE" value="Turning on power-saving mode turns off non-essential Bluetooth connections, as well as features such as sensor monitoring"/>
+       <lanstr id="STR_SAVEBACK" value="Press and hold the screen for more than 3 seconds or charge to exit the power saving mode"/>
+       <lanstr id="STR_SAVEASK" value="Enable or not"/>
+       <lanstr id="STR_BLOOD" value="bloodoxygen"/>
+       <lanstr id="STR_CHECK" value="detection"/>
+       <lanstr id="STR_CHECKNEW" value="Just detected"/>
+       <lanstr id="STR_CHECKTIME" value="Detected XX minutes ago"/>
+       <lanstr id="STR_CHECKLONG" value="Detected over 1 hour ago"/>
+       <lanstr id="STR_CHECKNO" value="No detection records available"/>
+       <lanstr id="STR_CHECKNOTE" value="Wear it snugly and stay still"/>
+       <lanstr id="STR_CHECKON" value="Detecting"/>
+       <lanstr id="STR_CHECKSTOP" value="Stop detection"/>
+       <lanstr id="STR_CHECKERROR" value="Unable to detect results"/>
+       <lanstr id="STR_WAERKEEP" value="Please ensure the watch is worn and remain still"/>
+       <lanstr id="STR_WEARRE" value="Perform a retest"/>
+       <lanstr id="STR_WEARREADY" value="Click the button below when ready"/>
+       <lanstr id="STR_RECHECK" value="Retest"/>
+       <lanstr id="STR_CHECKEWARN" value="Blood Oxygen Alert"/>
+       <lanstr id="STR_BLOODSHORT" value="Current blood oxygen level is below XX%"/>
+       <lanstr id="STR_HEARTNOTE" value="Please take care of your health"/>
+       <lanstr id="STR_KONW" value="Got it"/>
+       <lanstr id="STR_EXPLAIN" value="Explanation"/>
+       <lanstr id="STR_HEARTREST" value="Resting"/>
+       <lanstr id="STR_HEARTDATA" value="Heart rate detection result"/>
+       <lanstr id="STR_HEARTTITLE" value="Heart rate alert"/>
+       <lanstr id="STR_HEARTMAX" value="Current heart rate is higher than XX"/>
+       <lanstr id="STR_HEARTMIN" value="Current heart rate is lower than XX"/>
+       <lanstr id="STR_TRAINGNO" value="no record"/>
+       <lanstr id="STR_TRAINGGO" value="Go to training"/>
+       <lanstr id="STR_MESSAGE" value="Message Notification"/>
+       <lanstr id="STR_MESSAGENO" value="No content currently"/>
+       <lanstr id="STR_CLEAN" value="Clear"/>
+       <lanstr id="STR_CLEANALL" value="Clear all"/>
+       <lanstr id="STR_SLEEP" value="Last Night's Sleep"/>
+       <lanstr id="STR_SLEEPHOUR" value="Hours"/>
+       <lanstr id="STR_SLEEPMGOAL" value="Goal"/>
+       <lanstr id="STR_REATTIME" value="Schedule"/>
+       <lanstr id="STR_SLEEPTIME" value="Bedtime"/>
+       <lanstr id="STR_WALKTIME" value="Wake-up Time"/>
+       <lanstr id="STR_DISTURB" value="The watch will enter Do Not Disturb mode in 20 minutes. To turn it off, please go to the Control Center."/>
+       <lanstr id="STR_DISTURBNOTE" value="Do Not Disturb mode is enabled, thus the watch won't vibrate or ring."/>
+       <lanstr id="STR_MORNNING" value="Good morning"/>
+       <lanstr id="STR_NOW" value="Current"/>
+       <lanstr id="STR_NAP" value="Nap (5 minutes)"/>
+       <lanstr id="STR_TACK" value="Please open the app first, go to &quot;Device&quot; - &quot;Camera&quot;"/>
+       <lanstr id="STR_CLICK" value="click on &quot;Take a Photo"/>
+       <lanstr id="STR_TACKNUM" value="Number of photos taken: XX"/>
        <lanstr id="STR_HEART_RATE" value="Heart Rate"/>
        <lanstr id="STR_BLOOD_OXYGEN" value="Blood Oxygen"/>
        <lanstr id="STR_TRAINING" value="Training"/>
index f03ceb6..dccec19 100644 (file)
        <lanstr id="STR_OTHER_TITLE" value="其他运动"/>
        <lanstr id="STR_EXERCISE_TITLE" value="健身运动"/>
        <lanstr id="STR_RAPID_TRAINING" value="快速训练"/>
-       <lanstr id="STR_SET_GOALS" value="设置目标 &gt;"/>
+       <lanstr id="STR_SET_GOALS" value="设置目标"/>
        <lanstr id="STR_DURATION" value="时长"/>
        <lanstr id="STR_DURATION_SETTING" value="时长(分钟)"/>
        <lanstr id="STR_CALORIE" value="卡路里"/>
        <lanstr id="STR_HEARTMIN" value="当前心率值低于XX"/>
        <lanstr id="STR_TRAINGNO" value="无记录"/>
        <lanstr id="STR_TRAINGGO" value="去训练"/>
-       <lanstr id="STR_MESSAGE" value="通知"/>
+       <lanstr id="STR_MESSAGE" value="消息通知"/>
        <lanstr id="STR_MESSAGENO" value="暂无内容"/>
-       <lanstr id="STR_STEP" value="今日步数"/>
-       <lanstr id="STR_DIS" value="里程(KM)"/>
-       <lanstr id="STR_DUR" value="燃脂时间"/>
-       <lanstr id="STR_STANDUP" value="站立次数"/>
+       <lanstr id="STR_CLEAN" value="清除"/>
+       <lanstr id="STR_CLEANALL" value="全部清除"/>
        <lanstr id="STR_SLEEP" value="昨夜睡眠"/>
        <lanstr id="STR_SLEEPHOUR" value="小时"/>
        <lanstr id="STR_SLEEPMGOAL" value="目标"/>
index f1028ed..55bbff1 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 13f845c..00e921d 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 561c4c7..cf35605 100644 (file)
@@ -251,258 +251,257 @@ enum UIResourceTextId : uint16_t {
     STR_EXERCISE_KETTLEBELLTRAINING = 238,\r
     STR_EXTREME_ORIENTEERING = 239,\r
     STR_INSUFFICIENT_EXERCISE_AMOUNT = 240,\r
-    STR_BLOOD_OXYGEN = 241,\r
-    STR_TRAINING_RECORD = 242,\r
-    STR_COMPASS = 243,\r
-    STR_PHONE = 244,\r
-    STR_FAVORITE_CONTACTS = 245,\r
-    STR_WEATHER = 246,\r
-    STR_ACTIVITY = 247,\r
-    STR_WATCH_FACE = 248,\r
-    STR_DISPLAY_MODE = 249,\r
-    STR_CARD_MANAGEMENT = 250,\r
-    STR_MUSIC = 251,\r
-    STR_SLEEP = 252,\r
-    STR_RECORD = 253,\r
-    STR_BREATH_TRAINING = 254,\r
-    STR_REMOTE_SHOOTING = 255,\r
-    STR_VOICE_ASSISTANT = 256,\r
-    STR_ALIPAY = 257,\r
-    STR_TIMER = 258,\r
-    STR_ALARM = 259,\r
-    STR_STOPWATCH = 260,\r
-    STR_CALCULATOR = 261,\r
-    STR_FIND_PHONE = 262,\r
-    STR_BRIGHTNESS_ADJUSTMENT = 263,\r
-    STR_SOUND = 264,\r
-    STR_BLUETOOTH = 265,\r
-    STR_DO_NOT_DISTURB = 266,\r
-    STR_MESSAGE_NOTIFICATION = 267,\r
-    STR_POWER_SAVE_MODE = 268,\r
-    STR_FLASHLIGHT = 269,\r
-    STR_SETTINGS = 270,\r
-    STR_SCREEN_AND_BRIGHTNESS = 271,\r
-    STR_NETWORKANDCALL = 272,\r
-    STR_SOUND_AND_VIBRATION = 273,\r
-    STR_MOTION_RECOGNITION = 274,\r
-    STR_SYSTEM = 275,\r
-    STR_SHUTDOWN_AND_RESTART = 276,\r
-    STR_SCREEN_ON_DURATION = 277,\r
-    STR_RAISE_TO_WAKE = 278,\r
-    STR_5_SECONDS = 279,\r
-    STR_10_SECONDS = 280,\r
-    STR_15_SECONDS = 281,\r
-    STR_30_SECONDS = 282,\r
-    STR_60_SECONDS = 283,\r
-    STR_300_SECONDS = 284,\r
-    STR_4G_CAPABILITY = 285,\r
-    STR_VOLTE_CALL = 286,\r
-    STR_MOBILE_DATA_OPTION = 287,\r
-    STR_SYSTEM_UPDATE = 288,\r
-    STR_ONLINE_MUSIC = 289,\r
-    STR_BLUETOOTH_HEADPHONES = 290,\r
-    STR_TRADITIONAL_BLUETOOTH = 291,\r
-    STR_AUTO_OFF_BLUETOOTH_NOTE = 292,\r
-    STR_BLUETOOTH_SERVICE_OPTIONS = 293,\r
-    STR_HFP = 294,\r
-    STR_A2DP = 295,\r
-    STR_SYSTEM_VOLUME = 296,\r
-    STR_MEDIA_VOLUME = 297,\r
-    STR_VIBRATION_MODE = 298,\r
-    STR_SILENT_MODE = 299,\r
-    STR_LIST_DISPLAY = 300,\r
-    STR_GRID_DISPLAY = 301,\r
-    STR_CELLULAR_DISPLAY = 302,\r
-    STR_AUTO_DETECT = 303,\r
-    STR_ABOUT_WATCH = 304,\r
-    STR_WATCH_QR_CODE = 305,\r
-    STR_SYSTEM_LANGUAGE = 306,\r
-    STR_RESTART = 307,\r
-    STR_SHUTDOWN = 308,\r
-    STR_FACTORY_RESET = 309,\r
-    STR_WATCH_NAME = 310,\r
-    STR_FIRMWARE_VERSION = 311,\r
-    STR_BLUETOOTH_NAME = 312,\r
-    STR_BLUETOOTH_ADDRESS = 313,\r
-    STR_LATEST_VERSION = 314,\r
-    STR_UPDATENOW = 315,\r
-    STR_LATER = 316,\r
-    STR_UP_TO_DATE = 317,\r
-    STR_NO_UPDATE = 318,\r
-    STR_LANGUAGE_SELECTION = 319,\r
-    STR_RESET_CONFIRM = 320,\r
-    STR_SHUTDOWN_CONFIRM = 321,\r
-    STR_RESET_CONFIRM_NOTE = 322,\r
-    STR_RECORDER = 323,\r
-    STR_CLICK_TO_RECORD = 324,\r
-    STR_RECORDING = 325,\r
-    STR_AUDIO_XX = 326,\r
-    STR_VOICE_RECORDING_REMINDER = 327,\r
-    STR_VOICE_RECORDING_REMINDER_NOTE = 328,\r
-    STR_DELETE_RECORDING = 329,\r
-    STR_DELETE_PERMANENTLY = 330,\r
-    STR_DO_NOT_DISTURB_MODE = 331,\r
-    STR_CONNECTION_STATUS = 332,\r
-    STR_HEADSET = 333,\r
-    STR_CONNECTED = 334,\r
-    STR_DISCONNECTED = 335,\r
-    STR_PHONE_RINGING_VIBRATING = 336,\r
-    STR_BLUETOOTH_DISCONNECTED = 337,\r
-    STR_STOP = 338,\r
-    STR_WORKDAY = 339,\r
-    STR_REPEAT_NO = 340,\r
-    STR_EVERYDAY = 341,\r
-    STR_ADD_A_NEW_ALARM = 342,\r
-    STR_TIME = 343,\r
-    STR_NEXT_STEP = 344,\r
-    STR_MONDAY = 345,\r
-    STR_TUESDAY = 346,\r
-    STR_WEDNESDAY = 347,\r
-    STR_THURSDAY = 348,\r
-    STR_FRIDAY = 349,\r
-    STR_SATURDAY = 350,\r
-    STR_SUNDAY = 351,\r
-    STR_CALIBRATE_COMPASS = 352,\r
-    STR_CALIBRATE_COMPASS_NOTE = 353,\r
-    STR_EAST = 354,\r
-    STR_SOUTH = 355,\r
-    STR_WEST = 356,\r
-    STR_NORTH = 357,\r
-    STR_SOUTHEAST = 358,\r
-    STR_SOUTHWEST = 359,\r
-    STR_NORTHEAST = 360,\r
-    STR_NORTHWEST = 361,\r
-    STR_KEEP_STILL_FOCUS_ON_BREATHING = 362,\r
-    STR_EXHALE_NOW = 363,\r
-    STR_INHALE_NOW = 364,\r
-    STR_TRAINING_COMPLETE = 365,\r
-    STR_BREATHING_TRAINING = 366,\r
-    STR_THIS_BREATH = 367,\r
-    STR_TODAYS_BREATHING_TRAINING = 368,\r
-    STR_RECENT_CALLS = 369,\r
-    STR_NO_CALLS = 370,\r
-    STR_MISSED_CALLS = 371,\r
-    STR_DIALED_CALLS = 372,\r
-    STR_RECEIVED_CALLS = 373,\r
-    STR_NOTE_RECENT_CALLS_LIMITATION = 374,\r
-    STR_NO_CONTACTS_ADDED = 375,\r
-    STR_DIAL_MODE = 376,\r
-    STR_DIAL_VIA_WATCH_SIM = 377,\r
-    STR_DIAL_VIA_PHONE = 378,\r
-    STR_KUMI_TECHNOLOGY = 379,\r
-    STR_CALLING = 380,\r
-    STR_NOT_PAIRED = 381,\r
-    STR_PAIRED = 382,\r
-    STR_UNPAIR = 383,\r
-    STR_CONNECTION_ERROR = 384,\r
-    STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 385,\r
-    STR_ENABLE_BLUETOOTH_CALL = 386,\r
-    STR_ENABLE_BLUETOOTH_CALL_NOTE = 387,\r
-    STR_SIM_CARD_ERROR = 388,\r
-    STR_CHECK_SIM_CARD_INSERTION = 389,\r
-    STR_WEATHER_REPORT = 390,\r
-    STR_ULTRAVIOLET = 391,\r
-    STR_WIND_SPEED = 392,\r
-    STR_HUMIDITY = 393,\r
-    STR_NEXT_7_DAYS = 394,\r
-    STR_GET_WEATHER_ERROR = 395,\r
-    STR_MUSIC_SOURCE = 396,\r
-    STR_MOBILE_MUSIC = 397,\r
-    STR_WATCH_MUSIC = 398,\r
-    STR_MUSIC_LIST = 399,\r
-    STR_BLUETOOTH_CONNECTION_FAILED = 400,\r
-    STR_SCANNING_BINDING = 401,\r
-    STR_DEVICE_BINDING = 402,\r
-    STR_DEVICE_BINDING_NOTE = 403,\r
-    STR_EQUIPMENT_UNTYING = 404,\r
-    STR_EQUIPMENT_UNTYING_NOTE = 405,\r
-    STR_DRINK_WATER_REMINDER = 406,\r
-    STR_DRINK_WATER_REMINDER_NOTE = 407,\r
-    STR_SEDENTARY_REMINDER = 408,\r
-    STR_SEDENTARY_REMINDER_NOTE = 409,\r
-    STR_SYSTEM_UPGRADING = 410,\r
-    STR_NEWDEVICE_BIND_REMIND_NOTE = 411,\r
-    STR_TABULAR_DISPLAY = 412,\r
-    STR_RANGE_MILE = 413,\r
-    STR_CLOSE = 414,\r
-    STR_MORE_APP = 415,\r
-    STR_SAVENOTE = 416,\r
-    STR_SAVEBACK = 417,\r
-    STR_SAVEASK = 418,\r
-    STR_BLOOD = 419,\r
-    STR_CHECK = 420,\r
-    STR_CHECKNEW = 421,\r
-    STR_CHECKTIME = 422,\r
-    STR_CHECKLONG = 423,\r
-    STR_CHECKNO = 424,\r
-    STR_CHECKNOTE = 425,\r
-    STR_CHECKON = 426,\r
-    STR_CHECKSTOP = 427,\r
-    STR_CHECKERROR = 428,\r
-    STR_WAERKEEP = 429,\r
-    STR_WEARRE = 430,\r
-    STR_WEARREADY = 431,\r
-    STR_RECHECK = 432,\r
-    STR_CHECKEWARN = 433,\r
-    STR_BLOODSHORT = 434,\r
-    STR_HEARTNOTE = 435,\r
-    STR_KONW = 436,\r
-    STR_EXPLAIN = 437,\r
-    STR_HEARTREST = 438,\r
-    STR_HEARTDATA = 439,\r
-    STR_HEARTTITLE = 440,\r
-    STR_HEARTMAX = 441,\r
-    STR_HEARTMIN = 442,\r
-    STR_TRAINGNO = 443,\r
-    STR_TRAINGGO = 444,\r
-    STR_MESSAGE = 445,\r
-    STR_MESSAGENO = 446,\r
-    STR_DIS = 447,\r
-    STR_DUR = 448,\r
-    STR_STANDUP = 449,\r
-    STR_SLEEPHOUR = 450,\r
-    STR_SLEEPMGOAL = 451,\r
-    STR_REATTIME = 452,\r
-    STR_SLEEPTIME = 453,\r
-    STR_WALKTIME = 454,\r
-    STR_DISTURB = 455,\r
-    STR_DISTURBNOTE = 456,\r
-    STR_MORNNING = 457,\r
-    STR_NOW = 458,\r
-    STR_NAP = 459,\r
-    STR_TACK = 460,\r
-    STR_CLICK = 461,\r
-    STR_TACKNUM = 462,\r
-    STR_MON = 463,\r
-    STR_TUES = 464,\r
-    STR_WEDNES = 465,\r
-    STR_THURS = 466,\r
-    STR_FRI = 467,\r
-    STR_SATUR = 468,\r
-    STR_SUN = 469,\r
-    STR_RECORDING_LIST = 470,\r
-    STR_CRLEMPTY = 471,\r
-    STR_CALL_VOLUME = 472,\r
-    STR_AI_VOICE = 473,\r
-    STR_AI_INTELLIGENT_ASSISTANT = 474,\r
-    STR_START_CHAT = 475,\r
-    STR_BOOT_FAILED = 476,\r
-    STR_ENABLE_MOBILE_DATA_FIRST = 477,\r
-    STR_ENABLE_BLUETOOTH_FIRST = 478,\r
-    STR_LISTENING = 479,\r
-    STR_FINISH_SPEAKING = 480,\r
-    STR_THINKING = 481,\r
-    STR_CANCEL = 482,\r
-    STR_CONNECT_TIMEOUT = 483,\r
-    STR_PLEASE_RESTART_CHAT = 484,\r
-    STR_CONTINUE_CHAT = 485,\r
-    STR_MAX_ID = 486,\r
+    STR_RANGE_MILE = 241,\r
+    STR_CLOSE = 242,\r
+    STR_MORE_APP = 243,\r
+    STR_SAVENOTE = 244,\r
+    STR_SAVEBACK = 245,\r
+    STR_SAVEASK = 246,\r
+    STR_BLOOD = 247,\r
+    STR_CHECK = 248,\r
+    STR_CHECKNEW = 249,\r
+    STR_CHECKTIME = 250,\r
+    STR_CHECKLONG = 251,\r
+    STR_CHECKNO = 252,\r
+    STR_CHECKNOTE = 253,\r
+    STR_CHECKON = 254,\r
+    STR_CHECKSTOP = 255,\r
+    STR_CHECKERROR = 256,\r
+    STR_WAERKEEP = 257,\r
+    STR_WEARRE = 258,\r
+    STR_WEARREADY = 259,\r
+    STR_RECHECK = 260,\r
+    STR_CHECKEWARN = 261,\r
+    STR_BLOODSHORT = 262,\r
+    STR_HEARTNOTE = 263,\r
+    STR_KONW = 264,\r
+    STR_EXPLAIN = 265,\r
+    STR_HEARTREST = 266,\r
+    STR_HEARTDATA = 267,\r
+    STR_HEARTTITLE = 268,\r
+    STR_HEARTMAX = 269,\r
+    STR_HEARTMIN = 270,\r
+    STR_TRAINGNO = 271,\r
+    STR_TRAINGGO = 272,\r
+    STR_MESSAGE = 273,\r
+    STR_MESSAGENO = 274,\r
+    STR_CLEAN = 275,\r
+    STR_CLEANALL = 276,\r
+    STR_SLEEP = 277,\r
+    STR_SLEEPHOUR = 278,\r
+    STR_SLEEPMGOAL = 279,\r
+    STR_REATTIME = 280,\r
+    STR_SLEEPTIME = 281,\r
+    STR_WALKTIME = 282,\r
+    STR_DISTURB = 283,\r
+    STR_DISTURBNOTE = 284,\r
+    STR_MORNNING = 285,\r
+    STR_NOW = 286,\r
+    STR_NAP = 287,\r
+    STR_TACK = 288,\r
+    STR_CLICK = 289,\r
+    STR_TACKNUM = 290,\r
+    STR_BLOOD_OXYGEN = 291,\r
+    STR_TRAINING_RECORD = 292,\r
+    STR_COMPASS = 293,\r
+    STR_PHONE = 294,\r
+    STR_FAVORITE_CONTACTS = 295,\r
+    STR_WEATHER = 296,\r
+    STR_ACTIVITY = 297,\r
+    STR_WATCH_FACE = 298,\r
+    STR_DISPLAY_MODE = 299,\r
+    STR_CARD_MANAGEMENT = 300,\r
+    STR_MUSIC = 301,\r
+    STR_RECORD = 302,\r
+    STR_BREATH_TRAINING = 303,\r
+    STR_REMOTE_SHOOTING = 304,\r
+    STR_VOICE_ASSISTANT = 305,\r
+    STR_ALIPAY = 306,\r
+    STR_TIMER = 307,\r
+    STR_ALARM = 308,\r
+    STR_STOPWATCH = 309,\r
+    STR_CALCULATOR = 310,\r
+    STR_FIND_PHONE = 311,\r
+    STR_BRIGHTNESS_ADJUSTMENT = 312,\r
+    STR_SOUND = 313,\r
+    STR_BLUETOOTH = 314,\r
+    STR_DO_NOT_DISTURB = 315,\r
+    STR_MESSAGE_NOTIFICATION = 316,\r
+    STR_POWER_SAVE_MODE = 317,\r
+    STR_FLASHLIGHT = 318,\r
+    STR_SETTINGS = 319,\r
+    STR_SCREEN_AND_BRIGHTNESS = 320,\r
+    STR_NETWORKANDCALL = 321,\r
+    STR_SOUND_AND_VIBRATION = 322,\r
+    STR_MOTION_RECOGNITION = 323,\r
+    STR_SYSTEM = 324,\r
+    STR_SHUTDOWN_AND_RESTART = 325,\r
+    STR_SCREEN_ON_DURATION = 326,\r
+    STR_RAISE_TO_WAKE = 327,\r
+    STR_5_SECONDS = 328,\r
+    STR_10_SECONDS = 329,\r
+    STR_15_SECONDS = 330,\r
+    STR_30_SECONDS = 331,\r
+    STR_60_SECONDS = 332,\r
+    STR_300_SECONDS = 333,\r
+    STR_4G_CAPABILITY = 334,\r
+    STR_VOLTE_CALL = 335,\r
+    STR_MOBILE_DATA_OPTION = 336,\r
+    STR_SYSTEM_UPDATE = 337,\r
+    STR_ONLINE_MUSIC = 338,\r
+    STR_BLUETOOTH_HEADPHONES = 339,\r
+    STR_TRADITIONAL_BLUETOOTH = 340,\r
+    STR_AUTO_OFF_BLUETOOTH_NOTE = 341,\r
+    STR_BLUETOOTH_SERVICE_OPTIONS = 342,\r
+    STR_HFP = 343,\r
+    STR_A2DP = 344,\r
+    STR_SYSTEM_VOLUME = 345,\r
+    STR_MEDIA_VOLUME = 346,\r
+    STR_VIBRATION_MODE = 347,\r
+    STR_SILENT_MODE = 348,\r
+    STR_LIST_DISPLAY = 349,\r
+    STR_GRID_DISPLAY = 350,\r
+    STR_CELLULAR_DISPLAY = 351,\r
+    STR_AUTO_DETECT = 352,\r
+    STR_ABOUT_WATCH = 353,\r
+    STR_WATCH_QR_CODE = 354,\r
+    STR_SYSTEM_LANGUAGE = 355,\r
+    STR_RESTART = 356,\r
+    STR_SHUTDOWN = 357,\r
+    STR_FACTORY_RESET = 358,\r
+    STR_WATCH_NAME = 359,\r
+    STR_FIRMWARE_VERSION = 360,\r
+    STR_BLUETOOTH_NAME = 361,\r
+    STR_BLUETOOTH_ADDRESS = 362,\r
+    STR_LATEST_VERSION = 363,\r
+    STR_UPDATENOW = 364,\r
+    STR_LATER = 365,\r
+    STR_UP_TO_DATE = 366,\r
+    STR_NO_UPDATE = 367,\r
+    STR_LANGUAGE_SELECTION = 368,\r
+    STR_RESET_CONFIRM = 369,\r
+    STR_SHUTDOWN_CONFIRM = 370,\r
+    STR_RESET_CONFIRM_NOTE = 371,\r
+    STR_RECORDER = 372,\r
+    STR_CLICK_TO_RECORD = 373,\r
+    STR_RECORDING = 374,\r
+    STR_AUDIO_XX = 375,\r
+    STR_VOICE_RECORDING_REMINDER = 376,\r
+    STR_VOICE_RECORDING_REMINDER_NOTE = 377,\r
+    STR_DELETE_RECORDING = 378,\r
+    STR_DELETE_PERMANENTLY = 379,\r
+    STR_DO_NOT_DISTURB_MODE = 380,\r
+    STR_CONNECTION_STATUS = 381,\r
+    STR_HEADSET = 382,\r
+    STR_CONNECTED = 383,\r
+    STR_DISCONNECTED = 384,\r
+    STR_PHONE_RINGING_VIBRATING = 385,\r
+    STR_BLUETOOTH_DISCONNECTED = 386,\r
+    STR_STOP = 387,\r
+    STR_WORKDAY = 388,\r
+    STR_REPEAT_NO = 389,\r
+    STR_EVERYDAY = 390,\r
+    STR_ADD_A_NEW_ALARM = 391,\r
+    STR_TIME = 392,\r
+    STR_NEXT_STEP = 393,\r
+    STR_MON = 394,\r
+    STR_TUES = 395,\r
+    STR_WEDNES = 396,\r
+    STR_THURS = 397,\r
+    STR_FRI = 398,\r
+    STR_SATUR = 399,\r
+    STR_SUN = 400,\r
+    STR_MONDAY = 401,\r
+    STR_TUESDAY = 402,\r
+    STR_WEDNESDAY = 403,\r
+    STR_THURSDAY = 404,\r
+    STR_FRIDAY = 405,\r
+    STR_SATURDAY = 406,\r
+    STR_SUNDAY = 407,\r
+    STR_CALIBRATE_COMPASS = 408,\r
+    STR_CALIBRATE_COMPASS_NOTE = 409,\r
+    STR_EAST = 410,\r
+    STR_SOUTH = 411,\r
+    STR_WEST = 412,\r
+    STR_NORTH = 413,\r
+    STR_SOUTHEAST = 414,\r
+    STR_SOUTHWEST = 415,\r
+    STR_NORTHEAST = 416,\r
+    STR_NORTHWEST = 417,\r
+    STR_KEEP_STILL_FOCUS_ON_BREATHING = 418,\r
+    STR_EXHALE_NOW = 419,\r
+    STR_INHALE_NOW = 420,\r
+    STR_TRAINING_COMPLETE = 421,\r
+    STR_BREATHING_TRAINING = 422,\r
+    STR_THIS_BREATH = 423,\r
+    STR_TODAYS_BREATHING_TRAINING = 424,\r
+    STR_RECENT_CALLS = 425,\r
+    STR_NO_CALLS = 426,\r
+    STR_MISSED_CALLS = 427,\r
+    STR_DIALED_CALLS = 428,\r
+    STR_RECEIVED_CALLS = 429,\r
+    STR_NOTE_RECENT_CALLS_LIMITATION = 430,\r
+    STR_NO_CONTACTS_ADDED = 431,\r
+    STR_DIAL_MODE = 432,\r
+    STR_DIAL_VIA_WATCH_SIM = 433,\r
+    STR_DIAL_VIA_PHONE = 434,\r
+    STR_KUMI_TECHNOLOGY = 435,\r
+    STR_CALLING = 436,\r
+    STR_NOT_PAIRED = 437,\r
+    STR_PAIRED = 438,\r
+    STR_UNPAIR = 439,\r
+    STR_CONNECTION_ERROR = 440,\r
+    STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 441,\r
+    STR_ENABLE_BLUETOOTH_CALL = 442,\r
+    STR_ENABLE_BLUETOOTH_CALL_NOTE = 443,\r
+    STR_SIM_CARD_ERROR = 444,\r
+    STR_CHECK_SIM_CARD_INSERTION = 445,\r
+    STR_WEATHER_REPORT = 446,\r
+    STR_ULTRAVIOLET = 447,\r
+    STR_WIND_SPEED = 448,\r
+    STR_HUMIDITY = 449,\r
+    STR_NEXT_7_DAYS = 450,\r
+    STR_GET_WEATHER_ERROR = 451,\r
+    STR_MUSIC_SOURCE = 452,\r
+    STR_MOBILE_MUSIC = 453,\r
+    STR_WATCH_MUSIC = 454,\r
+    STR_MUSIC_LIST = 455,\r
+    STR_BLUETOOTH_CONNECTION_FAILED = 456,\r
+    STR_SCANNING_BINDING = 457,\r
+    STR_DEVICE_BINDING = 458,\r
+    STR_DEVICE_BINDING_NOTE = 459,\r
+    STR_EQUIPMENT_UNTYING = 460,\r
+    STR_EQUIPMENT_UNTYING_NOTE = 461,\r
+    STR_DRINK_WATER_REMINDER = 462,\r
+    STR_DRINK_WATER_REMINDER_NOTE = 463,\r
+    STR_SEDENTARY_REMINDER = 464,\r
+    STR_SEDENTARY_REMINDER_NOTE = 465,\r
+    STR_SYSTEM_UPGRADING = 466,\r
+    STR_NEWDEVICE_BIND_REMIND_NOTE = 467,\r
+    STR_TABULAR_DISPLAY = 468,\r
+    STR_RECORDING_LIST = 469,\r
+    STR_CRLEMPTY = 470,\r
+    STR_CALL_VOLUME = 471,\r
+    STR_AI_VOICE = 472,\r
+    STR_AI_INTELLIGENT_ASSISTANT = 473,\r
+    STR_START_CHAT = 474,\r
+    STR_BOOT_FAILED = 475,\r
+    STR_ENABLE_MOBILE_DATA_FIRST = 476,\r
+    STR_ENABLE_BLUETOOTH_FIRST = 477,\r
+    STR_LISTENING = 478,\r
+    STR_FINISH_SPEAKING = 479,\r
+    STR_THINKING = 480,\r
+    STR_CANCEL = 481,\r
+    STR_CONNECT_TIMEOUT = 482,\r
+    STR_PLEASE_RESTART_CHAT = 483,\r
+    STR_CONTINUE_CHAT = 484,\r
+    STR_MAX_ID = 485,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
     LANGUAGE_ID_JA,\r
-    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r
index ca52a6d..224c9cc 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 4833ec0..6b65091 100644 (file)
@@ -1,3 +1,9 @@
+/*** 
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-06-22 17:52:45
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageCardView.h
+ */
 /***
  * @Date: 2024-04-15 10:55:58
  * @LastEditors: Caisking 3449750381@qq.com
@@ -30,6 +36,7 @@
 #include "message/include/MessageModel.h"
 namespace OHOS
 {
+    #define MAINMESSAGEVIEW "messagecard"
     class MessageCardView : public AppGroupView
     {
     public:
diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageControlPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageControlPresenter.h
new file mode 100644 (file)
index 0000000..b82d73c
--- /dev/null
@@ -0,0 +1,47 @@
+/***
+ * @Date: 2024-06-22 11:36:07
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-06-22 14:57:34
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageControlPresenter.h
+ */
+/***
+ * @Date: 2024-06-22 11:36:16
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-06-22 11:39:50
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp
+ */
+
+#ifndef MESSAGE_CONTROL_PRESENTER_H
+#define MESSAGE_CONTROL_PRESENTER_H
+
+#include "Presenter.h"
+#include "components/ui_view.h"
+#include "components/ui_image_view.h"
+#include "ohos_types.h"
+#include "UiConfig.h"
+#include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
+#include "language/font/ui_resource_string.h"
+#include "message/include/MessageControlView.h"
+
+namespace OHOS
+{
+    class MessageControlView;
+    class MessageControlPresenter : public UIView::OnClickListener
+    {
+    public:
+        MessageControlPresenter(){};
+        virtual ~MessageControlPresenter(){};
+        static MessageControlPresenter *GetInstance()
+        {
+            static MessageControlPresenter instance;
+            return &instance;
+        }
+
+        bool OnClick(UIView &view, const ClickEvent &event) override;
+
+    private:
+        UIView *view_{nullptr};
+    };
+}
+#endif
\ No newline at end of file
index b91bf9b..4f9742b 100644 (file)
@@ -10,6 +10,7 @@
 #include "message/include/MessageCardView.h"
 #include "message/include/MessagePresenter.h"
 #include "uicomponents/UIComponents.h"
+#include "message/include/MessageControlPresenter.h"
 namespace OHOS
 {
 
@@ -84,9 +85,16 @@ namespace OHOS
         MessageList->EnableAutoAlign(true);
         MessageList->SetElastic(true); // 设置回弹效果
         MessageList->SetMaxScrollDistance(MAX_SCR_DIS);
+        MessageList->SetViewId(MAINMESSAGEVIEW);
 
         // SetYScrollBarVisible(true); // 设置滑动滚动条
-        MessageList->SetOnClickListener(static_cast<UIView::OnClickListener *>(MessagePresenter::GetInstance()));
+        UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::MessageControlPresenter::GetInstance();
+        if (clickListener == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AddButton::OnStart clickListener NULL");
+            return false;
+        }
+        MessageList->SetOnClickListener(clickListener);
         UIView::OnDragListener *Messagedraglistener = static_cast<UIView::OnDragListener *>(MessagePresenter::GetInstance());
 #if 0
         /*删除按键*/
diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlPresenter.cpp
new file mode 100644 (file)
index 0000000..aa123a7
--- /dev/null
@@ -0,0 +1,82 @@
+/***
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-04-16 17:36:17
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/training_card/src/MessageControlPresenter.cpp
+ */
+
+#include "message/include/MessageControlPresenter.h"
+#include "message/include/MessageControlView.h"
+#include "message/include/MessageModel.h"
+
+#include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
+#include "language/font/ui_resource_string.h"
+#include "NativeAbility.h"
+#include "components/ui_label_ext.h"
+#include "language/font/ui_resource_string.h"
+#include "UiConfig.h"
+#include "wearable_log.h"
+
+#include "uicomponents/UIComponents.h"
+
+namespace OHOS
+{
+    bool MessageControlPresenter::OnClick(UIView &view, const ClickEvent &event)
+    {
+        UNUSED(event);
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageControlView::OnClick %s", view.GetViewId());
+        if (strcmp(view.GetViewId(), MAINMESSAGEVIEW) != 0)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: View is not List");
+            return false;
+        }
+        
+        if (!MessageModel::GetInstance().GetJsonLoadStatus())
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Json data not loaded.");
+            return false;
+        }
+
+        // 获取 MessageItemView 并检查索引
+        MessageItemView *p_MessageItemView = static_cast<MessageItemView *>(&view);
+        if (!p_MessageItemView)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid view type.");
+            return false;
+        }
+        MessageCardView::GetInstance()->GetList()->GetViewIndex();
+        int index = p_MessageItemView->GetMessageListIndex();
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "index is %d", index);
+        // 读取json数据
+        std::vector<MessageData> messageDataVector = MessageModel::GetInstance().LoadMessageData();
+
+        if (messageDataVector.empty())
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: messageDataVector is empty");
+            return false;
+        }
+
+        if (index < 0)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid index (index < 0)");
+            return false;
+        }
+
+        if (index >= messageDataVector.size())
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid index (index out of range)");
+            return false;
+        }
+
+        int arraynum = messageDataVector.size() - 1;
+        MessageData &messageData = messageDataVector[arraynum - index];
+
+        MessageModel::GetInstance().SetCurrentMessageData(&messageData);
+        MessageModel::GetInstance().SetCurrentIndex(arraynum - index);
+        // 切换到详情界面
+        NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE_SHOW);
+
+        return true; // 返回 true 表示点击事件处理成功
+    }
+} // namespace OHOS
\ No newline at end of file
index 938ac9a..13f0c57 100644 (file)
@@ -6,6 +6,7 @@
  */
 #include "message/include/MessageControlView.h"
 #include "message/include/MessageModel.h"
+#include"message/include/MessageControlPresenter.h"
 #include "wearable_log.h"
 
 namespace OHOS
index 9ecef03..ebbcb89 100644 (file)
@@ -1,4 +1,10 @@
-/***
+/*
+ * @Date: 2024-06-21 09:56:18
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-06-22 15:32:37
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp
+ */
+/*
  * @Author: Caisking 3449750381@qq.com
  * @Date: 2024-01-29 19:58:37
  * @LastEditors: Caisking 3449750381@qq.com
@@ -115,7 +121,7 @@ namespace OHOS
 
             // 这里根据解析的 JSON 数据类型修改 messagedata.isRead 的精确类型
             messagedata.isRead = cJSON_GetObjectItem(item, "read")->valueint;
-            PrintData(messagedata);
+            // PrintData(messagedata);
             MessageVector.push_back(messagedata);
         }
         cJSON_Delete(root);
@@ -158,12 +164,12 @@ namespace OHOS
     }
     void MessageModel::PrintData(MessageData messagedata)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "**************************************");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "--------------------------------------");
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Message Title: %s", (messagedata.labelTitle).c_str());
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Message Details: %s", (messagedata.labelDetails).c_str());
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Message Time: %s", (messagedata.labelTime).c_str());
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Message Read: %d", messagedata.isRead);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "**************************************");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "--------------------------------------");
     }
     void MessageModel::InitMessageListItems()
     {
@@ -180,7 +186,7 @@ namespace OHOS
                 messageData.labelTitle = messageVector[i].labelTitle;
                 messageData.labelDetails = messageVector[i].labelDetails;
                 messageData.labelTime = messageVector[i].labelTime;
-                PrintData(messageData);
+                // PrintData(messageData);
                 // 获取是否读取 来信 信息内容 时间
                 Messages[count] = {count, messageData.isRead, messageData.labelTitle, messageData.labelDetails, messageData.labelTime};
             }
@@ -210,6 +216,7 @@ namespace OHOS
     // 获取目前的message
     MessageData *MessageModel::GetCurrentMessageData()
     {
+        PrintData(message_);
         return &message_;
     }
     // 设置目前的message
index 4199190..5d9abf3 100644 (file)
@@ -115,21 +115,46 @@ namespace OHOS
                 return true;
             }
             /* -------------------------------------------------------------------------- */
+            // 获取 MessageItemView 并检查索引
             MessageItemView *p_MessageItemView = static_cast<MessageItemView *>(&view);
+            if (!p_MessageItemView)
+            {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid view type.");
+                return false;
+            }
+
             int index = p_MessageItemView->GetMessageListIndex();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "the index is %d", index);
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "index is %d", index);
             // 读取json数据
             std::vector<MessageData> messageDataVector = MessageModel::GetInstance().LoadMessageData();
-            if (!messageDataVector.empty())
+
+            if (messageDataVector.empty())
             {
-                // 选择点击按键的历史数据
-                int arraynum = messageDataVector.size() - 1;
-                MessageData messageData = messageDataVector[arraynum - index]; // 显示是倒序 id同理
-                MessageModel::GetInstance().SetCurrentMessageData(&messageData);
-                MessageModel::GetInstance().SetCurrentIndex(arraynum - index);
-                NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE_SHOW);
-                return true;
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: messageDataVector is empty");
+                return false;
+            }
+
+            if (index < 0)
+            {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid index (index < 0)");
+                return false;
+            }
+
+            if (index >= messageDataVector.size())
+            {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Invalid index (index out of range)");
+                return false;
             }
+
+            int arraynum = messageDataVector.size() - 1;
+            MessageData &messageData = messageDataVector[arraynum - index];
+
+            MessageModel::GetInstance().SetCurrentMessageData(&messageData);
+            MessageModel::GetInstance().SetCurrentIndex(arraynum - index);
+            // 切换到详情界面
+            NativeAbility::GetInstance().ChangeSlice(VIEW_MESSAGE_SHOW);
+
+            return true; // 返回 true 表示点击事件处理成功
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "the messageDataVector is error");
         }
         return true;
index 261cad3..bee94e8 100644 (file)
@@ -42,7 +42,7 @@ namespace OHOS
     std::string messageStr = "【铁路12306】系统已自动为您生成订单EC09828333,04月23日G2231次,深圳北站13:31开。请您在2小时内完成支付。您可通过以下链接进行支付。https://www.12306.cn/index/";
 #endif
     std::string titleStr, timeStr, messageStr;
-    
+
     MessageShowView::MessageShowView()
     {
         g_pMessageShowView = this;
@@ -131,7 +131,7 @@ namespace OHOS
     }
     void MessageShowView::InitView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitView");
+        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitView");
         /* -------------------------------------------------------------------------- */
         title = new UILabel();
         if (title == nullptr)
@@ -146,7 +146,6 @@ namespace OHOS
         title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         title->SetVisible(true);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "title is ok!");
         /* -------------------------------------------------------------------------- */
         time = new UILabel();
         if (time == nullptr)
@@ -163,21 +162,17 @@ namespace OHOS
         time->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
         time->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         time->SetVisible(true);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "time is ok!");
         /* -------------------------------------------------------------------------- */
         /*初始化消息内容*/
         InitializeButton(messageButton, 33, 157, 380, 350, "message");
         messageButton->SetStyle(STYLE_BORDER_RADIUS, 30);
         messageButton->SetText(messageStr.c_str());
-        // messageButton->SetAlign(TEXT_ALIGNMENT_LEFT);
         messageButton->SetTextColor(Color::Gray());
         messageButton->SetTouchable(false);
         messageButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageButton");
         /*加载清除按键*/
-        InitButtonExt(deleteButton, 43, 527, 380, 100, DELETEBUTTON, STR_CLOSE, 30);
+        InitButtonExt(deleteButton, 43, 527, 380, 100, DELETEBUTTON, STR_CLEAN, 30);
         deleteButton->SetOnClickListener(static_cast<UIView::OnClickListener *>(MessageShowPresenter::GetInstance()));
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "deleteButton");
         /* -------------------------------------------------------------------------- */
         container_->Add(title);
         container_->Add(time);
@@ -213,7 +208,7 @@ namespace OHOS
 
     void MessageShowView::OnStart()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnStart");
+        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnStart");
         container_ = new UIScrollView();
         if (container_ == nullptr)
         {
index f1028ed..55bbff1 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 13f845c..00e921d 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 561c4c7..cf35605 100644 (file)
@@ -251,258 +251,257 @@ enum UIResourceTextId : uint16_t {
     STR_EXERCISE_KETTLEBELLTRAINING = 238,\r
     STR_EXTREME_ORIENTEERING = 239,\r
     STR_INSUFFICIENT_EXERCISE_AMOUNT = 240,\r
-    STR_BLOOD_OXYGEN = 241,\r
-    STR_TRAINING_RECORD = 242,\r
-    STR_COMPASS = 243,\r
-    STR_PHONE = 244,\r
-    STR_FAVORITE_CONTACTS = 245,\r
-    STR_WEATHER = 246,\r
-    STR_ACTIVITY = 247,\r
-    STR_WATCH_FACE = 248,\r
-    STR_DISPLAY_MODE = 249,\r
-    STR_CARD_MANAGEMENT = 250,\r
-    STR_MUSIC = 251,\r
-    STR_SLEEP = 252,\r
-    STR_RECORD = 253,\r
-    STR_BREATH_TRAINING = 254,\r
-    STR_REMOTE_SHOOTING = 255,\r
-    STR_VOICE_ASSISTANT = 256,\r
-    STR_ALIPAY = 257,\r
-    STR_TIMER = 258,\r
-    STR_ALARM = 259,\r
-    STR_STOPWATCH = 260,\r
-    STR_CALCULATOR = 261,\r
-    STR_FIND_PHONE = 262,\r
-    STR_BRIGHTNESS_ADJUSTMENT = 263,\r
-    STR_SOUND = 264,\r
-    STR_BLUETOOTH = 265,\r
-    STR_DO_NOT_DISTURB = 266,\r
-    STR_MESSAGE_NOTIFICATION = 267,\r
-    STR_POWER_SAVE_MODE = 268,\r
-    STR_FLASHLIGHT = 269,\r
-    STR_SETTINGS = 270,\r
-    STR_SCREEN_AND_BRIGHTNESS = 271,\r
-    STR_NETWORKANDCALL = 272,\r
-    STR_SOUND_AND_VIBRATION = 273,\r
-    STR_MOTION_RECOGNITION = 274,\r
-    STR_SYSTEM = 275,\r
-    STR_SHUTDOWN_AND_RESTART = 276,\r
-    STR_SCREEN_ON_DURATION = 277,\r
-    STR_RAISE_TO_WAKE = 278,\r
-    STR_5_SECONDS = 279,\r
-    STR_10_SECONDS = 280,\r
-    STR_15_SECONDS = 281,\r
-    STR_30_SECONDS = 282,\r
-    STR_60_SECONDS = 283,\r
-    STR_300_SECONDS = 284,\r
-    STR_4G_CAPABILITY = 285,\r
-    STR_VOLTE_CALL = 286,\r
-    STR_MOBILE_DATA_OPTION = 287,\r
-    STR_SYSTEM_UPDATE = 288,\r
-    STR_ONLINE_MUSIC = 289,\r
-    STR_BLUETOOTH_HEADPHONES = 290,\r
-    STR_TRADITIONAL_BLUETOOTH = 291,\r
-    STR_AUTO_OFF_BLUETOOTH_NOTE = 292,\r
-    STR_BLUETOOTH_SERVICE_OPTIONS = 293,\r
-    STR_HFP = 294,\r
-    STR_A2DP = 295,\r
-    STR_SYSTEM_VOLUME = 296,\r
-    STR_MEDIA_VOLUME = 297,\r
-    STR_VIBRATION_MODE = 298,\r
-    STR_SILENT_MODE = 299,\r
-    STR_LIST_DISPLAY = 300,\r
-    STR_GRID_DISPLAY = 301,\r
-    STR_CELLULAR_DISPLAY = 302,\r
-    STR_AUTO_DETECT = 303,\r
-    STR_ABOUT_WATCH = 304,\r
-    STR_WATCH_QR_CODE = 305,\r
-    STR_SYSTEM_LANGUAGE = 306,\r
-    STR_RESTART = 307,\r
-    STR_SHUTDOWN = 308,\r
-    STR_FACTORY_RESET = 309,\r
-    STR_WATCH_NAME = 310,\r
-    STR_FIRMWARE_VERSION = 311,\r
-    STR_BLUETOOTH_NAME = 312,\r
-    STR_BLUETOOTH_ADDRESS = 313,\r
-    STR_LATEST_VERSION = 314,\r
-    STR_UPDATENOW = 315,\r
-    STR_LATER = 316,\r
-    STR_UP_TO_DATE = 317,\r
-    STR_NO_UPDATE = 318,\r
-    STR_LANGUAGE_SELECTION = 319,\r
-    STR_RESET_CONFIRM = 320,\r
-    STR_SHUTDOWN_CONFIRM = 321,\r
-    STR_RESET_CONFIRM_NOTE = 322,\r
-    STR_RECORDER = 323,\r
-    STR_CLICK_TO_RECORD = 324,\r
-    STR_RECORDING = 325,\r
-    STR_AUDIO_XX = 326,\r
-    STR_VOICE_RECORDING_REMINDER = 327,\r
-    STR_VOICE_RECORDING_REMINDER_NOTE = 328,\r
-    STR_DELETE_RECORDING = 329,\r
-    STR_DELETE_PERMANENTLY = 330,\r
-    STR_DO_NOT_DISTURB_MODE = 331,\r
-    STR_CONNECTION_STATUS = 332,\r
-    STR_HEADSET = 333,\r
-    STR_CONNECTED = 334,\r
-    STR_DISCONNECTED = 335,\r
-    STR_PHONE_RINGING_VIBRATING = 336,\r
-    STR_BLUETOOTH_DISCONNECTED = 337,\r
-    STR_STOP = 338,\r
-    STR_WORKDAY = 339,\r
-    STR_REPEAT_NO = 340,\r
-    STR_EVERYDAY = 341,\r
-    STR_ADD_A_NEW_ALARM = 342,\r
-    STR_TIME = 343,\r
-    STR_NEXT_STEP = 344,\r
-    STR_MONDAY = 345,\r
-    STR_TUESDAY = 346,\r
-    STR_WEDNESDAY = 347,\r
-    STR_THURSDAY = 348,\r
-    STR_FRIDAY = 349,\r
-    STR_SATURDAY = 350,\r
-    STR_SUNDAY = 351,\r
-    STR_CALIBRATE_COMPASS = 352,\r
-    STR_CALIBRATE_COMPASS_NOTE = 353,\r
-    STR_EAST = 354,\r
-    STR_SOUTH = 355,\r
-    STR_WEST = 356,\r
-    STR_NORTH = 357,\r
-    STR_SOUTHEAST = 358,\r
-    STR_SOUTHWEST = 359,\r
-    STR_NORTHEAST = 360,\r
-    STR_NORTHWEST = 361,\r
-    STR_KEEP_STILL_FOCUS_ON_BREATHING = 362,\r
-    STR_EXHALE_NOW = 363,\r
-    STR_INHALE_NOW = 364,\r
-    STR_TRAINING_COMPLETE = 365,\r
-    STR_BREATHING_TRAINING = 366,\r
-    STR_THIS_BREATH = 367,\r
-    STR_TODAYS_BREATHING_TRAINING = 368,\r
-    STR_RECENT_CALLS = 369,\r
-    STR_NO_CALLS = 370,\r
-    STR_MISSED_CALLS = 371,\r
-    STR_DIALED_CALLS = 372,\r
-    STR_RECEIVED_CALLS = 373,\r
-    STR_NOTE_RECENT_CALLS_LIMITATION = 374,\r
-    STR_NO_CONTACTS_ADDED = 375,\r
-    STR_DIAL_MODE = 376,\r
-    STR_DIAL_VIA_WATCH_SIM = 377,\r
-    STR_DIAL_VIA_PHONE = 378,\r
-    STR_KUMI_TECHNOLOGY = 379,\r
-    STR_CALLING = 380,\r
-    STR_NOT_PAIRED = 381,\r
-    STR_PAIRED = 382,\r
-    STR_UNPAIR = 383,\r
-    STR_CONNECTION_ERROR = 384,\r
-    STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 385,\r
-    STR_ENABLE_BLUETOOTH_CALL = 386,\r
-    STR_ENABLE_BLUETOOTH_CALL_NOTE = 387,\r
-    STR_SIM_CARD_ERROR = 388,\r
-    STR_CHECK_SIM_CARD_INSERTION = 389,\r
-    STR_WEATHER_REPORT = 390,\r
-    STR_ULTRAVIOLET = 391,\r
-    STR_WIND_SPEED = 392,\r
-    STR_HUMIDITY = 393,\r
-    STR_NEXT_7_DAYS = 394,\r
-    STR_GET_WEATHER_ERROR = 395,\r
-    STR_MUSIC_SOURCE = 396,\r
-    STR_MOBILE_MUSIC = 397,\r
-    STR_WATCH_MUSIC = 398,\r
-    STR_MUSIC_LIST = 399,\r
-    STR_BLUETOOTH_CONNECTION_FAILED = 400,\r
-    STR_SCANNING_BINDING = 401,\r
-    STR_DEVICE_BINDING = 402,\r
-    STR_DEVICE_BINDING_NOTE = 403,\r
-    STR_EQUIPMENT_UNTYING = 404,\r
-    STR_EQUIPMENT_UNTYING_NOTE = 405,\r
-    STR_DRINK_WATER_REMINDER = 406,\r
-    STR_DRINK_WATER_REMINDER_NOTE = 407,\r
-    STR_SEDENTARY_REMINDER = 408,\r
-    STR_SEDENTARY_REMINDER_NOTE = 409,\r
-    STR_SYSTEM_UPGRADING = 410,\r
-    STR_NEWDEVICE_BIND_REMIND_NOTE = 411,\r
-    STR_TABULAR_DISPLAY = 412,\r
-    STR_RANGE_MILE = 413,\r
-    STR_CLOSE = 414,\r
-    STR_MORE_APP = 415,\r
-    STR_SAVENOTE = 416,\r
-    STR_SAVEBACK = 417,\r
-    STR_SAVEASK = 418,\r
-    STR_BLOOD = 419,\r
-    STR_CHECK = 420,\r
-    STR_CHECKNEW = 421,\r
-    STR_CHECKTIME = 422,\r
-    STR_CHECKLONG = 423,\r
-    STR_CHECKNO = 424,\r
-    STR_CHECKNOTE = 425,\r
-    STR_CHECKON = 426,\r
-    STR_CHECKSTOP = 427,\r
-    STR_CHECKERROR = 428,\r
-    STR_WAERKEEP = 429,\r
-    STR_WEARRE = 430,\r
-    STR_WEARREADY = 431,\r
-    STR_RECHECK = 432,\r
-    STR_CHECKEWARN = 433,\r
-    STR_BLOODSHORT = 434,\r
-    STR_HEARTNOTE = 435,\r
-    STR_KONW = 436,\r
-    STR_EXPLAIN = 437,\r
-    STR_HEARTREST = 438,\r
-    STR_HEARTDATA = 439,\r
-    STR_HEARTTITLE = 440,\r
-    STR_HEARTMAX = 441,\r
-    STR_HEARTMIN = 442,\r
-    STR_TRAINGNO = 443,\r
-    STR_TRAINGGO = 444,\r
-    STR_MESSAGE = 445,\r
-    STR_MESSAGENO = 446,\r
-    STR_DIS = 447,\r
-    STR_DUR = 448,\r
-    STR_STANDUP = 449,\r
-    STR_SLEEPHOUR = 450,\r
-    STR_SLEEPMGOAL = 451,\r
-    STR_REATTIME = 452,\r
-    STR_SLEEPTIME = 453,\r
-    STR_WALKTIME = 454,\r
-    STR_DISTURB = 455,\r
-    STR_DISTURBNOTE = 456,\r
-    STR_MORNNING = 457,\r
-    STR_NOW = 458,\r
-    STR_NAP = 459,\r
-    STR_TACK = 460,\r
-    STR_CLICK = 461,\r
-    STR_TACKNUM = 462,\r
-    STR_MON = 463,\r
-    STR_TUES = 464,\r
-    STR_WEDNES = 465,\r
-    STR_THURS = 466,\r
-    STR_FRI = 467,\r
-    STR_SATUR = 468,\r
-    STR_SUN = 469,\r
-    STR_RECORDING_LIST = 470,\r
-    STR_CRLEMPTY = 471,\r
-    STR_CALL_VOLUME = 472,\r
-    STR_AI_VOICE = 473,\r
-    STR_AI_INTELLIGENT_ASSISTANT = 474,\r
-    STR_START_CHAT = 475,\r
-    STR_BOOT_FAILED = 476,\r
-    STR_ENABLE_MOBILE_DATA_FIRST = 477,\r
-    STR_ENABLE_BLUETOOTH_FIRST = 478,\r
-    STR_LISTENING = 479,\r
-    STR_FINISH_SPEAKING = 480,\r
-    STR_THINKING = 481,\r
-    STR_CANCEL = 482,\r
-    STR_CONNECT_TIMEOUT = 483,\r
-    STR_PLEASE_RESTART_CHAT = 484,\r
-    STR_CONTINUE_CHAT = 485,\r
-    STR_MAX_ID = 486,\r
+    STR_RANGE_MILE = 241,\r
+    STR_CLOSE = 242,\r
+    STR_MORE_APP = 243,\r
+    STR_SAVENOTE = 244,\r
+    STR_SAVEBACK = 245,\r
+    STR_SAVEASK = 246,\r
+    STR_BLOOD = 247,\r
+    STR_CHECK = 248,\r
+    STR_CHECKNEW = 249,\r
+    STR_CHECKTIME = 250,\r
+    STR_CHECKLONG = 251,\r
+    STR_CHECKNO = 252,\r
+    STR_CHECKNOTE = 253,\r
+    STR_CHECKON = 254,\r
+    STR_CHECKSTOP = 255,\r
+    STR_CHECKERROR = 256,\r
+    STR_WAERKEEP = 257,\r
+    STR_WEARRE = 258,\r
+    STR_WEARREADY = 259,\r
+    STR_RECHECK = 260,\r
+    STR_CHECKEWARN = 261,\r
+    STR_BLOODSHORT = 262,\r
+    STR_HEARTNOTE = 263,\r
+    STR_KONW = 264,\r
+    STR_EXPLAIN = 265,\r
+    STR_HEARTREST = 266,\r
+    STR_HEARTDATA = 267,\r
+    STR_HEARTTITLE = 268,\r
+    STR_HEARTMAX = 269,\r
+    STR_HEARTMIN = 270,\r
+    STR_TRAINGNO = 271,\r
+    STR_TRAINGGO = 272,\r
+    STR_MESSAGE = 273,\r
+    STR_MESSAGENO = 274,\r
+    STR_CLEAN = 275,\r
+    STR_CLEANALL = 276,\r
+    STR_SLEEP = 277,\r
+    STR_SLEEPHOUR = 278,\r
+    STR_SLEEPMGOAL = 279,\r
+    STR_REATTIME = 280,\r
+    STR_SLEEPTIME = 281,\r
+    STR_WALKTIME = 282,\r
+    STR_DISTURB = 283,\r
+    STR_DISTURBNOTE = 284,\r
+    STR_MORNNING = 285,\r
+    STR_NOW = 286,\r
+    STR_NAP = 287,\r
+    STR_TACK = 288,\r
+    STR_CLICK = 289,\r
+    STR_TACKNUM = 290,\r
+    STR_BLOOD_OXYGEN = 291,\r
+    STR_TRAINING_RECORD = 292,\r
+    STR_COMPASS = 293,\r
+    STR_PHONE = 294,\r
+    STR_FAVORITE_CONTACTS = 295,\r
+    STR_WEATHER = 296,\r
+    STR_ACTIVITY = 297,\r
+    STR_WATCH_FACE = 298,\r
+    STR_DISPLAY_MODE = 299,\r
+    STR_CARD_MANAGEMENT = 300,\r
+    STR_MUSIC = 301,\r
+    STR_RECORD = 302,\r
+    STR_BREATH_TRAINING = 303,\r
+    STR_REMOTE_SHOOTING = 304,\r
+    STR_VOICE_ASSISTANT = 305,\r
+    STR_ALIPAY = 306,\r
+    STR_TIMER = 307,\r
+    STR_ALARM = 308,\r
+    STR_STOPWATCH = 309,\r
+    STR_CALCULATOR = 310,\r
+    STR_FIND_PHONE = 311,\r
+    STR_BRIGHTNESS_ADJUSTMENT = 312,\r
+    STR_SOUND = 313,\r
+    STR_BLUETOOTH = 314,\r
+    STR_DO_NOT_DISTURB = 315,\r
+    STR_MESSAGE_NOTIFICATION = 316,\r
+    STR_POWER_SAVE_MODE = 317,\r
+    STR_FLASHLIGHT = 318,\r
+    STR_SETTINGS = 319,\r
+    STR_SCREEN_AND_BRIGHTNESS = 320,\r
+    STR_NETWORKANDCALL = 321,\r
+    STR_SOUND_AND_VIBRATION = 322,\r
+    STR_MOTION_RECOGNITION = 323,\r
+    STR_SYSTEM = 324,\r
+    STR_SHUTDOWN_AND_RESTART = 325,\r
+    STR_SCREEN_ON_DURATION = 326,\r
+    STR_RAISE_TO_WAKE = 327,\r
+    STR_5_SECONDS = 328,\r
+    STR_10_SECONDS = 329,\r
+    STR_15_SECONDS = 330,\r
+    STR_30_SECONDS = 331,\r
+    STR_60_SECONDS = 332,\r
+    STR_300_SECONDS = 333,\r
+    STR_4G_CAPABILITY = 334,\r
+    STR_VOLTE_CALL = 335,\r
+    STR_MOBILE_DATA_OPTION = 336,\r
+    STR_SYSTEM_UPDATE = 337,\r
+    STR_ONLINE_MUSIC = 338,\r
+    STR_BLUETOOTH_HEADPHONES = 339,\r
+    STR_TRADITIONAL_BLUETOOTH = 340,\r
+    STR_AUTO_OFF_BLUETOOTH_NOTE = 341,\r
+    STR_BLUETOOTH_SERVICE_OPTIONS = 342,\r
+    STR_HFP = 343,\r
+    STR_A2DP = 344,\r
+    STR_SYSTEM_VOLUME = 345,\r
+    STR_MEDIA_VOLUME = 346,\r
+    STR_VIBRATION_MODE = 347,\r
+    STR_SILENT_MODE = 348,\r
+    STR_LIST_DISPLAY = 349,\r
+    STR_GRID_DISPLAY = 350,\r
+    STR_CELLULAR_DISPLAY = 351,\r
+    STR_AUTO_DETECT = 352,\r
+    STR_ABOUT_WATCH = 353,\r
+    STR_WATCH_QR_CODE = 354,\r
+    STR_SYSTEM_LANGUAGE = 355,\r
+    STR_RESTART = 356,\r
+    STR_SHUTDOWN = 357,\r
+    STR_FACTORY_RESET = 358,\r
+    STR_WATCH_NAME = 359,\r
+    STR_FIRMWARE_VERSION = 360,\r
+    STR_BLUETOOTH_NAME = 361,\r
+    STR_BLUETOOTH_ADDRESS = 362,\r
+    STR_LATEST_VERSION = 363,\r
+    STR_UPDATENOW = 364,\r
+    STR_LATER = 365,\r
+    STR_UP_TO_DATE = 366,\r
+    STR_NO_UPDATE = 367,\r
+    STR_LANGUAGE_SELECTION = 368,\r
+    STR_RESET_CONFIRM = 369,\r
+    STR_SHUTDOWN_CONFIRM = 370,\r
+    STR_RESET_CONFIRM_NOTE = 371,\r
+    STR_RECORDER = 372,\r
+    STR_CLICK_TO_RECORD = 373,\r
+    STR_RECORDING = 374,\r
+    STR_AUDIO_XX = 375,\r
+    STR_VOICE_RECORDING_REMINDER = 376,\r
+    STR_VOICE_RECORDING_REMINDER_NOTE = 377,\r
+    STR_DELETE_RECORDING = 378,\r
+    STR_DELETE_PERMANENTLY = 379,\r
+    STR_DO_NOT_DISTURB_MODE = 380,\r
+    STR_CONNECTION_STATUS = 381,\r
+    STR_HEADSET = 382,\r
+    STR_CONNECTED = 383,\r
+    STR_DISCONNECTED = 384,\r
+    STR_PHONE_RINGING_VIBRATING = 385,\r
+    STR_BLUETOOTH_DISCONNECTED = 386,\r
+    STR_STOP = 387,\r
+    STR_WORKDAY = 388,\r
+    STR_REPEAT_NO = 389,\r
+    STR_EVERYDAY = 390,\r
+    STR_ADD_A_NEW_ALARM = 391,\r
+    STR_TIME = 392,\r
+    STR_NEXT_STEP = 393,\r
+    STR_MON = 394,\r
+    STR_TUES = 395,\r
+    STR_WEDNES = 396,\r
+    STR_THURS = 397,\r
+    STR_FRI = 398,\r
+    STR_SATUR = 399,\r
+    STR_SUN = 400,\r
+    STR_MONDAY = 401,\r
+    STR_TUESDAY = 402,\r
+    STR_WEDNESDAY = 403,\r
+    STR_THURSDAY = 404,\r
+    STR_FRIDAY = 405,\r
+    STR_SATURDAY = 406,\r
+    STR_SUNDAY = 407,\r
+    STR_CALIBRATE_COMPASS = 408,\r
+    STR_CALIBRATE_COMPASS_NOTE = 409,\r
+    STR_EAST = 410,\r
+    STR_SOUTH = 411,\r
+    STR_WEST = 412,\r
+    STR_NORTH = 413,\r
+    STR_SOUTHEAST = 414,\r
+    STR_SOUTHWEST = 415,\r
+    STR_NORTHEAST = 416,\r
+    STR_NORTHWEST = 417,\r
+    STR_KEEP_STILL_FOCUS_ON_BREATHING = 418,\r
+    STR_EXHALE_NOW = 419,\r
+    STR_INHALE_NOW = 420,\r
+    STR_TRAINING_COMPLETE = 421,\r
+    STR_BREATHING_TRAINING = 422,\r
+    STR_THIS_BREATH = 423,\r
+    STR_TODAYS_BREATHING_TRAINING = 424,\r
+    STR_RECENT_CALLS = 425,\r
+    STR_NO_CALLS = 426,\r
+    STR_MISSED_CALLS = 427,\r
+    STR_DIALED_CALLS = 428,\r
+    STR_RECEIVED_CALLS = 429,\r
+    STR_NOTE_RECENT_CALLS_LIMITATION = 430,\r
+    STR_NO_CONTACTS_ADDED = 431,\r
+    STR_DIAL_MODE = 432,\r
+    STR_DIAL_VIA_WATCH_SIM = 433,\r
+    STR_DIAL_VIA_PHONE = 434,\r
+    STR_KUMI_TECHNOLOGY = 435,\r
+    STR_CALLING = 436,\r
+    STR_NOT_PAIRED = 437,\r
+    STR_PAIRED = 438,\r
+    STR_UNPAIR = 439,\r
+    STR_CONNECTION_ERROR = 440,\r
+    STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 441,\r
+    STR_ENABLE_BLUETOOTH_CALL = 442,\r
+    STR_ENABLE_BLUETOOTH_CALL_NOTE = 443,\r
+    STR_SIM_CARD_ERROR = 444,\r
+    STR_CHECK_SIM_CARD_INSERTION = 445,\r
+    STR_WEATHER_REPORT = 446,\r
+    STR_ULTRAVIOLET = 447,\r
+    STR_WIND_SPEED = 448,\r
+    STR_HUMIDITY = 449,\r
+    STR_NEXT_7_DAYS = 450,\r
+    STR_GET_WEATHER_ERROR = 451,\r
+    STR_MUSIC_SOURCE = 452,\r
+    STR_MOBILE_MUSIC = 453,\r
+    STR_WATCH_MUSIC = 454,\r
+    STR_MUSIC_LIST = 455,\r
+    STR_BLUETOOTH_CONNECTION_FAILED = 456,\r
+    STR_SCANNING_BINDING = 457,\r
+    STR_DEVICE_BINDING = 458,\r
+    STR_DEVICE_BINDING_NOTE = 459,\r
+    STR_EQUIPMENT_UNTYING = 460,\r
+    STR_EQUIPMENT_UNTYING_NOTE = 461,\r
+    STR_DRINK_WATER_REMINDER = 462,\r
+    STR_DRINK_WATER_REMINDER_NOTE = 463,\r
+    STR_SEDENTARY_REMINDER = 464,\r
+    STR_SEDENTARY_REMINDER_NOTE = 465,\r
+    STR_SYSTEM_UPGRADING = 466,\r
+    STR_NEWDEVICE_BIND_REMIND_NOTE = 467,\r
+    STR_TABULAR_DISPLAY = 468,\r
+    STR_RECORDING_LIST = 469,\r
+    STR_CRLEMPTY = 470,\r
+    STR_CALL_VOLUME = 471,\r
+    STR_AI_VOICE = 472,\r
+    STR_AI_INTELLIGENT_ASSISTANT = 473,\r
+    STR_START_CHAT = 474,\r
+    STR_BOOT_FAILED = 475,\r
+    STR_ENABLE_MOBILE_DATA_FIRST = 476,\r
+    STR_ENABLE_BLUETOOTH_FIRST = 477,\r
+    STR_LISTENING = 478,\r
+    STR_FINISH_SPEAKING = 479,\r
+    STR_THINKING = 480,\r
+    STR_CANCEL = 481,\r
+    STR_CONNECT_TIMEOUT = 482,\r
+    STR_PLEASE_RESTART_CHAT = 483,\r
+    STR_CONTINUE_CHAT = 484,\r
+    STR_MAX_ID = 485,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
     LANGUAGE_ID_JA,\r
-    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r
index ca52a6d..224c9cc 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