From: luozheng <1732036298@qq.com> Date: Tue, 12 Aug 2025 09:44:34 +0000 (+0800) Subject: BluetoothModel文件合并 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~188 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d1e7c4c97b72a55e94d0c1bad063876536df611b;p=mirrors%2FFD230.git 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 83dcf6cf6..a4d116fe6 100644 --- 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" #include "network/network_listener.h" #include "font/ui_font_header.h" - +#if defined(SUPPORT_LWIP) && defined(SUPPORT_BREDR) +#include "lwip_driver_adapter.h" +#endif #ifdef SUPPORT_BLE_SERVICE #include @@ -1233,6 +1235,9 @@ void GapAclStateChangedCallback(const bd_addr_t *bdAddr, gap_acl_state_t state, /* ---------------------------------- 补丁合入 ---------------------------------- */ // send to ace network // SetAclConnected(true); + #if defined(SUPPORT_LWIP) && defined(SUPPORT_BREDR) + bt_pan_open(); + #endif net_connect_status_change(NETWORK_TYPE_BLUETOOTH, CONNECTION_STATUS_CONNECTED); /* -------------------------------------------------------------------------- */ @@ -1795,6 +1800,11 @@ static void sample_gap_scan_mode_changed_callback(int mode) } +static void BleConnectCallback(uint16_t conn_id, errcode_t status, const gap_ble_conn_param_update_t *param) +{ + 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); +} + void BtInitCallBacks(void) { g_btGapCallBacks .scan_mode_changed_callback=sample_gap_scan_mode_changed_callback; @@ -1817,8 +1827,9 @@ void BtInitCallBacksEx() g_gapBleCallbacks.conn_state_change_cb = BleConnStateChangeCallback; g_gapBleCallbacks.start_adv_cb = BleAdvStartCallback; g_gapBleCallbacks.stop_adv_cb = BleAdvStopCallback; - g_gapBleCallbacks.terminate_adv_cb = BleAdvTerminateCallback; - wrapper_gap_ble_register_callbacks(&g_gapBleCallbacks); + g_gapBleCallbacks.terminate_adv_cb = BleAdvTerminateCallback; + g_gapBleCallbacks.conn_param_update_cb = BleConnectCallback; + wrapper_gap_ble_register_callbacks(&g_gapBleCallbacks); g_btGattsCallbacks.add_service_cb = BtGattsServiceAddCallback; g_btGattsCallbacks.add_characteristic_cb = BtGattsCharacteristicAddCallback; @@ -1900,10 +1911,6 @@ void BtSppServerCreate(const char *spp_uuid, const char *name, uint8_t name_len) param.socket_type = SPP_SOCKET_RFCOMM; param.is_encrypt = true; - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "uuid: %s uuid_len: %u\n", spp_uuid, param.uuid.uuid_len); - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "socket_type: %x is_encrypt: %d name: %s nameLen: %u\n", param.socket_type, - param.is_encrypt, name, name_len); - int ret = spp_server_create(¶m, name, name_len); WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "spp_server_create ret: %x\n", ret); } @@ -1911,12 +1918,9 @@ void BtSppServerCreate(const char *spp_uuid, const char *name, uint8_t name_len) static int BtSppServerAcceptTaskBody(void *data) { int server_id = (int)(intptr_t)data; - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "server_id: %x\n", server_id); - int ret = spp_server_accept(server_id); - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "spp_server_accept ret: %x\n", ret); - + WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "spp_server_accept ret: %x, server_id: %d\r\n", ret, server_id); return OSAL_SUCCESS; }