Merge #908 into sdk602patch0626 from refs/changes/908/head 903/target/2
author袁清梦 <3449750381@qq.com>
Sat, 7 Sep 2024 09:52:51 +0000 (09:52 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sat, 7 Sep 2024 09:52:51 +0000 (09:52 +0000)
commitb597a387d1f5cf68dc28eedd81814d5913ca48f8
tree821b3c41b457efd4d59a94a9aca4bdf5d430c8a9
parentd34f8b631af2a1c887e5234ee649951bb146830b
Merge #908 into sdk602patch0626 from refs/changes/908/head

Code review from 袁清梦

* refs/changes/908/head: (15 commits squashed)

  - 增加多国语言自动翻译脚本:待完善

  - 修复心率测量发生的死机

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

  - #440运动-健身类-少了循环训练

  - #439运动-健身类 排序问题 室外走路,跑步,骑行不在顶部,需要把常用的放在顶部

  - #445 运动-休闲运动-少了对战游戏

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

  - #447 运动结束界面添加提示语

  - #441运动-健身类有遮挡

  - #442运动-所有类底部有遮挡

  - #443运动-类别界面-上滑会有短暂回弹

  - #444运动类界面-右滑返回上一级界面有界面晃动

  - #207运动界面进行触摸进出操作,界面会抖动,卡顿

  - #438运动-健身类上下滑动,健身运动会跟着跳动

  - 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/908
code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.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