Merge #1766 into sdk650pathc0423 from refs/changes/1766/head

Code review from 胡传军

* refs/changes/1766/head: (2 commits squashed)

  - 修改安装app回复错误指令bug

  - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0423

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1766

diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
index 2440b7c..39f66b7 100644 (file)
--- a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
@@ -7909,15 +7909,10 @@ void decode_file_checksum_2AE6(ble_read_data *buffer_handle)
             {\r
                 case 1: //ota\r
                     ble_reply_cmd(FILE_SUCC_TRANSFER,1);\r
-\r
                     do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_STARTOTA,NULL,0);\r
-\r
-                   \r
-\r
                     TRANSMIT_DATA=TRANS_OTA_SUCC;\r
                     CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r
-                    \r
-\r
+        \r
                     break;\r
                 case 2://mp3\r
                     TRANSMIT_DATA=TRANS_MP3_SUCC;\r
@@ -8319,9 +8314,9 @@ void type2AE6Data(ble_read_data *buffer_handle,uint8_t *cmd_buf ,uint8_t *data,u
         {\r
             if (decode_bin_json( buffer_handle) == ERRCODE_SUCC)\r
             {\r
-                ble_reply_cmd(MP3_FILE_CMD,1);\r
+                ble_reply_cmd(BIN_FILE_CMD,1);\r
             }else{\r
-                ble_reply_cmd(MP3_FILE_CMD,2);\r
+                ble_reply_cmd(BIN_FILE_CMD,2);\r
             }              \r
         }\r
         break;\r