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 0225d40..15259fa 100644 (file)
--- 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());\r
         // if(AdverFlag == true){\r
             free_ble_data();            \r
-            svr_ble_adv_start();                        \r
+            svr_ble_adv_start();       \r
+            ble_disconnect_ok();                 \r
         // }    \r
     } else {\r
         devpair_state = 0;//\r
@@ -305,7 +306,8 @@ void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, gap_bl
         }              \r
         set_phone_info(addr);\r
 \r
-        //扫描ios的ANCS服务,扫描到服务后会自动建立连接，并订阅服务\r
+\r
+        ble_connect_ok();\r
        \r
 \r
         //int ret= a2dp_snk_connect(addr);\r
@@ -316,7 +318,7 @@ void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, gap_bl
         \r
         Bleconnect = GAP_BLE_STATE_CONNECTED;//蓝牙已连接\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GAP_BLE_STATE_CONNECTED!!! 0x%x\r\n",pair_state);\r
-        //连接上ble，此时如果没有连接上A2DP或者HFP则开启自动回连去连接\r
+       \r
        \r
         \r
     }\r
@@ -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)\r
 {\r
     devpair_state = 1;//代表配对成功了\r
+\r
     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],\r
     addr->addr[2],addr->addr[3],addr->addr[4],addr->addr[5],status);\r
     //if(get_notify_switch())\r
-    ble_ancs_client_cmd_setup_and_subscribe(g_ble_conn_id);\r
+    if(status==ERRCODE_SUCC)\r
+    {\r
+        ble_ancs_client_cmd_setup_and_subscribe(g_ble_conn_id);\r
 \r
-     gap_reconnect_media_device(&phone_addr);\r
+        if(get_ctkd_flag())\r
+        {\r
+           \r
+            int ret=gap_reconnect_media_device(&phone_addr);\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_reconnect_media_device!!! %X\r\n",ret);\r
+        }       \r
+    }\r
+   \r
 \r
     //if(!uapi_a2dp_snk_get_device_connect_state() || !uapi_hfp_connect_state())\r
     \r
@@ -1252,7 +1264,7 @@ void svr_ble_bluetooth_init(void)
     //     return ;\r
     // }\r
 \r
-    //清除上次内容\r
+    //清除上次内容r\r
   \r
 \r
     // osDelay(100);\r