From: SnickerSun Date: Thu, 20 Jun 2024 13:59:52 +0000 (+0800) Subject: 优化蓝牙名字初始化流程,只有名字不同才设置蓝牙名称。 X-Git-Tag: release_V1.2.70_20241020_135402~948^2~28 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=23d49024cf17acd776f3c3b42790b078679c4153;p=mirrors%2FFD230.git 优化蓝牙名字初始化流程,只有名字不同才设置蓝牙名称。 --- 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 aef644db4..40fd0ee5c 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c @@ -156,22 +156,8 @@ static void svr_ble_adv_data_set(int adv_id) unsigned char addr[BLE_MAC_MAX_LEN] = {0}; unsigned int len = BLE_MAC_MAX_LEN; errcode_t ret = 0; -#if 1 - bd_addr_t addr_info; - memset(addr,0,6); - bluetooth_get_local_addr(&addr[0],len); - char watchName[32]; - memset_s(watchName, sizeof(watchName), 0, sizeof(watchName)); - (void)sprintf_s(watchName, sizeof(watchName), "%s %02X%02X",BLE_DEFAULT_NAME,addr[1],addr[0]); - // (void)sprintf_s(watchName, sizeof(watchName), "%s",BLE_DEFAULT_NAME); - ret = bluetooth_set_local_name((unsigned char*)watchName, strlen((char*)watchName) + 1); - if (ret == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bt SetLocalName ret = 0x%x", ret); - } -#else - bluetooth_get_local_addr(&addr[0],len); -#endif + ret = bluetooth_get_local_name(ble_name, &ble_name_len); if (ret != 0) { @@ -180,6 +166,26 @@ static void svr_ble_adv_data_set(int adv_id) memcpy_s(ble_name, BLE_NAME_LENGTH,BLE_DEFAULT_NAME, BLE_DEFAULT_NAME_LEN); ble_name_len = BLE_DEFAULT_NAME_LEN + 1; } + + memset(addr,0,6); + bluetooth_get_local_addr(&addr[0],len); +#if 1 //如果蓝牙名称不正确,按照规则重命名 + char watchName[BLE_NAME_LENGTH]; + memset_s(watchName, sizeof(watchName), 0, sizeof(watchName)); + (void)sprintf_s(watchName, sizeof(watchName), "%s %02X%02X",BLE_DEFAULT_NAME,addr[1],addr[0]); + // (void)sprintf_s(watchName, sizeof(watchName), "%s",BLE_DEFAULT_NAME); + int watch_name_len = strlen(watchName); + int cmp_len = watch_name_len>ble_name_len?ble_name_len:watch_name_len; + if (strncmp(ble_name,watchName,cmp_len) != 0 ) + { + ret = bluetooth_set_local_name((unsigned char*)watchName, strlen((char*)watchName) + 1); + if (ret == false) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bt SetLocalName ret = 0x%x", ret); + } + memcpy_s(ble_name,BLE_NAME_LENGTH,watchName,BLE_NAME_LENGTH); + } +#endif + int k = BD_ADDR_LEN; for (int i = 0; i < BD_ADDR_LEN; i++) { ble_data_mac_switch[--k] = addr[i];