From: Caisking <3449750381@qq.com>
Date: Wed, 8 May 2024 07:59:16 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~16
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=refs%2Fchanges%2F143%2Fhead;p=mirrors%2FFD230.git

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

bb1f17b677e3ef898648b0f77b0327f162e3e04a
diff --cc code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
index 4b5af2e7e,acf33f74a..508ce988c
Binary files differ
diff --cc code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
index b16f07285,9983e1bf4..500f6858b
--- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
@@@ -251,138 -251,202 +251,202 @@@ enum UIResourceTextId : uint16_t 
      STR_EXERCISE_KETTLEBELLTRAINING = 238,
      STR_EXTREME_ORIENTEERING = 239,
      STR_INSUFFICIENT_EXERCISE_AMOUNT = 240,
 -    STR_BLOOD_OXYGEN = 241,
 -    STR_TRAINING_RECORD = 242,
 -    STR_COMPASS = 243,
 -    STR_PHONE = 244,
 -    STR_FAVORITE_CONTACTS = 245,
 -    STR_WEATHER = 246,
 -    STR_ACTIVITY = 247,
 -    STR_WATCH_FACE = 248,
 -    STR_DISPLAY_MODE = 249,
 -    STR_CARD_MANAGEMENT = 250,
 -    STR_MUSIC = 251,
 -    STR_SLEEP = 252,
 -    STR_RECORDING = 253,
 -    STR_BREATH_TRAINING = 254,
 -    STR_REMOTE_SHOOTING = 255,
 -    STR_VOICE_ASSISTANT = 256,
 -    STR_ALIPAY = 257,
 -    STR_TIMER = 258,
 -    STR_ALARM = 259,
 -    STR_STOPWATCH = 260,
 -    STR_CALCULATOR = 261,
 -    STR_FIND_PHONE = 262,
 -    STR_BRIGHTNESS_ADJUSTMENT = 263,
 -    STR_SOUND = 264,
 -    STR_BLUETOOTH = 265,
 -    STR_DO_NOT_DISTURB = 266,
 -    STR_MESSAGE_NOTIFICATION = 267,
 -    STR_POWER_SAVE_MODE = 268,
 -    STR_FLASHLIGHT = 269,
 -    STR_SETTINGS = 270,
 -    STR_SCREEN_AND_BRIGHTNESS = 271,
 -    STR_NETWORKANDCALL = 272,
 -    STR_SOUND_AND_VIBRATION = 273,
 -    STR_MOTION_RECOGNITION = 274,
 -    STR_SYSTEM = 275,
 -    STR_SHUTDOWN_AND_RESTART = 276,
 -    STR_SCREEN_ON_DURATION = 277,
 -    STR_RAISE_TO_WAKE = 278,
 -    STR_5_SECONDS = 279,
 -    STR_10_SECONDS = 280,
 -    STR_15_SECONDS = 281,
 -    STR_30_SECONDS = 282,
 -    STR_60_SECONDS = 283,
 -    STR_300_SECONDS = 284,
 -    STR_4G_CAPABILITY = 285,
 -    STR_VOLTE_CALL = 286,
 -    STR_MOBILE_DATA_OPTION = 287,
 -    STR_SYSTEM_UPDATE = 288,
 -    STR_ONLINE_MUSIC = 289,
 -    STR_BLUETOOTH_HEADPHONES = 290,
 -    STR_TRADITIONAL_BLUETOOTH = 291,
 -    STR_AUTO_OFF_BLUETOOTH_NOTE = 292,
 -    STR_BLUETOOTH_SERVICE_OPTIONS = 293,
 -    STR_HFP = 294,
 -    STR_A2DP = 295,
 -    STR_SYSTEM_VOLUME = 296,
 -    STR_MEDIA_VOLUME = 297,
 -    STR_VIBRATION_MODE = 298,
 -    STR_SILENT_MODE = 299,
 -    STR_LIST_DISPLAY = 300,
 -    STR_GRID_DISPLAY = 301,
 -    STR_CELLULAR_DISPLAY = 302,
 -    STR_AUTO_DETECT = 303,
 -    STR_ABOUT_WATCH = 304,
 -    STR_WATCH_QR_CODE = 305,
 -    STR_SYSTEM_LANGUAGE = 306,
 -    STR_RESTART = 307,
 -    STR_SHUTDOWN = 308,
 -    STR_FACTORY_RESET = 309,
 -    STR_WATCH_NAME = 310,
 -    STR_FIRMWARE_VERSION = 311,
 -    STR_BLUETOOTH_NAME = 312,
 -    STR_BLUETOOTH_ADDRESS = 313,
 -    STR_LATEST_VERSION = 314,
 -    STR_UPDATENOW = 315,
 -    STR_LATER = 316,
 -    STR_UP_TO_DATE = 317,
 -    STR_NO_UPDATE = 318,
 -    STR_LANGUAGE_SELECTION = 319,
 -    STR_RESET_CONFIRM = 320,
 -    STR_SHUTDOWN_CONFIRM = 321,
 -    STR_RESET_CONFIRM_NOTE = 322,
 -    STR_RANGE_MILE = 323,
 -    STR_CLOSE = 324,
 -    STR_MORE_APP = 325,
 -    STR_SAVENOTE = 326,
 -    STR_SAVEBACK = 327,
 -    STR_SAVEASK = 328,
 -    STR_BLOOD = 329,
 -    STR_CHECK = 330,
 -    STR_CHECKNEW = 331,
 -    STR_CHECKTIME = 332,
 -    STR_CHECKLONG = 333,
 -    STR_CHECKNO = 334,
 -    STR_CHECKNOTE = 335,
 -    STR_CHECKON = 336,
 -    STR_CHECKSTOP = 337,
 -    STR_CHECKERROR = 338,
 -    STR_WAERKEEP = 339,
 -    STR_WEARRE = 340,
 -    STR_WEARREADY = 341,
 -    STR_RECHECK = 342,
 -    STR_CHECKEWARN = 343,
 -    STR_BLOODSHORT = 344,
 -    STR_HEARTNOTE = 345,
 -    STR_KONW = 346,
 -    STR_EXPLAIN = 347,
 -    STR_HEARTREST = 348,
 -    STR_HEARTDATA = 349,
 -    STR_HEARTTITLE = 350,
 -    STR_HEARTMAX = 351,
 -    STR_HEARTMIN = 352,
 -    STR_TRAINGNO = 353,
 -    STR_TRAINGGO = 354,
 -    STR_MESSAGE = 355,
 -    STR_MESSAGENO = 356,
 -    STR_DIS = 357,
 -    STR_DUR = 358,
 -    STR_STANDUP = 359,
 -    STR_SLEEPHOUR = 360,
 -    STR_SLEEPMGOAL = 361,
 -    STR_REATTIME = 362,
 -    STR_SLEEPTIME = 363,
 -    STR_WALKTIME = 364,
 -    STR_DISTURB = 365,
 -    STR_DISTURBNOTE = 366,
 -    STR_MORNNING = 367,
 -    STR_NOW = 368,
 -    STR_NAP = 369,
 -    STR_TACK = 370,
 -    STR_CLICK = 371,
 -    STR_TACKNUM = 372,
 +    STR_RANGE_MILE = 241,
 +    STR_CLOSE = 242,
 +    STR_MORE_APP = 243,
 +    STR_SAVENOTE = 244,
 +    STR_SAVEBACK = 245,
 +    STR_SAVEASK = 246,
 +    STR_BLOOD = 247,
 +    STR_CHECK = 248,
 +    STR_CHECKNEW = 249,
 +    STR_CHECKTIME = 250,
 +    STR_CHECKLONG = 251,
 +    STR_CHECKNO = 252,
 +    STR_CHECKNOTE = 253,
 +    STR_CHECKON = 254,
 +    STR_CHECKSTOP = 255,
 +    STR_CHECKERROR = 256,
 +    STR_WAERKEEP = 257,
 +    STR_WEARRE = 258,
 +    STR_WEARREADY = 259,
 +    STR_RECHECK = 260,
 +    STR_CHECKEWARN = 261,
 +    STR_BLOODSHORT = 262,
 +    STR_HEARTNOTE = 263,
 +    STR_KONW = 264,
 +    STR_EXPLAIN = 265,
 +    STR_HEARTREST = 266,
 +    STR_HEARTDATA = 267,
 +    STR_HEARTTITLE = 268,
 +    STR_HEARTMAX = 269,
 +    STR_HEARTMIN = 270,
 +    STR_TRAINGNO = 271,
 +    STR_TRAINGGO = 272,
 +    STR_MESSAGE = 273,
 +    STR_MESSAGENO = 274,
 +    STR_DIS = 275,
 +    STR_DUR = 276,
 +    STR_STANDUP = 277,
 +    STR_SLEEP = 278,
 +    STR_SLEEPHOUR = 279,
 +    STR_SLEEPMGOAL = 280,
 +    STR_REATTIME = 281,
 +    STR_SLEEPTIME = 282,
 +    STR_WALKTIME = 283,
 +    STR_DISTURB = 284,
 +    STR_DISTURBNOTE = 285,
 +    STR_MORNNING = 286,
 +    STR_NOW = 287,
 +    STR_NAP = 288,
 +    STR_TACK = 289,
 +    STR_CLICK = 290,
 +    STR_TACKNUM = 291,
 +    STR_BLOOD_OXYGEN = 292,
 +    STR_TRAINING_RECORD = 293,
 +    STR_COMPASS = 294,
 +    STR_PHONE = 295,
 +    STR_FAVORITE_CONTACTS = 296,
 +    STR_WEATHER = 297,
 +    STR_ACTIVITY = 298,
 +    STR_WATCH_FACE = 299,
 +    STR_DISPLAY_MODE = 300,
 +    STR_CARD_MANAGEMENT = 301,
 +    STR_MUSIC = 302,
 +    STR_RECORDING = 303,
 +    STR_BREATH_TRAINING = 304,
 +    STR_REMOTE_SHOOTING = 305,
 +    STR_VOICE_ASSISTANT = 306,
 +    STR_ALIPAY = 307,
 +    STR_TIMER = 308,
 +    STR_ALARM = 309,
 +    STR_STOPWATCH = 310,
 +    STR_CALCULATOR = 311,
 +    STR_FIND_PHONE = 312,
 +    STR_BRIGHTNESS_ADJUSTMENT = 313,
 +    STR_SOUND = 314,
 +    STR_BLUETOOTH = 315,
 +    STR_DO_NOT_DISTURB = 316,
 +    STR_MESSAGE_NOTIFICATION = 317,
 +    STR_POWER_SAVE_MODE = 318,
 +    STR_FLASHLIGHT = 319,
 +    STR_SETTINGS = 320,
 +    STR_SCREEN_AND_BRIGHTNESS = 321,
 +    STR_NETWORKANDCALL = 322,
 +    STR_SOUND_AND_VIBRATION = 323,
 +    STR_MOTION_RECOGNITION = 324,
 +    STR_SYSTEM = 325,
 +    STR_SHUTDOWN_AND_RESTART = 326,
 +    STR_SCREEN_ON_DURATION = 327,
 +    STR_RAISE_TO_WAKE = 328,
 +    STR_5_SECONDS = 329,
 +    STR_10_SECONDS = 330,
 +    STR_15_SECONDS = 331,
 +    STR_30_SECONDS = 332,
 +    STR_60_SECONDS = 333,
 +    STR_300_SECONDS = 334,
 +    STR_4G_CAPABILITY = 335,
 +    STR_VOLTE_CALL = 336,
 +    STR_MOBILE_DATA_OPTION = 337,
 +    STR_SYSTEM_UPDATE = 338,
 +    STR_ONLINE_MUSIC = 339,
 +    STR_BLUETOOTH_HEADPHONES = 340,
 +    STR_TRADITIONAL_BLUETOOTH = 341,
 +    STR_AUTO_OFF_BLUETOOTH_NOTE = 342,
 +    STR_BLUETOOTH_SERVICE_OPTIONS = 343,
 +    STR_HFP = 344,
 +    STR_A2DP = 345,
 +    STR_SYSTEM_VOLUME = 346,
 +    STR_MEDIA_VOLUME = 347,
 +    STR_VIBRATION_MODE = 348,
 +    STR_SILENT_MODE = 349,
 +    STR_LIST_DISPLAY = 350,
 +    STR_GRID_DISPLAY = 351,
 +    STR_CELLULAR_DISPLAY = 352,
 +    STR_AUTO_DETECT = 353,
 +    STR_ABOUT_WATCH = 354,
 +    STR_WATCH_QR_CODE = 355,
 +    STR_SYSTEM_LANGUAGE = 356,
 +    STR_RESTART = 357,
 +    STR_SHUTDOWN = 358,
 +    STR_FACTORY_RESET = 359,
 +    STR_WATCH_NAME = 360,
 +    STR_FIRMWARE_VERSION = 361,
 +    STR_BLUETOOTH_NAME = 362,
 +    STR_BLUETOOTH_ADDRESS = 363,
 +    STR_LATEST_VERSION = 364,
