表盘：修改所有表盘电池组件

diff --git a/tools/dial_converter_tool/dial_lzma/101/sport.lzma b/tools/dial_converter_tool/dial_lzma/101/sport.lzma
index 656fea0..bad8d85 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/101/sport.lzma and b/tools/dial_converter_tool/dial_lzma/101/sport.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma
index 2ea153e..f4a073e 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma and b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/104/dog.lzma b/tools/dial_converter_tool/dial_lzma/104/dog.lzma
index 3bd661a..e74695d 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/104/dog.lzma and b/tools/dial_converter_tool/dial_lzma/104/dog.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/1052/classic.lzma b/tools/dial_converter_tool/dial_lzma/1052/classic.lzma
index 59fd2e4..c8c1f85 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/1052/classic.lzma and b/tools/dial_converter_tool/dial_lzma/1052/classic.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma b/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma
index 5b4c111..debb01f 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma and b/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/107/geometry.lzma b/tools/dial_converter_tool/dial_lzma/107/geometry.lzma
index a69b26b..0b31122 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/107/geometry.lzma and b/tools/dial_converter_tool/dial_lzma/107/geometry.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/108/maomao.lzma b/tools/dial_converter_tool/dial_lzma/108/maomao.lzma
index cdae586..40c60f3 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/108/maomao.lzma and b/tools/dial_converter_tool/dial_lzma/108/maomao.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/109/succulents.lzma b/tools/dial_converter_tool/dial_lzma/109/succulents.lzma
index 630da34..77ec3dc 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/109/succulents.lzma and b/tools/dial_converter_tool/dial_lzma/109/succulents.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma b/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma
index d93b069..719c1eb 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma and b/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/111/satellite.lzma b/tools/dial_converter_tool/dial_lzma/111/satellite.lzma
index b1b072e..4db5529 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/111/satellite.lzma and b/tools/dial_converter_tool/dial_lzma/111/satellite.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/112/birdie.lzma b/tools/dial_converter_tool/dial_lzma/112/birdie.lzma
index fe6d3da..ca30ed2 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/112/birdie.lzma and b/tools/dial_converter_tool/dial_lzma/112/birdie.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/115/mirrorvoyager.lzma b/tools/dial_converter_tool/dial_lzma/115/mirrorvoyager.lzma
index cbecb09..e8647b5 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/115/mirrorvoyager.lzma and b/tools/dial_converter_tool/dial_lzma/115/mirrorvoyager.lzma differ

diff --git a/tools/dial_converter_tool/instance/101/sport.xml b/tools/dial_converter_tool/instance/101/sport.xml
index 1353dc9..0d1d5a7 100644 (file)
--- a/tools/dial_converter_tool/instance/101/sport.xml
+++ b/tools/dial_converter_tool/instance/101/sport.xml
@@ -20,7 +20,7 @@
     <static_img id="progress" position="53 54" img_name="./instance/101/PROGRESS_IMAGE_PATH.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="%.0f%%" font_size="25" align="center" bind_data="8" period="10"></label>\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
     <!-- 时针旋转图像，周期性更新 -->\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

diff --git a/tools/dial_converter_tool/instance/103/jellyfish.xml b/tools/dial_converter_tool/instance/103/jellyfish.xml
index 39bf61b..c2c5f85 100644 (file)
--- a/tools/dial_converter_tool/instance/103/jellyfish.xml
+++ b/tools/dial_converter_tool/instance/103/jellyfish.xml
@@ -14,7 +14,7 @@
     <!-- 电池图像 -->\r
     <option_img position="176 52" img_names="./instance/103/Battery/Battery.png,./instance/103/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
 \r
 \r
     <!-- 小时标签 -->\r

diff --git a/tools/dial_converter_tool/instance/104/dog.xml b/tools/dial_converter_tool/instance/104/dog.xml
index 382716c..b892d49 100644 (file)
--- a/tools/dial_converter_tool/instance/104/dog.xml
+++ b/tools/dial_converter_tool/instance/104/dog.xml
@@ -10,9 +10,11 @@
     <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="194 348 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>\r
 \r
     <!-- 电池标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="335 246 100 60" text="%.0f%%" font_size="28" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="360 246 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
+\r
     <!-- 心率标签 -->\r
-    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="35 246 100 60" text="%.0f" font_size="28" align="center" bind_data="2" period="10"></label>\r
+    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="38 246 100 60" text="%.0f" font_size="28" align="center" bind_data="2" period="10"></label>\r
 \r
     <!-- 时针图像 -->\r
     <rotate_img id="hour" position="221 87" rotate_center="12.0 146.0" rotate_start="0" rotate_end="360" img_name="./instance/104/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r

diff --git a/tools/dial_converter_tool/instance/1052/classic.xml b/tools/dial_converter_tool/instance/1052/classic.xml
index b459278..6e38764 100644 (file)
--- a/tools/dial_converter_tool/instance/1052/classic.xml
+++ b/tools/dial_converter_tool/instance/1052/classic.xml
@@ -14,7 +14,7 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/1052/Battery/Battery.png,./instance/1052/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
 \r
     <!-- 时针 -->\r
     <rotate_img id="hour" position="221 87" rotate_center="12.0 146.0" rotate_start="0" rotate_end="360" img_name="./instance/1052/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r

