From f007d27d979a3fb7ae1636174597b8cc38bc386b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Tue, 13 Aug 2024 13:13:14 +0000 Subject: [PATCH] Merge #695 into sdk602patch0626 from refs/changes/695/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/695 --- .../service/ble_service/bleservice/bleEvent.c | 13 +++++++++++++ .../service/ble_service/bleservice/bleService.c | 13 +++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) 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 169f2d8dc..f84f65b74 100644 --- 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 { ble_set_pair(0); + + errcode_t ret = gap_ble_set_ctkd_enable(true); + } CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,(uint8_t *)buf,devnamelen+2); @@ -1052,6 +1055,16 @@ void sendBindInfor(uint8_t *data) // WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gap_ble_set_ctkd_enable ret = %x", ret); // set_ctkd_flag(true); // } + if(get_ble_pair()) + { + set_ctkd_flag(true); + errcode_t ret = gap_ble_set_ctkd_enable(true); + + } + else + { + errcode_t ret = gap_ble_set_ctkd_enable(true); + } printf("phone_addr:%02x-%02x-%02x-%02x-%02x-%02x type:%d ",phone_addr.addr[0],phone_addr.addr[1],phone_addr.addr[2], phone_addr.addr[3],phone_addr.addr[4],phone_addr.addr[5],phone_addr.type); 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 c451425a4..68c3e5581 100644 --- 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 { gap_br_set_bt_scan_mode(GAP_SCAN_MODE_NONE, 20); - if(!uapi_dev_runtime_get_android_connection_status()) + if(get_ble_pair()) { int ret=gap_reconnect_media_device(&phone_addr); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_reconnect_media_device!!! %X\r\n",ret); @@ -363,6 +363,16 @@ void svr_pair_result_cbt_cb(uint16_t conn_id, const bd_addr_t *addr, errcode_t s }else{ + if(false==(bt_is_acl_connected(addr))) + { + int ret=gap_reconnect_media_device(&phone_addr); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_reconnect_media_device!!! %X\r\n",ret); + } + else + { + uapi_a2dp_snk_connect(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_a2dp_snk_connect!!! \r\n"); + } // int ret = gap_connect_remote_device(addr); // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_connect_remote_device!!! %X\r\n",ret); @@ -1425,7 +1435,6 @@ void custom_ble_service_stop(void) void uapi_ble_disconnect_device() { errcode_t ret = 0; - ret = gap_ble_disconnect_remote_device((const bd_addr_t *)&phone_addr);//与固定的mac设置地址进行断开连接 WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gap_ble_disconnect_remote_device ret = %X", ret); -- 2.17.1