Merge #623 into sdk602patch0626 from refs/changes/623/head
author袁清梦 <3449750381@qq.com>
Thu, 1 Aug 2024 02:24:12 +0000 (02:24 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Thu, 1 Aug 2024 02:24:12 +0000 (02:24 +0000)
commit0ce1b648ac3efb2a4b3ecb83f68fc39ea95992a2
tree1c7a67f5e04844d0afc01cb5a83f71ad5e512e8c
parentac23e04c70c966c40d5f1a4a76f91075eb6770ac
Merge #623 into sdk602patch0626 from refs/changes/623/head

Code review from 袁清梦

* refs/changes/623/head: (7 commits squashed)

  - 删除code里面的语言工具

  - 重构心率检测Slice

  - 心率添加异常管理

  - 优化部分配置

  - 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/623
70 files changed:
code/sdk/application/wearable/fd230app/CMakeLists.txt
code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.h
code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartBandoffView.h [deleted file]
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartCheckView.h [deleted file]
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartDetectionPresenter.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartDetectionView.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartPresenter.h [deleted file]
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultPresenter.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartResultView.h
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartView.h [deleted file]
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartBandoffView.cpp [deleted file]
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartCheckView.cpp [deleted file]
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionPresenter.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionView.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultPresenter.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/languagetool.py [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/README [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/languagemake.sh [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/stringpack_tool/language_trans.py [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/stringpack_tool/searchdir.py [deleted file]
code/sdk/application/wearable/fd230app/nativeui/language/多国语言工具脚本.md [deleted file]
code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp
code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
code/sdk/drivers/peripheral/config/include/ConfigModel.h
tools/language_tool/Language_xml/input_list_en.txt
tools/language_tool/Language_xml/input_list_zh.txt
tools/language_tool/Language_xml/language_en.xml
tools/language_tool/Language_xml/language_zh.xml
tools/language_tool/font/en.lang
tools/language_tool/font/ui_resource_string.h
tools/language_tool/font/zh.lang