自动ota场景优化,表盘下载后断连增加优化

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
index feb1237..38743aa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -176,7 +176,11 @@ static int bluetooth_init_all(void)
 \r
     if(uapi_dev_runtime_get_safemode_flag())\r
     {\r
+\r
+        gap_remove_all_pairs();\r
+\r
         uapi_dev_runtime_atuoota_status_status(1);\r
+\r
         BtInitSpp();\r
     }\r
    \r

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index d0edf12..c2c4c6f 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -148,7 +148,7 @@ static errcode_t create_mp3_name(char* path,char*dir_path ,char* file_name)
     }\r
     else\r
     {\r
-        sprintf_s(path,256,"%s/%s",dir_path,file_name);\r
+        sprintf_s(path,256,"%s/%s.mp3",dir_path,file_name);\r
     }\r
     return ERRCODE_FAIL;\r
     \r
@@ -1161,20 +1161,22 @@ void sendBindInfor(uint8_t *data)
         #else\r
         devnamelen = 0;\r
         getPhoneNameLen(data,&devnamelen,&phone_type);//获取手机下发的手机设备名称长度\r
-        if(devnamelen > 0 )\r
+\r
+        if(phone_type==0)\r
         {\r
-            if(phone_type==0)\r
+            unsigned int paired_devices_num=0;\r
+            bool  gap_get_paired =gap_get_paired_devices_num(&paired_devices_num);\r
+            if(gap_get_paired!=true ||paired_devices_num!=0 )\r
             {\r
-                unsigned int paired_devices_num=0;\r
-                bool  gap_get_paired =gap_get_paired_devices_num(&paired_devices_num);\r
-                if(gap_get_paired!=true ||paired_devices_num!=0 )\r
-                {\r
-                      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"sendBindInfor!!!!!!!!!:gap_remove_all_pairs \r\n");\r
-                    gap_remove_all_pairs();\r
-                }\r
+                    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"sendBindInfor!!!!!!!!!:gap_remove_all_pairs \r\n");\r
+                gap_remove_all_pairs();\r
             }\r
+        }\r
        \r
 \r
+        if(devnamelen > 0 )\r
+        {\r
+        \r
             devname = getPhoneName(data);\r
               WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"devname!!!!!!!!!:%s devnamelen:%d",devname,devnamelen);\r
             if (devname != NULL){\r
@@ -7006,9 +7008,9 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da
                     osTimerDelete(BR_TRANSFER_timer);\r
                     BR_TRANSFER_timer = NULL;\r
                 }\r
-\r
+                ble_read_timer_p=NULL;\r
                 ble_reply_cmd(OTA_FILE_SUCC_CMD,1);//接收成功\r
-                }\r
+            }\r
 \r
             }\r
             else if (last_package_id==package_id)\r
@@ -8067,9 +8069,15 @@ errcode_t cancel_recv_file(uint8_t flag)
                 ble_read_timer_p->file_recv_stat.file_name=NULL;\r
             }\r
             ble_read_timer_p->file_recv_stat.recv_file_stat = -1;\r
-            ble_read_timer_p=NULL;\r
+            //ble_read_timer_p=NULL;\r
+            CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r
         }\r
-        CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r
+        // else\r
+        // {\r
+        //     CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r
+        // }\r
+        ble_read_timer_p=NULL;\r
+       \r
     }\r
     \r
    \r
@@ -8259,7 +8267,7 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t
             osTimerDelete(BR_TRANSFER_timer);\r
             BR_TRANSFER_timer = NULL;\r
         }\r
-\r
+        ble_read_timer_p=NULL;\r
        \r
         ble_reply_cmd(FILE_RECV_REPLY_STAT_CMD,1);//接收成功\r
     }\r