Merge #778 into sdk602patch0626 from refs/changes/778/head

修复自定义表盘下载问题

* refs/changes/778/head: (1 commits squashed)

  - 修复自定义表盘下载问题

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/778

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 3a8993a..eee2c06 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -164,7 +164,7 @@ static errcode_t get_file_recv_file_path(char* input_filename ,uint32_t input_si
 \r
     return ERRCODE_SUCC;\r
 } \r
-static errcode_t get_custom_dial_file_path(uint16_t id,uint32_t input_size, char* output_file_path , uint32_t max_output_size)\r
+static errcode_t get_custom_dial_file_path(uint16_t id,char *filename,uint32_t input_size, char* output_file_path , uint32_t max_output_size)\r
 {\r
     if( id >=5  || output_file_path == NULL)\r
     {\r
@@ -173,7 +173,7 @@ static errcode_t get_custom_dial_file_path(uint16_t id,uint32_t input_size, char
     char name[64]={0};\r
     ble_get_dial_path(name,id);\r
 \r
-    int ret = sprintf_s(output_file_path,max_output_size,"%s",name);\r
+    int ret = sprintf_s(output_file_path,max_output_size,"%s/%s.bin",name,filename);\r
     if (ret < 0)\r
         return ERRCODE_FAIL;\r
 \r
@@ -6451,6 +6451,10 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle)
     uapi_dev_runtime_set_dialname(filename);\r
     //存表盘id\r
     ble_dial_uid = dialinfo.dial_uid;\r
+    if(ble_dial_uid==0)\r
+    {\r
+        ble_dial_uid=1;\r
+    }\r
 \r
 \r
     buffer_handle->file_recv_stat.file_name = filename;\r
@@ -6509,7 +6513,7 @@ static errcode_t install_dial(void)
         }\r
         else\r
         {\r
-            if (get_custom_dial_file_path(ble_dial_uid,strlen(dial_basename),dialbin_filepath,sizeof(dialbin_filepath)) != ERRCODE_SUCC)\r
+            if (get_custom_dial_file_path(ble_dial_uid,dial_basename,strlen(dial_basename),dialbin_filepath,sizeof(dialbin_filepath)) != ERRCODE_SUCC)\r
             {\r
                 return ERRCODE_FAIL;\r
             }\r