Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...

diff --cc code/sdk/application/wearable/fd230app/CMakeLists.txt
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
index 4b5af2e,acf33f7..508ce98
Binary files differ

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
index b16f072,9983e1b..500f685
--- 1/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
--- 2/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
@@@ -251,138 -251,202 +251,202 @@@ 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_RECORDING = 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_RANGE_MILE = 323,\r
 -    STR_CLOSE = 324,\r
 -    STR_MORE_APP = 325,\r
 -    STR_SAVENOTE = 326,\r
 -    STR_SAVEBACK = 327,\r
 -    STR_SAVEASK = 328,\r
 -    STR_BLOOD = 329,\r
 -    STR_CHECK = 330,\r
 -    STR_CHECKNEW = 331,\r
 -    STR_CHECKTIME = 332,\r
 -    STR_CHECKLONG = 333,\r
 -    STR_CHECKNO = 334,\r
 -    STR_CHECKNOTE = 335,\r
 -    STR_CHECKON = 336,\r
 -    STR_CHECKSTOP = 337,\r
 -    STR_CHECKERROR = 338,\r
 -    STR_WAERKEEP = 339,\r
 -    STR_WEARRE = 340,\r
 -    STR_WEARREADY = 341,\r
 -    STR_RECHECK = 342,\r
 -    STR_CHECKEWARN = 343,\r
 -    STR_BLOODSHORT = 344,\r
 -    STR_HEARTNOTE = 345,\r
 -    STR_KONW = 346,\r
 -    STR_EXPLAIN = 347,\r
 -    STR_HEARTREST = 348,\r
 -    STR_HEARTDATA = 349,\r
 -    STR_HEARTTITLE = 350,\r
 -    STR_HEARTMAX = 351,\r
 -    STR_HEARTMIN = 352,\r
 -    STR_TRAINGNO = 353,\r
 -    STR_TRAINGGO = 354,\r
 -    STR_MESSAGE = 355,\r
 -    STR_MESSAGENO = 356,\r
 -    STR_DIS = 357,\r
 -    STR_DUR = 358,\r
 -    STR_STANDUP = 359,\r
 -    STR_SLEEPHOUR = 360,\r
 -    STR_SLEEPMGOAL = 361,\r
 -    STR_REATTIME = 362,\r
 -    STR_SLEEPTIME = 363,\r
 -    STR_WALKTIME = 364,\r
 -    STR_DISTURB = 365,\r
 -    STR_DISTURBNOTE = 366,\r
 -    STR_MORNNING = 367,\r
 -    STR_NOW = 368,\r
 -    STR_NAP = 369,\r
 -    STR_TACK = 370,\r
 -    STR_CLICK = 371,\r
 -    STR_TACKNUM = 372,\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_DIS = 275,\r
 +    STR_DUR = 276,\r
 +    STR_STANDUP = 277,\r
 +    STR_SLEEP = 278,\r
 +    STR_SLEEPHOUR = 279,\r
 +    STR_SLEEPMGOAL = 280,\r
 +    STR_REATTIME = 281,\r
 +    STR_SLEEPTIME = 282,\r
 +    STR_WALKTIME = 283,\r
 +    STR_DISTURB = 284,\r
 +    STR_DISTURBNOTE = 285,\r
 +    STR_MORNNING = 286,\r
 +    STR_NOW = 287,\r
 +    STR_NAP = 288,\r
 +    STR_TACK = 289,\r
 +    STR_CLICK = 290,\r
 +    STR_TACKNUM = 291,\r
 +    STR_BLOOD_OXYGEN = 292,\r
 +    STR_TRAINING_RECORD = 293,\r
 +    STR_COMPASS = 294,\r
 +    STR_PHONE = 295,\r
 +    STR_FAVORITE_CONTACTS = 296,\r
 +    STR_WEATHER = 297,\r
 +    STR_ACTIVITY = 298,\r
 +    STR_WATCH_FACE = 299,\r
 +    STR_DISPLAY_MODE = 300,\r
 +    STR_CARD_MANAGEMENT = 301,\r
 +    STR_MUSIC = 302,\r
 +    STR_RECORDING = 303,\r
 +    STR_BREATH_TRAINING = 304,\r
 +    STR_REMOTE_SHOOTING = 305,\r
 +    STR_VOICE_ASSISTANT = 306,\r
 +    STR_ALIPAY = 307,\r
 +    STR_TIMER = 308,\r
 +    STR_ALARM = 309,\r
 +    STR_STOPWATCH = 310,\r
 +    STR_CALCULATOR = 311,\r
 +    STR_FIND_PHONE = 312,\r
 +    STR_BRIGHTNESS_ADJUSTMENT = 313,\r
 +    STR_SOUND = 314,\r
 +    STR_BLUETOOTH = 315,\r
 +    STR_DO_NOT_DISTURB = 316,\r
 +    STR_MESSAGE_NOTIFICATION = 317,\r
 +    STR_POWER_SAVE_MODE = 318,\r
 +    STR_FLASHLIGHT = 319,\r
 +    STR_SETTINGS = 320,\r
 +    STR_SCREEN_AND_BRIGHTNESS = 321,\r
 +    STR_NETWORKANDCALL = 322,\r
 +    STR_SOUND_AND_VIBRATION = 323,\r
 +    STR_MOTION_RECOGNITION = 324,\r
 +    STR_SYSTEM = 325,\r
 +    STR_SHUTDOWN_AND_RESTART = 326,\r
 +    STR_SCREEN_ON_DURATION = 327,\r
 +    STR_RAISE_TO_WAKE = 328,\r
 +    STR_5_SECONDS = 329,\r
 +    STR_10_SECONDS = 330,\r
 +    STR_15_SECONDS = 331,\r
 +    STR_30_SECONDS = 332,\r
 +    STR_60_SECONDS = 333,\r
 +    STR_300_SECONDS = 334,\r
 +    STR_4G_CAPABILITY = 335,\r
 +    STR_VOLTE_CALL = 336,\r
 +    STR_MOBILE_DATA_OPTION = 337,\r
 +    STR_SYSTEM_UPDATE = 338,\r
 +    STR_ONLINE_MUSIC = 339,\r
 +    STR_BLUETOOTH_HEADPHONES = 340,\r
 +    STR_TRADITIONAL_BLUETOOTH = 341,\r
 +    STR_AUTO_OFF_BLUETOOTH_NOTE = 342,\r
 +    STR_BLUETOOTH_SERVICE_OPTIONS = 343,\r
 +    STR_HFP = 344,\r
 +    STR_A2DP = 345,\r
 +    STR_SYSTEM_VOLUME = 346,\r
 +    STR_MEDIA_VOLUME = 347,\r
 +    STR_VIBRATION_MODE = 348,\r
 +    STR_SILENT_MODE = 349,\r
 +    STR_LIST_DISPLAY = 350,\r
 +    STR_GRID_DISPLAY = 351,\r
 +    STR_CELLULAR_DISPLAY = 352,\r
 +    STR_AUTO_DETECT = 353,\r
 +    STR_ABOUT_WATCH = 354,\r
 +    STR_WATCH_QR_CODE = 355,\r
 +    STR_SYSTEM_LANGUAGE = 356,\r
 +    STR_RESTART = 357,\r
 +    STR_SHUTDOWN = 358,\r
 +    STR_FACTORY_RESET = 359,\r
 +    STR_WATCH_NAME = 360,\r
 +    STR_FIRMWARE_VERSION = 361,\r
 +    STR_BLUETOOTH_NAME = 362,\r
 +    STR_BLUETOOTH_ADDRESS = 363,\r
 +    STR_LATEST_VERSION = 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_MAX_ID = 372,\r
