Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin
index f0f7855,879b868..04df3c9
--- 1/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin
--- 2/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin
@@@ -1,3 -1,3 +1,3 @@@
  version https://git-lfs.github.com/spec/v1
- oid sha256:09cf5e3dbf8523842d4418991516548ebb52fb12aabb1dcc92e53d821b017731
 -oid sha256:d648fe0fbe7cad7403a186126eb04b8d3405fd6764a8d21448a8625129b9c28a
--size 217079
++oid sha256:6ba791c5dbbd887f5a7c468c55a3f7338732b618d27cfe0cc67b749a7c8e4464
++size 277

diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin
index 21d246a,5b95785..62e59bc
--- 1/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin
--- 2/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin
@@@ -1,3 -1,3 +1,3 @@@
  version https://git-lfs.github.com/spec/v1
- oid sha256:87aa20f99c96a5e21c55012eab383770de14af8b301c9145d0d260ae9c33fab6
 -oid sha256:080f0ca457c58d293efa8e4e195bb56ee4efc495d566afb8bce802969e8fc2a7
--size 1323490
++oid sha256:8949ecd2b52899d0a7f7b973a3e72665dfd58278aefff789215ff7268469bd73
++size 278

diff --cc tools/dial_converter_tool/instance/101/sport.xml
index 7cf5658,63b0225..39d3d2f
--- 1/tools/dial_converter_tool/instance/101/sport.xml
--- 2/tools/dial_converter_tool/instance/101/sport.xml
+++ b/tools/dial_converter_tool/instance/101/sport.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="sport" description="运动" size="466 466" version="1.0" preview_img="./instance/101/sport.png">\r
++=======
+ <dial title="运动" description="101" size="466 466" version="1.0" preview_img="./instance/101/sport.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
      <!-- 背景图像 -->\r
      <static_img id="back_ground" position="0 0" img_name="./instance/101/MAIN_FACE_IMAGE.png"></static_img>\r
  \r

diff --cc tools/dial_converter_tool/instance/102/kaleidoscope.xml
index 2492710,1adacff..f9d3d4f
--- 1/tools/dial_converter_tool/instance/102/kaleidoscope.xml
--- 2/tools/dial_converter_tool/instance/102/kaleidoscope.xml
+++ b/tools/dial_converter_tool/instance/102/kaleidoscope.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="kaleidoscope" description="万花筒" size="466 466" version="1.0" preview_img="./instance/102/preview_img.png">\r
++=======
+ <dial title="万花筒" description="kaleidoscope dial" size="466 466" version="1.0" preview_img="./instance/102/preview_img.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
      <!-- 万花筒图像 -->\r
      <kaleidoscope id="kale" img_name="./instance/102/rabbit466.png" crown_rotate_step="0.2" animator_rotate_step="0.1"></kaleidoscope>\r
  \r

diff --cc tools/dial_converter_tool/instance/1028/KUMI.xml
index 22a3674,3b360fa..49710bc
--- 1/tools/dial_converter_tool/instance/1028/KUMI.xml
--- 2/tools/dial_converter_tool/instance/1028/KUMI.xml
+++ b/tools/dial_converter_tool/instance/1028/KUMI.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="KUMI" description="KUMI" size="466 466" version="1.0" preview_img="./instance/1028/KUMI.png">\r
++=======
+ <dial title="KUMI" description="KUMI clock" size="466 466" version="1.0" preview_img="./instance/1028/KUMI.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
      <static_img id="back_ground" position="0 0" img_name="./instance/1028/MAIN_FACE_IMAGE.png"></static_img>\r
  \r
      <!-- 日期标签 -->\r

diff --cc tools/dial_converter_tool/instance/103/jellyfish.xml
index 6055df0,a007ada..9adab39
--- 1/tools/dial_converter_tool/instance/103/jellyfish.xml
--- 2/tools/dial_converter_tool/instance/103/jellyfish.xml
+++ b/tools/dial_converter_tool/instance/103/jellyfish.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="jellyfish" description="水母" size="466 466" version="1.0" preview_img="./instance/103/jellyfish.png">\r
++=======
+ <dial title="水母" description="jellyfish clock" size="466 466" version="1.0" preview_img="./instance/103/jellyfish.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
      <static_img id="back_ground" position="0 0" img_name="./instance/103/MAIN_FACE_IMAGE.png"></static_img>\r
  \r
      <!-- 月份标签 -->\r

