From 945fc4de4bfdc132c70ce9be99b26a97ad56d80f Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Tue, 23 Jul 2024 18:25:38 +0800
Subject: [PATCH] =?utf8?q?=E9=80=9A=E8=BF=87=E4=B8=8B=E6=8B=89=EF=BC=8C?=
 =?utf8?q?=E5=88=B7=E6=96=B0=E8=93=9D=E7=89=99=E8=BF=9E=E6=8E=A5=E7=8A=B6?=
 =?utf8?q?=E6=80=81=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=89=8B=E6=9C=BA=E5=85=B3?=
 =?utf8?q?=E9=97=AD=E8=93=9D=E7=89=99=E5=90=8E=E6=89=8B=E6=9C=BA=E8=BF=98?=
 =?utf8?q?=E6=98=BE=E7=A4=BA=E5=B7=B2=E8=BF=9E=E6=8E=A5=E9=97=AE=E9=A2=98?=
 =?utf8?q?=E9=9C=80=E8=A6=81=E7=AD=89=E5=BE=85=E4=B8=80=E4=BC=9A=E6=89=8D?=
 =?utf8?q?=E4=BC=9A=E6=98=BE=E7=A4=BA=E6=96=AD=E5=BC=80=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/main/src/PullUpDownView.cpp      | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
index 2f08ff2e6..c82401102 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-26 18:14:24
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-16 15:31:46
+ * @LastEditTime: 2024-07-23 18:13:38
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
  */
 
@@ -18,6 +18,8 @@
 #include "dnotdisturb/include/DnotDisturbModel.h"
 #include "custom_utils.h"
 #include "custom_runtime.h"
+#include "bluetooth/include/BluetoothModel.h"
+#include "phoneservice/include/PhoneService.h"
 namespace OHOS
 {
 
@@ -755,7 +757,7 @@ namespace OHOS
         }
         else if (cat1_powerOn == 1 && sim == 1)
         {
-            if (signal == SIGNAL_NO_SIGNAL) //计算信号强度
+            if (signal == SIGNAL_NO_SIGNAL) // 计算信号强度
             {
                 // 无信号UI显示
                 // UpdateCat1NoSignalisplay(true);
@@ -780,10 +782,10 @@ namespace OHOS
             }
             else
             {
-                if (cat1_network_type == NETWORK_TYPE_NO_NETWORK) 
+                if (cat1_network_type == NETWORK_TYPE_NO_NETWORK)
                 {
                     // 无信号，无4G图标 显示
-                    //UpdateCat1NoSignalisplay(true);
+                    // UpdateCat1NoSignalisplay(true);
                     UpdateCat14GDisplay(false);
                     UpdateCat1MobileDataDisplay(false);
                     // UpdateSignalBarDisplay(CalculateSignalBars(signal), false);
@@ -791,7 +793,7 @@ namespace OHOS
                 else if (cat1_network_type == NETWORK_TYPE_4G)
                 {
                     // 有4G图标，正常显示信号
-                    //UpdateCat1NoSignalisplay(false);
+                    // UpdateCat1NoSignalisplay(false);
                     UpdateCat14GDisplay(true);
                     UpdateCat1MobileDataDisplay(true);
                     // UpdateSignalBarDisplay(CalculateSignalBars(signal), true);
@@ -799,7 +801,7 @@ namespace OHOS
                 else
                 {
                     // 无4G图标，正常显示信号
-                    //UpdateCat1NoSignalisplay(false);
+                    // UpdateCat1NoSignalisplay(false);
                     UpdateCat14GDisplay(false);
                     UpdateCat1MobileDataDisplay(true);
                     // UpdateSignalBarDisplay(CalculateSignalBars(signal), true);
@@ -880,7 +882,7 @@ namespace OHOS
     /*更新移动数据图标显示*/
     void PullUpDownView::UpdateCat1MobileDataDisplay(bool state)
     {
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UpdateCat1MobileDataDisplay %d",state);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UpdateCat1MobileDataDisplay %d", state);
         if (MobileData != nullptr)
         {
             MobileData->SetVisible(state);
@@ -910,7 +912,12 @@ namespace OHOS
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UpdateSignalStrengthStatusAndBatteryPosition");
         updateSignalDisplay();
-        //UpdateBatteryPosition(GetSignalStrength());
+
+        int a2dp = uapi_a2dp_snk_get_device_connect_state();
+        int hfp = uapi_hfp_connect_state();
+        bool bluetoothstatus = (a2dp == 0 || hfp == 0) ? false : true;
+        UpdateBlueToothStatus(bluetoothstatus);
+        // UpdateBatteryPosition(GetSignalStrength());
     }
 
     // 下拉视图初始化
-- 
2.17.1