From: luozheng <1732036298@qq.com> Date: Tue, 23 Jul 2024 10:25:38 +0000 (+0800) Subject: 通过下拉,刷新蓝牙连接状态,解决手机关闭蓝牙后手机还显示已连接问题需要等待一会才会显示断开连接 X-Git-Tag: release_V1.2.70_20241020_135402~760 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=945fc4de4bfdc132c70ce9be99b26a97ad56d80f;p=mirrors%2FFD230.git 通过下拉,刷新蓝牙连接状态,解决手机关闭蓝牙后手机还显示已连接问题需要等待一会才会显示断开连接 --- 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()); } // 下拉视图初始化