禅道1442：解决手表-蓝牙-连接蓝牙耳机后显示异常，无法重连问题

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp
index 0250e22..7ef18ff 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp
@@ -167,7 +167,7 @@ namespace OHOS
         /* ------------------------------ 检查ACL链路是否连接。 ------------------------------ */\r
 \r
         {\r
-            #ifdef SUPPORT_BT_SERVICE\r
+            #ifdef SUPPORT_BLE_SERVICE\r
             bool aclConnected = bt_is_acl_connected((const bd_addr_t *)&infoData.addr);\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BluetoothItemView::SetConnectionstatus aclConnected %d", aclConnected);\r
             #else\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp
index 0250e22..7ef18ff 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp
@@ -167,7 +167,7 @@ namespace OHOS
         /* ------------------------------ 检查ACL链路是否连接。 ------------------------------ */\r
 \r
         {\r
-            #ifdef SUPPORT_BT_SERVICE\r
+            #ifdef SUPPORT_BLE_SERVICE\r
             bool aclConnected = bt_is_acl_connected((const bd_addr_t *)&infoData.addr);\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BluetoothItemView::SetConnectionstatus aclConnected %d", aclConnected);\r
             #else\r

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp
index 0250e22..7ef18ff 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp
@@ -167,7 +167,7 @@ namespace OHOS
         /* ------------------------------ 检查ACL链路是否连接。 ------------------------------ */\r
 \r
         {\r
-            #ifdef SUPPORT_BT_SERVICE\r
+            #ifdef SUPPORT_BLE_SERVICE\r
             bool aclConnected = bt_is_acl_connected((const bd_addr_t *)&infoData.addr);\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BluetoothItemView::SetConnectionstatus aclConnected %d", aclConnected);\r
             #else\r

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 42cba78..997a311 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -383,7 +383,6 @@ target = {
             #'ENABLE_VIBRATOR',
             'ENCODER_SUPPORT',
             'SUPPORT_CAT1_HFP_AG_SERV',
-            # 'SUPPORT_BT_SERVICE',
             # 'SUPPORT_PHONE_SERVICE',
             # 'SUPPORT_SPO2_NOTIFICATION',
             # 'SUPPORT_SPO2_NOTIFICATION_TEST',
@@ -982,6 +981,7 @@ target = {
             # 'ENABLE_SHAPING',
             'SUPPORT_CHARGER_PLUG_DETECTION_NOTIFICATION',
             # 'SUPPORT_AT_CUSTOMUTILS',
+            'SUPPORT_CAT1_HFP_AG_SERV',
             'SUPPORT_BLE_SERVICE',
             'SUPPORT_MAG_SERVICE',
             'SUPPORT_PPG_SERVICE',