表盘：修复南瓜表盘切换失败的问题

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
index d3cad1c..83f83a7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
@@ -528,6 +528,7 @@ void SetDialModel::LoadAllDialFromDefult(void) {
       SetDialInfo dialInfo{0};
       int ret = ParseDialHeader(DEFULTDIAL, fullDialName, dialInfo);
       if (ret == 0) {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Adding dial %s", fullDialName.c_str());
         dialInfoList.push_back(dialInfo);
       } else {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,

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..0e46da4 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -7260,7 +7260,7 @@ errcode_t decode_dial_info(ble_read_data *buffer_handle)
         memcpy_s(filename,dialinfo.file_name_len,data+sizeof(msg_recv_dial_info_t),dialinfo.file_name_len);\r
         buffer_handle->file_recv_stat.file_name = filename;\r
         \r
-          WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," dial name = %s, dial file count = %d \n",\r
+          WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP," dial name = %s, dial file count = %d \n",\r
             filename,\r
             ble_dial_file_count\r
         );\r
@@ -7345,7 +7345,7 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle)
     buffer_handle->file_recv_stat.file_name = filename;\r
     buffer_handle->file_recv_stat.file_size = file_size;\r
     buffer_handle->file_recv_stat.file_type = 3;//表盘\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"  filetype = %d, file_name=%s, file_size=%d , dial_uid %04X ,dial_count %d, dial_filetype %d\n",\r
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"  filetype = %d, file_name=%s, file_size=%d , dial_uid %04X ,dial_count %d, dial_filetype %d\n",\r
         buffer_handle->file_recv_stat.file_type,\r
         buffer_handle->file_recv_stat.file_name,\r
         buffer_handle->file_recv_stat.file_size,\r

diff --git a/tools/dial_converter_tool/dial_lzma/120/halloweenpumpkin.lzma b/tools/dial_converter_tool/dial_lzma/120/halloweenpumpkin.lzma
deleted file mode 100644 (file)
index 60a2ca3..0000000
Binary files a/tools/dial_converter_tool/dial_lzma/120/halloweenpumpkin.lzma and /dev/null differ

diff --git a/tools/dial_converter_tool/dial_lzma/120/pumpkin.lzma b/tools/dial_converter_tool/dial_lzma/120/pumpkin.lzma
new file mode 100644 (file)
index 0000000..51ff570
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/120/pumpkin.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/120/halloween pumpkin.png b/tools/dial_converter_tool/dial_lzma/120/pumpkin.png
similarity index 100%
rename from tools/dial_converter_tool/dial_lzma/120/halloween pumpkin.png
rename to tools/dial_converter_tool/dial_lzma/120/pumpkin.png

diff --git a/tools/dial_converter_tool/dial_lzma/120/说明.txt b/tools/dial_converter_tool/dial_lzma/120/说明.txt
index 3a1a64f..19020aa 100644 (file)
--- a/tools/dial_converter_tool/dial_lzma/120/说明.txt
+++ b/tools/dial_converter_tool/dial_lzma/120/说明.txt
@@ -1,3 +1,3 @@
 中文名：万圣南瓜\r
-英文名：halloween pumpkin\r
+英文名：pumpkin\r
 标签：数码表盘；节日活动
\ No newline at end of file

diff --git a/tools/dial_converter_tool/instance/120/halloweenpumpkin.png b/tools/dial_converter_tool/instance/120/pumpkin.png
similarity index 100%
rename from tools/dial_converter_tool/instance/120/halloweenpumpkin.png
rename to tools/dial_converter_tool/instance/120/pumpkin.png

diff --git a/tools/dial_converter_tool/instance/120/halloweenpumpkin.xml b/tools/dial_converter_tool/instance/120/pumpkin.xml
similarity index 93%
rename from tools/dial_converter_tool/instance/120/halloweenpumpkin.xml
rename to tools/dial_converter_tool/instance/120/pumpkin.xml
index 0b57b55..caf585e 100644 (file)
--- a/tools/dial_converter_tool/instance/120/halloweenpumpkin.xml
+++ b/tools/dial_converter_tool/instance/120/pumpkin.xml
@@ -1,4 +1,4 @@
-<dial title="halloweenpumpkin" description="万圣南瓜" size="466 466" version="1.0" preview_img="./instance/120/halloweenpumpkin.png">\r
+<dial title="pumpkin" description="万圣南瓜" size="466 466" version="1.0" preview_img="./instance/120/pumpkin.png">\r
     <static_img id="back_ground" position="0 0" img_name="./instance/120/MAIN_FACE_IMAGE.png"></static_img>\r
 \r
     <!-- 月份标签 -->\r