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 'sdk602patch0911' 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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
index 8c73faa..fb87efa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -137,7 +137,7 @@ static void Training_Notify(void *args, const Topic topic, Request *request) {
     delete traingbleInfo;
   }
   //增加训练runtime控制
-  if (uapi_dev_runtime_get_train_status() == 0) {
+  if (uapi_dev_runtime_get_train_status() == 0 ||  TraingModel::GetInstance()->GetSportState() == ExerciseState::End) {
     return;
   }
   //训练基本信息更新