表盘：增加【大鹅】

diff --git a/tools/dial_converter_tool/instance/132/goose.xml b/tools/dial_converter_tool/instance/132/goose.xml
index 0d1d5a7..828204d 100644 (file)
--- a/tools/dial_converter_tool/instance/132/goose.xml
+++ b/tools/dial_converter_tool/instance/132/goose.xml
@@ -1,42 +1,59 @@
-<dial title="sport" description="运动" size="466 466" version="101" preview_img="./instance/101/sport.png">\r
-    <!-- 背景图像 -->\r
-    <static_img id="back_ground" position="0 0" img_name="./instance/101/MAIN_FACE_IMAGE.png"></static_img>\r
+<dial title="goose" description="大鹅" size="466 466" version="1.0"\r
+    preview_img="./instance/132/goose.png">\r
 \r
-    <!-- 显示一周七天的选项图像，周期性更新 -->\r
-    <option_img position="202 132" img_names="./instance/101/week/SUNDAY_IMAGE_PATH.png,./instance/101/week/MONDAY_IMAGE_PATH.png,./instance/101/week/TUESDAY_IMAGE_PATH.png,./instance/101/week/WEDNESDAY_IMAGE_PATH.png,./instance/101/week/THURSDAY_IMAGE_PATH.png,./instance/101/week/FIRDAY_IMAGE_PATH.png,./instance/101/week/SATURDAY_IMAGE_PATH.png" bind_data="17" period="10"></option_img>\r
+    <static_img id="back_ground" position="0 0" img_name="./instance/132/MAIN_FACE_IMAGE.png"></static_img>\r
+\r
+    <!-- 日期 -->\r
+    <label id="date_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf"\r
+        break_mode="ellipsis" rect="133 75 200 60" text="%s" font_size="40" align="center"\r
+        bind_data="20487" period="10"></label>\r
     <!-- 星期label -->\r
-    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="210 126 100 35" text="%.0f" font_size="25" align="center" bind_data="30" period="10"></label>\r
+    <label id="week_label" color="0xffA0A0A0" font="Gilroy_Bold.ttf"\r
+        break_mode="ellipsis" rect="133 130 200 60" text="%s" font_size="30" align="center"\r
+        bind_data="20488" period="10"></label>\r
+\r
+\r
+    <!-- 步数显示标签 str -->\r
+    <label id="step_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf"\r
+        break_mode="ellipsis" rect="12 240 200 60" text="%s" font_size="25" align="center"\r
+        bind_data="20489" period="10"></label>\r
+\r
 \r
-    <!-- 步数显示标签，动态更新步数 -->\r
-    <label id="step_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="80 230 100 35" text="%.0f" font_size="25" align="center" bind_data="1" period="10"></label>\r
+    <!-- 卡路里显示标签 str -->\r
+    <label id="calorie_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf"\r
+        break_mode="ellipsis" rect="266 240 200 60" text="%s" font_size="25" align="center"\r
+        bind_data="20490"></label>\r
 \r
-    <!-- 心率图标 -->\r
-    <static_img id="heart_rate" position="156 260" img_name="./instance/101/HEARTRATE_IMAGE_PATH.png"></static_img>\r
 \r
-    <!-- 心率显示标签，动态更新心率 -->\r
-    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="196 330 60 35" text="%.0f" font_size="25" align="center" bind_data="2" period="10"></label>\r
+    <!-- 大鹅动画序列 32张 -->\r
+    <sequence_img\r
+        img_names="./instance/132/goose_out/goose_01.png,./instance/132/goose_out/goose_02.png,./instance/132/goose_out/goose_03.png,./instance/132/goose_out/goose_04.png,./instance/132/goose_out/goose_05.png,./instance/132/goose_out/goose_06.png,./instance/132/goose_out/goose_07.png,./instance/132/goose_out/goose_08.png,./instance/132/goose_out/goose_09.png,./instance/132/goose_out/goose_10.png,./instance/132/goose_out/goose_11.png,./instance/132/goose_out/goose_12.png,./instance/132/goose_out/goose_13.png,./instance/132/goose_out/goose_14.png,./instance/132/goose_out/goose_15.png,./instance/132/goose_out/goose_16.png,./instance/132/goose_out/goose_17.png,./instance/132/goose_out/goose_18.png,./instance/132/goose_out/goose_19.png,./instance/132/goose_out/goose_20.png,./instance/132/goose_out/goose_21.png,./instance/132/goose_out/goose_22.png,./instance/132/goose_out/goose_23.png,./instance/132/goose_out/goose_24.png,./instance/132/goose_out/goose_25.png,./instance/132/goose_out/goose_26.png,./instance/132/goose_out/goose_27.png,./instance/132/goose_out/goose_28.png,./instance/132/goose_out/goose_29.png,./instance/132/goose_out/goose_30.png,./instance/132/goose_out/goose_31.png,./instance/132/goose_out/goose_32.png"\r
+        position="175 280" repeat="true" interval="100"></sequence_img>\r
 \r
