优化功能

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 aa42aab..8b1b82e 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
@@ -1137,10 +1137,20 @@ void clear_earphone_record(void){
     if(bt_connect){
         user_emitter_cmd_prepare(USER_CTRL_DISCONNECTION_HCI, 0, NULL);
     }
-    // delete_last_device_from_vm();
+    delete_last_device_from_vm();
+    u8 delete_mac[6]={0};
     uart_send_clear_earphoneok();
     printf("删除连接密钥!!!!!!!");
-    delete_link_key((bd_addr_t *)bt_conn_addr,1);
+    if(memcmp(bt_conn_addr,"\0\0\0\0\0\0",6) != 0){
+        printf("删除连接密钥:%02X:%02X:%02X:%02X:%02X:%02X",bt_conn_addr[5],bt_conn_addr[4],bt_conn_addr[3],bt_conn_addr[2],bt_conn_addr[1],bt_conn_addr[0]);
+        for (u8 i = 0; i < 6; i++)
+        {
+            delete_mac[i]=bt_conn_addr[5-i];
+        }
+        printf("连接密钥:%02X:%02X:%02X:%02X:%02X:%02X",delete_mac[5],delete_mac[4],delete_mac[3],delete_mac[2],delete_mac[1],delete_mac[0]);
+        // delete_link_key((bd_addr_t *)delete_mac,1);
+        
+    }
 }
 int uart_send_clear_earphoneok(void)
 {

diff --git a/2.code/1.sdk/apps/common/third_party_profile/jieli/trans_data_demo/le_trans_data.c b/2.code/1.sdk/apps/common/third_party_profile/jieli/trans_data_demo/le_trans_data.c
index b500b9a..1fd4062 100644 (file)
--- a/2.code/1.sdk/apps/common/third_party_profile/jieli/trans_data_demo/le_trans_data.c
+++ b/2.code/1.sdk/apps/common/third_party_profile/jieli/trans_data_demo/le_trans_data.c
@@ -397,6 +397,10 @@ extern u8 bt_conn_addr[6];//蓝牙连接成功的地址
 u8 maddr[6]={0}; // 目标数组
 extern u8 is_need_send_bt_state;
 void connect_bt(char *json_data,u8 conect){
+    if(is_bredr_close() == 1) //经典蓝牙关闭能去连蓝牙耳机
+    {
+        return;
+    }
     if(scan_state){ //扫描蓝牙不允许连接设备
         return;
     }

diff --git a/2.code/1.sdk/apps/watch/app_main.c b/2.code/1.sdk/apps/watch/app_main.c
index bf27ff3..de95794 100644 (file)
--- a/2.code/1.sdk/apps/watch/app_main.c
+++ b/2.code/1.sdk/apps/watch/app_main.c
@@ -189,7 +189,7 @@ void app_main()
         ex_flash_file_download_init();
     }
 #endif
-
+    bk_app_init();
     /* sys_timer_add(NULL, mem_printf, 1000); */
     app_task_loop();
 }

diff --git a/2.code/1.sdk/apps/watch/board/br28/board_7014f5_demo/board_7014f5_demo.c b/2.code/1.sdk/apps/watch/board/br28/board_7014f5_demo/board_7014f5_demo.c
index de73541..b371d5f 100644 (file)
--- a/2.code/1.sdk/apps/watch/board/br28/board_7014f5_demo/board_7014f5_demo.c
+++ b/2.code/1.sdk/apps/watch/board/br28/board_7014f5_demo/board_7014f5_demo.c
@@ -1435,7 +1435,7 @@ void board_init()
        ai_interaction_init();
 #endif
     user_ble_creat_task();
-    bk_app_init();
+    
 
 }