From 9b10d878c6978b90662872ad299172991603b3b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Fri, 14 Mar 2025 01:57:23 +0000 Subject: [PATCH] Merge #1686 into sdk602patch0911 from refs/changes/1686/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: aliyun6865282430 <1624952103@qq.com> Reviewed-by: 薛文强 Reviewed-by: 于伟铭 Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1686 --- .../wearable/fd230app/nativeui/traing/src/TraingModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8c73faa7e..fb87efaa2 100644 --- 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; } //训练基本信息更新 -- 2.17.1