修正表盘配置，适配466x466分辨率，解决 万花筒表盘不工作问题

diff --git a/.gitignore b/.gitignore
index 0313d22..aa402d7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,5 @@ code/sdk/build/config/target_config/brandy/mk_fs_image/evb4/file.bin
 code/sdk/build/config/target_config/brandy/mk_fs_image/evb4/file_tmp.bin
 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/file.bin
 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/file_tmp.bin
-code/sdk/drivers/peripheral/cywee/doc/~$CWM lib Sensor Info_Gnt_Fd230_20240222.xlsx
-code/sdk/drivers/peripheral/cywee/doc/~$Cwm_Dml_Info__LIS2DOC__20230816.xlsx
+tools/dial_converter_tool/__pycache__/**
+tools/dial_converter_tool/out/**

diff --git a/tools/dial_converter_tool/instance/analogue_dial/analogue_dial.xml b/tools/dial_converter_tool/instance/analogue_dial/analogue_dial.xml
index ee40385..2849a58 100644 (file)
--- a/tools/dial_converter_tool/instance/analogue_dial/analogue_dial.xml
+++ b/tools/dial_converter_tool/instance/analogue_dial/analogue_dial.xml
@@ -1,4 +1,4 @@
-<dial title="clock" description="main clock" size="454 454" version="1.0" preview_img="./instance/analogue_dial/preview_img.JPG">\r
+<dial title="clock" description="main clock" size="466 466" version="1.0" preview_img="./instance/analogue_dial/preview_img.JPG">\r
     <static_img id="back_ground" position="0 0" img_name="./instance/analogue_dial/MAIN_FACE_IMAGE.png"></static_img>\r
     <option_img position="207 127" img_names="./instance/analogue_dial/week/MONDAY_IMAGE_PATH.png,./instance/analogue_dial/week/TUESDAY_IMAGE_PATH.png,./instance/analogue_dial/week/WEDNESDAY_IMAGE_PATH.png,./instance/analogue_dial/week/THURSDAY_IMAGE_PATH.png,./instance/analogue_dial/week/FIRDAY_IMAGE_PATH.png,./instance/analogue_dial/week/SATURDAY_IMAGE_PATH.png,./instance/analogue_dial/week/SUNDAY_IMAGE_PATH.png" bind_data="17" period="10"></option_img>\r
     <label id="step_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="100 230 75 35" text="%5.0f" font_size="25" align="center" bind_data="1" period="10"></label>\r
@@ -12,4 +12,4 @@
     <static_img id="minute_circle" position="202 202" img_name="./instance/analogue_dial/MEDCIRCLE_IMAGE_PATH.png"></static_img>\r
     <rotate_img id="second" position="202 16" rotate_center="25.0 211.0" rotate_start="0" rotate_end="360" img_name="./instance/analogue_dial/SECONDHAND.png" bind_data="12" period="60"></rotate_img>\r
     <static_img id="second_circle" position="215 213" img_name="./instance/analogue_dial/SMALLCIRCLE_IMAGE_PATH.png"></static_img>\r
-</dial>
\ No newline at end of file
+</dial>\r

diff --git a/tools/dial_converter_tool/instance/kaleidoscope_dial/kaleidoscope_dial.xml b/tools/dial_converter_tool/instance/kaleidoscope_dial/kaleidoscope_dial.xml
index 4c1511e..f8cabcd 100644 (file)
--- a/tools/dial_converter_tool/instance/kaleidoscope_dial/kaleidoscope_dial.xml
+++ b/tools/dial_converter_tool/instance/kaleidoscope_dial/kaleidoscope_dial.xml
@@ -1,5 +1,5 @@
-<dial title="kaleidoscope" description="kaleidoscope dial" size="454 454" version="1.0" preview_img="./instance/kaleidoscope_dial/preview_img.PNG">\r
-    <kaleidoscope id="kale" img_name="./instance/kaleidoscope_dial/rabbit454.png" crown_rotate_step="0.2" animator_rotate_step="0.1"></kaleidoscope>\r
+<dial title="kaleidoscope" description="kaleidoscope dial" size="466 466" version="1.0" preview_img="./instance/kaleidoscope_dial/preview_img.PNG">\r
+    <kaleidoscope id="kale" img_name="./instance/kaleidoscope_dial/rabbit466.png" crown_rotate_step="0.2" animator_rotate_step="0.1"></kaleidoscope>\r
     <rotate_img id="hour" position="202 16" rotate_center="25.0 211.0" rotate_start="0" rotate_end="360" img_name="./instance/kaleidoscope_dial/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r
     <static_img id="hour_circle" position="202 202" img_name="./instance/kaleidoscope_dial/BIGCIRCLE_IMAGE_PATH.png"></static_img>\r
     <rotate_img id="minute" position="202 16" rotate_center="25.0 211.0" rotate_start="0" rotate_end="360" img_name="./instance/kaleidoscope_dial/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>\r

diff --git a/tools/dial_converter_tool/instance/kaleidoscope_dial/rabbit466.png b/tools/dial_converter_tool/instance/kaleidoscope_dial/rabbit466.png
new file mode 100644 (file)
index 0000000..a4d6f44
Binary files /dev/null and b/tools/dial_converter_tool/instance/kaleidoscope_dial/rabbit466.png differ