Merge #834 into sdk602patch0626 from refs/changes/834/head 835/target/2
author袁清梦 <3449750381@qq.com>
Fri, 30 Aug 2024 10:05:49 +0000 (10:05 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Fri, 30 Aug 2024 10:05:49 +0000 (10:05 +0000)
commitd317135e294511dd0a4332045396803ec6f2f708
tree9bbf4e7d33f139f4f4dee4e78d6ea7e2287fb7f4
parentc7dc7f1b040d18a35f9136722f89fcfc0cf5ff9f
Merge #834 into sdk602patch0626 from refs/changes/834/head

Code review from 袁清梦

* refs/changes/834/head: (10 commits squashed)

  - 黑曜律动表盘资源汇总

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

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

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

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

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

  - 更新表盘制作脚本以及说明文档

  - 更新黑耀表盘资源文件

  - 修改时间分钟个位获取的错误

  - 优化睡眠数据计算。优化数据显示

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/834
13 files changed:
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinUnits.cpp
code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma
tools/dial_converter_tool/instance/114/week/WEEK_FRI.png
tools/dial_converter_tool/instance/114/week/WEEK_MON.png
tools/dial_converter_tool/instance/114/week/WEEK_SAT.png
tools/dial_converter_tool/instance/114/week/WEEK_SUN.png
tools/dial_converter_tool/instance/114/week/WEEK_THU.png
tools/dial_converter_tool/instance/114/week/WEEK_TUE.png
tools/dial_converter_tool/instance/114/week/WEEK_WED.png
tools/dial_converter_tool/make_tools/gen_dial_bin.sh
tools/dial_converter_tool/make_tools/表盘制作脚本使用说明.md [new file with mode: 0644]
tools/dial_converter_tool/make_tools/表盘制作脚本使用说明.txt [deleted file]