Merge #572 into sdk602patch0626 from refs/changes/572/head
author袁清梦 <3449750381@qq.com>
Tue, 23 Jul 2024 01:51:20 +0000 (01:51 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 23 Jul 2024 01:51:20 +0000 (01:51 +0000)
commit595ae515064bfb172f8b6470959b43b3e59e2d76
treeee0e3aabac0669c93d72ccc7ff1c479933044615
parente1d3dd777f1adac7ff38db9926c4cfe909f058f5
Merge #572 into sdk602patch0626 from refs/changes/572/head

Code review from 袁清梦

* refs/changes/572/head: (6 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

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/572
24 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/fd230app/nativeui/clock/include/MainClockView.h
code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
tools/dial_converter_tool/instance/112/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/birdie.mp4 [new file with mode: 0644]
tools/dial_converter_tool/instance/112/birdie.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/birdie.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/112/preview_birdie.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/1.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/2.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/3.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/4.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/5.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/6.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/7.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/FIRDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/MONDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/SATURDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/SUNDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/THURSDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/TUESDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/112/week/WEDNESDAY_IMAGE_PATH.png [new file with mode: 0644]