实现负一屏设置卡片

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 498bd52..9c055de 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -23,9 +23,7 @@ namespace OHOS
         {BLOODOXGEN, PNG_SET_CARD_BLOOD},\r
         {WEATHER, PNG_SET_CARD_WEATHER},\r
         {TRAINING, PNG_SET_CARD_TRAIN},\r
-        {SETCARD, PNG_SET_CARD_MAIN},\r
         {GOAL, PNG_SET_CARD_ACTIVITY},\r
-\r
         // {ACTIVITY, PNG_SET_CARD_ACTIVITY},\r
     };\r
     /*自定义map？*/\r
@@ -94,12 +92,11 @@ namespace OHOS
         else\r
         {\r
             /* 使用默认card配置 */\r
+            cardSettings[index++] = SETCARD; // 默认卡片增加设置卡片\r
             cardSettings[index++] = WATCH_FACE;\r
             cardSettings[index++] = HEART_RATE;\r
             cardSettings[index++] = COMPASS;\r
-            // cardSettings[index++] = ACTIVITY;\r
             cardSettings[index++] = MUSIC_PLAYER;\r
-            cardSettings[index++] = SETCARD; // 默认卡片增加设置卡片\r
             cardSettingCount = index;\r
         }\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 3a1d5cb..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
@@ -200,7 +200,7 @@ namespace OHOS
         VertViewLoad();
         mainSwipeGroup->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
         mainSwipeGroup->SetAnimatorTime(50); // 50: animator drag time(ms);
-        mainSwipeGroup->SetLoopState(true); // 关闭主界面循环
+        mainSwipeGroup->SetLoopState(false); // 关闭主界面循环
         mainSwipeGroup->EnableScreenCap(true);
         mainSwipeGroup->RegisterSwipeCallback(callback);
         if (presenter_->IsFromSetCardView())

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardModel.cpp
index 32ca2b5..69b97f8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardModel.cpp
@@ -10,7 +10,8 @@
 #include "kv_store.h"
 #include "securec.h"
 
-namespace OHOS {
+namespace OHOS
+{
     SetCardModel::SetCardModel() {}
 
     SetCardModel::~SetCardModel() {}
@@ -27,8 +28,10 @@ namespace OHOS {
         uint8_t cardCount = MainModel::GetInstance().GetCardSettingCount();
         CardId *cardSettings = MainModel::GetInstance().GetCardSettings();
         cardShowCount = 0;
-        for (uint8_t i = 0; i < cardCount; i++) {
-            if (cardSettings[i] == WATCH_FACE) {
+        for (uint8_t i = 0; i < cardCount; i++)
+        {
+            if (cardSettings[i] == WATCH_FACE || cardSettings[i] == SETCARD)
+            {
                 continue;
             }
             cardShowList[cardShowCount++] = cardSettings[i];