From da3fe8aa31b5c5d6fae1c34e805915aac4059edb Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=BD=AD=E7=A3=8A?= <1624952103@qq.com>
Date: Thu, 26 Sep 2024 14:24:48 +0000
Subject: [PATCH] Merge #1026 into sdk602patch0626 from refs/changes/1026/head
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

修改黑曜表盘配置

* refs/changes/1026/head: (3 commits squashed)

  - 修改黑曜表盘配置

  - 同步默认表盘更新

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1026
---
 .../fd230/fs/user/dial/obsidianrhythm.bin     |  2 +-
 .../instance/114/obsidianrhythm.xml           | 40 ++++++++++++-------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin
index 48dd46e04..c703ad623 100644
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53d1a6626429f4ea7d0219f7d9637e2cc59979557f9424221ec95381cd0fea22
+oid sha256:e216b822c0eb079b5a09f1665993633059316450e5345bd5ea52c14ab867f42e
 size 1399839
diff --git a/tools/dial_converter_tool/instance/114/obsidianrhythm.xml b/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
index a5683d93a..d944f9285 100644
--- a/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
+++ b/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
@@ -17,19 +17,19 @@
     <option_img position="75 173" img_names="./instance/114/week/WEEK_SUN.png,./instance/114/week/WEEK_MON.png,./instance/114/week/WEEK_TUE.png,./instance/114/week/WEEK_WED.png,./instance/114/week/WEEK_THU.png,./instance/114/week/WEEK_FRI.png,./instance/114/week/WEEK_SAT.png" bind_data="17" period="10"></option_img>
 
     <!-- 天气信息显示 -->
-    <label id="weather_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="83 130 300 30" text="%s" font_size="26" align="center" bind_data="20482" ></label>
+    <label id="weather_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="83 130 300 30" text="%s" font_size="20" align="center" bind_data="20482" ></label>
  
     <!-- 日期显示 -->
-    <label id="day_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="120 222 33 40" text="%02.0f" font_size="24" align="center" bind_data="16" period="10"></label>
+    <label id="day_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="90 222 100 40" text="%0.f" font_size="24" align="center" bind_data="16" period="10"></label>
     
     <!-- 心率显示 -->
-    <label id="heart_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="126 348 49 25" text="%3.0f" font_size="20" align="center" bind_data="2"></label>
+    <label id="heart_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="132 348 49 25" text="%0.f" font_size="20" align="center" bind_data="2"></label>
     
     <!-- 步数显示 -->
-    <label id="step_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="83 374 300 25" text="%5.0f" font_size="20" align="center" bind_data="1"></label>
+    <label id="step_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="83 374 300 25" text="%0.f" font_size="20" align="center" bind_data="1"></label>
     
     <!-- 卡路里显示 -->
-    <label id="calories_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="281 348 45 25" text="%3.0f" font_size="20" align="center" bind_data="3"></label>
+    <label id="calories_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="287 348 45 25" text="%0.f" font_size="20" align="center" bind_data="3"></label>
     
     <!-- 心率icon显示 -->
     <static_img  position="144 315"  img_name="./instance/114/module/heartrate.png"></static_img>
@@ -40,16 +40,27 @@
     <!-- 时间背景框icon显示 -->
     <static_img  position="300 213"  img_name="./instance/114/module/ellipse.png"></static_img>
 
-    <!-- 小时十位显示 -->
-    <label id="hour_ten_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="312 223 64 33" text="%1.0f" font_size="20" align="center" bind_data="26" period="10"></label>
-        <!-- 小时个位显示 -->
-    <label id="hour_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="327 223 64 33" text="%1.0f" font_size="20" align="center" bind_data="27" period="10"></label>
+
+    <!-- 小时显示 -->
+    <!-- <label id="hour_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="293 222 77 104" text="%02.f" font_size="20" align="center" bind_data="15" period="10"></label> -->
+    <!-- 分号显示 -->
+    <!-- <label id="point_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="333 222 28 139" text=":" font_size="20" align="center"></label> -->
+    <!-- 分钟显示 -->
+    <!-- <label id="minute_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="331 222 77 104" text="%02.f" font_size="20" align="center" bind_data="14" period="10"></label> -->
+
+ 
+
+    <!-- 小时十位显示-->
+    <label id="hour_ten_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="313 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="26" period="10"></label>
+    <!-- 小时个位显示 -->
+    <label id="hour_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="323 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="27" period="10"></label>
     <!-- 分号显示    -->
-    <label id="point_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="345 220 28 139" text=":" font_size="22" align="center"></label>
+    <label id="point_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="340 220 28 139" text=":" font_size="22" align="center"></label>
     <!-- 分钟十位显示 -->
-    <label id="minute_ten_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="355 223 64 33" text="%1.0f" font_size="20" align="center" bind_data="28" period="10"></label>
-        <!-- 分钟个位显示 -->
-    <label id="hour_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="370 223 64 33" text="%1.0f" font_size="20" align="center" bind_data="29" period="10"></label>
+    <label id="minute_ten_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="355 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="28" period="10"></label>
+    <!-- 分钟个位显示 -->
+    <label id="hour_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="370 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="29" period="10"></label>
+
 
     <!-- 小时 -->
     <rotate_img id="hour" position="212 75" rotate_center="21.0 158.0" rotate_start="0" rotate_end="360" img_name="./instance/114/HOURHAND.png" bind_data="9" period="10"></rotate_img>
@@ -57,7 +68,8 @@
     <rotate_img id="minute" position="218 23" rotate_center="15.0 210.0" rotate_start="0" rotate_end="360" img_name="./instance/114/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>
     <!-- 秒钟 -->
     <rotate_img id="second" position="220 17" rotate_center="13.0 216.0" rotate_start="0" rotate_end="360" img_name="./instance/114/SECONDHAND.png" bind_data="12" period="60"></rotate_img>
-    
+
+
     <!--通话
     <click rect="0 193 80 80" action_slice="84"></click>
     -->
-- 
2.17.1