Merge #1686 into sdk602patch0911 from refs/changes/1686/head 1693/target/1
author袁清梦 <3449750381@qq.com>
Fri, 14 Mar 2025 01:57:23 +0000 (01:57 +0000)
committer袁清梦 <3449750381@qq.com>
Fri, 14 Mar 2025 01:57:23 +0000 (01:57 +0000)
commit9b10d878c6978b90662872ad299172991603b3b8
treefb264ea46a535d69c4b47da3a0871940e1f52806
parentf572fb5de421014d1bc0579a314166f703d59275
Merge #1686 into sdk602patch0911 from refs/changes/1686/head

Code review from 袁清梦

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

  - #1271 android app开启辅助运动,运动结束后app端数据与手表端数据显示不一致

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

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Reviewed-by: 于伟铭 <accounts_67aaf9d1ddf7780be0a9b080@mail.teambition.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1686
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp