Merge #2051 into sdk602patch0911 from refs/changes/2051/head

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 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2051

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 ff51e7b..f8e780c 100644 (file)
--- 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"
         }\r
 \r
         HandleDrinkReminder(&curTime);  \r
-#ifdef BOARD_FD230\r
         HandleHeartRateDetection(&curTime);  \r
-#endif\r
     }\r
     \r
     //判断是否绑定\r
@@ -612,7 +610,7 @@ extern "C"
         \r
       WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Heart rate detection cycle detection is enabled %d",heartRateDetectionInterval);\r
       if (heartRateDetectionInterval) {\r
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Heart rate detection cycle detection is enabled %d",curTime->tm_min % heartRateDetectionInterval);\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " %d curTime->tm_sec %d",curTime->tm_min % heartRateDetectionInterval,curTime->tm_sec);\r
             if (curTime->tm_min % heartRateDetectionInterval == 0 && curTime->tm_sec == 0) {  \r
                 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Automatic heart rate detection starts");  \r
                 // 开启心率检测  \r

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 efcedb9..42932ac 100644 (file)
--- 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) {\r
   //优先级低不对高优先级处理\r
   if (check < checkstate) {\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
                   "Higher execution instruction exists");\r
     return;\r
   }\r
@@ -444,10 +444,10 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) {
     /*充电状态下不进行检测*/\r
     bool isCharging = get_charge_stat(); // 获取充电状态\r
     if (isCharging) {\r
-      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "充电不能检测");\r
+      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "充电不能检测");\r
       return;\r
     }\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState Start");\r
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartState Start");\r
     uint8_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST;\r
     send_ppg_cmd_msg(md);\r
     heartstate = true;\r
@@ -469,7 +469,7 @@ void HeartModel::Heart_Start(HeartCheck check) {
     Heart_Control(HeartState::Start, check);\r
     // ScreenTurnOn(60 * 1000); // 亮屏操作 600000ms 60秒关闭\r
     sensorstate = true;\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "开始心率检测");\r
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "开始心率检测");\r
     // 设置runtime\r
     if (uapi_dev_runtime_get_heartrate_detect_status() == 0) {\r
       uapi_dev_runtime_set_heartrate_detect_status(1);\r
@@ -518,7 +518,7 @@ void HeartModel::Heart_Stop() {
       sensorstate = false;\r
       uapi_dev_runtime_set_heartrate_detect_status(0);\r
     }\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "本次心率检测结束");\r
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "本次心率检测结束");\r
   }\r
 }\r
 // 保存检测数据\r

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 d9d5b89..1ded4bf 100644 (file)
--- 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);
   
 }