diff --cc tools/dial_converter_tool/instance/104/dog.xml
index 0410875,6982d9a..4407eac
--- 1/tools/dial_converter_tool/instance/104/dog.xml
--- 2/tools/dial_converter_tool/instance/104/dog.xml
+++ b/tools/dial_converter_tool/instance/104/dog.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="dog" description="小狗" size="466 466" version="1.0" preview_img="./instance/104/dog.png">\r
++=======
+ <dial title="小狗" description="dog clock" size="466 466" version="1.0" preview_img="./instance/104/dog.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
      <!-- 背景图像 -->\r
      <static_img id="back_ground" position="0 0" img_name="./instance/104/MAIN_FACE_IMAGE.png"></static_img>\r
  \r

diff --cc tools/dial_converter_tool/instance/105/kitty.xml
index aefeb92,c316dcf..9779b74
--- 1/tools/dial_converter_tool/instance/105/kitty.xml
--- 2/tools/dial_converter_tool/instance/105/kitty.xml
+++ b/tools/dial_converter_tool/instance/105/kitty.xml
@@@ -1,12 -1,36 +1,50 @@@
++<<<<<<< HEAD
 +<dial title="kitty" description="小猫" size="466 466" version="1.0" preview_img="./instance/105/kitty.png">
 +    <sequence_img img_names="./instance/105/background/1.png,./instance/105/background/6.png,./instance/105/background/11.png,./instance/105/background/16.png,./instance/105/background/21.png,./instance/105/background/26.png,./instance/105/background/31.png,./instance/105/background/36.png,./instance/105/background/41.png,./instance/105/background/46.png,./instance/105/background/51.png,./instance/105/background/56.png,./instance/105/background/61.png,./instance/105/background/66.png,./instance/105/background/71.png,./instance/105/background/76.png,./instance/105/background/81.png,./instance/105/background/86.png,./instance/105/background/91.png,./instance/105/background/96.png,./instance/105/background/101.png,./instance/105/background/106.png,./instance/105/background/111.png,./instance/105/background/116.png,./instance/105/background/121.png,./instance/105/background/126.png,./instance/105/background/131.png,./instance/105/background/136.png,./instance/105/background/141.png,./instance/105/background/146.png,./instance/105/background/151.png,./instance/105/background/156.png,./instance/105/background/161.png,./instance/105/background/166.png,./instance/105/background/171.png,./instance/105/background/176.png,./instance/105/background/181.png,./instance/105/background/186.png,./instance/105/background/191.png,./instance/105/background/196.png,./instance/105/background/201.png" position="0 140" repeat="true" interval="100"></sequence_img>
 +    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 390 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
 +    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 390 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
 +    <option_img position="262 390" img_names="./instance/105/week/7.png,./instance/105/week/1.png,./instance/105/week/2.png,./instance/105/week/3.png,./instance/105/week/4.png,./instance/105/week/5.png,./instance/105/week/6.png" bind_data="17" period="10"></option_img>
 +    <box_progress id="battery_progress" rect="180 43 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
 +    <option_img position="174 37" img_names="./instance/105/Battery/Battery.png,./instance/105/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
 +    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 35 200 60" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>
 +    <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="101 295 200 60" text="%02.0f" font_size="90" align="center" bind_data="15" period="10"></label>
 +    <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="259 295 200 60" text="%02.0f" font_size="90" align="center" bind_data="14" period="10"></label>
 +    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="208 275 50 120" text=":" font_size="105" align="center" bind_data="15" period="10"></label>
