#1107,解决上传音乐过程打断，音乐还是会显示在本地bug

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt b/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
index 8869448..06fa4e4 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
@@ -48,6 +48,7 @@ ${ROOT_DIR}/application/wearable/fd230app/nativeui/alipay/include
 #/home/hcj/FD230/code/sdk/middleware/services/gui/uikit/surface/interfaces/kits/surface.h
 # ${ROOT_DIR}/middleware/services/media/foundation/player/interfaces/kits
 # ${ROOT_DIR}/middleware/services/gui/uikit/surface/interfaces/kits
+${ROOT_DIR}/application/wearable/fd230app/nativeui/player/include
 )
 
 set(SOURCES

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
index be1da02..c0d0620 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -90,6 +90,7 @@ extern "C" {
 #include "alipay_feature.h"
 #include "transmitting.h"
 #include "AlipayC.h"
+#include "PlayersModelC.h"
 
 
 uint8_t get_dial_num()
@@ -2482,6 +2483,12 @@ void ble_mp3_list_update(void)
 #endif
 } 
 
+bool IS_free_save_Mp3(uint32_t size)
+{
+    printf("11111111111111111\n");
+    return canSyncMusic(size);
+}
+
 #ifdef __cplusplus
 #if __cplusplus
 }

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
index e4e41d3..26d0c4e 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
@@ -329,6 +329,7 @@ char * dir_to_json_buf_malloc_(uint8_t type);
 
 void get_music_path(char *buf,uint8_t max_len);
 
+bool IS_free_save_Mp3(uint32_t size);
 /////////////////设备绑定相关//////////////
 void ble_set_pair(uint8_t falg);
 

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 dd17873..99cb658 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -7142,14 +7142,29 @@ errcode_t decode_mp3_json(ble_read_data *buffer_handle)
             buffer_handle->file_recv_stat.file_name,\r
             buffer_handle->file_recv_stat.file_size\r
         );\r
-        buffer_handle->file_recv_stat.received_size = 0;\r
-        buffer_handle->file_recv_stat.lrcvalue = 0;\r
-        buffer_handle->receive_file_flag = 1;\r
-        uapi_ble_connect_param_update(BLE_CONNECT_INTERVAL_HIGH);\r
-        TRANSMIT_DATA=TRANS_MP3_TRANSMITTING;\r
-        CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r
+        // buffer_handle->file_recv_stat.received_size = 0;\r
+        // buffer_handle->file_recv_stat.lrcvalue = 0;\r
+        // buffer_handle->receive_file_flag = 1;\r
+        // uapi_ble_connect_param_update(BLE_CONNECT_INTERVAL_HIGH);\r
+        // TRANSMIT_DATA=TRANS_MP3_TRANSMITTING;\r
+        // CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r
+        if(IS_free_save_Mp3(ota_size_json->valueint)==false)\r
+        {\r
+            TRANSMIT_DATA=TRANS_MP3_FAIL;\r
+            CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r
+            return  ERRCODE_FAIL;\r
+        }\r
+        else\r
+        {\r
+             buffer_handle->file_recv_stat.received_size = 0;\r
+            buffer_handle->file_recv_stat.lrcvalue = 0;\r
+            buffer_handle->receive_file_flag = 1;\r
+            uapi_ble_connect_param_update(BLE_CONNECT_INTERVAL_HIGH);\r
+            TRANSMIT_DATA=TRANS_MP3_TRANSMITTING;\r
+            CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r
 \r
-        return ERRCODE_SUCC;\r
+            return ERRCODE_SUCC;\r
+        }\r
 \r
     }else{\r
         buffer_handle->receive_file_flag = 0;        \r
@@ -7738,8 +7753,10 @@ void type2AE0Data(ble_read_data *buffer_handle)
                 {\r
                     if (decode_mp3_json( buffer_handle) == ERRCODE_SUCC)\r
                     {\r
+                        printf("11111111112\n");\r
                         ble_reply_cmd(MP3_FILE_RECV_CMD,1);\r
                     }else{\r
+                        printf("11111111113\n");\r
                         ble_reply_cmd(MP3_FILE_RECV_CMD,2);\r
                     }               \r
                 }\r
@@ -7969,6 +7986,20 @@ errcode_t cancel_recv_file(void)
                 fclose(ble_read_timer_p->file_recv_stat.file);\r
                 ble_read_timer_p->file_recv_stat.file = NULL;\r
             }\r
+\r
+            if (ble_read_timer_p->file_recv_stat.file_type == 2)\r
+            {\r
+                char musicpath[64]={0};\r
+                get_music_path(musicpath,64);\r
+                //"/user/userdata/music"\r
+                char filepath[256]={0};\r
+                create_mp3_name(filepath,musicpath,ble_read_timer_p->file_recv_stat.file_name);\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"filepath %s\r\n",filepath);\r
+                remove(filepath);\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"filepath %s\r\n",filepath);\r
+            }\r
+\r
+\r
             if (ble_read_timer_p->file_recv_stat.file_name != NULL)\r
             {\r
                 free(ble_read_timer_p->file_recv_stat.file_name);\r