双色艺术表盘优化还需优化

diff --git a/tools/dial_tools/dial_lzma/210/two_tone_art.lzma b/tools/dial_tools/dial_lzma/210/two_tone_art.lzma
new file mode 100644 (file)
index 0000000..ae19ceb
Binary files /dev/null and b/tools/dial_tools/dial_lzma/210/two_tone_art.lzma differ

diff --git a/tools/dial_tools/instance/210/BACKGROUND_0_6.png b/tools/dial_tools/instance/210/BACKGROUND_0_6.png
index 067518e..7add9eb 100644 (file)
Binary files a/tools/dial_tools/instance/210/BACKGROUND_0_6.png and b/tools/dial_tools/instance/210/BACKGROUND_0_6.png differ

diff --git a/tools/dial_tools/instance/210/BACKGROUND_12_18.png b/tools/dial_tools/instance/210/BACKGROUND_12_18.png
index c0d38ce..0a67559 100644 (file)
Binary files a/tools/dial_tools/instance/210/BACKGROUND_12_18.png and b/tools/dial_tools/instance/210/BACKGROUND_12_18.png differ

diff --git a/tools/dial_tools/instance/210/BACKGROUND_18_24.png b/tools/dial_tools/instance/210/BACKGROUND_18_24.png
index 588f622..4e4759f 100644 (file)
Binary files a/tools/dial_tools/instance/210/BACKGROUND_18_24.png and b/tools/dial_tools/instance/210/BACKGROUND_18_24.png differ

diff --git a/tools/dial_tools/instance/210/BACKGROUND_6_12.png b/tools/dial_tools/instance/210/BACKGROUND_6_12.png
index 7477e4b..ecdd4b2 100644 (file)
Binary files a/tools/dial_tools/instance/210/BACKGROUND_6_12.png and b/tools/dial_tools/instance/210/BACKGROUND_6_12.png differ

diff --git a/tools/dial_tools/instance/210/Battery_0_6.png b/tools/dial_tools/instance/210/Battery_0_6.png
new file mode 100644 (file)
index 0000000..27b8a44
Binary files /dev/null and b/tools/dial_tools/instance/210/Battery_0_6.png differ

diff --git a/tools/dial_tools/instance/210/Battery_12_18.png b/tools/dial_tools/instance/210/Battery_12_18.png
new file mode 100644 (file)
index 0000000..07626f5
Binary files /dev/null and b/tools/dial_tools/instance/210/Battery_12_18.png differ

diff --git a/tools/dial_tools/instance/210/Battery_18_24.png b/tools/dial_tools/instance/210/Battery_18_24.png
new file mode 100644 (file)
index 0000000..6c70904
Binary files /dev/null and b/tools/dial_tools/instance/210/Battery_18_24.png differ

diff --git a/tools/dial_tools/instance/210/Battery_6_12.png b/tools/dial_tools/instance/210/Battery_6_12.png
new file mode 100644 (file)
index 0000000..a711a09
Binary files /dev/null and b/tools/dial_tools/instance/210/Battery_6_12.png differ

diff --git a/tools/dial_tools/instance/210/two_tone_art.xml b/tools/dial_tools/instance/210/two_tone_art.xml
index c25e2dc..3a8085b 100644 (file)
--- a/tools/dial_tools/instance/210/two_tone_art.xml
+++ b/tools/dial_tools/instance/210/two_tone_art.xml
@@ -6,16 +6,18 @@
     <!-- 时间段背景切换（已实现系统端映射逻辑） -->\r
     <option_img position="0 0" img_names="./instance/210/BACKGROUND_0_6.png,./instance/210/BACKGROUND_6_12.png,./instance/210/BACKGROUND_12_18.png,./instance/210/BACKGROUND_18_24.png" bind_data="37" period="10"></option_img>\r
     \r
+    <!-- 电量 -->\r
+    <arc_progress id="battery_progress" rect="0 20 466 466" color="0xFF74EE21" cap_type="round" radius="230"  background_color="0xff191919" start_angle="316" end_angle="404" line_width="10" bind_data="33" period="10"></arc_progress>\r
 \r
-    <!-- 月份显示 -->\r
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="186 120 60 30" text="%02.0f-" font_size="36" align="center" bind_data="18" period="10"></label>\r
-    <!-- 日期显示 -->\r
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="246 120 60 30" text="%02.0f" font_size="36" align="center" bind_data="16" period="10"></label>\r
-\r
-    <!-- 小时和分钟     -->\r
-    <label id="hour_ten_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="83 280 300 120" text="%s" font_size="90" align="center" bind_data="20483" period="10"></label>\r
+    <option_img position="223 10" img_names="./instance/210/Battery_0_6.png,./instance/210/Battery_6_12.png,./instance/210/Battery_12_18.png,./instance/210/Battery_18_24.png" bind_data="37" period="10"></option_img>\r
 \r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 394 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="215 40 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
+    <!-- 月/日 -->\r
+    <label id="date_month_day" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="158 400 60 30" text="%s" font_size="30" align="center" bind_data="20488" period="10"></label>\r
+\r
+    <!-- 星期显示 -->\r
+    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="240 400 100 30" text="%s" font_size="30" align="center" bind_data="20480" period="10"></label>\r
 \r
 </dial>\r

diff --git a/tools/dial_tools/out/two_tone_art.bin b/tools/dial_tools/out/two_tone_art.bin
new file mode 100644 (file)
index 0000000..9e9480b
Binary files /dev/null and b/tools/dial_tools/out/two_tone_art.bin differ