Revert "修复卡片显示"

This reverts commit 5de4c9027c4ce8841a4ddef3ed7d815d38360d05.

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 2d0aacf..a23a831 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -100,20 +100,14 @@ namespace OHOS
         else\r
         {\r
             /* 使用默认card配置 */\r
-            cardSettings[index] = SETCARD;\r
-          //  printf("InitCardSettings index:%d %d\r\n", index, SETCARD);\r
-            index++;\r
-            cardSettings[index] = WATCH_FACE;\r
-          //  printf("InitCardSettings index:%d %d\r\n", index, WATCH_FACE);\r
-            index++;\r
+            cardSettings[index++] = SETCARD;\r
+            cardSettings[index++] = WATCH_FACE;\r
             /**遍历cardInfoMap 的默认visable选项，true的被设置进来 */\r
-            for (uint8_t i = WATCH_FACE; i < MAX_CARD; i++)\r
+            for (uint8_t i = WATCH_FACE + 2; i < MAX_CARD; i++)\r
             {\r
                 if (GetCardVisable((CardId)i) == true)\r
                 {\r
-                    cardSettings[index] = (CardId)i;\r
-                    //printf("InitCardSettings index:%d %d\r\n", index, (CardId)i);\r
-                    index++;\r
+                    cardSettings[index++] = (CardId)i;\r
                 }\r
             }\r
             cardSettingCount = index;\r
@@ -122,7 +116,7 @@ namespace OHOS
 \r
     void MainModel::DeleteCardSetting(uint8_t index)\r
     {\r
-        /**找到 cardInfoMap 中的 对应 CardId , 在 cardSettings中删除  */\r
+        /**找到 cardInfoMap 中的 对应 CardId , 在 cardSettings中删除   */\r
         char temp[CARD_SETTING_VALUE_LEN] = {0};\r
         for (uint8_t i = 0; i < cardSettingCount; i++)\r
         {\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 ece7d17..4c0c317 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -30,13 +30,14 @@ namespace OHOS
     // 严格按照Id对应
     static const MainViewMapper CardMapper[] = {
         {WATCH_FACE, &MainViewSample::InitWatchFacePage},
-        {SETCARD, &MainViewSample::InitSetMainPage},
         {HEART_RATE, &MainViewSample::InitHeartRatePage},
         {COMPASS, &MainViewSample::InitCompassPage},
         {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
         {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
         {WEATHER, &MainViewSample::InitWeatherPage},
         {TRAINING, &MainViewSample::InitTrainingPage},
+        //{ACTIVITY, &MainViewSample::InitActivityPage},
+        {SETCARD, &MainViewSample::InitSetMainPage},
         {GOAL, &MainViewSample::InitGoalPage},
     };
     MainViewSample::MainViewSample()
@@ -228,15 +229,15 @@ namespace OHOS
             {
                 if (cardSettings[i] == CardMapper[j].id)
                 {
-                    recordCard[i] = (this->*(CardMapper[j].func))();
-                    if (recordCard[i] == nullptr)
+                    recordCard[j] = (this->*(CardMapper[j].func))();
+                    if (recordCard[j] == nullptr)
                     {
                         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
                                       "MainViewSample:: recordCard %d error", j);
                         return false;
                     }
                     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
-                                  "MainViewSample:: recordCard [%d]: cardId %d", i, cardSettings[i]);
+                                  "MainViewSample:: recordCard[%d]:%p", j, recordCard[j]);
                     break;
                 }
             }
@@ -256,11 +257,11 @@ namespace OHOS
         for (int16_t i = 0; i < cardSettingNum; i++)
         {
             CardId cardId = cardSettings[i];
-            if (recordCard[i] != nullptr)
+            if (recordCard[cardId] != nullptr)
             {
-                mainSwipeGroup->HorAdd(recordCard[i]);
+                mainSwipeGroup->HorAdd(recordCard[cardId]);
                 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample:: HorViewLoad cardid = %d ViewIndex = %d",
-                              cardId, recordCard[i]->GetViewIndex());
+                              cardId, recordCard[cardId]->GetViewIndex());
             }
         }
     }
@@ -546,20 +547,14 @@ namespace OHOS
 
     void MainViewSample::SwitchToCard(uint8_t cardId)
     {
-        uint8_t cardSettingNum = presenter_->GetCardSettingCount();
-        CardId *cardSettings = presenter_->GetCardSettings();
-        for (int16_t i = 0; i < cardSettingNum; i++)
+        if ((cardId < MAX_CARD) && (recordCard[cardId] != nullptr))
         {
-            if (cardId == cardSettings[i])
-            {
-                if ((cardId < MAX_CARD) && (recordCard[i] != nullptr))
-                {
-                    SetPage(recordCard[i]->GetViewIndex());
-                    return;
-                }
-            }
+            SetPage(recordCard[cardId]->GetViewIndex());
+        }
+        else
+        {
+            SwitchToClockPage();
         }
-        SwitchToClockPage();
     }
 
 }