修改主界面卡片配置与figma同步

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index 36407b3..7198851 100644 (file)
--- 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 bc1debf..725ef05 100644 (file)
--- 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\r
     const CardInfo cardInfoMap[] = {\r
         {HEART_RATE, PNG_SET_CARD_HEART, true},\r
+        {TRAINING, PNG_SET_CARD_TRAIN, false},\r
         {COMPASS, PNG_SET_CARD_COMPASS, true},\r
-        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, true},\r
+        {SLEEP, PNG_SET_CARD_SLEEP, false},\r
         {BLOODOXGEN, PNG_SET_CARD_BLOOD, false},\r
-        {WEATHER, PNG_SET_CARD_WEATHER, false},\r
-        {TRAINING, PNG_SET_CARD_TRAIN, false},\r
         {GOAL, PNG_SET_CARD_ACTIVITY, false},\r
-        {SLEEP, PNG_SET_CARD_SLEEP, false},\r
+        {WEATHER, PNG_SET_CARD_WEATHER, false},\r
+        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, true},\r
     };\r
     /*维护卡片*/\r
     CardInfoSet cardInfoSet[] =\r
         {\r
             {HEART_RATE, true},\r
+            {TRAINING, false},\r
             {COMPASS, true},\r
-            {MUSIC_PLAYER, true},\r
+            {SLEEP, false},\r
             {BLOODOXGEN, false},\r
-            {WEATHER, false},\r
-            {TRAINING, false},\r
             {GOAL, false},\r
-            {SLEEP, false},\r
+            {WEATHER, false},\r
+            {MUSIC_PLAYER, true},\r
     };\r
     /*自定义map配置*/\r
     const DialInfo dialInfoMap[] = {\r

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 a9f1aac..f75f9ce 100644 (file)
--- 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);
         /*获取勿扰状态*/