From: Caisking Date: Sat, 19 Jul 2025 10:23:16 +0000 (+0800) Subject: 修复运动界面无法进入的bug X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~210^2~23 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=35a2b4de3953cdc2a203a65a1488241f3d34b639;p=mirrors%2FFD230.git 修复运动界面无法进入的bug --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp index c122e4bd7..7166adcec 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp @@ -105,7 +105,7 @@ void NativeLauncher::InitNativeLauncher(LaunchMode mode) // 初始化所有预加载slice InitAllNativeSlices(); - // #ifdef FD230_650 + CallerLogModel::GetInstance()->InitPhoneService(); GoalModel::GetInstance().GoalModelInitdata();//活动数据初始化 // PresenterTask::GetInstance()->Init(); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp index a9d959a13..fd10a7990 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -48,10 +48,13 @@ void PauseTimer(); void ResumeTimer(); } #include "NativeRegisterManager.h" -namespace OHOS -{ - REGIST_SLICE(VIEW_TRAININGCRAD, TraingCardView, TraingCardPresenter); +#ifdef SUPPORT_CYWEE_SERVICE +#include "cywee_service.h" +#endif +namespace OHOS { + +REGIST_SLICE(VIEW_TRAININGCRAD, TraingCardView, TraingCardPresenter); // 当前Presenter属性实例化的内存指针 static TraingCardPresenter *g_pTraingCardPresenter = nullptr; @@ -111,12 +114,15 @@ void TraingCardPresenter::ModifiesTime() { "TraingModel::GetInstance()->DisplayMotionDuration() nullptr"); return; } - if (TrainingControlView::GetInstance()->GetTimeLabel() != nullptr) { - TrainingControlView::GetInstance()->GetTimeLabel()->SetText( - TimeStr.c_str()); - } - if (TrainingDataView::GetInstance()->GetTimeLabel() != nullptr) { - TrainingDataView::GetInstance()->GetTimeLabel()->SetText(TimeStr.c_str()); + if (TrainingControlView::GetInstance() != nullptr && + TrainingDataView::GetInstance() != nullptr) { + if (TrainingControlView::GetInstance()->GetTimeLabel() != nullptr) { + TrainingControlView::GetInstance()->GetTimeLabel()->SetText( + TimeStr.c_str()); + } + if (TrainingDataView::GetInstance()->GetTimeLabel() != nullptr) { + TrainingDataView::GetInstance()->GetTimeLabel()->SetText(TimeStr.c_str()); + } } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ModifiesTime end"); } @@ -130,9 +136,11 @@ void TraingCardPresenter::UpdateTimeOfControl() { "TraingModel::GetInstance()->DisplayMotionDuration() nullptr"); return; } - if (TrainingControlView::GetInstance()->GetTimeLabel() != nullptr) { - TrainingControlView::GetInstance()->GetTimeLabel()->SetText( - TimeStr.c_str()); + if (TrainingControlView::GetInstance() != nullptr) { + if (TrainingControlView::GetInstance()->GetTimeLabel() != nullptr) { + TrainingControlView::GetInstance()->GetTimeLabel()->SetText( + TimeStr.c_str()); + } } } void TraingCardPresenter::UpdateTimeOfData() { @@ -143,8 +151,10 @@ void TraingCardPresenter::UpdateTimeOfData() { "TraingModel::GetInstance()->DisplayMotionDuration() nullptr"); return; } - if (TrainingDataView::GetInstance()->GetTimeLabel() != nullptr) { - TrainingDataView::GetInstance()->GetTimeLabel()->SetText(TimeStr.c_str()); + if (TrainingDataView::GetInstance() != nullptr) { + if (TrainingDataView::GetInstance()->GetTimeLabel() != nullptr) { + TrainingDataView::GetInstance()->GetTimeLabel()->SetText(TimeStr.c_str()); + } } } @@ -152,58 +162,62 @@ void TraingCardPresenter::UpdateTimeOfData() { * -------------------------------- */ /*开启cywee*/ bool TraingCardPresenter::OpenSensor(ExerciseClass type) { - // // 防止重复开启 - // if (opensensorstuats) { - // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OpenSensor is opening!!"); - // return false; - // } - // // 根据不同的运动项目进行不同的运动 - // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingCardPresenter::OpenSensor!!"); - // switch (type) { - // case ExerciseClass::NORMAL: - // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE, NULL); - // break; - // case ExerciseClass::TREADMILL: - // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TREADMILL_MODE, NULL); - // break; - // case ExerciseClass::OUTDOOR: - // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE, NULL); - // break; - // case ExerciseClass::INDOOR: - // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE, NULL); - // break; - // case ExerciseClass::FITNESS_PEDOMETER: - // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE, NULL); - // break; - // case ExerciseClass::FREE_TRAINING: - // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FREE_TRAINING_MODE, NULL); - // break; - // default: - // break; - // } - // opensensorstuats = true; - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OpenSensor--%d!!", type); + // 防止重复开启 + if (opensensorstuats) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OpenSensor is opening!!"); + return false; + } + // 根据不同的运动项目进行不同的运动 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingCardPresenter::OpenSensor!!"); +#ifdef SUPPORT_PPG_SERVICE + switch (type) { + case ExerciseClass::NORMAL: + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE, NULL); + break; + case ExerciseClass::TREADMILL: + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TREADMILL_MODE, NULL); + break; + case ExerciseClass::OUTDOOR: + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE, NULL); + break; + case ExerciseClass::INDOOR: + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE, NULL); + break; + case ExerciseClass::FITNESS_PEDOMETER: + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE, NULL); + break; + case ExerciseClass::FREE_TRAINING: + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FREE_TRAINING_MODE, NULL); + break; + default: + break; + } +#endif + opensensorstuats = true; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OpenSensor--%d!!", type); return true; } /*控制cywee*/ bool TraingCardPresenter::ControlSensor(ExerciseState state) { +#ifdef SUPPORT_PPG_SERVICE switch (state) { - // case ExerciseState::End: - // // 退出进入普通模式 - // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE, NULL); - // opensensorstuats = false; // 恢复标志位 - // StopAndResetTimer(); // 关闭计时器 - // break; - // case ExerciseState::Pause: - // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_PAUSE, 0); - // break; - // case ExerciseState::Continue: - // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESUME, 0); - // break; + case ExerciseState::End: + // 退出进入普通模式 + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE, NULL); + opensensorstuats = false; // 恢复标志位 + StopAndResetTimer(); // 关闭计时器 + break; + case ExerciseState::Pause: + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_PAUSE, 0); + break; + case ExerciseState::Continue: + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESUME, 0); + break; default: break; } +#endif WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ControlSensor[%d]!!", state); return true; } @@ -213,6 +227,11 @@ void TraingCardPresenter::RefreshData(SportData *sportdata) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sportdata is null"); return; } + + if (TrainingDetailView::GetInstance() == nullptr || + TrainingDataView::GetInstance() == nullptr) + return; + std::string distanceStr; if (sportdata->distance != 0) { double distance_km = @@ -270,7 +289,7 @@ void TraingCardPresenter::RefreshData(SportData *sportdata) { #if 1 void TraingCardPresenter::Notify(void) { // 如果未开启训练,直接退出 - if (TraingModel::GetInstance()->GetSportState() == ExerciseState::General) { + if (TraingModel::GetInstance()->GetSportState() == ExerciseState::General || view_ == nullptr) { return; } @@ -375,7 +394,7 @@ bool TraingCardPresenter::OnKeyAct(UIView &view, const KeyEvent &event) { /* -------------------------------- 协议发起运动处理 * -------------------------------- */ - #ifdef BLE_SERVER_ENABLE +#ifdef BLE_SERVER_ENABLE bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) { if (cmd == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "无效的运动命令 cmd 为空!"); @@ -496,7 +515,6 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) { } #endif - /*训练结束*/ void TraingCardPresenter::handleEndState() { TraingModel::GetInstance()->SetSportState(ExerciseState::End); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp index 70cf11f3a..da986c556 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp @@ -618,7 +618,7 @@ void TraingCardView ::InitView() { } swipe_->SetOnSwipeListener(onSwipeListener); - RootView::GetInstance()->SetOnKeyActListener(presenter_); + RootView::GetInstance()->SetOnKeyActListener(presenter_); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingCardView::InitPage over"); } @@ -1024,8 +1024,9 @@ void TraingCardView::InitImageAnimator() { /*获取卡片View单例*/ UICrossView *TraingCardView::GetTraingCrad() { return swipe_; } - int TraingCardView::GetCurrentPage() { + if (swipe_ == nullptr) + return -1; return swipe_->GetCurrentPageId(0); // 获取水平页面 } UIImageAnimatorView *TraingCardView::GetAnimator() { return imageAnimator; } diff --git a/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c b/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c index 447e6f5ae..57b211c1f 100644 --- a/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c +++ b/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c @@ -1010,7 +1010,7 @@ void cywee_activity_mode_change(int mode) { //一般模式(生活模式) case SPORT_ACTIVE_MODE_NORMAL: - // CWM_OS_dbgPrintf("SPORT_ACTIVE_MODE_NORMAL\r\n"); + CWM_OS_dbgPrintf("SPORT_ACTIVE_MODE_NORMAL\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_NORMAL; @@ -1054,7 +1054,7 @@ void cywee_activity_mode_change(int mode) //自由运动 case SPORT_ACTIVE_MODE_FREE_TRAINING: - // CWM_OS_dbgPrintf("SPORT_ACTIVE_MODE_FREE_TRAINING\r\n"); + CWM_OS_dbgPrintf("SPORT_ACTIVE_MODE_FREE_TRAINING\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_FREE_TRAINING; diff --git a/code/sdk/zhihui/drivers/cywee/service/cywee_service.c b/code/sdk/zhihui/drivers/cywee/service/cywee_service.c index e8c88ad5e..3d0389997 100644 --- a/code/sdk/zhihui/drivers/cywee/service/cywee_service.c +++ b/code/sdk/zhihui/drivers/cywee/service/cywee_service.c @@ -275,34 +275,34 @@ static void cywee_service_check_task(void const *arg) case CYWEE_SERVICE_CMD_NORMAL_MODE: // PRINT("普通运动模式\r\n"); - // cywee_activity_mode_change(SPORT_ACTIVE_MODE_NORMAL); + cywee_activity_mode_change(SPORT_ACTIVE_MODE_NORMAL); break; case CYWEE_SERVICE_CMD_TREADMILL_MODE: - // cywee_activity_mode_change(SPORT_ACTIVE_MODE_TREADMILL); + cywee_activity_mode_change(SPORT_ACTIVE_MODE_TREADMILL); break; case CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE: // PRINT("室外跑步模式\r\n"); - // cywee_activity_mode_change(SPORT_ACTIVE_MODE_OUTDOOR_RUNNING); + cywee_activity_mode_change(SPORT_ACTIVE_MODE_OUTDOOR_RUNNING); break; case CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE: // PRINT("室内跑步模式\r\n"); - // cywee_activity_mode_change(SPORT_ACTIVE_MODE_INDOOR_RUNNING); + cywee_activity_mode_change(SPORT_ACTIVE_MODE_INDOOR_RUNNING); break; case CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE: - // cywee_activity_mode_change(SPORT_ACTIVE_MODE_FITNESS_PEDOMETERR); + cywee_activity_mode_change(SPORT_ACTIVE_MODE_FITNESS_PEDOMETERR); break; case CYWEE_SERVICE_CMD_FREE_TRAINING_MODE: // PRINT("自由训练模式\r\n"); - // cywee_activity_mode_change(SPORT_ACTIVE_MODE_FREE_TRAINING); + cywee_activity_mode_change(SPORT_ACTIVE_MODE_FREE_TRAINING); break; case CYWEE_SERVICE_CMD_AR_ALERT_MODE: - // cywee_activity_mode_change(SPORT_ACTIVE_MODE_AR_ALERT); + cywee_activity_mode_change(SPORT_ACTIVE_MODE_AR_ALERT); break; case CYWEE_SERVICE_CMD_PAUSE: