优化表盘UI

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/KUMI.bin:Zone.Identifier b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/KUMI.bin:Zone.Identifier
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin
index e63bbad..3673926 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8fedf9d0e0bae4092e18acfa11df03eeec8702dd0359f5040d76470a13062b2a
+oid sha256:7977363dc95ad16bbba5f3678d534c15affb6f0d0b4deef316e43fd104f28e54
 size 209287

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin:Zone.Identifier b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin:Zone.Identifier
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/clock.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/clock.bin
deleted file mode 100644 (file)
index 957d2b9..0000000
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/clock.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fceff8cffb427333a92613f88df2d9221ce3782c8eada5ace68d0bc75a12276c
-size 415594

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/kaleidoscope_dial.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/kaleidoscope_dial.bin
index f914a0b..521aa33 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/kaleidoscope_dial.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/kaleidoscope_dial.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52ea12e29f9044a9de5a757cd9aa3cf228cbedd221502cc7894f02aa78a3b6d3
-size 323633
+oid sha256:13bfb2fdf614e08bbed3e68a104f9967a8681cc5671e4d5e6df98b6757275a61
+size 245009

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/kaleidoscope_dial.bin:Zone.Identifier b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/kaleidoscope_dial.bin:Zone.Identifier
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sportdial.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sportdial.bin
new file mode 100644 (file)
index 0000000..8ba6dc2
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sportdial.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:decfc8d8357661e30b32d399fe08eb4ac688f1589acc2869c07043a240cec644
+size 336970

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sportdial.bin:Zone.Identifier b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sportdial.bin:Zone.Identifier
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dial_soures/MAIN_FACE_IMAGE.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dial_soures/MAIN_FACE_IMAGE.bin
new file mode 100644 (file)
index 0000000..5585996
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dial_soures/MAIN_FACE_IMAGE.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bdb31d00bfa5e994210d2bd70a3fd454880e77967f03ba0b7e3ffe16c4593ca
+size 146040

diff --git a/tools/dial_converter_tool/instance/KUMI/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/KUMI/MAIN_FACE_IMAGE.png
index 3ad295c..106b375 100644 (file)
Binary files a/tools/dial_converter_tool/instance/KUMI/MAIN_FACE_IMAGE.png and b/tools/dial_converter_tool/instance/KUMI/MAIN_FACE_IMAGE.png differ

diff --git a/tools/dial_converter_tool/instance/classic/classic.xml b/tools/dial_converter_tool/instance/classic/classic.xml
index d164377..a4ad826 100644 (file)
--- a/tools/dial_converter_tool/instance/classic/classic.xml
+++ b/tools/dial_converter_tool/instance/classic/classic.xml
@@ -1,4 +1,4 @@
-<dial title="classic" description="classic clock" size="466 466" version="1.0"\r
+<dial title="classic" description="classic clock" size="454 454" version="1.0"\r
     preview_img="./instance/classic/classic.png">\r
     <static_img id="back_ground" position="0 0" img_name="./instance/classic/MAIN_FACE_IMAGE.png"></static_img>\r
     <option_img position="207 400"\r

diff --git a/tools/dial_converter_tool/instance/clock/clock01.JPG b/tools/dial_converter_tool/instance/clock/clock01.JPG
deleted file mode 100644 (file)
index 2b1ee83..0000000
Binary files a/tools/dial_converter_tool/instance/clock/clock01.JPG and /dev/null differ

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 f8cabcd..6845016 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,4 +1,4 @@
-<dial title="kaleidoscope" description="kaleidoscope dial" size="466 466" version="1.0" preview_img="./instance/kaleidoscope_dial/preview_img.PNG">\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

diff --git a/tools/dial_converter_tool/instance/kaleidoscope_dial/preview_img.PNG b/tools/dial_converter_tool/instance/kaleidoscope_dial/preview_img.PNG
deleted file mode 100644 (file)
index 9d7239d..0000000
Binary files a/tools/dial_converter_tool/instance/kaleidoscope_dial/preview_img.PNG and /dev/null differ

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

