修复删除卡片功能异常；卡片管理需要重构。

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index 28b74ea..d8dfa8d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -18,13 +18,13 @@ namespace OHOS
     typedef enum
     {
         WATCH_FACE = 0, /* 主表盘枚举值不能修改 */
+        SETCARD,
         HEART_RATE,
         COMPASS,
         MUSIC_PLAYER,
         BLOODOXGEN,
         WEATHER,
         TRAINING,
-        SETCARD,
         GOAL,
         SLEEP,
         MAX_CARD,

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 ccacb18..bb5a7d5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -17,6 +17,7 @@ namespace OHOS
     static const int DIAL_SETTING_VALUE_LEN = 64;\r
     // 更新主界面卡片需要更新Map\r
     const CardInfo cardInfoMap[] = {\r
+        {SETCARD, PNG_SET_CARD_MAIN},\r
         {HEART_RATE, PNG_SET_CARD_HEART},\r
         {COMPASS, PNG_SET_CARD_COMPASS},\r
         {MUSIC_PLAYER, PNG_SET_CARD_PLAYER},\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 d3eac90..de73526 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,13 @@ 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},
-        {SETCARD, &MainViewSample::InitSetMainPage},
         {GOAL, &MainViewSample::InitGoalPage},
         {SLEEP, &MainViewSample::InitSleepPage},
 
@@ -215,7 +215,7 @@ namespace OHOS
         VertViewLoad();
         mainSwipeGroup->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
         mainSwipeGroup->SetAnimatorTime(50); // 50: animator drag time(ms);
-        mainSwipeGroup->SetLoopState(false); // 关闭主界面循环
+        mainSwipeGroup->SetLoopState(true);  // 关闭主界面循环
         mainSwipeGroup->EnableScreenCap(true);
         mainSwipeGroup->RegisterSwipeCallback(callback);
         if (presenter_->IsFromSetCardView())

diff --git a/tools/image_converter_tool/test/hert/maincard/SleepCard.png:Zone.Identifier b/tools/image_converter_tool/test/hert/maincard/SleepCard.png:Zone.Identifier
deleted file mode 100644 (file)
index 053d112..0000000
--- a/tools/image_converter_tool/test/hert/maincard/SleepCard.png:Zone.Identifier
+++ /dev/null
@@ -1,3 +0,0 @@
-[ZoneTransfer]\r
-ZoneId=3\r
-HostUrl=about:internet\r