From: Caisking <3449750381@qq.com>
Date: Sat, 27 Jul 2024 05:47:58 +0000 (+0800)
Subject: 修复主界面切换表盘卡死
X-Git-Tag: release_V1.2.70_20241020_135402~730^2~12
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ef28876f522dae2c76e4de58bc1307eba5ae20ce;p=mirrors%2FFD230.git

修复主界面切换表盘卡死
---

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 3fd875e3d..81f72f900 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp
@@ -88,7 +88,9 @@ namespace OHOS
         std::vector<SetDialInfo> &dialInfo = presenter_->GetDialInfo();
         for (auto iter : dialInfo)
         {
-            bool succ = rollerView_.AddItem(iter.dialName.c_str(), iter.preImageInfo);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDialView::SetUpRollerView %s",
+                          iter.dialName.c_str());
+            bool succ = rollerView_.AddItem(iter.dialName, iter.preImageInfo);
             rollerItemNum_ += succ ? 1 : 0;
         }
         float scalerCoef = 0.55;
@@ -103,23 +105,10 @@ namespace OHOS
         label_.SetPosition(127, 50, 200, 50);
         label_.SetTextColor(Color::White());
         label_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-
-        if (dialInfo[lastIndex_].dialFlag)
-        {
-            // 切换表盘[表盘名称设置{多国语言需要配置xml里面的表盘描述}]
-            label_.SetText(dialInfo[lastIndex_].description.c_str());
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetText dialName %s",
-                          dialInfo[lastIndex_].description.c_str());
-        }
-        else
-        {
-            label_.SetText(dialInfo[lastIndex_].dialName.c_str());
-        }
-
+        label_.SetText(dialInfo[lastIndex_].dialName.c_str());
         label_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         container_->Add(&label_);
     }
-
     void SetDialView::OnSetUpView()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDialView::OnSetUpView");