Merge #695 into sdk602patch0626 from refs/changes/695/head

Code review from 胡传军

* refs/changes/695/head: (2 commits squashed)

  - 重新打开Aandirons 一键双连

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/695

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 169f2d8..f84f65b 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -1001,6 +1001,9 @@ void sendBindInfor(uint8_t *data)
                 else\r
                 {\r
                     ble_set_pair(0);\r
+               \r
+                    errcode_t ret = gap_ble_set_ctkd_enable(true);\r
+                    \r
                 }\r
                 \r
                 CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,(uint8_t *)buf,devnamelen+2);\r
@@ -1052,6 +1055,16 @@ void sendBindInfor(uint8_t *data)
                 //     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gap_ble_set_ctkd_enable ret = %x", ret);\r
                 //     set_ctkd_flag(true);\r
                 // }\r
+                if(get_ble_pair())\r
+                {\r
+                    set_ctkd_flag(true);\r
+                    errcode_t ret = gap_ble_set_ctkd_enable(true);\r
+\r
+                }\r
+                else\r
+                {\r
+                    errcode_t ret = gap_ble_set_ctkd_enable(true);\r
+                }\r
 \r
                 printf("phone_addr:%02x-%02x-%02x-%02x-%02x-%02x type:%d ",phone_addr.addr[0],phone_addr.addr[1],phone_addr.addr[2],\r
                 phone_addr.addr[3],phone_addr.addr[4],phone_addr.addr[5],phone_addr.type);\r

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 c451425..68c3e55 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
@@ -355,7 +355,7 @@ void svr_pair_result_cbt_cb(uint16_t conn_id, const bd_addr_t *addr, errcode_t s
         {\r
             gap_br_set_bt_scan_mode(GAP_SCAN_MODE_NONE, 20);\r
             \r
-            if(!uapi_dev_runtime_get_android_connection_status())\r
+            if(get_ble_pair())\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
@@ -363,6 +363,16 @@ void svr_pair_result_cbt_cb(uint16_t conn_id, const bd_addr_t *addr, errcode_t s
                 \r
             \r
             }else{\r
+                if(false==(bt_is_acl_connected(addr)))\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
+                else\r
+                {\r
+                    uapi_a2dp_snk_connect();\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_a2dp_snk_connect!!! \r\n");\r
+                }\r
                 // int ret = gap_connect_remote_device(addr);\r
                 //  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_connect_remote_device!!! %X\r\n",ret);\r
                 \r
@@ -1425,7 +1435,6 @@ void custom_ble_service_stop(void)
 void uapi_ble_disconnect_device()\r
 {\r
     errcode_t ret = 0;\r
-\r
     ret = gap_ble_disconnect_remote_device((const bd_addr_t *)&phone_addr);//与固定的mac设置地址进行断开连接\r
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gap_ble_disconnect_remote_device ret = %X", ret);\r
 \r