Merge #593 into sdk602patch0626 from refs/changes/593/head
author袁清梦 <3449750381@qq.com>
Fri, 26 Jul 2024 10:09:58 +0000 (10:09 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Fri, 26 Jul 2024 10:09:58 +0000 (10:09 +0000)
commitcbd8b3d5bf47c2ff565382542a9be3ad00606218
treed7433c157995c0794249ef4e97c975f6431f437a
parent4bd7ba4952a1ee778c54c37a267724831220d506
Merge #593 into sdk602patch0626 from refs/changes/593/head

Code review from 袁清梦

* refs/changes/593/head: (6 commits squashed)

  - 增加自定义表盘配置文件相对应接口

  - 修复maomao表盘异常

  - 暂时屏蔽自定义表盘配置文件读取

  - 取消训练状态下的心率存储

  - 增加runtime训练状态管理

  - 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/593
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/heartrate/src/HeartModel.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h
code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
tools/dial_converter_tool/dial_lzma/101/sport.lzma
tools/dial_converter_tool/dial_lzma/108/maomao.lzma
tools/dial_converter_tool/instance/108/maomao.xml