表盘：增加晨曦表盘资源

diff --git a/tools/dial_converter_tool/dial_lzma/113/dawninsight.lzma b/tools/dial_converter_tool/dial_lzma/113/dawninsight.lzma
new file mode 100644 (file)
index 0000000..6f1ddd9
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/113/dawninsight.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma b/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma
index 3b6e759..f98e4a6 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma and b/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma differ

diff --git a/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png
index e2fea40..ab986df 100644 (file)
Binary files a/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png and b/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png differ

diff --git a/tools/dial_converter_tool/instance/113/dawninsight.xml b/tools/dial_converter_tool/instance/113/dawninsight.xml
index 4c39537..56be3a9 100644 (file)
--- a/tools/dial_converter_tool/instance/113/dawninsight.xml
+++ b/tools/dial_converter_tool/instance/113/dawninsight.xml
@@ -1,4 +1,39 @@
-<dial title="time" description="晨曦智影" size="466 466" version="1.0" preview_img="./instance/116/dawninsight.png">\r
-    <!-- 背景 -->\r
-    <static_img id="back_ground" position="0 0" img_name="./instance/116/MAIN_FACE_IMAGE.png"></static_img>\r
+<dial title="dawninsight" description="晨曦智影" size="466 466" version="1.0" preview_img="./instance/113/dawninsight.png">\r
+    <!-- 背景   -->\r
+    <static_img id="back_ground" position="0 0" img_name="./instance/113/MAIN_FACE_IMAGE.png"></static_img>\r
+\r
+    <!-- 天气显示 -->\r
+    <option_img position="165 50" img_names="./instance/113/weather/SUNNY.png,./instance/113/weather/CLEAR_SUNNY.png,./instance/113/weather/SUNNY_CLOUDY.png,./instance/113/weather/CLEAR_CLOUDY.png,./instance/113/weather/OVERCAST.png,./instance/113/weather/RAIN.png,./instance/113/weather/THUNDERSHOWER.png,./instance/113/weather/SNOW.png,./instance/113/weather/FOGGY.png,./instance/113/weather/HAZE.png,./instance/113/weather/DUSTSTORM.png,./instance/113/weather/UNKNOWN.png" bind_data="24" ></option_img>\r
+    <!-- 天气信息显示 -->\r
+    <label id="weather_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="165 70 200 60" text="%s" font_size="30" align="center" bind_data="20482" ></label>\r
+    \r
+    <!-- 日期显示 -->\r
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="43 128 380 60" text="%s" font_size="30" align="center" bind_data="20484" period="10"></label>\r
+    \r
+    <!-- 步数 -->\r
+    <label id="step_label" color="0xFFaaaaaa" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="133 413 200 60" text="步数" font_size="20" align="center"></label>\r
+    <!-- 目标步数完成度 -->\r
+    <label id="step_label_goal" color="0xFF666666" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="133 325 200 60" text="目标步数完成度" font_size="16" align="center"></label>\r
+\r
+    <!-- 心率显示 -->\r
+    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="30 353 200 60" text="%0.f" font_size="30" align="center" bind_data="2"></label> \r
+    <!-- 步数显示 -->\r
+    <label id="step_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="133 376 200 60" text="%0.f" font_size="30" align="center" bind_data="1"></label>\r
+    <!-- 卡路里显示 -->\r
+    <label id="calories_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="240 353 200 60" text="%0.f" font_size="30" align="center" bind_data="3"></label>\r
+    \r
+    <!-- 小时显示 -->\r
+    <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="86 162 200 60" text="%02.f" font_size="120" align="center" bind_data="15" period="10"></label>\r
+    <!-- 分钟显示 -->\r
+    <label id="minute_label" color="0xFF666666" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="240 162 200 60" text="%02.f" font_size="120" align="center" bind_data="14" period="10"></label>\r
+\r
+    <!-- 电量 -->\r
+    <arc_progress id="battery_progress" rect="0 0 466 436" color="0xFFf0c440" cap_type="round" radius="191"  background_color="0x00FFFFFF" start_angle="290" end_angle="430" line_width="10" bind_data="25" period="10"></arc_progress>\r
+    <!-- 步数目标 -->\r
+    <box_progress id="stepgoal_progress" rect="103 302 260 12" color="0xFFf0c440" cap_type="round" direction="left_to_right" background_color="0xff191919" bind_data="31"></box_progress>\r
+\r
+    <!-- 支付宝 -->\r
+    <click rect="20 208 80 80" action_slice="204"></click>\r
+    <!--AI-->\r
+    <click rect="393 208 80 80" action_slice="203"></click>\r
 </dial>\r