-    <!-- 进度条背景图 -->\r
-    <static_img id="progress" position="53 54" img_name="./instance/101/PROGRESS_IMAGE_PATH.png"></static_img>\r
+    <!-- 圆圈图标 -->\r
+    <static_img id="quan_img" position="153 262" img_name="./instance/132/quan.png"></static_img>\r
 \r
-    <!-- 电池电量显示标签，动态更新电池百分比 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="313 230 80 35" text="%s" font_size="25" align="center" bind_data="20485" period="10"></label>\r
+    <!-- 步数完成度 [圆形进度条] -->\r
+    <arc_progress id="step_progress" rect="0 0 216 466" color="0xFFffc70d" cap_type="round"\r
+        radius="50" background_color="0xffFF0000" start_angle="0" end_angle="359" line_width="10"\r
+        bind_data="35" period="10"></arc_progress>\r
 \r
-    <!-- 时针旋转图像，周期性更新 -->\r
-    <rotate_img id="hour" position="202 16" rotate_center="25.0 211.0" rotate_start="0" rotate_end="360" img_name="./instance/101/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r
+    <!-- 卡路里完成度 [圆形进度条] -->\r
+    <arc_progress id="calorie_progress" rect="0 0 722 466" color="0xFFffc70d" cap_type="round"\r
+        radius="50" background_color="0xffFF0000" start_angle="0" end_angle="359" line_width="10"\r
+        bind_data="36"></arc_progress>\r
 \r
-    <!-- 时钟大圈背景图 -->\r
-    <static_img id="hour_circle" position="202 202" img_name="./instance/101/BIGCIRCLE_IMAGE_PATH.png"></static_img>\r
 \r
-    <!-- 分针旋转图像，周期性更新 -->\r
-    <rotate_img id="minute" position="202 16" rotate_center="25.0 211.0" rotate_start="0" rotate_end="360" img_name="./instance/101/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>\r
+    <!-- 小时 -->\r
+    <rotate_img id="hour" position="224 103" rotate_center="9.0 130.0" rotate_start="0"\r
+        rotate_end="360" img_name="./instance/132/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r
+    <!-- 分钟 -->\r
+    <rotate_img id="minute" position="219 63" rotate_center="13.5 170.0" rotate_start="0"\r
+        rotate_end="360" img_name="./instance/132/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>\r
 \r
-    <!-- 分钟圈背景图 -->\r
-    <static_img id="minute_circle" position="202 202" img_name="./instance/101/MEDCIRCLE_IMAGE_PATH.png"></static_img>\r
+    <!-- 点背景图 -->\r
+    <static_img id="second_circle" position="223 223"\r
+        img_name="./instance/132/point.png"></static_img>\r
 \r
-    <!-- 秒针旋转图像，周期性更新 -->\r
-    <rotate_img id="second" position="202 16" rotate_center="25.0 211.0" rotate_start="0" rotate_end="360" img_name="./instance/101/SECONDHAND.png" bind_data="12" period="60"></rotate_img>\r
 \r
