From dce9ed593be0e2199d2ac2fce49a3f7a509a77cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Thu, 7 Aug 2025 01:37:20 +0000 Subject: [PATCH] Merge #2051 into sdk602patch0911 from refs/changes/2051/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 袁清梦 * refs/changes/2051/head: (2 commits squashed) - 修复n9无法正常进行心率周期检测 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2051 --- .../src/AlarmClockTimerConfig.cpp | 4 +--- .../fd230app/nativeui/heartrate/src/HeartModel.cpp | 10 +++++----- .../wearable/service/ble_service/blemoder/bletest.cpp | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp index ff51e7bd1..f8e780c3e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -435,9 +435,7 @@ extern "C" } HandleDrinkReminder(&curTime); -#ifdef BOARD_FD230 HandleHeartRateDetection(&curTime); -#endif } //判断是否绑定 @@ -612,7 +610,7 @@ extern "C" WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Heart rate detection cycle detection is enabled %d",heartRateDetectionInterval); if (heartRateDetectionInterval) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Heart rate detection cycle detection is enabled %d",curTime->tm_min % heartRateDetectionInterval); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " %d curTime->tm_sec %d",curTime->tm_min % heartRateDetectionInterval,curTime->tm_sec); if (curTime->tm_min % heartRateDetectionInterval == 0 && curTime->tm_sec == 0) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Automatic heart rate detection starts"); // 开启心率检测 diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp index efcedb954..42932ac65 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp @@ -395,7 +395,7 @@ HeartResult HeartModel::GetResult() { return heartresult_; } void HeartModel::Heart_Control(HeartState state, HeartCheck check) { //优先级低不对高优先级处理 if (check < checkstate) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Higher execution instruction exists"); return; } @@ -444,10 +444,10 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) { /*充电状态下不进行检测*/ bool isCharging = get_charge_stat(); // 获取充电状态 if (isCharging) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "充电不能检测"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "充电不能检测"); return; } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState Start"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartState Start"); uint8_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST; send_ppg_cmd_msg(md); heartstate = true; @@ -469,7 +469,7 @@ void HeartModel::Heart_Start(HeartCheck check) { Heart_Control(HeartState::Start, check); // ScreenTurnOn(60 * 1000); // 亮屏操作 600000ms 60秒关闭 sensorstate = true; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "开始心率检测"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "开始心率检测"); // 设置runtime if (uapi_dev_runtime_get_heartrate_detect_status() == 0) { uapi_dev_runtime_set_heartrate_detect_status(1); @@ -518,7 +518,7 @@ void HeartModel::Heart_Stop() { sensorstate = false; uapi_dev_runtime_set_heartrate_detect_status(0); } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "本次心率检测结束"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "本次心率检测结束"); } } // 保存检测数据 diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp index d9d5b89e4..1ded4bf49 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp @@ -2322,8 +2322,8 @@ void Set_heart_cmd(msg_get_heart_set_param_info_t *data) OHOS::ConfigModel *p_ConfigModel = OHOS::ConfigModel::GetInstance(); p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_DETECTED,data->frequence); - p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_REMIND,data->remind_on); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"set_condigData_Int data->frequence %d\r\n",data->frequence); if(data->remind_on) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"set_condigData_Int data->max_min %d\r\n",data->max_min); @@ -2342,7 +2342,7 @@ void Get_heart_cmd(msg_get_heart_set_param_info_t *data) data->frequence = p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_DETECTED); data->remind_on = p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_REMIND); data->max_min= p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_MAX_MIN); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"Get_heart_cmd data->max_min %d\r\n",data->max_min); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Get_heart_cmd data->max_min %d\r\n",data->max_min); data->heart = p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_THRESHOLD_VALUE); } -- 2.17.1