From 577f240557253604e39aa066e3fe3a7fd88a9faf Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Tue, 24 Sep 2024 20:34:01 +0800 Subject: [PATCH] =?utf8?q?=E7=A7=BB=E9=99=A4=E8=AE=AD=E7=BB=83=E7=9A=84uap?= =?utf8?q?i=5Fadd=5Fsport=5Fvote=EF=BC=88=EF=BC=89=E4=BF=AE=E6=94=B9?= =?utf8?q?=E8=BF=90=E5=8A=A8=E7=BB=93=E6=9D=9F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/traing/src/TraingModel.cpp | 20 ++++++++++--------- .../training_card/src/TraingCardView.cpp | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) 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 982df613c..dc2b49db9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -428,18 +428,10 @@ namespace OHOS if (state != ExerciseState::General) { /*运动开始并且是app发起的运动*/ - if (Openingway == true) + if (Openingway == true && state != ExerciseState::End) { sendtraningstatedata(static_cast(state), sportdata->duration); } - else - { - /*手表发起并且是结束状态*/ - if (state == ExerciseState::End) - { - sendtraningstateend(); - } - } } sportState_ = state; } @@ -713,6 +705,16 @@ namespace OHOS sportTag_ = 0; sportTagType_ = ExerciseTag::UNKNOW; #endif + /*运动结束并且是手表发起的运动*/ + if (Openingway == false) + { + sendtraningstateend(); + } + /*运动结束并且是app发起的运动*/ + else + { + sendtraningstatedata(0, sportdata->duration); + } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "结束运动"); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp index 29a583e35..f5d312a86 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp @@ -74,7 +74,7 @@ TraingCardView::TraingCardView() { TraingModel::GetInstance()->SetSportState( ExerciseState::Start); // 设置运动状态为开始 TraingModel::GetInstance()->SetTimestamp(); - uapi_add_sport_vote(); // 保护进程 + // uapi_add_sport_vote(); // 保护进程 g_pTraingCardView = this; } @@ -87,7 +87,7 @@ TraingCardView::~TraingCardView() { g_pTraingCardView = nullptr; DisableTimer(); // 关闭计时器 TraingModel::GetInstance()->SetTimestamp(); - uapi_remove_sport_vote(); // 移除 + // uapi_remove_sport_vote(); // 移除 } TraingCardView *TraingCardView::GetInstance() { return g_pTraingCardView; } -- 2.17.1