修复运动表盘切换失败

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
index 2f3c214..0080f3a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
@@ -51,7 +51,7 @@ namespace OHOS
         {DEFAULT_DIAL_ID_1, "KUMI"},
 #endif
         {DEFAULT_DIAL_ID_2, "classic"},     // 经典表盘
-        {DEFAULT_DIAL_ID_3, "sportdial"},   // 运动表盘
+        {DEFAULT_DIAL_ID_3, "sport"},       // 运动表盘
         {DEFAULT_DIAL_ID_4, "galaxy"},      // 星空表盘
         {MAX_DEFAULT_DIAL_ID, "satellite"}, // 卫星表盘
     };

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp
index 619c335..3fd875e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp
@@ -48,18 +48,10 @@ namespace OHOS
         std::vector<SetDialInfo> &dialInfo = presenter_->GetDialInfo();
         for (auto iter : dialInfo)
         {
-            if (iter.dialFlag)
-            {
-                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDialView::SetUpCoverflowView  description %s",
-                              iter.description.c_str());
-                coverflow_.Add(iter.description.c_str(), iter.preImageInfo);
-            }
-            else
-            {
-                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDialView::SetUpCoverflowView  dialName %s",
-                              iter.dialName.c_str());
-                coverflow_.Add(iter.dialName.c_str(), iter.preImageInfo);
-            }
+
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDialView::SetUpCoverflowView  dialName %s",
+                          iter.dialName.c_str());
+            coverflow_.Add(iter.dialName.c_str(), iter.preImageInfo);
         }
         lastIndex_ = presenter_->GetPageIndex();
         coverflow_.SetCurrentPage(lastIndex_);
@@ -96,19 +88,7 @@ namespace OHOS
         std::vector<SetDialInfo> &dialInfo = presenter_->GetDialInfo();
         for (auto iter : dialInfo)
         {
-            bool succ = false;
-            if (iter.dialFlag)
-            {
-                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDialView::SetUpCoverflowView  description %s",
-                              iter.description.c_str());
-                succ = rollerView_.AddItem(iter.description.c_str(), iter.preImageInfo);
-            }
-            else
-            {
-                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDialView::SetUpCoverflowView  dialName %s",
-                              iter.dialName.c_str());
-                succ = rollerView_.AddItem(iter.dialName.c_str(), iter.preImageInfo);
-            }
+            bool succ = rollerView_.AddItem(iter.dialName.c_str(), iter.preImageInfo);
             rollerItemNum_ += succ ? 1 : 0;
         }
         float scalerCoef = 0.55;

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin
index 0318d8e..7dcb4e1 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2601230e222f40e8d73ade7ced312b044741565baa3e7867dea1521284c8ddfb
-size 336893
+oid sha256:cf0d391926886e79f8db09ff61bc22ad9cd202a931ece38407f409ae8775e0b8
+size 344285