From: 袁清梦 <3449750381@qq.com> Date: Mon, 3 Jun 2024 13:26:34 +0000 (+0000) Subject: Merge #218 into sdk602patch0521 from refs/changes/218/head X-Git-Tag: release_V1.2.70_20241020_135402~1050^2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F219%2Ftarget%2F1;p=mirrors%2FFD230.git Merge #218 into sdk602patch0521 from refs/changes/218/head 调整训练结束状态发送顺序 * refs/changes/218/head: (1 commits squashed) - 调整训练结束状态发送顺序 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/218 --- 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 053e2e5f7..20ad4b6f7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -281,17 +281,19 @@ namespace OHOS if (state != ExerciseState::General) { /*运动开始并且是app发起的运动*/ - if (Openingway == true) + if (Openingway == true && state != ExerciseState::End) { sendtraningstatedata(static_cast(state), sportdata->duration); } else { +#if 0 /*手表发起并且是结束状态*/ if (state == ExerciseState::End) { sendtraningstateend(); } +#endif } } sportState_ = state; @@ -467,6 +469,16 @@ namespace OHOS Startstate = false; Endstate = true; + /*保存数据之后再发送结束消息*/ + if (Openingway == true) + { + sendtraningstatedata(static_cast(ExerciseState::End), sportdata->duration); + } + else + { + sendtraningstateend(); + } + printf("结束运动\r\n"); } }