diff --git a/tools/dial_converter_tool/instance/clock/BIGCIRCLE_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/BIGCIRCLE_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/BIGCIRCLE_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/BIGCIRCLE_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/HEARTRATE_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/HEARTRATE_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/HEARTRATE_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/HEARTRATE_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/HOURHAND.png b/tools/dial_converter_tool/instance/sportdial/HOURHAND.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/HOURHAND.png
rename to tools/dial_converter_tool/instance/sportdial/HOURHAND.png

diff --git a/tools/dial_converter_tool/instance/clock/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/sportdial/MAIN_FACE_IMAGE.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/MAIN_FACE_IMAGE.png
rename to tools/dial_converter_tool/instance/sportdial/MAIN_FACE_IMAGE.png

diff --git a/tools/dial_converter_tool/instance/clock/MEDCIRCLE_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/MEDCIRCLE_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/MEDCIRCLE_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/MEDCIRCLE_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/MINUTEHAND.png b/tools/dial_converter_tool/instance/sportdial/MINUTEHAND.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/MINUTEHAND.png
rename to tools/dial_converter_tool/instance/sportdial/MINUTEHAND.png

diff --git a/tools/dial_converter_tool/instance/clock/PROGRESS_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/PROGRESS_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/PROGRESS_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/PROGRESS_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/SECONDHAND.png b/tools/dial_converter_tool/instance/sportdial/SECONDHAND.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/SECONDHAND.png
rename to tools/dial_converter_tool/instance/sportdial/SECONDHAND.png

diff --git a/tools/dial_converter_tool/instance/clock/SMALLCIRCLE_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/SMALLCIRCLE_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/SMALLCIRCLE_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/SMALLCIRCLE_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/clock.xml b/tools/dial_converter_tool/instance/sportdial/sportdial.xml
similarity index 53%
rename from tools/dial_converter_tool/instance/clock/clock.xml
rename to tools/dial_converter_tool/instance/sportdial/sportdial.xml
index e3a34e5..0818e42 100644 (file)
--- a/tools/dial_converter_tool/instance/clock/clock.xml
+++ b/tools/dial_converter_tool/instance/sportdial/sportdial.xml
@@ -1,16 +1,16 @@
-<dial title="clock" description="main clock" size="454 454" version="1.0" preview_img="./instance/clock/clock01.JPG">\r
-    <static_img id="back_ground" position="0 0" img_name="./instance/clock/MAIN_FACE_IMAGE.png"></static_img>\r
-    <option_img position="207 127" img_names="./instance/clock/week/MONDAY_IMAGE_PATH.png,./instance/clock/week/TUESDAY_IMAGE_PATH.png,./instance/clock/week/WEDNESDAY_IMAGE_PATH.png,./instance/clock/week/THURSDAY_IMAGE_PATH.png,./instance/clock/week/FIRDAY_IMAGE_PATH.png,./instance/clock/week/SATURDAY_IMAGE_PATH.png,./instance/clock/week/SUNDAY_IMAGE_PATH.png" bind_data="17" period="10"></option_img>\r
+<dial title="sportdial" description="main sportdial" size="454 454" version="1.0" preview_img="./instance/sportdial/sportdial01.png">\r
+    <static_img id="back_ground" position="0 0" img_name="./instance/sportdial/MAIN_FACE_IMAGE.png"></static_img>\r
+    <option_img position="207 127" img_names="./instance/sportdial/week/MONDAY_IMAGE_PATH.png,./instance/sportdial/week/TUESDAY_IMAGE_PATH.png,./instance/sportdial/week/WEDNESDAY_IMAGE_PATH.png,./instance/sportdial/week/THURSDAY_IMAGE_PATH.png,./instance/sportdial/week/FIRDAY_IMAGE_PATH.png,./instance/sportdial/week/SATURDAY_IMAGE_PATH.png,./instance/sportdial/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
-    <static_img id="heart_rate" position="156 260" img_name="./instance/clock/HEARTRATE_IMAGE_PATH.png"></static_img>\r
+    <static_img id="heart_rate" position="156 260" img_name="./instance/sportdial/HEARTRATE_IMAGE_PATH.png"></static_img>\r
     <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="198 330 60 35" text="%3.0f" font_size="25" align="center" bind_data="2" period="10"></label>\r