-    <!-- 秒针小圈背景图 -->\r
-    <static_img id="second_circle" position="215 213" img_name="./instance/101/SMALLCIRCLE_IMAGE_PATH.png"></static_img>\r
-</dial>\r
+</dial>
\ No newline at end of file

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_01.png b/tools/dial_converter_tool/instance/132/goose_out/goose_01.png
index 0c8660d..4c0c53e 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_01.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_01.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_02.png b/tools/dial_converter_tool/instance/132/goose_out/goose_02.png
index d227276..cefd622 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_02.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_02.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_03.png b/tools/dial_converter_tool/instance/132/goose_out/goose_03.png
index 3c07174..a0b3b19 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_03.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_03.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_04.png b/tools/dial_converter_tool/instance/132/goose_out/goose_04.png
index ae4d136..1e15044 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_04.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_04.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_05.png b/tools/dial_converter_tool/instance/132/goose_out/goose_05.png
index e9505ef..f605604 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_05.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_05.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_06.png b/tools/dial_converter_tool/instance/132/goose_out/goose_06.png
index 4ba5954..d7bf45a 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_06.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_06.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_07.png b/tools/dial_converter_tool/instance/132/goose_out/goose_07.png
index 2ebaf5f..0610714 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_07.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_07.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_08.png b/tools/dial_converter_tool/instance/132/goose_out/goose_08.png
index 89ead63..9f68dd2 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_08.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_08.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_09.png b/tools/dial_converter_tool/instance/132/goose_out/goose_09.png
index 5ba01aa..804b258 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_09.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_09.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_10.png b/tools/dial_converter_tool/instance/132/goose_out/goose_10.png
index 71e70ce..cc837cc 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_10.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_10.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_11.png b/tools/dial_converter_tool/instance/132/goose_out/goose_11.png
index 87f15d2..d594539 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_11.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_11.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_12.png b/tools/dial_converter_tool/instance/132/goose_out/goose_12.png
index 6427754..35eaf95 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_12.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_12.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_13.png b/tools/dial_converter_tool/instance/132/goose_out/goose_13.png
index 1cc744b..8e20828 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_13.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_13.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_14.png b/tools/dial_converter_tool/instance/132/goose_out/goose_14.png
index 30fdc60..fd86572 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_14.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_14.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_15.png b/tools/dial_converter_tool/instance/132/goose_out/goose_15.png
index 0fa35e3..4305674 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_15.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_15.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_16.png b/tools/dial_converter_tool/instance/132/goose_out/goose_16.png
index 037ca14..cc33ea4 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_16.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_16.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_17.png b/tools/dial_converter_tool/instance/132/goose_out/goose_17.png
index 81c4176..7588f81 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_17.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_17.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_18.png b/tools/dial_converter_tool/instance/132/goose_out/goose_18.png
index c6bd812..8956427 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_18.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_18.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_19.png b/tools/dial_converter_tool/instance/132/goose_out/goose_19.png
index 04d40d7..276d63a 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_19.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_19.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_20.png b/tools/dial_converter_tool/instance/132/goose_out/goose_20.png
index 1bec265..4dfedbc 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_20.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_20.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_21.png b/tools/dial_converter_tool/instance/132/goose_out/goose_21.png
index b4f3d7f..8c3eb82 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_21.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_21.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_22.png b/tools/dial_converter_tool/instance/132/goose_out/goose_22.png
index cc2a891..f7ded14 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_22.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_22.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_23.png b/tools/dial_converter_tool/instance/132/goose_out/goose_23.png
index af51be8..96f47fb 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_23.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_23.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_24.png b/tools/dial_converter_tool/instance/132/goose_out/goose_24.png
index b932e4a..2843632 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_24.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_24.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_25.png b/tools/dial_converter_tool/instance/132/goose_out/goose_25.png
index abb6a78..80c19f2 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_25.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_25.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_26.png b/tools/dial_converter_tool/instance/132/goose_out/goose_26.png
index 51ef993..6d1eb82 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_26.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_26.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_27.png b/tools/dial_converter_tool/instance/132/goose_out/goose_27.png
index fc01860..23cd19f 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_27.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_27.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_28.png b/tools/dial_converter_tool/instance/132/goose_out/goose_28.png
index 169ee11..624c68f 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_28.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_28.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_29.png b/tools/dial_converter_tool/instance/132/goose_out/goose_29.png
index 2ccffdf..7d5cba6 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_29.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_29.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_30.png b/tools/dial_converter_tool/instance/132/goose_out/goose_30.png
index 9dd3203..ef79c5b 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_30.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_30.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_31.png b/tools/dial_converter_tool/instance/132/goose_out/goose_31.png
index 7b18167..c13d262 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_31.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_31.png differ

diff --git a/tools/dial_converter_tool/instance/132/goose_out/goose_32.png b/tools/dial_converter_tool/instance/132/goose_out/goose_32.png
index 40e29e2..86b3105 100644 (file)
Binary files a/tools/dial_converter_tool/instance/132/goose_out/goose_32.png and b/tools/dial_converter_tool/instance/132/goose_out/goose_32.png differ

diff --git a/tools/dial_converter_tool/instance/132/quan.png b/tools/dial_converter_tool/instance/132/quan.png
new file mode 100644 (file)
index 0000000..8ad9552
Binary files /dev/null and b/tools/dial_converter_tool/instance/132/quan.png differ