From: hcj <1224667075@qq.com>
Date: Sat, 20 Jul 2024 10:46:35 +0000 (+0800)
Subject: ble 状态改变提交
X-Git-Tag: release_V1.2.70_20241020_135402~745^2~20
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=6a3b7b420d52e3b28ab87fe6f4839b1822116bc2;p=mirrors%2FFD230.git

ble 状态改变提交
---

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
index 0225d4014..15259fa8c 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
@@ -293,7 +293,8 @@ void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, gap_bl
         // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GAP_BLE_STATE_DISCONNECTED!!! svr_alipay_get_adv_start_state %d alipay_get_binding_status:%d\r\n",svr_alipay_get_adv_start_state(),alipay_get_binding_status());
         // if(AdverFlag == true){
             free_ble_data();            
-            svr_ble_adv_start();                        
+            svr_ble_adv_start();       
+            ble_disconnect_ok();                 
         // }    
     } else {
         devpair_state = 0;//
@@ -305,7 +306,8 @@ void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, gap_bl
         }              
         set_phone_info(addr);
 
-        //扫描ios的ANCS服务,扫描到服务后会自动建立连接，并订阅服务
+
+        ble_connect_ok();
        
 
         //int ret= a2dp_snk_connect(addr);
@@ -316,7 +318,7 @@ void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, gap_bl
         
         Bleconnect = GAP_BLE_STATE_CONNECTED;//蓝牙已连接
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GAP_BLE_STATE_CONNECTED!!! 0x%x\r\n",pair_state);
-        //连接上ble，此时如果没有连接上A2DP或者HFP则开启自动回连去连接
+       
        
         
     }
@@ -327,12 +329,22 @@ void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, gap_bl
 void svr_pair_result_cbt_cb(uint16_t conn_id, const bd_addr_t *addr, errcode_t status)
 {
     devpair_state = 1;//代表配对成功了
+
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_pair_result_cbt_cb!!! addr 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x status:0x%x\r\n",addr->addr[0],addr->addr[1],
     addr->addr[2],addr->addr[3],addr->addr[4],addr->addr[5],status);
     //if(get_notify_switch())
-    ble_ancs_client_cmd_setup_and_subscribe(g_ble_conn_id);
+    if(status==ERRCODE_SUCC)
+    {
+        ble_ancs_client_cmd_setup_and_subscribe(g_ble_conn_id);
 
-     gap_reconnect_media_device(&phone_addr);
+        if(get_ctkd_flag())
+        {
+           
+            int ret=gap_reconnect_media_device(&phone_addr);
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_reconnect_media_device!!! %X\r\n",ret);
+        }       
+    }
+   
 
     //if(!uapi_a2dp_snk_get_device_connect_state() || !uapi_hfp_connect_state())
     
@@ -1252,7 +1264,7 @@ void svr_ble_bluetooth_init(void)
     //     return ;
     // }
 
-    //清除上次内容
+    //清除上次内容r
   
 
     // osDelay(100);