BluetoothModel文件合并

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
index 83dcf6c..a4d116f 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -44,7 +44,9 @@
 #include "uiservice/include/ui_service.h"\r
 #include "network/network_listener.h"\r
 #include "font/ui_font_header.h"\r
-\r
+#if defined(SUPPORT_LWIP) && defined(SUPPORT_BREDR)\r
+#include "lwip_driver_adapter.h"\r
+#endif\r
 \r
 #ifdef SUPPORT_BLE_SERVICE\r
 #include <bleEvent.h>\r
@@ -1233,6 +1235,9 @@ void GapAclStateChangedCallback(const bd_addr_t *bdAddr, gap_acl_state_t state,
             /* ---------------------------------- 补丁合入 ---------------------------------- */\r
             // send to ace network\r
             // SetAclConnected(true);\r
+            #if defined(SUPPORT_LWIP) && defined(SUPPORT_BREDR)\r
+            bt_pan_open();\r
+            #endif\r
             net_connect_status_change(NETWORK_TYPE_BLUETOOTH, CONNECTION_STATUS_CONNECTED);\r
             /* -------------------------------------------------------------------------- */\r
 \r
@@ -1795,6 +1800,11 @@ static void sample_gap_scan_mode_changed_callback(int mode)
     \r
 }\r
 \r
+static void BleConnectCallback(uint16_t conn_id, errcode_t status, const gap_ble_conn_param_update_t *param)\r
+{\r
+    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "BleConnectCallback conn_id:%u, interval-1:%u latency:%u timeout:%u\n",conn_id, param->interval, param->latency, param->timeout);\r
+}\r
+\r
 void BtInitCallBacks(void)\r
 {\r
     g_btGapCallBacks .scan_mode_changed_callback=sample_gap_scan_mode_changed_callback;\r
@@ -1817,8 +1827,9 @@ void BtInitCallBacksEx()
     g_gapBleCallbacks.conn_state_change_cb = BleConnStateChangeCallback;\r
     g_gapBleCallbacks.start_adv_cb = BleAdvStartCallback;\r
     g_gapBleCallbacks.stop_adv_cb = BleAdvStopCallback;\r
-        g_gapBleCallbacks.terminate_adv_cb = BleAdvTerminateCallback;\r
-        wrapper_gap_ble_register_callbacks(&g_gapBleCallbacks);\r
+    g_gapBleCallbacks.terminate_adv_cb = BleAdvTerminateCallback;\r
+    g_gapBleCallbacks.conn_param_update_cb = BleConnectCallback;\r
+    wrapper_gap_ble_register_callbacks(&g_gapBleCallbacks);\r
 \r
     g_btGattsCallbacks.add_service_cb = BtGattsServiceAddCallback;\r
     g_btGattsCallbacks.add_characteristic_cb = BtGattsCharacteristicAddCallback;\r
@@ -1900,10 +1911,6 @@ void BtSppServerCreate(const char *spp_uuid, const char *name, uint8_t name_len)
     param.socket_type = SPP_SOCKET_RFCOMM;\r
     param.is_encrypt = true;\r
 \r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "uuid: %s uuid_len: %u\n", spp_uuid, param.uuid.uuid_len);\r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "socket_type: %x is_encrypt: %d name: %s nameLen: %u\n", param.socket_type,\r
-        param.is_encrypt, name, name_len);\r
-\r
     int ret = spp_server_create(&param, name, name_len);\r
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "spp_server_create ret: %x\n", ret);\r
 }\r
@@ -1911,12 +1918,9 @@ void BtSppServerCreate(const char *spp_uuid, const char *name, uint8_t name_len)
 static int BtSppServerAcceptTaskBody(void *data)\r
 {\r
     int server_id = (int)(intptr_t)data;\r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "server_id: %x\n", server_id);\r
-\r
     int ret = spp_server_accept(server_id);\r
 \r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "spp_server_accept ret: %x\n", ret);\r
-\r
+    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "spp_server_accept ret: %x, server_id: %d\r\n", ret, server_id);\r
     return OSAL_SUCCESS;\r
 }\r
 \r