++    STR_UPDATENOW = 365,\r
++    STR_LATER = 366,\r
++    STR_UP_TO_DATE = 367,\r
++    STR_NO_UPDATE = 368,\r
++    STR_LANGUAGE_SELECTION = 369,\r
++    STR_RESET_CONFIRM = 370,\r
++    STR_SHUTDOWN_CONFIRM = 371,\r
++    STR_RESET_CONFIRM_NOTE = 372,\r
+     RECORDER = 373,\r
+     STR_CLICK_TO_RECORD = 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_HEADSET = 381,\r
+     STR_CONNECTED = 382,\r
+     STR_DISCONNECTED = 383,\r
+     STR_PHONE_RINGING_VIBRATING = 384,\r
+     STR_WORKDAY = 385,\r
+     STR_REPEAT_NO = 386,\r
+     STR_EVERYDAY = 387,\r
+     STR_ADD_A_NEW_ALARM = 388,\r
+     STR_TIME = 389,\r
+     STR_NEXT_STEP = 390,\r
+     STR_MONDAY = 391,\r
+     STR_TUESDAY = 392,\r
+     STR_WEDNESDAY = 393,\r
+     STR_THURSDAY = 394,\r
+     STR_FRIDAY = 395,\r
+     STR_SATURDAY = 396,\r
+     STR_SUNDAY = 397,\r
+     STR_CALIBRATE_COMPASS = 398,\r
+     STR_CALIBRATE_COMPASS_NOTE = 399,\r
+     STR_EAST = 400,\r
+     STR_SOUTH = 401,\r
+     STR_WEST = 402,\r
+     STR_NORTH = 403,\r
+     STR_SOUTHEAST = 404,\r
+     STR_SOUTHWEST = 405,\r
+     STR_NORTHEAST = 406,\r
+     STR_NORTHWEST = 407,\r
+     STR_KEEP_STILL_FOCUS_ON_BREATHING = 408,\r
+     STR_EXHALE_NOW = 409,\r
+     STR_INHALE_NOW = 410,\r
+     STR_TRAINING_COMPLETE = 411,\r
+     STR_BREATHING_TRAINING = 412,\r
+     STR_THIS_BREATH = 413,\r
+     STR_TODAYS_BREATHING_TRAINING = 414,\r
+     STR_RECENT_CALLS = 415,\r
+     STR_NO_CALLS = 416,\r
+     STR_MISSED_CALLS = 417,\r
+     STR_DIALED_CALLS = 418,\r
+     STR_RECEIVED_CALLS = 419,\r
+     STR_NOTE_RECENT_CALLS_LIMITATION = 420,\r
+     STR_NO_CONTACTS_ADDED = 421,\r
+     STR_DIAL_MODE = 422,\r
+     STR_DIAL_VIA_WATCH_SIM = 423,\r
+     STR_DIAL_VIA_PHONE = 424,\r
+     STR_KUMI_TECHNOLOGY = 425,\r
+     STR_CALLING = 426,\r
+     STR_NOT_PAIRED = 427,\r
+     STR_PAIRED = 428,\r
+     STR_UNPAIR = 429,\r
+     STR_CONNECTION_ERROR = 430,\r
+     STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 431,\r
+     STR_ENABLE_BLUETOOTH_CALL = 432,\r
+     STR_ENABLE_BLUETOOTH_CALL_NOTE = 433,\r
+     STR_SIM_CARD_ERROR = 434,\r
+     STR_CHECK_SIM_CARD_INSERTION = 435,\r
+     STR_MAX_ID = 436,\r
  }; // UIResourceTextId\r
  
  enum FontLanguageId : uint8_t {

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
index 3f1488f,c5e4f83..26ae983
Binary files differ

diff --cc code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp
index 284cf60,87c9fd1..c46d586
--- 1/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp
@@@ -283,51 -279,26 +283,53 @@@ namespace OHO
          size_t pos = str.find("XX");
          if (pos != std::string::npos)
          {
 -            // 替换标志"XX"为数字字符串
 -            str.replace(pos, 2, numStr); // 2 是标志"XX"的长度
 +            // 替换标志"XX"为更新字符串
 +            str.replace(pos, 2, newText); // 2 是标志"XX"的长度
 +            label->SetText(str.c_str());
 +        }
 +    }
 +    /*更新数字*/
 +    void UpdateLabel(UILabelExt *&label, int num)
 +    {
-         if (label == nullptr)
 +        {
 +            return;
          }
  
 -        label->SetText(str.c_str());
 +        UpdateLabelText(label, std::to_string(num));
      }
  
 -    /*更新label的字符串*/
 -    void UpdateLabel(UILabelExt *&label, const std::string updatestr)
 +    /*更新文本*/
 +    void UpdateLabel(UILabelExt *&label, const std::string &updateStr)
      {
 -        std::string str = label->GetText();
 -        printf("UpdateLabel:%s->%s\r\n", str.c_str(), updatestr.c_str());
 -        // 找到标志"XX"在字符串中的位置
 -        size_t pos = str.find("XX");
 -        if (pos != std::string::npos)
 +        if (label == nullptr)
 +        {
 +            return;
 +        }
 +
 +        UpdateLabelText(label, updateStr);
 +    }
 +
 +    /*设置label的Id*/
 +    void SetLabelId(UILabel *&label, UIResourceTextId id)
 +    {
 +        if (label == nullptr)
          {
 -            // 替换标志"XX"为数字字符串
 -            str.replace(pos, 2, updatestr); // 2 是标志"XX"的长度
 +            return;
          }
  
 -        label->SetText(str.c_str());
 +        UILabelExt *labelext = new UILabelExt();
 +        labelext->SetTextId(id);
 +
 +        const std::string text = labelext->GetText();
 +        if (!text.empty())
 +        {
 +            printf("SetLabelId:%s\r\n", text.c_str());
 +            label->SetText(text.c_str());
 +        }
 +
 +        delete labelext;
      }
--}
++
++}
++
++/*更新label的字符串*/