From: Caisking <3449750381@qq.com> Date: Wed, 9 Oct 2024 09:37:44 +0000 (+0800) Subject: 训练:增加app发起的运动的状态返回 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=758960e151ddf9a34c1e39c23c158383ca3b535a;p=mirrors%2FFD230.git 训练:增加app发起的运动的状态返回 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index 340571f18..96dba2295 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -335,9 +335,9 @@ bool TraingCardPresenter::OnClick(UIView &view, const ClickEvent &event) { // 确定达到目标 {BUTTONWINOK, [&]() { + TraingCardView::GetInstance()->GetAnimator()->Stop(); TraingCardView::GetInstance()->SetPopupViewStatus(GetTagPopup, false); - TraingCardView::GetInstance()->GetAnimator()->Stop(); }}, // 确定心率提醒 {BUTTONNOTE, @@ -396,34 +396,39 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) { } // 仅在一般状态下允许开始运动 - if (cmdstate == ExerciseState::Start && - currentState == ExerciseState::General) { - if (TraingCardView::GetInstance() == nullptr) { - uapi_set_screen_on_api(); // 亮屏 - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD); - // 设置目标类型和项目有且只有一次 - switch (cmd->sportType) { - case 0: - TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORWALKING); - OpenSensor(ExerciseClass::OUTDOOR); - break; - case 1: - TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORRUNNING); - OpenSensor(ExerciseClass::OUTDOOR); - break; - case 2: - TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORBIKING); - OpenSensor(ExerciseClass::FREE_TRAINING); - break; - default: - break; + if (cmdstate == ExerciseState::Start) { + if ((currentState == ExerciseState::General)) { + if (TraingCardView::GetInstance() == nullptr) { + uapi_set_screen_on_api(); // 亮屏 + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD); + // 设置目标类型和项目有且只有一次 + switch (cmd->sportType) { + case 0: + TraingModel::GetInstance()->SetSportEvent( + STR_EXERCISE_OUTDOORWALKING); + OpenSensor(ExerciseClass::OUTDOOR); + break; + case 1: + TraingModel::GetInstance()->SetSportEvent( + STR_EXERCISE_OUTDOORRUNNING); + OpenSensor(ExerciseClass::OUTDOOR); + break; + case 2: + TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORBIKING); + OpenSensor(ExerciseClass::FREE_TRAINING); + break; + default: + break; + } } + handleStartState(); + reply_APP_OpenSportModeCmd(true); + return true; + } else { + reply_APP_OpenSportModeCmd(false); + // return false; } - - handleStartState(); - return true; } - // 仅在运动状态为开始或继续时允许暂停 if (cmdstate == ExerciseState::Pause) { if (currentState == ExerciseState::Start || @@ -460,7 +465,8 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) { cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportTag); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "由于状态限制,命令未执行。\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "由于状态限制,命令未执行 当前状态 %d。\r\n", currentState); return false; // 没有执行任何命令 }