ln去除部分不必要服务

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
index 2137417..565b271 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -104,7 +104,7 @@ void BluetoothModel::InitBluetoothInfo(void)
         uint32_t currentUs = uapi_tcxo_get_us();\r
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "currentUs 0x%x", currentUs);\r
         // 设置蓝牙名称\r
-        (void)sprintf_s(watchName, sizeof(watchName), "Watch%x", (currentUs & 0xFFFF));\r
+        (void)sprintf_s(watchName, sizeof(watchName), "LN%x", (currentUs & 0xFFFF));\r
         ret = bluetooth_set_local_name((unsigned char*)watchName, strlen((char*)watchName) + 1);\r
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bluetooth_set_local_name %s ret = %u", watchName, ret);\r
 \r
@@ -135,26 +135,12 @@ void BluetoothModel::Init()
     ret = enable_bt_stack();\r
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt enable_bt_stack ret = %u", ret);\r
 \r
-    // 设置安全连接\r
-    gap_ble_sec_params_t sec_param = { 1, GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT, 1, GAP_BLE_GAP_SECURITY_MODE1_LEVEL3 };\r
-    ret = gap_ble_set_sec_param(&sec_param);\r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt gap_ble_set_sec_param ret = %u", ret);\r
-\r
     InitBluetoothInfo();\r
     BtInitCallBacks();\r
-    wrapper_ble_register();\r
 \r
-    BtInitCallBacksEx();\r
-    BtInitGatts();\r
-    BtInitSpp();\r
     InitBtHeadsetEvent(); // 蓝牙ct和tg适配初始化\r
     PhoneServiceInit();\r
-    // gap_remove_all_pairs();\r
     BtA2dpInit();\r
-\r
-    /* 实验室测试需要，开机开广播 */\r
-    BleAdvStart();\r
-\r
 #endif\r
 }\r
 \r
@@ -1203,12 +1189,15 @@ static void A2dpSrcConnectstateChanged(bd_addr_t *bdAddr, int connState)
     }\r
 \r
     if (connState == PROFILE_STATE_DISCONNECTED) {\r
+\r
+\r
+\r
         if(AI_IsVoiceServiceRunning()){\r
             ln_ws_audio_deinit();\r
         }\r
 \r
-\r
         PhoneAudioManagerSetDeviceConnState(OUT_BLUETOOTH_A2DP, AUDIO_DEVICE_DISCONNECTED);\r
+\r
         set_a2dp_is_connect(false);\r
 \r
  \r