Merge #30 into xts_origin from refs/changes/30/head
author袁清梦 <3449750381@qq.com>
Wed, 17 Apr 2024 08:11:35 +0000 (08:11 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 17 Apr 2024 08:11:35 +0000 (08:11 +0000)
commit71ec4dc98e5b238f6581d5adce562e064d3dc4da
tree8cf0e33822a16f6c67d13682d94c90b65b48ab66
parent6baa88fd1f97d4e90be2f148d1bf7d14859f449b
Merge #30 into xts_origin from refs/changes/30/head

Code review from 袁清梦

* refs/changes/30/head: (2 commits squashed)

  - 优化训练back逻辑

  - 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/30
15 files changed:
code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp
code/sdk/application/wearable/nativeabilityfwk/include/Ability.h