修改N9,W9主界面卡片排序

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