-    <static_img id="progress" position="53 54" img_name="./instance/clock/PROGRESS_IMAGE_PATH.png"></static_img>\r
+    <static_img id="progress" position="53 54" img_name="./instance/sportdial/PROGRESS_IMAGE_PATH.png"></static_img>\r
     <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="315 230 60 35" text="%2.0f%%" font_size="25" align="center" bind_data="8" period="10"></label>\r
-    <rotate_img id="hour" position="202 16" rotate_center="25.0 211.0" rotate_start="0" rotate_end="360" img_name="./instance/clock/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r
-    <static_img id="hour_circle" position="202 202" img_name="./instance/clock/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/clock/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>\r
-    <static_img id="minute_circle" position="202 202" img_name="./instance/clock/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/clock/SECONDHAND.png" bind_data="12" period="60"></rotate_img>\r
-    <static_img id="second_circle" position="215 213" img_name="./instance/clock/SMALLCIRCLE_IMAGE_PATH.png"></static_img>\r
+    <rotate_img id="hour" position="202 16" rotate_center="25.0 211.0" rotate_start="0" rotate_end="360" img_name="./instance/sportdial/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r
+    <static_img id="hour_circle" position="202 202" img_name="./instance/sportdial/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/sportdial/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>\r
+    <static_img id="minute_circle" position="202 202" img_name="./instance/sportdial/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/sportdial/SECONDHAND.png" bind_data="12" period="60"></rotate_img>\r
+    <static_img id="second_circle" position="215 213" img_name="./instance/sportdial/SMALLCIRCLE_IMAGE_PATH.png"></static_img>\r
     <click rect="133 133 200 200" action_slice="4" ></click>\r
 </dial>
\ No newline at end of file

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

diff --git a/tools/dial_converter_tool/instance/clock/week/FIRDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/week/FIRDAY_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/week/FIRDAY_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/week/FIRDAY_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/week/MONDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/week/MONDAY_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/week/MONDAY_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/week/MONDAY_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/week/SATURDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/week/SATURDAY_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/week/SATURDAY_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/week/SATURDAY_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/week/SUNDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/week/SUNDAY_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/week/SUNDAY_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/week/SUNDAY_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/week/THURSDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/week/THURSDAY_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/week/THURSDAY_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/week/THURSDAY_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/week/TUESDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/week/TUESDAY_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/week/TUESDAY_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/week/TUESDAY_IMAGE_PATH.png

diff --git a/tools/dial_converter_tool/instance/clock/week/WEDNESDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/sportdial/week/WEDNESDAY_IMAGE_PATH.png
similarity index 100%
rename from tools/dial_converter_tool/instance/clock/week/WEDNESDAY_IMAGE_PATH.png
rename to tools/dial_converter_tool/instance/sportdial/week/WEDNESDAY_IMAGE_PATH.png

diff --git a/tools/image_converter_tool/test/hert/dial_soures/MAIN_FACE_IMAGE.png b/tools/image_converter_tool/test/hert/dial_soures/MAIN_FACE_IMAGE.png
new file mode 100644 (file)
index 0000000..106b375
Binary files /dev/null and b/tools/image_converter_tool/test/hert/dial_soures/MAIN_FACE_IMAGE.png differ

diff --git a/tools/image_converter_tool/test/hert/dial_soures/MAIN_FACE_IMAGE.png:Zone.Identifier b/tools/image_converter_tool/test/hert/dial_soures/MAIN_FACE_IMAGE.png:Zone.Identifier
new file mode 100644 (file)
index 0000000..a45e1ac
--- /dev/null
+++ b/tools/image_converter_tool/test/hert/dial_soures/MAIN_FACE_IMAGE.png:Zone.Identifier
@@ -0,0 +1,2 @@
+[ZoneTransfer]\r
+ZoneId=3\r