1.下拉菜单添加更新蓝牙，4G图标状态函数

2.开启和关闭蓝牙和4G和勿扰操作类似，都为未开启进入视图开启，关闭则可直接快捷关闭

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h
index c72d98d..e569d97 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-08-21 11:54:00
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-24 10:15:32
+ * @LastEditTime: 2024-08-26 20:21:33
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h
  */
 #ifndef __DROPDOWN_CARD_PAGE1_H__
@@ -49,6 +49,8 @@ namespace OHOS
         void ClearAll();
 
         UIToggleButton *GetDropDownCardPage1_ToggleButton(int index);
+        void UpdateBTState(bool state);
+        void Updat4GState(bool state);
         void UpdateDnotdisturbState(bool state);
         void UpdateSleepModelState(bool state);
 

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 87e58c3..c7c2232 100644 (file)
--- 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-24 10:19:09
+ * @LastEditTime: 2024-08-26 20:29:37
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
  */
 #include "main/include/dropdown/DropDownCardPage1.h"
@@ -76,25 +76,28 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::OnClick %s ", view.GetViewId());
         if (viewId == DROPDOWN_BT_TOGGLEBUTTON_VIEWID) // 蓝牙开关
         {
-            state = toggleButton[DropDownCardPage1::toggleButton_BT]->GetState();
-            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开关
         {
-            state = toggleButton[DropDownCardPage1::toggleButton_4G]->GetState();
-            if (state)
+            if (ConfigModel::GetInstance()->GetCat1_4Gability() == false)
             {
-                uapi_set4GCapability(true);
-                ConfigModel::GetInstance()->SetCat1_4Gability(uapi_cat1_get_power_stat());
+                NativeAbility::GetInstance().EnterSlice(VIEW_NETWORKANDCALL);
             }
             else
             {
-#if defined(A5133_DEMO_CLIENT) || defined(A5133_DEMO_SERVER)
-                uapi_set4GCapability(true);
-#else
-                uapi_set4GCapability(false);
-#endif
-                ConfigModel::GetInstance()->SetCat1_4Gability(uapi_cat1_get_power_stat());
+                state = toggleButton[DropDownCardPage1::toggleButton_4G]->GetState();
+                Updat4GState(state);
+                ConfigModel::GetInstance()->SetCat1_4Gability(state);
             }
         }
         else if (viewId == DROPDOWN_ALIPAY_TOGGLEBUTTON_VIEWID) // 支付宝
@@ -181,8 +184,8 @@ namespace OHOS
         bool state_dnotdisturb = DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled();
 
         ToggleButtonConfig toggleButtonConfig[] = {
-            {0, 0, 100, 100, DROPDOWN_BT_TOGGLEBUTTON_VIEWID, DROPDOWN_BT_IMAGE, DROPDOWN_BT_IMAGE, true, true},
-            {110, 0, 100, 100, DROPDOWN_4G_TOGGLEBUTTON_VIEWID, DROPDOWN_4G_ON_IMAGE, DROPDOWN_4G_OFF_IMAGE, true, state_4g},
+            {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},
+            {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},
             {55, 100, 100, 100, DROPDOWN_SLEEP_TOGGLEBUTTON_VIEWID, state_sleep ? DROPDOWN_SLEEP_ON_IMAGE : DROPDOWN_SLEEP_OFF_IMAGE, state_sleep ? DROPDOWN_SLEEP_ON_IMAGE : DROPDOWN_SLEEP_OFF_IMAGE, true, state_sleep},
@@ -223,6 +226,24 @@ namespace OHOS
         return toggleButton[index];
     }
 
+    void DropDownCardPage1::UpdateBTState(bool state)
+    {
+        if (toggleButton[DropDownCardPage1::toggleButton_BT] != nullptr)
+        {
+            const char *ImageSrc = state ? DROPDOWN_BT_CONNECT_IMAGE : DROPDOWN_BT_DISCONNECT_IMAGE;
+            toggleButton[DropDownCardPage1::toggleButton_BT]->SetImages(ImageSrc, ImageSrc);
+        }
+    }
+
+    void DropDownCardPage1::Updat4GState(bool state)
+    {
+        if (toggleButton[DropDownCardPage1::toggleButton_4G] != nullptr)
+        {
+            const char *ImageSrc = state ? DROPDOWN_4G_ON_IMAGE : DROPDOWN_4G_OFF_IMAGE;
+            toggleButton[DropDownCardPage1::toggleButton_4G]->SetImages(ImageSrc, ImageSrc);
+        }
+    }
+
     void DropDownCardPage1::UpdateDnotdisturbState(bool state)
     {
         if (toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB] != nullptr)
@@ -238,7 +259,7 @@ namespace OHOS
         if (toggleButton[DropDownCardPage1::toggleButton_SLEEP] != nullptr)
         {
             const char *ImageSrc = state ? DROPDOWN_SLEEP_ON_IMAGE : DROPDOWN_SLEEP_OFF_IMAGE;
-            toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB]->SetImages(ImageSrc, ImageSrc);
+            toggleButton[DropDownCardPage1::toggleButton_SLEEP]->SetImages(ImageSrc, ImageSrc);
         }
     }
 }
\ No newline at end of file