修改遗漏的蓝牙连接耳机的mac地址大小写的问题

diff --git a/2.code/1.sdk/apps/BK_app/BK_drive/bk_uart.c b/2.code/1.sdk/apps/BK_app/BK_drive/bk_uart.c
index c6c1ab8..bc9ea99 100644 (file)
--- a/2.code/1.sdk/apps/BK_app/BK_drive/bk_uart.c
+++ b/2.code/1.sdk/apps/BK_app/BK_drive/bk_uart.c
@@ -902,7 +902,7 @@ int uart_send_bt_state(u8 bt_state) //蓝牙向4G发送蓝牙耳机的状态
     // BT_CONN_STATE_NOT_FOUND = 4
     char s_mac[18];
     memset(s_mac,0,18);
-    sprintf(s_mac,"%02x:%02X:%02X:%02X:%02X:%02X",maddr[0],maddr[1],maddr[2],maddr[3],maddr[4],maddr[5]);
+    sprintf(s_mac,"%02X:%02X:%02X:%02X:%02X:%02X",maddr[0],maddr[1],maddr[2],maddr[3],maddr[4],maddr[5]);
     // cJSON_AddStringToObject(data, "name", (char *)userremote_name);
     cJSON_AddStringToObject(data, "mac", (char *)s_mac);
     if(bt_state == 1){
@@ -997,28 +997,8 @@ void clear_earphone_record(void){
     if(bt_connect){
         user_emitter_cmd_prepare(USER_CTRL_DISCONNECTION_HCI, 0, NULL);
     }
-    u8 *current_mac = get_cur_connect_emitter_mac_addr();
-    for(u8 i=0;i<6;i++)
-    {
-        printf("%02x",current_mac[i]);
-    }
-    bd_addr_t *connect_bd_addr = NULL;
-    for(u8 i=0;i<6;i++)
-    {
-        printf("%02x",bt_conn_addr[i]);
-    }
-    if(bt_conn_addr[0] != 0x00 || bt_conn_addr[1] != 0x00 || bt_conn_addr[2] != 0x00 || bt_conn_addr[3] != 0x00 || bt_conn_addr[4] != 0x00 || bt_conn_addr[5] != 0x00){
-        connect_bd_addr=malloc(sizeof(bd_addr_t));
-        if(connect_bd_addr == NULL){
-            return;
-        }
-        memcpy(connect_bd_addr,bt_conn_addr,6);
-        printf("删除成功");
-        delete_link_key(connect_bd_addr,1);
-    }
-    // user_emitter_cmd_prepare(USER_CTRL_DEL_ALL_REMOTE_INFO, 0, NULL);
+    delete_last_device_from_vm();
     uart_send_clear_earphoneok();
-
 }
 int uart_send_clear_earphoneok(void)
 {

diff --git a/2.code/1.sdk/apps/BK_app/bk_app.c b/2.code/1.sdk/apps/BK_app/bk_app.c
index a79f7a1..b8d9a0b 100644 (file)
--- a/2.code/1.sdk/apps/BK_app/bk_app.c
+++ b/2.code/1.sdk/apps/BK_app/bk_app.c
@@ -139,8 +139,9 @@ void AI_VC_start(void)
     printf("AI_VC_start:AI_start_flag:%d",AI_start_flag);
     if(AI_start_flag == 0)
     {
-        if(AI_VC_1S_id == 0)
+        if(AI_VC_1S_id == 0){
             AI_VC_1S_id = sys_timer_add(NULL, AI_VC_1S_cb, 1000);
+        }
         bk_audio_open();    
         AI_start_flag = 1;
     }