diff --git a/tools/dial_converter_tool/instance/113/weather/CLEAR_CLOUDY.png b/tools/dial_converter_tool/instance/113/weather/CLEAR_CLOUDY.png
new file mode 100644 (file)
index 0000000..d387a55
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/CLEAR_CLOUDY.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/CLEAR_SUNNY.png b/tools/dial_converter_tool/instance/113/weather/CLEAR_SUNNY.png
new file mode 100644 (file)
index 0000000..f0a8a2d
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/CLEAR_SUNNY.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/DUSTSTORM.png b/tools/dial_converter_tool/instance/113/weather/DUSTSTORM.png
new file mode 100644 (file)
index 0000000..3588ac4
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/DUSTSTORM.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/FOGGY.png b/tools/dial_converter_tool/instance/113/weather/FOGGY.png
new file mode 100644 (file)
index 0000000..2d9a3bd
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/FOGGY.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/HAZE.png b/tools/dial_converter_tool/instance/113/weather/HAZE.png
new file mode 100644 (file)
index 0000000..57bba86
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/HAZE.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/OVERCAST.png b/tools/dial_converter_tool/instance/113/weather/OVERCAST.png
new file mode 100644 (file)
index 0000000..175538b
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/OVERCAST.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/RAIN.png b/tools/dial_converter_tool/instance/113/weather/RAIN.png
new file mode 100644 (file)
index 0000000..f70dd0a
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/RAIN.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/SNOW.png b/tools/dial_converter_tool/instance/113/weather/SNOW.png
new file mode 100644 (file)
index 0000000..99ff98b
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/SNOW.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/SUNNY.png b/tools/dial_converter_tool/instance/113/weather/SUNNY.png
new file mode 100644 (file)
index 0000000..4270b00
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/SUNNY.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/SUNNY_CLOUDY.png b/tools/dial_converter_tool/instance/113/weather/SUNNY_CLOUDY.png
new file mode 100644 (file)
index 0000000..ae9e0d5
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/SUNNY_CLOUDY.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/THUNDERSHOWER.png b/tools/dial_converter_tool/instance/113/weather/THUNDERSHOWER.png
new file mode 100644 (file)
index 0000000..fa73721
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/THUNDERSHOWER.png differ

diff --git a/tools/dial_converter_tool/instance/113/weather/UNKNOWN.png b/tools/dial_converter_tool/instance/113/weather/UNKNOWN.png
new file mode 100644 (file)
index 0000000..60d37ae
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/weather/UNKNOWN.png differ

diff --git a/tools/dial_converter_tool/instance/114/obsidianrhythm.mp4 b/tools/dial_converter_tool/instance/114/output.mp4
similarity index 76%
rename from tools/dial_converter_tool/instance/114/obsidianrhythm.mp4
rename to tools/dial_converter_tool/instance/114/output.mp4
index 8bad271..a617bb7 100644 (file)
Binary files a/tools/dial_converter_tool/instance/114/obsidianrhythm.mp4 and b/tools/dial_converter_tool/instance/114/output.mp4 differ

diff --git a/tools/image_converter_tool/test/clocks/Galaxy.png b/tools/image_converter_tool/test/clocks/Galaxy.png
deleted file mode 100644 (file)
index 0ea475e..0000000
Binary files a/tools/image_converter_tool/test/clocks/Galaxy.png and /dev/null differ

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

diff --git a/tools/image_converter_tool/test/clocks/dawninsight.png b/tools/image_converter_tool/test/clocks/dawninsight.png
new file mode 100644 (file)
index 0000000..e2fea40
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/dawninsight.png differ

diff --git a/tools/image_converter_tool/test/clocks/dawninsight.xml b/tools/image_converter_tool/test/clocks/dawninsight.xml
new file mode 100644 (file)
index 0000000..4c39537
--- /dev/null
+++ b/tools/image_converter_tool/test/clocks/dawninsight.xml
@@ -0,0 +1,4 @@
+<dial title="time" description="晨曦智影" size="466 466" version="1.0" preview_img="./instance/116/dawninsight.png">\r
+    <!-- 背景 -->\r
+    <static_img id="back_ground" position="0 0" img_name="./instance/116/MAIN_FACE_IMAGE.png"></static_img>\r
+</dial>\r

diff --git a/tools/image_converter_tool/test/clocks/weather/CLEAR_CLOUDY.png b/tools/image_converter_tool/test/clocks/weather/CLEAR_CLOUDY.png
new file mode 100644 (file)
index 0000000..d387a55
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/CLEAR_CLOUDY.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/CLEAR_SUNNY.png b/tools/image_converter_tool/test/clocks/weather/CLEAR_SUNNY.png
new file mode 100644 (file)
index 0000000..f0a8a2d
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/CLEAR_SUNNY.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/DUSTSTORM.png b/tools/image_converter_tool/test/clocks/weather/DUSTSTORM.png
new file mode 100644 (file)
index 0000000..3588ac4
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/DUSTSTORM.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/FOGGY.png b/tools/image_converter_tool/test/clocks/weather/FOGGY.png
new file mode 100644 (file)
index 0000000..2d9a3bd
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/FOGGY.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/HAZE.png b/tools/image_converter_tool/test/clocks/weather/HAZE.png
new file mode 100644 (file)
index 0000000..57bba86
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/HAZE.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/OVERCAST.png b/tools/image_converter_tool/test/clocks/weather/OVERCAST.png
new file mode 100644 (file)
index 0000000..175538b
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/OVERCAST.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/RAIN.png b/tools/image_converter_tool/test/clocks/weather/RAIN.png
new file mode 100644 (file)
index 0000000..f70dd0a
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/RAIN.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/SNOW.png b/tools/image_converter_tool/test/clocks/weather/SNOW.png
new file mode 100644 (file)
index 0000000..99ff98b
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/SNOW.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/SUNNY.png b/tools/image_converter_tool/test/clocks/weather/SUNNY.png
new file mode 100644 (file)
index 0000000..4270b00
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/SUNNY.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/SUNNY_CLOUDY.png b/tools/image_converter_tool/test/clocks/weather/SUNNY_CLOUDY.png
new file mode 100644 (file)
index 0000000..ae9e0d5
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/SUNNY_CLOUDY.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/THUNDERSHOWER.png b/tools/image_converter_tool/test/clocks/weather/THUNDERSHOWER.png
new file mode 100644 (file)
index 0000000..fa73721
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/THUNDERSHOWER.png differ

diff --git a/tools/image_converter_tool/test/clocks/weather/UNKNOWN.png b/tools/image_converter_tool/test/clocks/weather/UNKNOWN.png
new file mode 100644 (file)
index 0000000..60d37ae
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/weather/UNKNOWN.png differ