From 212c4e22f836b53b02db886aff5cdccce43188f0 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Mon, 12 Aug 2024 10:33:34 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E7=95=8C=E9=9D=A2?=
 =?utf8?q?=E5=8D=A1=E7=89=87=E9=85=8D=E7=BD=AE=E4=B8=8Efigma=E5=90=8C?=
 =?utf8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativelauncher/include/UiConfig.h   | 12 ++++++------
 .../fd230app/nativeui/main/src/MainModel.cpp     | 16 ++++++++--------
 .../nativeui/main/src/MainViewSample.cpp         | 10 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index 36407b34f..71988512f 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -19,13 +19,13 @@ namespace OHOS
     {
         WATCH_FACE = 0, /* 主表盘枚举值不能修改 */
         HEART_RATE,
+        TRAINING,
         COMPASS,
-        MUSIC_PLAYER,
+        SLEEP,
         BLOODOXGEN,
-        WEATHER,
-        TRAINING,
         GOAL,
-        SLEEP,
+        WEATHER,
+        MUSIC_PLAYER,
         SETCARD,
         MAX_CARD,
     } CardId;
@@ -307,12 +307,12 @@ namespace OHOS
     static constexpr const char *PNG_APPLIST_TACKEPHOTOS_IMAGE = APP_LIST_PATH "/assistant.bin";    // 遥控拍照
     static constexpr const char *PNG_APPLIST_BLUETOOTH_IMAGE = APP_LIST_PATH "/Bluetooth.bin";      // 蓝牙
     static constexpr const char *PNG_APPLIST_BREATHE_IMAGE = APP_LIST_PATH "/breathe.bin";          // 呼吸训练
-    static constexpr const char *PNG_APPLIST_GOAL_IMAGE = APP_LIST_PATH "/sport.bin";               //每日目标
+    static constexpr const char *PNG_APPLIST_GOAL_IMAGE = APP_LIST_PATH "/sport.bin";               // 每日目标
     static constexpr const char *PNG_APPLIST_VOICE_IMAGE = APP_LIST_PATH "/voice.bin";              // 声音
     static constexpr const char *PNG_APPLIST_AIVOICE_IMAGE = APP_LIST_PATH "/aivoice.bin";          // AI Voice(人工智能语音)
     static constexpr const char *PNG_APPLIST_SLEEP_IMAGE = APP_LIST_PATH "/sleeping.bin";           // 睡眠
     static constexpr const char *PNG_APPLIST_INFORMATION_IMAGE = APP_LIST_PATH "/information.bin";  // 计算器
-    static constexpr const char *PNG_APPLIST_MUSIC_IMAGE = APP_LIST_PATH "/music.bin";  // 音乐
+    static constexpr const char *PNG_APPLIST_MUSIC_IMAGE = APP_LIST_PATH "/music.bin";              // 音乐
 
     // AppList hexagon icon
     static constexpr const char *PNG_APPLIST_DEFAULT_IMG = APP_RES_PATH "/regular_hexagon.bin";
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
index bc1debf7f..725ef0542 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -18,25 +18,25 @@ namespace OHOS
     // 更新主界面卡片需要更新Map
     const CardInfo cardInfoMap[] = {
         {HEART_RATE, PNG_SET_CARD_HEART, true},
+        {TRAINING, PNG_SET_CARD_TRAIN, false},
         {COMPASS, PNG_SET_CARD_COMPASS, true},
-        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, true},
+        {SLEEP, PNG_SET_CARD_SLEEP, false},
         {BLOODOXGEN, PNG_SET_CARD_BLOOD, false},
-        {WEATHER, PNG_SET_CARD_WEATHER, false},
-        {TRAINING, PNG_SET_CARD_TRAIN, false},
         {GOAL, PNG_SET_CARD_ACTIVITY, false},
-        {SLEEP, PNG_SET_CARD_SLEEP, false},
+        {WEATHER, PNG_SET_CARD_WEATHER, false},
+        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, true},
     };
     /*维护卡片*/
     CardInfoSet cardInfoSet[] =
         {
             {HEART_RATE, true},
+            {TRAINING, false},
             {COMPASS, true},
-            {MUSIC_PLAYER, true},
+            {SLEEP, false},
             {BLOODOXGEN, false},
-            {WEATHER, false},
-            {TRAINING, false},
             {GOAL, false},
-            {SLEEP, false},
+            {WEATHER, false},
+            {MUSIC_PLAYER, true},
     };
     /*自定义map配置*/
     const DialInfo dialInfoMap[] = {
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index a9f1aac9e..f75f9cee3 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -31,13 +31,13 @@ namespace OHOS
     static const MainViewMapper CardMapper[] = {
         {WATCH_FACE, &MainViewSample::InitWatchFacePage},
         {HEART_RATE, &MainViewSample::InitHeartRatePage},
+        {TRAINING, &MainViewSample::InitTrainingPage},
         {COMPASS, &MainViewSample::InitCompassPage},
-        {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
+        {SLEEP, &MainViewSample::InitSleepPage},
         {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
-        {WEATHER, &MainViewSample::InitWeatherPage},
-        {TRAINING, &MainViewSample::InitTrainingPage},
         {GOAL, &MainViewSample::InitGoalPage},
-        {SLEEP, &MainViewSample::InitSleepPage},
+        {WEATHER, &MainViewSample::InitWeatherPage},
+        {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
         {SETCARD, &MainViewSample::InitSetMainPage},
 
 #if 0
@@ -388,7 +388,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainClockView new fail");
             return nullptr;
         }
-        
+
         /*增加勿扰图标*/
         InitImageView(disturbIcon, 213, 0, 40, 40, "disturbIcon", DISTURBICON);
         /*获取勿扰状态*/
-- 
2.17.1