++=======
+ <dial title="小猫" description="kitty clock" size="466 466" version="1.0"
+     preview_img="./instance/105/kitty.png">
+     <sequence_img
+         img_names="./instance/105/background/1.png,./instance/105/background/6.png,./instance/105/background/11.png,./instance/105/background/16.png,./instance/105/background/21.png,./instance/105/background/26.png,./instance/105/background/31.png,./instance/105/background/36.png,./instance/105/background/41.png,./instance/105/background/46.png,./instance/105/background/51.png,./instance/105/background/56.png,./instance/105/background/61.png,./instance/105/background/66.png,./instance/105/background/71.png,./instance/105/background/76.png,./instance/105/background/81.png,./instance/105/background/86.png,./instance/105/background/91.png,./instance/105/background/96.png,./instance/105/background/101.png,./instance/105/background/106.png,./instance/105/background/111.png,./instance/105/background/116.png,./instance/105/background/121.png,./instance/105/background/126.png,./instance/105/background/131.png,./instance/105/background/136.png,./instance/105/background/141.png,./instance/105/background/146.png,./instance/105/background/151.png,./instance/105/background/156.png,./instance/105/background/161.png,./instance/105/background/166.png,./instance/105/background/171.png,./instance/105/background/176.png,./instance/105/background/181.png,./instance/105/background/186.png,./instance/105/background/191.png,./instance/105/background/196.png,./instance/105/background/201.png"
+         position="0 140" repeat="true" interval="100"></sequence_img>
+     <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf"
+         break_mode="adapt" rect="142 390 60 30" text="%2.0f月" font_size="26" align="center"
+         bind_data="18" period="10"></label>
+     <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt"
+         rect="185 390 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+     <option_img position="262 390"
+         img_names="./instance/105/week/7.png,./instance/105/week/1.png,./instance/105/week/2.png,./instance/105/week/3.png,./instance/105/week/4.png,./instance/105/week/5.png,./instance/105/week/6.png"
+         bind_data="17" period="10"></option_img>
+     <!-- <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" -->
+     <!-- break_mode="adapt" rect="262 390 60 30" text="星期%2.0f" font_size="26" align="center" -->
+     <!-- bind_data="17" period="10"></label> -->
+     <box_progress id="battery_progress" rect="180 43 31 19"
+         color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF"
+         bind_data="25"
+         period="10"></box_progress>
+     <option_img position="174 37"
+         img_names="./instance/105/Battery/Battery.png,./instance/105/Battery/BatteryCharge.png"
+         bind_data="20" period="10"></option_img>
+     <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf"
+         break_mode="adapt" rect="226 35 200 60" text="%2.0f%%" font_size="26" align="center"
+         bind_data="8" period="10"></label>
+     <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf"
+         break_mode="adapt" rect="101 295 200 60" text="%02.0f" font_size="90" align="center"
+         bind_data="15" period="10"></label>
+     <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf"
+         break_mode="adapt" rect="259 295 200 60" text="%02.0f" font_size="90" align="center"
+         bind_data="14" period="10"></label>
+     <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf"
+         break_mode="ellipsis" rect="208 275 50 120" text=":" font_size="105" align="center"
+         bind_data="15" period="10"></label>
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
  </dial>

diff --cc tools/dial_converter_tool/instance/1052/classic.xml
index c54d8a2,8004ede..6029c86
--- 1/tools/dial_converter_tool/instance/1052/classic.xml
--- 2/tools/dial_converter_tool/instance/1052/classic.xml
+++ b/tools/dial_converter_tool/instance/1052/classic.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="classic" description="经典表盘" size="466 466" version="1.0" preview_img="./instance/1052/classic.png">\r
++=======
+ <dial title="经典表盘" description="classic clock" size="466 466" version="1.0" preview_img="./instance/1052/classic.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
      <static_img id="back_ground" position="0 0" img_name="./instance/1052/MAIN_FACE_IMAGE.png"></static_img>\r
      <!-- 月份显示 -->\r
      <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 365 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>\r

diff --cc tools/dial_converter_tool/instance/106/galaxy.xml
index 7ff3eaf,4c664fc..e877857
--- 1/tools/dial_converter_tool/instance/106/galaxy.xml
--- 2/tools/dial_converter_tool/instance/106/galaxy.xml
+++ b/tools/dial_converter_tool/instance/106/galaxy.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="galaxy" description="星空" size="466 466" version="1.0" preview_img="./instance/106/galaxy.png">\r
++=======
+ <dial title="星空" description="galaxy clock" size="466 466" version="1.0" preview_img="./instance/106/galaxy.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
      <static_img id="back_ground" position="0 0" img_name="./instance/106/MAIN_FACE_IMAGE.png"></static_img>\r
  \r
      <!-- 月份显示 -->\r

