From 8289ed3ca9cd276d5a883f6fc37ccc9f2c6541f8 Mon Sep 17 00:00:00 2001 From: Caisking Date: Thu, 17 Jul 2025 17:33:12 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E7=94=B5=E6=B1=A0=E6=9C=8D?= =?utf8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../bloodoxygen/src/BloodOxygenModel.cpp | 2 +- .../bloodoxygen/src/BloodResultPresenter.cpp | 24 +++---- .../nativeui/clock/src/MainClockView.cpp | 2 +- .../health/CheckAbnormalPresenter.cpp | 5 +- .../heartrate/include/HeartResultPresenter.h | 2 +- .../nativeui/heartrate/src/HeartModel.cpp | 28 ++++---- .../heartrate/src/HeartResultPresenter.cpp | 6 +- .../nativeui/main/src/MainPresenterSample.cpp | 68 ++++++++++--------- .../nativeui/main/src/MainViewSample.cpp | 28 ++++---- .../nativeui/saveele/src/SaveBatPresenter.cpp | 2 +- .../nativeui/system/src/SystemView.cpp | 3 +- .../services/ble_service/bleservice/bleANCS.c | 2 +- .../ble_service/bleservice/bleEvent.c | 2 +- .../ble_service/bleservice/bleService.c | 2 +- 14 files changed, 88 insertions(+), 88 deletions(-) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp index 5b4b14413..b0fdf85aa 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp @@ -183,7 +183,7 @@ void BloodOxygenModel::Blood_Result() { healthState.checkType = BLOOD_CHECK; healthState.resultStatus = LOW; healthState.checkResult = MiniBlood; - // HealthService::GetInstance()->SetHealthCurrent(healthState); + HealthService::GetInstance()->SetHealthCurrent(healthState); //保存异常数据 Blood_Save(); NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp index a4c41a309..a37656b67 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp @@ -44,7 +44,7 @@ #include "cywee_service.h" #endif -// #include "battery_hal.h" +#include "battery_hal.h" #include "health/health_service/health_service.h" @@ -139,18 +139,18 @@ namespace OHOS { if (strcmp(view.GetViewId(), CLICK_BLOOD) == 0) { - // // 如果正在充电进入提醒界面 - // if (get_charge_stat()) - // { - // HealthState highHealthState; - // highHealthState.checkType = CHARGE; - // HealthService::GetInstance()->SetHealthCurrent(highHealthState); - // NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID, TransitionType::TRANSITION_BACK_TO_HEXAGONS); - // } - // else - // { + // 如果正在充电进入提醒界面 + if (get_charge_stat()) + { + HealthState highHealthState; + highHealthState.checkType = CHARGE; + HealthService::GetInstance()->SetHealthCurrent(highHealthState); + NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID, TransitionType::TRANSITION_BACK_TO_HEXAGONS); + } + else + { NativeAbility::GetInstance().EnterSlice(VIEW_BLOOD_CHECK, TransitionType::TRANSITION_BACK_TO_HEXAGONS); - // } + } } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodPresenter::OnClick"); return true; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp index 7ac83e00a..140458bb1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp @@ -15,7 +15,7 @@ #include "MainModel.h" #include "MainPresenterSample.h" #include "SetDialModel.h" -// #include "battery_hal.h" + #include "battery_hal.h" #include "common/image_cache_manager.h" #include "components/ui_label.h" #include "custom_runtime.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp index 8a38efc34..63c1caed5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp @@ -53,7 +53,7 @@ #include "MainModel.h" #include "health/health_service/health_service.h" -// #include "battery_hal.h" +#include "battery_hal.h" #include "NativeRegisterManager.h" @@ -100,8 +100,7 @@ namespace OHOS if (strcmp(view.GetViewId(), CLICK_BLOOD_RE) == 0) { // 检测过程中充电 失败可以弹窗 - // bool isCharging = get_charge_stat(); // 获取充电状态 - bool isCharging = false; + bool isCharging = get_charge_stat(); // 获取充电状态 if (isCharging) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartResultPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartResultPresenter.h index f3cf85598..a6d87c58b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartResultPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartResultPresenter.h @@ -16,7 +16,7 @@ #include "KeyInputListener.h" #include "common/key_code.h" -// #include "battery_hal.h" +#include "battery_hal.h" #include "heartrate/include/HeartResultView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp index b40370bfe..1eeb5eb69 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp @@ -199,10 +199,9 @@ void HeartModel::ClearHeartData(void) { } SetAveHeartRateCount(0); // GraphicService::GetInstance()->PostGraphicEvent( - // std::bind(&HeartModel::RefreshHeartRateScreen, - // HeartModel::GetInstance(), - // healthDatas.heartRatePerSec,healthDatas.heartRateRest, - // healthDatas.heartRateMax.y,healthDatas.heartRateMin.y)); + // std::bind(&HeartModel::RefreshHeartRateScreen, HeartModel::GetInstance(), + // healthDatas.heartRatePerSec, healthDatas.heartRateRest, + // healthDatas.heartRateMax.y, healthDatas.heartRateMin.y)); } HeartModel::HeartModel() { @@ -334,10 +333,9 @@ void HeartModel::HeartRatePros(HeartDatas *heartInfo) { } // GraphicService::GetInstance()->PostGraphicEvent( - // std::bind(&HeartModel::RefreshHeartRateScreen, - // HeartModel::GetInstance(), - // healthDatas.heartRatePerSec,healthDatas.heartRateRest, - // healthDatas.heartRateMax.y,healthDatas.heartRateMin.y)); + // std::bind(&HeartModel::RefreshHeartRateScreen, HeartModel::GetInstance(), + // healthDatas.heartRatePerSec, healthDatas.heartRateRest, + // healthDatas.heartRateMax.y, healthDatas.heartRateMin.y)); } uint16_t HeartModel::GetAveHeartRateCount(void) { return aveCount; } @@ -418,7 +416,7 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) { } if (state == HeartState::End && heartstate == true) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState End"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartState End"); //状态数全部清空 valid_counter_ = 0; disvalid_counter_ = 0; @@ -457,9 +455,8 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "充电不能检测"); return; } - -#ifdef SUPPORT_PPG_SERVICE WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartState Start"); +#ifdef SUPPORT_PPG_SERVICE uint8_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST; send_ppg_cmd_msg(md); #endif @@ -1056,12 +1053,14 @@ static void heart_data_timer_callback(int data) { std::bind(heart_data_callbackProc, data)); } void HeartModel::heart_data_timer(uint32_t interval) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartModel::heart_start_screen60s_timer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, + "HeartModel::heart_start_screen60s_timer"); if (g_data_timer != nullptr) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Timer already exists!!"); return; } - g_data_timer = osTimerNew((osTimerFunc_t)heart_data_timer_callback, osTimerPeriodic, nullptr, nullptr); + g_data_timer = osTimerNew((osTimerFunc_t)heart_data_timer_callback, + osTimerPeriodic, nullptr, nullptr); if (g_data_timer == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Timer create failed!!"); return; @@ -1069,7 +1068,8 @@ void HeartModel::heart_data_timer(uint32_t interval) { int tick = osMs2Tick(interval); osStatus_t ret = osTimerStart(g_data_timer, tick); if (ret != osOK) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "osTimerDelete failed, ret = %lx!!", ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "osTimerDelete failed, ret = %lx!!", + ret); if (g_data_timer != nullptr) { ret = osTimerDelete(g_data_timer); } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp index 78a32f05d..286978346 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp @@ -43,7 +43,7 @@ #include "cywee_service.h" #endif -// #include "battery_hal.h" +#include "battery_hal.h" #include "health/health_service/health_service.h" #include "NativeRegisterManager.h" @@ -142,8 +142,8 @@ namespace OHOS if (strcmp(view.GetViewId(), CLICK_HEART) == 0) { // 如果正在充电进入提醒界面 - // bool isCharging = get_charge_stat(); - bool isCharging = false; + bool isCharging = get_charge_stat(); + // bool isCharging = false; if (isCharging) { HealthState highHealthState; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp index e0466d506..355d8adb0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp @@ -27,16 +27,16 @@ #include "heartrate/include/HeartModel.h" #include "gfx_utils/mem_check.h" #include "custom_utils.h" -// #include "traing/training_card/include/Training_CardView.h" -// #include "dnotdisturb/include/DnotDisturbModel.h" +#include "traing/training_card/include/Training_CardView.h" +#include "dnotdisturb/include/DnotDisturbModel.h" #include "weather/include/WeatherModel.h" #include "health/health_service/health_service.h" #include "sleep/include/SleepControlView.h" #include "sleep/include/SleepCardView.h" #include "sleep/include/SleepModel.h" #include "MainModel.h" -// #include "custom_runtime.h" -// #include "rebootandshutdown/include/RebootAndShutdownModelC.h" +#include "custom_runtime.h" +#include "rebootandshutdown/include/RebootAndShutdownModelC.h" #if USE_OFFLINE_DIAL #include "DialViewGroup.h" @@ -182,13 +182,13 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { return false; } - // /*发生点击进入密码锁*/ - // if (uapi_dev_runtime_get_lock_status()) - // { - // /*进入密码锁*/ - // NativeAbility::GetInstance().ChangeSlice(VIEW_CODED_LOCK); - // return true; - // } + /*发生点击进入密码锁*/ + if (uapi_dev_runtime_get_lock_status()) + { + /*进入密码锁*/ + NativeAbility::GetInstance().ChangeSlice(VIEW_CODED_LOCK); + return true; + } if (curViewId == CONNECTEDSTATUSBACKGROUNDBUTTON) { @@ -208,13 +208,13 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { MainModel::GetInstance().SetFromSetCardView(true); MainModel::GetInstance().SetFromCardId(BLOODOXGEN); // 如果正在充电进入提醒界面 - // if (get_charge_stat()) - // { - // HealthState highHealthState; - // highHealthState.checkType = CHARGE; - // HealthService::GetInstance()->SetHealthCurrent(highHealthState); - // NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID, TransitionType::TRANSITION_ZOOM); - // } + if (get_charge_stat()) + { + HealthState highHealthState; + highHealthState.checkType = CHARGE; + HealthService::GetInstance()->SetHealthCurrent(highHealthState); + NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID, TransitionType::TRANSITION_ZOOM); + } } // 设置卡片管理进入 if (curViewId == MAIN_CLICK_SETCARD) @@ -245,16 +245,16 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { */ if (cardId == WATCH_FACE) { - // if (uapi_dev_runtime_get_lock_status()) - // { - // /*进入密码锁*/ - // NativeAbility::GetInstance().ChangeSlice(VIEW_CODED_LOCK); - // } - // else - // { + if (uapi_dev_runtime_get_lock_status()) + { + /*进入密码锁*/ + NativeAbility::GetInstance().ChangeSlice(VIEW_CODED_LOCK); + } + else + { /*进入表盘设置*/ NativeAbility::GetInstance().ChangeSlice(VIEW_SET_DIAL); - // } + } } return true; } @@ -340,7 +340,7 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { void MainPresenterSample::SetCircleProgress() { - #if 0 + #if 1 PlayersView *playersView = dynamic_cast(view_->GetViewById(MUSIC_PLAYER)); if (playersView == nullptr) { @@ -466,7 +466,7 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { break; case MUSIC_PLAYER: - // PlayersModel::GetInstance()->SetCircleProgress(); + PlayersModel::GetInstance()->SetCircleProgress(); break; case WATCH_FACE: @@ -535,11 +535,13 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { /*心率卡片*/ void MainPresenterSample::StartHeartRateDetection() { - // HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::PASSIVITY); + HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::PASSIVITY); #if HEART_RATE_CHECK_TIMEOUT - HeartModel::GetInstance()->Heart_Control(HeartState::Start,HeartCheck::CARDCHECK); + HeartModel::GetInstance()->Heart_Control(HeartState::Start,HeartCheck::CARDCHECK); #else - // HeartModel::GetInstance()->Heart_Start(HeartCheck::CARDCHECK); + HeartModel::GetInstance()->Heart_Start(HeartCheck::CARDCHECK); + // 更新显示值 + GraphicService::GetInstance()->PostGraphicEvent(std::bind(&HeartModel::RefreshHeartRateScreen, HeartModel::GetInstance())); #endif } /*主表盘*/ @@ -572,8 +574,8 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { /*睡眠*/ void MainPresenterSample::UpdateSleep() { - // GraphicService::GetInstance()->PostGraphicEvent( - // std::bind(&OHOS::SleepModel::UpdateSleepView, &OHOS::SleepModel::GetInstance())); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::SleepModel::UpdateSleepView, &OHOS::SleepModel::GetInstance())); } /*天气*/ diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp index bb5f686d8..02a3647cf 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp @@ -237,19 +237,19 @@ namespace OHOS mainSwipeGroup->SetLoopState(false); // 主界面循环 mainSwipeGroup->EnableScreenCap(true); // 主界面截屏滑动 mainSwipeGroup->RegisterSwipeCallback(callback); // 主界面动画回调 - // /*密码锁上锁*/ - // if (uapi_dev_runtime_get_lock_status()) - // { - // // 回到表盘 - // SwitchToClockPage(); - // // printf("密码锁\r\n"); - // mainClockView->SetIntercept(true); - // mainSwipeGroup->SetDraggable(false); - // mainSwipeGroup->SetOnSwipeListener(nullptr); - // mainSwipeGroup->SetOnClickListener(presenter_); - // } - // else - // { + /*密码锁上锁*/ + if (uapi_dev_runtime_get_lock_status()) + { + // 回到表盘 + SwitchToClockPage(); + // printf("密码锁\r\n"); + mainClockView->SetIntercept(true); + mainSwipeGroup->SetDraggable(false); + mainSwipeGroup->SetOnSwipeListener(nullptr); + mainSwipeGroup->SetOnClickListener(presenter_); + } + else + { // 判断是否为从主界面前往的其他Slice if (presenter_->IsFromSetCardView()) { @@ -263,7 +263,7 @@ namespace OHOS // 回到表盘 SwitchToClockPage(); } - // } + } #ifdef XTS_SUPPORT /* ----------------------------------- XTS ---------------------------------- */ diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp index a78300ac0..c8594f125 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp @@ -5,7 +5,7 @@ #include "NativeAbility.h" #include "common/key_code.h" #include "cmsis_os.h" -//#include "battery_hal.h" +#include "battery_hal.h" #include "custom_utils.h" #include "saveele/include/SaveBatPresenter.h" #include "saveele/include/SaveBatView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp index 779e1dcdd..9e5796db9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp @@ -7,8 +7,7 @@ #include "bleService.h" #endif -// #include "battery_hal.h" -// extern uint8_t battery_get_voltage(float *voltage); +#include "battery_hal.h" #include "UiConfig.h" diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleANCS.c b/code/sdk/zhihui/services/ble_service/bleservice/bleANCS.c index 23ddbe888..7faafd8f6 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleANCS.c +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleANCS.c @@ -24,7 +24,7 @@ #include "bts_le_gap.h" #include "bts_br_gap.h" -// #include "battery_hal.h" +#include "battery_hal.h" #include "bleService.h" #include "alipay_feature.h" diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c index e6062d617..54b409788 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c @@ -23,7 +23,7 @@ extern "C" { #include "stdbool.h" #include "bts_br_gap.h" -// #include "battery_hal.h" +#include "battery_hal.h" #include "bleService.h" #include "alipay_feature.h" diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c index b9cba497f..a9dc4afdb 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c @@ -25,7 +25,7 @@ extern "C" { #include "bts_le_gap.h" #include "bts_br_gap.h" -// #include "battery_hal.h" +#include "battery_hal.h" #include "bleService.h" #include "alipay_feature.h" #ifdef AILPAY_SUPPORT -- 2.17.1