修改运动与心率的卡片顺序

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
index 598e74c..c7fe8b6 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
@@ -18,8 +18,8 @@ namespace OHOS
     typedef enum
     {
         WATCH_FACE = 0, /* 主表盘枚举值不能修改 */
-        HEART_RATE,
         TRAINING,
+        HEART_RATE,
         // COMPASS,
         SLEEP,
         BLOODOXGEN,

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp
index 10cfe58..e488dbc 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp
@@ -30,12 +30,12 @@ namespace OHOS
 {\r
     static const int CARD_SETTING_VALUE_LEN = 32;\r
     static const int DIAL_SETTING_VALUE_LEN = 64;\r
-    /*默认卡片：心率，睡眠，快速训练*/\r
+    /*默认卡片：运动，心率，睡眠*/\r
     // 更新主界面卡片需要更新Map\r
 \r
     const CardInfo cardInfoMap[] = {\r
-        {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},\r
         {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING},\r
+        {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},\r
         // {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS},\r
         {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP},\r
         {BLOODOXGEN, PNG_SET_CARD_BLOOD, false,STR_BLOOD_OXYGEN},\r
@@ -46,11 +46,11 @@ namespace OHOS
     /*维护卡片*/\r
     /*\r
         fd272 排序\r
-        心率 运动 指南针 睡眠 血氧 每日目标 天气 音乐\r
+        运动 心率 睡眠 指南针 血氧 每日目标 天气 音乐\r
     */\r
     CardInfoSet cardInfoSet[] = {\r
-    {HEART_RATE, true},\r
     {TRAINING, true},\r
+    {HEART_RATE, true},\r
     // {COMPASS, false},\r
     {SLEEP, true},\r
     {BLOODOXGEN, false},\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp
index 266042f..e60c6ad 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp
@@ -35,8 +35,8 @@ namespace OHOS
     // 严格按照Id对应
     static const MainViewMapper CardMapper[] = {
         {WATCH_FACE, &MainViewSample::InitWatchFacePage},
-        {HEART_RATE, &MainViewSample::InitHeartRatePage},
         {TRAINING, &MainViewSample::InitTrainingPage},
+        {HEART_RATE, &MainViewSample::InitHeartRatePage},
         // {COMPASS, &MainViewSample::InitCompassPage},
         {SLEEP, &MainViewSample::InitSleepPage},
         {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},