Merge #1625 into sdk602patch0911 from refs/changes/1625/head
author袁清梦 <3449750381@qq.com>
Mon, 13 Jan 2025 02:29:22 +0000 (02:29 +0000)
committer袁清梦 <3449750381@qq.com>
Mon, 13 Jan 2025 02:29:22 +0000 (02:29 +0000)
commit4c37ce5a6dfeb2c5c3a49734e8f45d145ebdefc2
tree301cc31b8af897d89c02981c67c7969c65cc90e7
parentd9f3f85a1af9af414a5b3ff4f204a94bb51ad92d
Merge #1625 into sdk602patch0911 from refs/changes/1625/head

Code review from 袁清梦

* refs/changes/1625/head: (24 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

  - 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

  - 修改表盘;【沙皮狗】

  - 表盘:【新年快乐】

  - 表盘:【蛇年大吉】

  - 表盘:【福娃贺岁】

  - 表盘:【恭喜发财】

  - 表盘:【好运连连】

  - 表盘:【八方来财】

  - 表盘:【喜迎2025】

  - 表盘:【元旦快乐】

  - 表盘:【新春快乐】

  - 表盘【2025】

  - 表盘:【蛇来运转】

  - 表盘:【蛇年吉祥】

  - 工具:优化表盘工具

  - 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

  - 表盘:【2025】

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

Signed-off-by: Caisking <3449750381@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/1625
101 files changed:
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.cpp
tools/dial_converter_tool/dial_lzma/147/sharpee.lzma
tools/dial_converter_tool/dial_lzma/192/HappyNewYear.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/192/HappyNewYear.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/192/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/193/SnakeYearLuck.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/193/SnakeYearLuck.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/193/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/194/LuckyDollNew.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/194/LuckyDollNew.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/194/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/195/WishYouWealth.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/195/WishYouWealth.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/195/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/196/GoodLuckForever.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/196/GoodLuckForever.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/196/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/197/WealthfromAll.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/197/WealthfromAll.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/197/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/198/Welcome2025.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/198/Welcome2025.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/198/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/199/NewYearsDay.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/199/NewYearsDay.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/199/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/200/HappySpring.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/200/HappySpring.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/200/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/201/2025.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/201/2025.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/201/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/202/LuckwithSnake.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/202/LuckwithSnake.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/202/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/203/GoodSnakeYear.lzma [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/203/GoodSnakeYear.png [new file with mode: 0644]
tools/dial_converter_tool/dial_lzma/203/说明.txt [new file with mode: 0644]
tools/dial_converter_tool/instance/147/sharpee.xml
tools/dial_converter_tool/instance/192/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/192/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/192/HappyNewYear.png [new file with mode: 0644]
tools/dial_converter_tool/instance/192/HappyNewYear.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/192/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/193/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/193/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/193/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/193/SnakeYearLuck.png [new file with mode: 0644]
tools/dial_converter_tool/instance/193/SnakeYearLuck.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/194/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/194/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/194/LuckyDollNew.png [new file with mode: 0644]
tools/dial_converter_tool/instance/194/LuckyDollNew.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/194/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/195/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/195/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/195/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/195/WishYouWealth.png [new file with mode: 0644]
tools/dial_converter_tool/instance/195/WishYouWealth.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/196/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/196/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/196/GoodLuckForever.png [new file with mode: 0644]
tools/dial_converter_tool/instance/196/GoodLuckForever.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/196/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/197/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/197/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/197/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/197/WealthfromAll.png [new file with mode: 0644]
tools/dial_converter_tool/instance/197/WealthfromAll.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/198/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/198/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/198/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/198/Welcome2025.png [new file with mode: 0644]
tools/dial_converter_tool/instance/198/Welcome2025.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/199/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/199/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/199/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/199/NewYearsDay.png [new file with mode: 0644]
tools/dial_converter_tool/instance/199/NewYearsDay.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/200/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/200/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/200/HappySpring.png [new file with mode: 0644]
tools/dial_converter_tool/instance/200/HappySpring.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/200/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/201/2025.png [new file with mode: 0644]
tools/dial_converter_tool/instance/201/2025.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/201/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/201/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/201/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/202/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/202/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/202/LuckwithSnake.png [new file with mode: 0644]
tools/dial_converter_tool/instance/202/LuckwithSnake.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/202/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/203/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/203/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/203/GoodSnakeYear.png [new file with mode: 0644]
tools/dial_converter_tool/instance/203/GoodSnakeYear.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/203/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/make_tools/gen_dial_bin.sh
tools/dial_converter_tool/make_tools/表盘制作脚本使用说明.md