Merge #143 into xts_origin from refs/changes/143/head
author袁清梦 <3449750381@qq.com>
Wed, 8 May 2024 09:11:43 +0000 (09:11 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 8 May 2024 09:11:43 +0000 (09:11 +0000)
Code review from 袁清梦

* refs/changes/143/head: (21 commits squashed)

  - 替换结构体成员变量

  - 更新多国语言xml以及font文件

  - 更新训练Slice的多国语言配置

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

  - 优化设置训练频率

  - 适配心率Slice多国语言

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

  - 多国语言支持变量适配(updateLabel)

  - 增加佩戴状态下的无效数控制

  - 更新字体文件

  - 优化心率血氧time的更新显示逻辑

  - 适配血氧Slice多国语言

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

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

  - 适配信息通知Slice多国语言

  - 适配训练记录Slice多国语言

  - 增加label适配多国语言函数

  - 删除部分打印

  - 增加训练记录列表

  - 训练记录同步make

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

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/143
18 files changed:
code/sdk/application/wearable/fd230app/CMakeLists.txt
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/ui_resource_string.h
code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
code/sdk/application/wearable/fd230app/nativeui/message/include/MessageAdapter.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/include/TraingMoreAdapter.h
code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordAdapter.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordItemView.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordModel.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordAdapter.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordItemView.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp
code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp
code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h
code/sdk/drivers/peripheral/cywee/src/main_dml.c

index 149872f..a78e488 100644 (file)
@@ -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
 
     #训练列表
     #极限训练
index a86a06c..09e59b5 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="卡路里"/>
index acf33f7..508ce98 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 9983e1b..500f685 100644 (file)
@@ -251,138 +251,138 @@ 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_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
@@ -451,8 +451,8 @@ enum UIResourceTextId : uint16_t {
 
 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 c5e4f83..26ae983 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 42f3da7..18b9621 100644 (file)
@@ -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
 {
 
index 8d67fdc..36fef6a 100644 (file)
@@ -210,8 +210,8 @@ namespace OHOS
         TrainingDetailView::GetInstance()->GetCalorieLabel()->SetText(calorieStr.c_str()); // 卡路里\r
         TrainingDetailView::GetInstance()->GetMileLabel()->SetText(distanceStr.c_str());   // 距离\r
         TrainingDetailView::GetInstance()->GetStepLabel()->SetText(stepsStr.c_str());      // 步数\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[Calories: %s, Distance: %s, Steps: %s]", calorieStr.c_str(), distanceStr.c_str(), stepsStr.c_str());\r
-        // 释放sportdata内存\r
+        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[Calories: %s, Distance: %s, Steps: %s]", calorieStr.c_str(), distanceStr.c_str(), stepsStr.c_str());\r
+        //  释放sportdata内存\r
     }\r
     /*刷新time和data*/\r
     void TraingCardPresenter::Notify(void)\r
index e2e9697..2a06068 100644 (file)
@@ -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 (file)
index 0000000..bcff417
--- /dev/null
@@ -0,0 +1,51 @@
+
+#ifndef TraingRecord_ADAPTER_H
+#define TraingRecord_ADAPTER_H
+#include <list>
+#include <string>
+#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<TraingRecordItem> &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<TraingRecordItem> 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 (file)
index 0000000..e69de29
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 (file)
index 0000000..e69de29
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 (file)
index 0000000..e69de29
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 (file)
index 0000000..e69de29
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 (file)
index 0000000..e69de29
index 0e495de..e9150c1 100644 (file)
@@ -145,6 +145,7 @@ namespace OHOS
     /*记录列表界面*/
     void TraingRecordView::ShowRecordView()
     {
+        
     }
     /*控制显示界面*/
     void TraingRecordView::SetPopupViewStatus(PopupRecord view, bool status)
index 87c9fd1..c46d586 100644 (file)
@@ -268,37 +268,68 @@ namespace OHOS
         InitLabel(label, x, y, width, height, viewId, text, fontName, fontSize);
     }
 
-    /*æ\9b´æ\96°labelç\9a\84æ\95°å­\97*/
-    void UpdateLabel(UILabelExt *&label, int num)
+    /*æ\9b¿æ\8d¢å­\97符串中ç\9a\84å\8f\98é\87\8f*/
+    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的字符串*/
index 7b0164a..88027cf 100644 (file)
@@ -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
index c1ad8c0..8aa607a 100644 (file)
@@ -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;