diff --cc tools/dial_converter_tool/instance/107/geometry.xml
index 68e5a9c,a631c38..aa182d9
--- 1/tools/dial_converter_tool/instance/107/geometry.xml
--- 2/tools/dial_converter_tool/instance/107/geometry.xml
+++ b/tools/dial_converter_tool/instance/107/geometry.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="geometry" description="数码几何" size="466 466" version="1.0" preview_img="./instance/107/geometry.png">\r
++=======
+ <dial title="数码几何" description="geometry clock" size="466 466" version="1.0" preview_img="./instance/107/geometry.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
      <!-- 几何动画序列 -->\r
      <sequence_img img_names="./instance/107/geometry/1.png,./instance/107/geometry/2.png,./instance/107/geometry/3.png,./instance/107/geometry/4.png,./instance/107/geometry/5.png,./instance/107/geometry/6.png,./instance/107/geometry/7.png,./instance/107/geometry/8.png,./instance/107/geometry/9.png,./instance/107/geometry/10.png,./instance/107/geometry/11.png" position="138 132" repeat="true" interval="100"></sequence_img>\r
  \r

diff --cc tools/dial_converter_tool/instance/108/maomao.xml
index a642751,ab31a05..ba4e9e7
--- 1/tools/dial_converter_tool/instance/108/maomao.xml
--- 2/tools/dial_converter_tool/instance/108/maomao.xml
+++ b/tools/dial_converter_tool/instance/108/maomao.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="maoamo" description="招财猫" size="466 466" version="1.0" preview_img="./instance/108/maomao.png">\r
++=======
+ <dial title="招财猫" description="maoamo clock" size="466 466" version="1.0" preview_img="./instance/108/maomao.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
      <!-- 背景 -->\r
      <static_img id="back_ground" position="0 0" img_name="./instance/108/MAIN_FACE_IMAGE.png"></static_img>\r
  \r

diff --cc tools/dial_converter_tool/instance/109/succulents.xml
index b09820f,bfb26e5..6f5c980
--- 1/tools/dial_converter_tool/instance/109/succulents.xml
--- 2/tools/dial_converter_tool/instance/109/succulents.xml
+++ b/tools/dial_converter_tool/instance/109/succulents.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="succulents" description="多肉" size="466 466" version="1.0" preview_img="./instance/109/succulents.png">\r
++=======
+ <dial title="多肉" description="succulents clock" size="466 466" version="1.0" preview_img="./instance/109/succulents.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
      <static_img id="back_ground" position="0 0" img_name="./instance/109/MAIN_FACE_IMAGE.png"></static_img>\r
  \r
      <!-- 电量进度条 -->\r

diff --cc tools/dial_converter_tool/instance/110/spaceman.xml
index 138f108,f56d435..d6c3764
--- 1/tools/dial_converter_tool/instance/110/spaceman.xml
--- 2/tools/dial_converter_tool/instance/110/spaceman.xml
+++ b/tools/dial_converter_tool/instance/110/spaceman.xml
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<dial title="spaceman" description="宇航员" size="466 466" version="1.0" preview_img="./instance/110/spaceman.png">\r
++=======
+ <dial title="宇航员" description="spaceman clock" size="466 466" version="1.0" preview_img="./instance/110/spaceman.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
  \r
      <video id="video" rect="0 0 466 466" source="./instance/110/spaceman.mp4" color_key="0xff212324" preview_frame="./instance/110/preview_spaceman.png"></video>\r
  \r

diff --cc tools/dial_converter_tool/instance/111/satellite.xml
index eeaf218,9c9622b..d1c347a
--- 1/tools/dial_converter_tool/instance/111/satellite.xml
--- 2/tools/dial_converter_tool/instance/111/satellite.xml
+++ b/tools/dial_converter_tool/instance/111/satellite.xml
@@@ -1,5 -1,5 +1,9 @@@
  \r
++<<<<<<< HEAD
 +<dial title="satellite" description="卫星" size="466 466" version="1.0" preview_img="./instance/111/satellite.png">\r
++=======
+ <dial title="卫星" description="satellite clock" size="466 466" version="1.0" preview_img="./instance/111/satellite.png">\r
++>>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
  \r
      <video id="video" rect="0 0 466 466" source="./instance/111/satellite.mp4" color_key="0xff212324" preview_frame="./instance/111/preview_satellite.png"></video>\r
  \r