diff --git a/tools/dial_converter_tool/instance/106/galaxy.xml b/tools/dial_converter_tool/instance/106/galaxy.xml
index 0ab47cf..f29021a 100644 (file)
--- a/tools/dial_converter_tool/instance/106/galaxy.xml
+++ b/tools/dial_converter_tool/instance/106/galaxy.xml
@@ -28,7 +28,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/106/Battery/Battery.png,./instance/106/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时显示 -->\r
     <!-- <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="59 160 77 104" text="%02.0f" font_size="120" align="center" bind_data="15" period="10"></label> -->\r

diff --git a/tools/dial_converter_tool/instance/107/geometry.xml b/tools/dial_converter_tool/instance/107/geometry.xml
index 2c2a2bb..f7c9024 100644 (file)
--- a/tools/dial_converter_tool/instance/107/geometry.xml
+++ b/tools/dial_converter_tool/instance/107/geometry.xml
@@ -15,7 +15,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/107/Battery/Battery.png,./instance/107/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时显示 -->\r
     <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="40 139 200 60" text="%02.0f" font_size="90" align="center" bind_data="15" period="10"></label>\r

diff --git a/tools/dial_converter_tool/instance/108/maomao.xml b/tools/dial_converter_tool/instance/108/maomao.xml
index 50ddad6..ea6048c 100644 (file)
--- a/tools/dial_converter_tool/instance/108/maomao.xml
+++ b/tools/dial_converter_tool/instance/108/maomao.xml
@@ -14,7 +14,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/108/Battery/Battery.png,./instance/108/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时 -->\r
     <rotate_img id="hour" position="221 87" rotate_center="12.0 146.0" rotate_start="0" rotate_end="360" img_name="./instance/108/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r

diff --git a/tools/dial_converter_tool/instance/109/succulents.xml b/tools/dial_converter_tool/instance/109/succulents.xml
index 5672354..3c2c948 100644 (file)
--- a/tools/dial_converter_tool/instance/109/succulents.xml
+++ b/tools/dial_converter_tool/instance/109/succulents.xml
@@ -13,7 +13,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/109/Battery/Battery.png,./instance/109/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时标签 -->\r
     <!-- <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="152 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="15" period="10"></label> -->\r

diff --git a/tools/dial_converter_tool/instance/110/spaceman.xml b/tools/dial_converter_tool/instance/110/spaceman.xml
index 3a89a21..d238772 100644 (file)
--- a/tools/dial_converter_tool/instance/110/spaceman.xml
+++ b/tools/dial_converter_tool/instance/110/spaceman.xml
@@ -15,7 +15,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/110/Battery/Battery.png,./instance/110/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时标签 -->\r
     <!-- <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="152 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="15" period="10"></label> -->\r

diff --git a/tools/dial_converter_tool/instance/111/satellite.xml b/tools/dial_converter_tool/instance/111/satellite.xml
index 8c4abba..f3a513c 100644 (file)
--- a/tools/dial_converter_tool/instance/111/satellite.xml
+++ b/tools/dial_converter_tool/instance/111/satellite.xml
@@ -15,7 +15,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/111/Battery/Battery.png,./instance/111/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时标签 -->\r
     <!-- <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="152 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="15" period="10"></label> -->\r

diff --git a/tools/dial_converter_tool/instance/112/birdie.xml b/tools/dial_converter_tool/instance/112/birdie.xml
index c36096f..61e7f15 100644 (file)
--- a/tools/dial_converter_tool/instance/112/birdie.xml
+++ b/tools/dial_converter_tool/instance/112/birdie.xml
@@ -14,7 +14,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/112/Battery/Battery.png,./instance/112/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时标签 -->\r
     <!-- <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="152 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="15" period="10"></label> -->\r

diff --git a/tools/dial_converter_tool/instance/115/mirrorvoyager.xml b/tools/dial_converter_tool/instance/115/mirrorvoyager.xml
index ba13eb1..12ef967 100644 (file)
--- a/tools/dial_converter_tool/instance/115/mirrorvoyager.xml
+++ b/tools/dial_converter_tool/instance/115/mirrorvoyager.xml
@@ -24,8 +24,8 @@
         rect="29 340 200 60" text="%0.f" font_size="20" align="center" bind_data="3"></label>\r
     <!-- 电量显示 -->\r
     <label id="battery_label" color="0xFF000000" font="HarmonyOS_Sans_SC_Regular.ttf"\r
-        break_mode="ellipsis" rect="232 340 200 60" text="%2.0f%%" font_size="20" align="center"\r
-        bind_data="8" period="10"></label>\r
+        break_mode="ellipsis" rect="232 340 200 60" text="%s" font_size="20" align="center"\r
+        bind_data="20485" period="10"></label>\r
 \r
     <!-- 小时 -->\r
     <rotate_img id="hour" position="212 75" rotate_center="21.0 158.0" rotate_start="0"\r
@@ -35,7 +35,7 @@
         rotate_end="360" img_name="./instance/115/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>\r
     <!-- 秒钟 -->\r
     <rotate_img id="second" position="220 17" rotate_center="13.0 216.0" rotate_start="0"\r
-        rotate_end="360" img_name="./instance/115/SECONDHAND.png" bind_data="12" period="60"></rotate_img>\r
+        rotate_end="360" img_name="./instance/115/SECONDHAND.png" bind_data="12" period="30"></rotate_img>\r
 \r
     <!-- 秒进度条-->\r
     <arc_progress id="second_progress" rect="0 0 466 466" color="0xAA191919" cap_type="none"\r