From: Caisking <3449750381@qq.com> Date: Thu, 20 Jun 2024 11:52:12 +0000 (+0800) Subject: 优化表盘UI X-Git-Tag: release_V1.2.70_20241020_135402~948^2~36 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=303b3c3b3575061b6d792d02eeb54f6e9873c0db;p=mirrors%2FFD230.git 优化表盘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 index 000000000..e69de29bb 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 e63bbad59..367392644 100644 --- 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 index 000000000..e69de29bb 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 index 957d2b91f..000000000 --- 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 f914a0b1d..521aa33f0 100644 --- 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 index 000000000..e69de29bb 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 index 000000000..8ba6dc2ef --- /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 index 000000000..e69de29bb 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 index 000000000..5585996ac --- /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 3ad295cc8..106b375a1 100644 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 d16437710..a4ad82660 100644 --- a/tools/dial_converter_tool/instance/classic/classic.xml +++ b/tools/dial_converter_tool/instance/classic/classic.xml @@ -1,4 +1,4 @@ - + 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 index 9d7239d5c..000000000 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 index 000000000..22598439e 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 e3a34e595..0818e4256 100644 --- a/tools/dial_converter_tool/instance/clock/clock.xml +++ b/tools/dial_converter_tool/instance/sportdial/sportdial.xml @@ -1,16 +1,16 @@ - - - + + + - + - + - - - - - - + + + + + + \ 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 index 000000000..b9a06790f 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 index 000000000..106b375a1 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 index 000000000..a45e1ac4c --- /dev/null +++ b/tools/image_converter_tool/test/hert/dial_soures/MAIN_FACE_IMAGE.png:Zone.Identifier @@ -0,0 +1,2 @@ +[ZoneTransfer] +ZoneId=3