自定义表盘下载修复

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 12a3cd9..81dc5c9 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -687,6 +687,14 @@ void ble_set_dial_by_id(uint16_t id)
 #endif
 }
 
+void ble_get_custom_dial(uint16_t id,char *buf)
+{
+    #ifdef FD230
+        const char *name=OHOS::SetDialModel::GetInstance().GetCustomName(id).c_str();
+        memset_s(buf,32,0,32);
+        memcpy_s(buf,32,name,strlen(name));
+    #endif
+}
 uint16_t ble_get_dial_id(void)
 {
 #ifdef FD230

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 036180e..d273b3f 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
@@ -241,6 +241,8 @@ bool dial_file_save(void);
 
 void ble_save_dial_custom(msg_recv_custom_dial_info_t *data);
 
+void ble_get_custom_dial(uint16_t id,char *buf);
+
 //////////////////////久坐提醒////////////////////////////
 void set_sedent_param(  msg_sedent_set_param_info_t * data);
 

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 90ad5da..56678a5 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -6350,8 +6350,7 @@ errcode_t decode_dial_info(ble_read_data *buffer_handle)
     {\r
         \r
         msg_recv_custom_dial_info_t *custom_dial_info=(msg_recv_custom_dial_info_t*)data;\r
-        if(custom_dial_info->dial_uid==0)\r
-        custom_dial_info->dial_uid=1;\r
+        custom_dial_info->dial_uid+=1;\r
         printf("custom_dial_info %d %d %d %d",\r
         custom_dial_info->dial_uid,\r
         custom_dial_info->battery,\r
@@ -6458,10 +6457,8 @@ 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
+    ble_dial_uid++;\r
+    \r
 \r
 \r
     buffer_handle->file_recv_stat.file_name = filename;\r
@@ -6511,7 +6508,7 @@ static errcode_t install_dial(void)
         }\r
         printf("dial_basename %s\n",dial_basename);\r
         char dialbin_filepath[128]={0};\r
-        if(ble_dial_uid>=5)\r
+        if(ble_dial_uid>5)\r
         {\r
             if (get_dial_file_path(dial_basename,strlen(dial_basename),dialbin_filepath,sizeof(dialbin_filepath)) != ERRCODE_SUCC)\r
             {\r
@@ -6541,7 +6538,7 @@ static errcode_t install_dial(void)
 \r
         char *namebuf= strtok(lzmapkgname,".");\r
 \r
-        if(ble_dial_uid>=5)\r
+        if(ble_dial_uid>5)\r
         {\r
             install_Register_dial(namebuf,ble_dial_uid);\r
 \r
@@ -6550,10 +6547,15 @@ static errcode_t install_dial(void)
         }\r
         else\r
         {\r
-\r
-            install_Register_dial(namebuf,ble_dial_uid);\r
-\r
-            ble_set_dial_by_id(ble_dial_uid);\r
+            if(ble_dial_file_index==ble_dial_file_count)\r
+            {\r
+                printf("自定义表盘安装完毕\r\n");\r
+                char name_str[32]={0};\r
+                ble_get_custom_dial(ble_dial_uid,name_str);\r
+                install_Register_dial(name_str,ble_dial_uid);\r
+                ble_set_dial_by_id(ble_dial_uid);\r
+            }\r
+     \r
         }\r
         \r
        \r
@@ -6670,7 +6672,7 @@ void decode_file_checksum(ble_read_data *buffer_handle)
                     {\r
                         //ble_set_dial_by_id(ble_dial_uid);\r
 \r
-                        if(ble_dial_uid>=5 ||  ble_dial_file_index==ble_dial_file_count)\r
+                        if(ble_dial_uid>5 ||  ble_dial_file_index==ble_dial_file_count)\r
                         {\r
                             TRANSMIT_DATA= TRANS_DIAL_SUCC;\r
                             CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r