From c8831ce7547b933752e04f988a18a4640b6f1dda Mon Sep 17 00:00:00 2001
From: hcj <1224667075@qq.com>
Date: Fri, 27 Sep 2024 14:38:25 +0800
Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E5=AE=89=E5=8D=93=E8=BF=9E?=
 =?utf8?q?=E6=8E=A5=E8=80=B3=E6=9C=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../src/BluetoothCaseListAdapter.cpp          | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp
index a9003d33f..43b524601 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp
@@ -89,15 +89,28 @@ public:
 
         // 判断是否正在连接
         bd_addr_t *lastAddr = BluetoothModel::GetInstance()->GetLastConnedAddr();
+
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disconnect LastDevice retVal = %02X %02X %02X * * *",
+           lastAddr->addr[0],lastAddr->addr[1],lastAddr->addr[2]);
+        
+     
         bool ret = bt_is_acl_connected(lastAddr);
-        if (ret) {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disconnect LastDevice retVal =  ret %d %02X %02X %02X * * *",
+           ret, lastAddr->addr[0],lastAddr->addr[1],lastAddr->addr[2]);
+        
+        
+        if (!( lastAddr->addr[0] == 0 && lastAddr->addr[1] == 0 && lastAddr->addr[2] == 0
+         && lastAddr->addr[3] == 0 && lastAddr->addr[4] == 0 && lastAddr->addr[5] == 0 ) && ret) {
             BluetoothModel::GetInstance()->SetTagConnectNew(true);
             errcode_t retVal = gap_disconnect_remote_device(lastAddr);
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Disconnect LastDevice retVal =  %d", retVal);
-        } else {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disconnect LastDevice retVal =  %d %02X %02X %02X * * *", retVal,
+            lastAddr->addr[0],lastAddr->addr[1],lastAddr->addr[2]);
+        }
+        else
+        {
             mainBluetoothView->ChangeView(BluetoothModel::GetInstance()->GetCurView(), BLUETOOTHRECONNECTVIEW);
             errcode_t retVal = BluetoothModel::GetInstance()->ConnectRemoteDevice(&addr);
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ConnectRemoteDevice ret =  %d", retVal);
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ConnectRemoteDevice ret =  %d", retVal);
         }
         // 跳转可选页
         return true;
-- 
2.17.1