From: Caisking <3449750381@qq.com> Date: Tue, 12 Nov 2024 04:01:03 +0000 (+0800) Subject: 表盘：修复南瓜表盘切换失败的问题 X-Git-Tag: fd230_release_V1.3.102~92^2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1388%2F2;p=mirrors%2FFD230.git 表盘：修复南瓜表盘切换失败的问题 --- 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 d3cad1c09..83f83a7da 100644 --- 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 d0edf1230..0e46da4e4 100644 --- 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); buffer_handle->file_recv_stat.file_name = filename; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," dial name = %s, dial file count = %d \n", + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP," dial name = %s, dial file count = %d \n", filename, ble_dial_file_count ); @@ -7345,7 +7345,7 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle) buffer_handle->file_recv_stat.file_name = filename; buffer_handle->file_recv_stat.file_size = file_size; buffer_handle->file_recv_stat.file_type = 3;//表盘 - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," filetype = %d, file_name=%s, file_size=%d , dial_uid %04X ,dial_count %d, dial_filetype %d\n", + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP," filetype = %d, file_name=%s, file_size=%d , dial_uid %04X ,dial_count %d, dial_filetype %d\n", buffer_handle->file_recv_stat.file_type, buffer_handle->file_recv_stat.file_name, buffer_handle->file_recv_stat.file_size, 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 index 60a2ca3e6..000000000 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 index 000000000..51ff5707d 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/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/120/\350\257\264\346\230\216.txt" index 3a1a64f8d..19020aaca 100644 --- "a/tools/dial_converter_tool/dial_lzma/120/\350\257\264\346\230\216.txt" +++ "b/tools/dial_converter_tool/dial_lzma/120/\350\257\264\346\230\216.txt" @@ -1,3 +1,3 @@ 中文名：万圣南瓜 -英文名：halloween pumpkin +英文名：pumpkin 标签：数码表盘；节日活动 \ 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 0b57b55ce..caf585e08 100644 --- a/tools/dial_converter_tool/instance/120/halloweenpumpkin.xml +++ b/tools/dial_converter_tool/instance/120/pumpkin.xml @@ -1,4 +1,4 @@ - +