Merge #1583 into sdk602patch0911 from refs/changes/1583/head 1585/target/1 1586/target/1
author罗正 <1732036298@qq.com>
Mon, 30 Dec 2024 10:09:25 +0000 (10:09 +0000)
committer袁清梦 <3449750381@qq.com>
Mon, 30 Dec 2024 10:09:25 +0000 (10:09 +0000)
commit3ce4947c29bbd8986ae827ad744983336209bd86
tree81009c2826372e0421659cffb62572dc031eedaf
parentea1dda03109415548a668bf9927f23e462b12e91
Merge #1583 into sdk602patch0911 from refs/changes/1583/head

Code review from 罗正

* refs/changes/1583/head: (42 commits squashed)

  - 表盘【大眼雀梅】

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

  - 表盘市场【大眼雀梅】

  - 表盘【柯基】

  - 表盘【仰望】

  - 表盘【绿叶】

  - 表盘【黄昏】

  - 表盘【小松鼠】

  - 表盘【蜥蜴】

  - 表盘【灯塔】

  - 表盘【波斯猫】

  - 表盘【都市夜色】

  - 表盘【自然】

  - 表盘【梅花鹿】

  - 表盘【烟花】

  - 表盘【粉树】

  - 表盘【湖泊】

  - 表盘【樱花】

  - 表盘【蜗牛】

  - 表盘【小鸭】

  - 表盘【深潜】

  - 表盘【波浪】

  - 表盘市场【柯基】

  - 表盘市场【仰望】

  - 表盘市场【绿叶】

  - 表盘市场【黄昏】

  - 表盘市场【小松鼠】

  - 表盘市场【蜥蜴】

  - 表盘市场【灯塔】

  - 表盘市场【波斯猫】

  - 表盘市场【都市夜色】

  - 表盘市场【自然】

  - 表盘市场【梅花鹿】

  - 表盘市场【烟花】

  - 表盘市场【粉树】

  - 表盘市场【湖泊】

  - 表盘市场【樱花】

  - 表盘市场【蜗牛】

  - 表盘市场【小鸭】

  - 表盘市场【深潜】

  - 表盘市场【波浪】

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

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1583
161 files changed:
tools/dial_converter_tool/dial_lzma/145/ornithogalum.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/145/ornithogalum.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/145/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/154/corgi.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/154/corgi.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/154/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/155/lookup.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/155/lookup.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/155/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/156/greenery.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/156/greenery.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/156/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/157/dusk.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/157/dusk.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/157/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/158/squirrel.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/158/squirrel.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/158/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/159/lizard.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/159/lizard.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/159/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/160/lighthouse.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/160/lighthouse.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/160/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/161/persiancat.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/161/persiancat.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/161/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/162/urbannight.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/162/urbannight.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/162/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/163/nature.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/163/nature.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/163/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/164/sikadeer.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/164/sikadeer.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/164/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/165/firework.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/165/firework.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/165/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/166/pinktree.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/166/pinktree.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/166/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/167/lake.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/167/lake.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/167/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/168/sakura.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/168/sakura.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/168/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/169/snails.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/169/snails.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/169/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/170/duck.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/170/duck.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/170/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/171/deepdive.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/171/deepdive.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/171/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/172/wave.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/172/wave.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/172/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/instance/145/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/145/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/145/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/145/ornithogalum.png [new file with mode: 0644]
tools/dial_converter_tool/instance/145/ornithogalum.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/145/thumbnail.png [deleted file]
tools/dial_converter_tool/instance/154/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/154/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/154/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/154/corgi.png [new file with mode: 0644]
tools/dial_converter_tool/instance/154/corgi.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/155/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/155/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/155/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/155/lookup.png [new file with mode: 0644]
tools/dial_converter_tool/instance/155/lookup.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/156/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/156/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/156/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/156/greenery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/156/greenery.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/157/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/157/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/157/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/157/dusk.png [new file with mode: 0644]
tools/dial_converter_tool/instance/157/dusk.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/158/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/158/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/158/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/158/squirrel.png [new file with mode: 0644]
tools/dial_converter_tool/instance/158/squirrel.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/159/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/159/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/159/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/159/lizard.png [new file with mode: 0644]
tools/dial_converter_tool/instance/159/lizard.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/160/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/160/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/160/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/160/lighthouse.png [new file with mode: 0644]
tools/dial_converter_tool/instance/160/lighthouse.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/161/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/161/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/161/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/161/persiancat.png [new file with mode: 0644]
tools/dial_converter_tool/instance/161/persiancat.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/162/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/162/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/162/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/162/urbannight.png [new file with mode: 0644]
tools/dial_converter_tool/instance/162/urbannight.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/163/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/163/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/163/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/163/nature.png [new file with mode: 0644]
tools/dial_converter_tool/instance/163/nature.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/164/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/164/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/164/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/164/sikadeer.png [new file with mode: 0644]
tools/dial_converter_tool/instance/164/sikadeer.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/165/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/165/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/165/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/165/firework.png [new file with mode: 0644]
tools/dial_converter_tool/instance/165/firework.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/166/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/166/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/166/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/166/pinktree.png [new file with mode: 0644]
tools/dial_converter_tool/instance/166/pinktree.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/167/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/167/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/167/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/167/lake.png [new file with mode: 0644]
tools/dial_converter_tool/instance/167/lake.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/168/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/168/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/168/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/168/sakura.png [new file with mode: 0644]
tools/dial_converter_tool/instance/168/sakura.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/169/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/169/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/169/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/169/snails.png [new file with mode: 0644]
tools/dial_converter_tool/instance/169/snails.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/170/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/170/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/170/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/170/duck.png [new file with mode: 0644]
tools/dial_converter_tool/instance/170/duck.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/171/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/171/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/171/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/171/deepdive.png [new file with mode: 0644]
tools/dial_converter_tool/instance/171/deepdive.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/172/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/172/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/172/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/172/wave.png [new file with mode: 0644]
tools/dial_converter_tool/instance/172/wave.xml [new file with mode: 0644]