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

Code review from 胡传军

* refs/changes/708/head: (5 commits squashed)

  - 修改br连接接口 改用消息机制 增加回连判断 实际实现传统蓝牙开关关闭则br连接不上(有BUG)

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

  - 增加连接中 UI 及部分蓝牙问题修正

  - 重新打开br广播

  - 合并

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/708

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 0f40874..461471e 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
@@ -307,7 +307,7 @@ void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, gap_bl
             free_ble_data(); \r
             if(cm_custom_ble_service_on_flag())           \r
             svr_ble_adv_start();\r
-\r
+                  \r
             ble_disconnect_ok();                 \r
         // }    \r
     } else {\r
@@ -370,8 +370,12 @@ void svr_pair_result_cbt_cb(uint16_t conn_id, const bd_addr_t *addr, errcode_t s
                 uapi_get_br_address(&bdaddr);\r
                 if(false==(bt_is_acl_connected(&bdaddr)))\r
                 {\r
-                    int ret=gap_reconnect_media_device(&bdaddr);\r
-                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_reconnect_media_device!!! %X\r\n",ret);\r
+                    if(cm_get_A2DP_switch() || cm_get_HFP_switch())\r
+                    {\r
+                        int ret=gap_reconnect_media_device(&bdaddr);\r
+                        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_reconnect_media_device!!! %X\r\n",ret);\r
+                    }\r
+                   \r
                 }\r
                 else\r
                 {\r
@@ -1452,7 +1456,7 @@ void custom_ble_service_start(void)
     AdverFlag = true;\r
     svr_ble_adv_start_param();\r
    \r
-    gap_br_set_bt_scan_mode(GAP_SCAN_MODE_NONE, 0);\r
+    //gap_br_set_bt_scan_mode(GAP_SCAN_MODE_CONNECTABLE, 0);\r
    \r
 }\r
 \r
@@ -1461,7 +1465,7 @@ void custom_ble_service_start_(uint8_t data)
     AdverFlag = true;\r
     svr_ble_adv_start_param();\r
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "custom_ble_service_start_ ");\r
-    gap_br_set_bt_scan_mode(GAP_SCAN_MODE_NONE, data);\r
+    gap_br_set_bt_scan_mode(GAP_SCAN_MODE_CONNECTABLE, data);\r
    \r
 }\r
 #define MODE_BLE_ADV_SRV (0)\r