Merge #13 into xts_origin from refs/changes/13/head 14/target/1 15/target/1 16/target/1
author袁清梦 <3449750381@qq.com>
Tue, 16 Apr 2024 03:09:42 +0000 (03:09 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 16 Apr 2024 03:09:42 +0000 (03:09 +0000)
commitd9b76781e644b2192e7f0b736281adecd5f58ba9
treee2093ad23987b0af88d7d9fafb447473563367eb
parent12d0507a8c26c0041bab8ad17fd9395c3003f356
Merge #13 into xts_origin from refs/changes/13/head

Code review from 袁清梦

* refs/changes/13/head: (4 commits squashed)

  - 修改主界面上拉界面UI;删除视频表盘panda;优化训练结束以及弹窗UI;搭建训练结束数据处理

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

  - 优化部分交互逻辑

  - 训练同步部分结束数据

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/13
17 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.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/message/include/MessageCardView.h
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp
code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/panda.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/Message.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Line 1.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/message.bin [new file with mode: 0644]