From ec8c9926c1bcc4f52f5c567c7104e911fb8a1992 Mon Sep 17 00:00:00 2001
From: Caisking <Casiking@zhihuishixun.com>
Date: Thu, 10 Jul 2025 12:19:56 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9N9,W9=E4=B8=BB=E7=95=8C?=
 =?utf8?q?=E9=9D=A2=E5=8D=A1=E7=89=87=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/main/src/MainModel.cpp  | 128 ++++++++----------
 1 file changed, 60 insertions(+), 68 deletions(-)

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 942189d8d..c60caf151 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -29,6 +29,33 @@ namespace OHOS
     /*默认卡片：心率，睡眠，快速训练*/
     // 更新主界面卡片需要更新Map
     const CardInfo cardInfoMap[] = {
+    #if defined(BOARD_N9)
+        /*
+            n9 排序
+            运动 心率 指南针 睡眠 血氧 每日目标 天气 音乐
+        */
+        {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING},
+        {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},
+        {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS},
+        {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP},
+        {BLOODOXGEN, PNG_SET_CARD_BLOOD, false,STR_BLOOD_OXYGEN},
+        {GOAL, PNG_SET_CARD_ACTIVITY, true,STR_ACTIVITY},
+        {WEATHER, PNG_SET_CARD_WEATHER, false,STR_WEATHER},
+        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC},
+    #elif defined(BOARD_W9)
+        /*
+            w9 排序
+            睡眠 运动 心率 音乐 每日运动 天气 指南针 血氧
+        */
+        {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP},
+        {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING},
+        {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},
+        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC},
+        {GOAL, PNG_SET_CARD_ACTIVITY, true,STR_ACTIVITY},
+        {WEATHER, PNG_SET_CARD_WEATHER, false,STR_WEATHER},
+        {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS},
+        {BLOODOXGEN, PNG_SET_CARD_BLOOD, false,STR_BLOOD_OXYGEN},
+    #else    
         {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},
         {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING},
         {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS},
@@ -37,9 +64,41 @@ namespace OHOS
         {GOAL, PNG_SET_CARD_ACTIVITY, false,STR_ACTIVITY},
         {WEATHER, PNG_SET_CARD_WEATHER, false,STR_WEATHER},
         {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC},
+    #endif
     };
     /*维护卡片*/
     CardInfoSet cardInfoSet[] = {
+    #if defined(BOARD_N9)
+        /*
+            n9 排序
+            运动 心率 指南针 睡眠 血氧 每日目标 天气 音乐
+        */
+        {TRAINING, true},
+        {HEART_RATE, true},
+        {COMPASS, false},
+        {SLEEP, true},
+        {BLOODOXGEN, false},
+        {GOAL, true},
+        {WEATHER, false},
+        {MUSIC_PLAYER, false},
+    #elif defined(BOARD_W9)
+        /*
+            w9 排序
+            睡眠 运动 心率 音乐 每日运动 天气 指南针 血氧
+        */
+        {SLEEP, true},
+        {TRAINING, true},
+        {HEART_RATE, true},
+        {MUSIC_PLAYER, false},
+        {GOAL, true},
+        {WEATHER, false},
+        {COMPASS, false},
+        {BLOODOXGEN, false},
+    #else
+        /*
+            fd230 排序
+            心率 运动 指南针 睡眠 血氧 每日目标 天气 音乐
+        */
         {HEART_RATE, true},
         {TRAINING, true},
         {COMPASS, false},
@@ -48,6 +107,7 @@ namespace OHOS
         {GOAL, false},
         {WEATHER, false},
         {MUSIC_PLAYER, false},
+    #endif
     };
     /*自定义map配置*/
     const DialInfo dialInfoMap[] = {
@@ -644,71 +704,3 @@ namespace OHOS
     }
 
 }
-#if 0
-    void MainModel::DeleteCardSetting(uint8_t index)
-    {
-        char temp[CARD_SETTING_VALUE_LEN] = {0};
-        for (uint8_t i = 0; i < cardSettingCount; i++)
-        {
-            if (i == index + 1)
-            {
-                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "i:%d index:%d", i, index);
-                uint8_t j = i;
-                for (; j < cardSettingCount - 1; j++)
-                {
-                    cardSettings[j] = cardSettings[j + 1];
-                }
-                cardSettings[j] = MAX_CARD;
-                cardSettingCount--;
-            }
-        }
-
-        for (uint8_t i = 0; i < cardSettingCount; i++)
-        {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);
-            (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]);
-        }
-        (void)UtilsSetValue("card_setting", temp);
-
-         WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "\r\n***************DeleteCardSetting********************\r\n");
-        printCardSettings();
-         WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "\r\n_____________________________________________________\r\n");
-    }
-
-    void MainModel::AddCardSetting(uint8_t index)
-    {
-        char temp[CARD_SETTING_VALUE_LEN] = {0};
-        if (cardSettingCount >= CARD_SETTING_COUNT_MAX)
-        {
-            return;
-        }
-        for (int i = 0; i < cardSettingCount; i++)
-        {
-            if (cardSettings[i] == cardInfoMap[index].id)
-            {
-                return;
-            }
-        }
-        cardSettings[cardSettingCount++] = cardInfoMap[index].id;
-        for (uint8_t i = 0; i < cardSettingCount; i++)
-        {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);
-            (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]);
-        }
-        (void)UtilsSetValue("card_setting", temp);
-
-         WEARABLE_LOGD(WEARABL_LOG_MODULE_APP, "\r\n***************AddCardSetting********************\r\n");
-        printCardSettings();
-    }
-
-    else
-    {
-        /* 使用默认card配置 */
-        cardSettings[index++] = WATCH_FACE;
-        cardSettings[index++] = HEART_RATE;
-        cardSettings[index++] = COMPASS;
-        cardSettings[index++] = MUSIC_PLAYER;
-        cardSettings[index++] = SETCARD; // 默认卡片增加设置卡片
-        cardSettingCount = index;
-    }
-#endif
-- 
2.17.1