-     STR_LATER = 365,
-     STR_UP_TO_DATE = 366,
-     STR_NO_UPDATE = 367,
-     STR_LANGUAGE_SELECTION = 368,
-     STR_RESET_CONFIRM = 369,
-     STR_SHUTDOWN_CONFIRM = 370,
-     STR_RESET_CONFIRM_NOTE = 371,
-     STR_MAX_ID = 372,
++    STR_UPDATENOW = 365,
++    STR_LATER = 366,
++    STR_UP_TO_DATE = 367,
++    STR_NO_UPDATE = 368,
++    STR_LANGUAGE_SELECTION = 369,
++    STR_RESET_CONFIRM = 370,
++    STR_SHUTDOWN_CONFIRM = 371,
++    STR_RESET_CONFIRM_NOTE = 372,
+     RECORDER = 373,
+     STR_CLICK_TO_RECORD = 374,
+     STR_AUDIO_XX = 375,
+     STR_VOICE_RECORDING_REMINDER = 376,
+     STR_VOICE_RECORDING_REMINDER_NOTE = 377,
+     STR_DELETE_RECORDING  = 378,
+     STR_DELETE_PERMANENTLY = 379,
+     STR_DO_NOT_DISTURB_MODE = 380,
+     STR_HEADSET = 381,
+     STR_CONNECTED = 382,
+     STR_DISCONNECTED = 383,
+     STR_PHONE_RINGING_VIBRATING = 384,
+     STR_WORKDAY = 385,
+     STR_REPEAT_NO = 386,
+     STR_EVERYDAY = 387,
+     STR_ADD_A_NEW_ALARM = 388,
+     STR_TIME = 389,
+     STR_NEXT_STEP = 390,
+     STR_MONDAY = 391,
+     STR_TUESDAY = 392,
+     STR_WEDNESDAY = 393,
+     STR_THURSDAY = 394,
+     STR_FRIDAY = 395,
+     STR_SATURDAY = 396,
+     STR_SUNDAY = 397,
+     STR_CALIBRATE_COMPASS = 398,
+     STR_CALIBRATE_COMPASS_NOTE = 399,
+     STR_EAST = 400,
+     STR_SOUTH = 401,
+     STR_WEST = 402,
+     STR_NORTH = 403,
+     STR_SOUTHEAST = 404,
+     STR_SOUTHWEST = 405,
+     STR_NORTHEAST = 406,
+     STR_NORTHWEST = 407,
+     STR_KEEP_STILL_FOCUS_ON_BREATHING = 408,
+     STR_EXHALE_NOW = 409,
+     STR_INHALE_NOW = 410,
+     STR_TRAINING_COMPLETE = 411,
+     STR_BREATHING_TRAINING = 412,
+     STR_THIS_BREATH = 413,
+     STR_TODAYS_BREATHING_TRAINING = 414,
+     STR_RECENT_CALLS = 415,
+     STR_NO_CALLS = 416,
+     STR_MISSED_CALLS = 417,
+     STR_DIALED_CALLS = 418,
+     STR_RECEIVED_CALLS = 419,
+     STR_NOTE_RECENT_CALLS_LIMITATION = 420,
+     STR_NO_CONTACTS_ADDED = 421,
+     STR_DIAL_MODE = 422,
+     STR_DIAL_VIA_WATCH_SIM = 423,
+     STR_DIAL_VIA_PHONE = 424,
+     STR_KUMI_TECHNOLOGY = 425,
+     STR_CALLING = 426,
+     STR_NOT_PAIRED = 427,
+     STR_PAIRED = 428,
+     STR_UNPAIR = 429,
+     STR_CONNECTION_ERROR = 430,
+     STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 431,
+     STR_ENABLE_BLUETOOTH_CALL = 432,
+     STR_ENABLE_BLUETOOTH_CALL_NOTE = 433,
+     STR_SIM_CARD_ERROR = 434,
+     STR_CHECK_SIM_CARD_INSERTION = 435,
+     STR_MAX_ID = 436,
  }; // UIResourceTextId
  
  enum FontLanguageId : uint8_t {
diff --cc code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
index 3f1488f25,c5e4f83e0..26ae98394
Binary files differ
diff --cc code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp
index 284cf60c3,87c9fd1ed..c46d58655
--- a/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的字符串*/