From: 袁清梦 <3449750381@qq.com> Date: Wed, 8 May 2024 09:11:43 +0000 (+0000) Subject: Merge #143 into xts_origin from refs/changes/143/head X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~12^2~2 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=8ce7b38a0249e30ef586124943ea18fc88a6b243;p=mirrors%2FFD230.git Merge #143 into xts_origin from refs/changes/143/head Code review from 袁清梦 * refs/changes/143/head: (21 commits squashed) - 替换结构体成员变量 - 更新多国语言xml以及font文件 - 更新训练Slice的多国语言配置 - Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin - 优化设置训练频率 - 适配心率Slice多国语言 - Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin - 多国语言支持变量适配（updateLabel) - 增加佩戴状态下的无效数控制 - 更新字体文件 - 优化心率血氧time的更新显示逻辑 - 适配血氧Slice多国语言 - Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin - Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin - 适配信息通知Slice多国语言 - 适配训练记录Slice多国语言 - 增加label适配多国语言函数 - 删除部分打印 - 增加训练记录列表 - 训练记录同步make - Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/143 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 149872fe2..a78e4880c 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -512,6 +512,9 @@ set(SOURCES #训练记录 ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traingrecord/src/TraingRecordView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traingrecord/src/TraingRecordPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traingrecord/src/TraingRecordAdapter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traingrecord/src/TraingRecordItemView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traingrecord/src/TraingRecordModel.cpp #训练列表 #极限训练 diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml index a86a06cce..09e59b5e6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml @@ -188,7 +188,7 @@ - + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang index acf33f74a..508ce988c 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h index 9983e1bf4..500f6858b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h @@ -251,138 +251,138 @@ 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_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, @@ -451,8 +451,8 @@ enum UIResourceTextId : uint16_t { enum FontLanguageId : uint8_t { LANGUAGE_ID_JA, - LANGUAGE_ID_EN, LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, LANGUAGE_ID_MAX }; // UITextLanguageTextId } diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang index c5e4f83e0..26ae98394 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h index 42f3da76c..18b962123 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h @@ -2,8 +2,8 @@ * @Author: Caisking 3449750381@qq.com * @Date: 2024-01-29 19:58:37 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-03-26 17:59:57 - * @FilePath: /sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h + * @LastEditTime: 2024-05-08 09:49:17 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -17,7 +17,6 @@ #include "components/ui_label_ext.h" #include "components/ui_checkbox.h" -// 音乐列表的适配器 namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index 8d67fdcb3..36fef6a43 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -210,8 +210,8 @@ namespace OHOS TrainingDetailView::GetInstance()->GetCalorieLabel()->SetText(calorieStr.c_str()); // 卡路里 TrainingDetailView::GetInstance()->GetMileLabel()->SetText(distanceStr.c_str()); // 距离 TrainingDetailView::GetInstance()->GetStepLabel()->SetText(stepsStr.c_str()); // 步数 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[Calories: %s, Distance: %s, Steps: %s]", calorieStr.c_str(), distanceStr.c_str(), stepsStr.c_str()); - // 释放sportdata内存 + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[Calories: %s, Distance: %s, Steps: %s]", calorieStr.c_str(), distanceStr.c_str(), stepsStr.c_str()); + // 释放sportdata内存 } /*刷新time和data*/ void TraingCardPresenter::Notify(void) diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreAdapter.h index e2e969750..2a060688c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreAdapter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreAdapter.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-05-08 09:52:10 + * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreAdapter.h + */ #ifndef TraingMore_ADAPTER_H #define TraingMore_ADAPTER_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordAdapter.h new file mode 100644 index 000000000..bcff41779 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordAdapter.h @@ -0,0 +1,51 @@ + +#ifndef TraingRecord_ADAPTER_H +#define TraingRecord_ADAPTER_H +#include +#include +#include "components/ui_list.h" +#include "components/abstract_adapter.h" +#include "components/ui_label.h" +#include "components/ui_label_ext.h" +#include "components/ui_checkbox.h" +#include "AppViewIDs.h" +#include "components/ui_label_ext.h" +#include "language/font/ui_resource_string.h" + +// 列表的适配器 +namespace OHOS +{ + + typedef struct + { + AppViewId id; + UIResourceTextId labelid; // 标签 + const char *logo; + } TraingRecordItem; + + class TraingRecordAdapter : public AbstractAdapter + { + public: + explicit TraingRecordAdapter(); + virtual ~TraingRecordAdapter(); + + void SetData(std::list &data); + + virtual uint16_t GetCount(void) override; + + virtual UIView *GetView(UIView *inView, int16_t index) override; + + virtual void AddItem(const TraingRecordItem &item); + + void SetItemClickListener(UIView::OnClickListener *itemclicklistener) + { + itemClickListener = itemclicklistener; + } + + private: + std::list listData; + UIView::OnClickListener *itemClickListener{nullptr}; + }; +} + +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordItemView.h new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordModel.h b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordModel.h new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordAdapter.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordItemView.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp index 0e495deef..e9150c16a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp @@ -145,6 +145,7 @@ namespace OHOS /*记录列表界面*/ void TraingRecordView::ShowRecordView() { + } /*控制显示界面*/ void TraingRecordView::SetPopupViewStatus(PopupRecord view, bool status) diff --git a/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp b/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp index 87c9fd1ed..c46d58655 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp @@ -268,37 +268,68 @@ namespace OHOS InitLabel(label, x, y, width, height, viewId, text, fontName, fontSize); } - /*更新label的数字*/ - void UpdateLabel(UILabelExt *&label, int num) + /*替换字符串中的变量*/ + void UpdateLabelText(UILabelExt *&label, const std::string &newText) { + if (label == nullptr) + { + return; + } + std::string str = label->GetText(); - std::string numStr = std::to_string(num); - printf("UpdateLabel:%s->%d\r\n", str.c_str(), num); + printf("UpdateLabel:%s->%s\r\n", str.c_str(), newText.c_str()); // 找到标志"XX"在字符串中的位置 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) + { + { + 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; } -} \ No newline at end of file + +} + +/*更新label的字符串*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h b/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h index 7b0164af3..88027cfb5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h +++ b/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h @@ -52,10 +52,13 @@ namespace OHOS /*InitLabel[默认参数]*/ void InitLabelDefault(UILabelExt *&label, int x, int y, int width, int height, const char *viewId, const char *text, int fontSize = 30, const char *fontName = DEFAULT_VECTOR_FONT_FILENAME); + /*通用替换*/ + void UpdateLabelText(UILabelExt *&label, const std::string &newText); /*更新label的数字*/ void UpdateLabel(UILabelExt *&label, int num); /*更新label的字符串*/ - void UpdateLabel(UILabelExt *&label, const std::string updatestr); - + void UpdateLabel(UILabelExt *&label, const std::string &updatestr); + /*通过labelext获取Id设置label*/ + void SetLabelId(UILabel *&label, UIResourceTextId id); } #endif // UICOMPONENTS_H \ No newline at end of file diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c index c1ad8c0ba..8aa607a53 100644 --- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c +++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c @@ -206,6 +206,7 @@ void cyw_activity_mode_change(int mode) { //一般模式(生活模式) case SPORT_ACTIVE_MODE_NORMAL: + PRINT("SPORT_ACTIVE_MODE_NORMAL\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_NORMAL; @@ -214,6 +215,7 @@ void cyw_activity_mode_change(int mode) //跑步机 case SPORT_ACTIVE_MODE_TREADMILL: + PRINT("SPORT_ACTIVE_MODE_TREADMILL\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_TREADMILL; @@ -222,6 +224,7 @@ void cyw_activity_mode_change(int mode) //户外跑步 case SPORT_ACTIVE_MODE_OUTDOOR_RUNNING: + PRINT("SPORT_ACTIVE_MODE_OUTDOOR_RUNNING\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_OUTDOOR_RUNNING; @@ -230,6 +233,7 @@ void cyw_activity_mode_change(int mode) //室内跑步 case SPORT_ACTIVE_MODE_INDOOR_RUNNING: + PRINT("SPORT_ACTIVE_MODE_INDOOR_RUNNING\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_INDOOR_RUNNING; @@ -246,6 +250,7 @@ void cyw_activity_mode_change(int mode) //自由运动 case SPORT_ACTIVE_MODE_FREE_TRAINING: + PRINT("SPORT_ACTIVE_MODE_FREE_TRAINING\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_FREE_TRAINING;