From: Caisking <3449750381@qq.com>
Date: Thu, 5 Sep 2024 10:43:39 +0000 (+0800)
Subject: #475设置-跟换表盘 开关按钮太大，全是黑色背景没有区分框
X-Git-Tag: release_V1.2.70_20241020_135402~518^2~22
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=0e26a27e55f6e759d72274d9cb5119438db69d8d;p=mirrors%2FFD230.git

#475设置-跟换表盘 开关按钮太大，全是黑色背景没有区分框
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/include/SetDialStyleView.h b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/include/SetDialStyleView.h
index 031fe01f3..8e7c232b2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/include/SetDialStyleView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/include/SetDialStyleView.h
@@ -40,10 +40,10 @@ namespace OHOS
         void OnClick(UIView &view);
 
     private:
-        UILabel labelTitle_;
+        UILabelExt labelTitle_;
 
-        UILabel labelCover_;
-        UILabel labelRoller_;
+        UILabelExt labelCover_;
+        UILabelExt labelRoller_;
 
         UIToggleButton btnCover_;
         UIToggleButton btnRoller_;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStylePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStylePresenter.cpp
index d89c52e25..81dfa5718 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStylePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStylePresenter.cpp
@@ -49,11 +49,6 @@ namespace OHOS
         if ((event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) &&
             (event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY()))))
         {
-#if 0
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingPresenter::OnDrag ChangeSlice");
-            uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-            NativeAbility::GetInstance().ChangeSlice(preSlice);
-#endif
             NativeAbility::GetInstance().Back();
         }
         return true;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp
index 580a0163d..6413ce44b 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp
@@ -1,9 +1,16 @@
+/*** 
+ * @Date: 2024-07-05 11:09:20
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-09-05 18:09:22
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp
+ */
 
 
 #include "SetDialStyleView.h"
 #include "SetDialStyleModel.h"
 #include "SetDialStylePresenter.h"
 #include "UiConfig.h"
+#include "ui_resource_string.h"
 namespace OHOS
 {
     SetDialStyleView::SetDialStyleView()
@@ -53,19 +60,19 @@ namespace OHOS
 
         labelTitle_.SetPosition(83, 50, 300, 60);
         labelTitle_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
-        labelTitle_.SetText("表盘样式");
+        labelTitle_.SetTextId(STR_BROWSING_SPECIAL_EFFECTS);
         labelTitle_.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); // 居中
         labelTitle_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         container_->Add(&labelTitle_);
 
         labelCover_.SetPosition(90, 153, 200, 60);
         labelCover_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
-        labelCover_.SetText("覆盖流样式");
+        labelCover_.SetTextId(STR_OVERLAY_FLOW);
         container_->Add(&labelCover_);
 
         labelRoller_.SetPosition(90, 273, 200, 60);
         labelRoller_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
-        labelRoller_.SetText("滚筒样式");
+        labelRoller_.SetTextId(STR_ROLLER);
         container_->Add(&labelRoller_);
 
         btnCover_.SetPosition(298, 145, 100, 50);
@@ -125,6 +132,6 @@ namespace OHOS
             }
         }
         // 切换到切换表盘Slice
-        NativeAbility::GetInstance().ChangeSlice(VIEW_SET_DIAL);
+        // NativeAbility::GetInstance().ChangeSlice(VIEW_SET_DIAL);
     }
 } // OHOS
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
index 1154f2cbc..f8acb67ab 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
@@ -34,7 +34,7 @@ namespace OHOS
         settings[index++] = {VIEW_MOTION_RECOGNITION, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true};
         settings[index++] = {VIEW_DNOTDISTURB, PNG_APPLIST_DISTURB_IMAGE, STR_DO_NOT_DISTURB, true};
         settings[index++] = {VIEW_ADD_CARD, PNG_APPLIST_CARDSET_IMAGE, STR_CARD_MANAGEMENT, true};
-        settings[index++] = {VIEW_SET_DIAL_STYLE, PNG_APPLIST_CHANGEDIAL_IMAGE, STR_WATCH_FACE, true};
+        settings[index++] = {VIEW_SET_DIAL_STYLE, PNG_APPLIST_CHANGEDIAL_IMAGE, STR_DIAL_BROWSING_SPECIAL_EFFECTS, true};
         settings[index++] = {VIEW_SAVEELE, PNG_APPLIST_SAVEELE_IMAGE, STR_POWER_SAVE_MODE, true};
         settings[index++] = {VIEW_SYSTEM, PNG_SETTINGS_SYSTEM, STR_SYSTEM, true};
         // settings[index++] = {VIEW_REBOOTANDSHUTDOWN, PNG_SETTINGS_SHUTDOWN_AND_RESTART, STR_SHUTDOWN_AND_RESTART, true};