From: 胡传军 <1224667075@qq.com>
Date: Sat, 9 Nov 2024 08:59:00 +0000 (+0000)
Subject: Merge #1376 into sdk602patch0911 from refs/changes/1376/head
X-Git-Tag: fd230_release_V1.3.102~97^2~4
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=776d38fcc41cf64bb2cfbf9150778dd60528628a;p=mirrors%2FFD230.git

Merge #1376 into sdk602patch0911 from refs/changes/1376/head

Code review from 胡传军

* refs/changes/1376/head: (7 commits squashed)

  - 取消 activity多余的订阅消息

  - 取消订阅

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

  - 修改4G电话处理流程，改为postgraphicevent

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

  - 蓝牙修改

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1376
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
index 3c7face64..a77170817 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
@@ -411,19 +411,25 @@ namespace OHOS
 
     void BluetoothServiceOptionsView::show_connecting_view(bool data)
     {
-        
+        if(connectingScrollView)
         connectingScrollView->SetVisible(data);
+
         if(data==false)
         {
+            if(A2DP_ToggleButton)
             A2DP_ToggleButton->SetState(uapi_a2dp_snk_get_device_connect_state());
+
+            if(HFP_ToggleButton)
             HFP_ToggleButton->SetState(uapi_hfp_connect_state()); // ConfigModel::GetInstance()->GetHFPState());
         }
     }
 
     void BluetoothServiceOptionsView::Button_UPdata(void)
     {
-        
+        if(A2DP_ToggleButton)
         A2DP_ToggleButton->SetState(uapi_a2dp_snk_get_device_connect_state());
+        
+        if(HFP_ToggleButton)
         HFP_ToggleButton->SetState(uapi_hfp_connect_state()); // ConfigModel::GetInstance()->GetHFPState());
         
     }