From: Caisking <3449750381@qq.com>
Date: Fri, 21 Jun 2024 09:36:52 +0000 (+0800)
Subject: 实现负一屏设置卡片
X-Git-Tag: release_V1.2.70_20241020_135402~973^2~3
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F347%2F2;p=mirrors%2FFD230.git

实现负一屏设置卡片
---

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 498bd5224..9c055dee0 100644
--- 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},
         {WEATHER, PNG_SET_CARD_WEATHER},
         {TRAINING, PNG_SET_CARD_TRAIN},
-        {SETCARD, PNG_SET_CARD_MAIN},
         {GOAL, PNG_SET_CARD_ACTIVITY},
-
         // {ACTIVITY, PNG_SET_CARD_ACTIVITY},
     };
     /*自定义map？*/
@@ -94,12 +92,11 @@ namespace OHOS
         else
         {
             /* 使用默认card配置 */
+            cardSettings[index++] = SETCARD; // 默认卡片增加设置卡片
             cardSettings[index++] = WATCH_FACE;
             cardSettings[index++] = HEART_RATE;
             cardSettings[index++] = COMPASS;
-            // cardSettings[index++] = ACTIVITY;
             cardSettings[index++] = MUSIC_PLAYER;
-            cardSettings[index++] = SETCARD; // 默认卡片增加设置卡片
             cardSettingCount = index;
         }
     }
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 3a1d5cb62..4c0c31771 100644
--- 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 32ca2b547..69b97f840 100644
--- 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];