From: luozheng <1732036298@qq.com>
Date: Wed, 28 Aug 2024 12:46:07 +0000 (+0800)
Subject: 下拉界面修改蓝牙图标不高亮
X-Git-Tag: release_V1.2.70_20241020_135402~563^2~9
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=c1fefedb221d988006f212039f061119d6807c50;p=mirrors%2FFD230.git

下拉界面修改蓝牙图标不高亮
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
index 259de9636..ec122c9b1 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-08-21 11:54:00
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-26 20:29:37
+ * @LastEditTime: 2024-08-28 20:38:05
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
  */
 #include "main/include/dropdown/DropDownCardPage1.h"
@@ -77,16 +77,17 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::OnClick %s ", view.GetViewId());
         if (viewId == DROPDOWN_BT_TOGGLEBUTTON_VIEWID) // 蓝牙开关
         {
-            if (ConfigModel::GetInstance()->GetClassicBlueToothState() == false)
-            {
-                NativeAbility::GetInstance().EnterSlice(VIEW_CLASSIC_BLUETOOTH);
-            }
-            else
-            {
-                state = toggleButton[DropDownCardPage1::toggleButton_BT]->GetState();
-                UpdateBTState(state);
-                ConfigModel::GetInstance()->SetClassicBlueToothState(state);
-            }
+            NativeAbility::GetInstance().EnterSlice(VIEW_CLASSIC_BLUETOOTH);
+            // if (ConfigModel::GetInstance()->GetClassicBlueToothState() == false)
+            // {
+            //     NativeAbility::GetInstance().EnterSlice(VIEW_CLASSIC_BLUETOOTH);
+            // }
+            // else
+            // {
+            //     state = toggleButton[DropDownCardPage1::toggleButton_BT]->GetState();
+            //     UpdateBTState(state);
+            //     ConfigModel::GetInstance()->SetClassicBlueToothState(state);
+            // }
         }
         else if (viewId == DROPDOWN_4G_TOGGLEBUTTON_VIEWID) // 4G开关
         {
@@ -196,7 +197,8 @@ namespace OHOS
         bool state_dnotdisturb = DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled();
 
         ToggleButtonConfig toggleButtonConfig[] = {
-            {0, 0, 100, 100, DROPDOWN_BT_TOGGLEBUTTON_VIEWID, state_bt ? DROPDOWN_BT_CONNECT_IMAGE : DROPDOWN_BT_DISCONNECT_IMAGE, state_bt ? DROPDOWN_BT_CONNECT_IMAGE : DROPDOWN_BT_DISCONNECT_IMAGE, true, state_bt},
+            // {0, 0, 100, 100, DROPDOWN_BT_TOGGLEBUTTON_VIEWID, state_bt ? DROPDOWN_BT_CONNECT_IMAGE : DROPDOWN_BT_DISCONNECT_IMAGE, state_bt ? DROPDOWN_BT_CONNECT_IMAGE : DROPDOWN_BT_DISCONNECT_IMAGE, true, state_bt},
+            {0, 0, 100, 100, DROPDOWN_BT_TOGGLEBUTTON_VIEWID, DROPDOWN_BT_IMAGE, DROPDOWN_BT_IMAGE, true, state_bt},
             {110, 0, 100, 100, DROPDOWN_4G_TOGGLEBUTTON_VIEWID, state_4g ? DROPDOWN_4G_ON_IMAGE : DROPDOWN_4G_OFF_IMAGE, state_4g ? DROPDOWN_4G_ON_IMAGE : DROPDOWN_4G_OFF_IMAGE, true, state_4g},
             {220, 0, 100, 100, DROPDOWN_ALIPAY_TOGGLEBUTTON_VIEWID, DROPDOWN_ALIPAY_IMAGE, DROPDOWN_ALIPAY_IMAGE, true, true},
             {330, 0, 100, 100, DROPDOWN_SAVEPOWER_TOGGLEBUTTON_VIEWID, state_savepower ? DROPDOWN_SAVEPOWER_ON_IMAGE : DROPDOWN_SAVEPOWER_OFF_IMAGE, state_savepower ? DROPDOWN_SAVEPOWER_ON_IMAGE : DROPDOWN_SAVEPOWER_OFF_IMAGE, true, state_savepower},