From 458da3aed0a54ae03ec498d9da78c90039c58e62 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Thu, 17 Oct 2024 18:24:46 +0800
Subject: [PATCH] =?utf8?q?=E7=B3=BB=E7=BB=9F=EF=BC=9A=E8=BF=9B=E8=A1=8C?=
 =?utf8?q?=E6=AF=8F=E7=A7=92=E5=9B=9E=E8=B0=83=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?utf8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../src/AlarmClockTimerConfig.cpp             | 43 ++++++++++++-------
 .../peripheral/utils/custom_cmd_service.c     |  1 +
 2 files changed, 28 insertions(+), 16 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 d748fb559..62e5091f3 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -344,14 +344,11 @@ extern "C"
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get current time info, error code: %d", ret);
             return;
         }
-        
-        if(curTime.tm_sec%3==0)
-        do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_BLE_ADV_CHECK, nullptr, 0);
 
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Scanning alarms - Current time: %02d:%02d:%02d",
-                      curTime.tm_hour, curTime.tm_min, curTime.tm_sec);
+        if (curTime.tm_sec % 3 == 0) {
+             do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_BLE_ADV_CHECK, nullptr, 0);
+          }
 
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_alarmCtrA.state = %d,%02d:%02d", g_alarmCtrA.state,g_alarmCtrA.info.hour ,g_alarmCtrA.info.minute);
         if (g_alarmCtrA.state == ALARM_STATUS_RUNNING)
         {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Checking Alarm A");
@@ -395,15 +392,20 @@ extern "C"
         }
 
         //绑定判断
-        if (HandleIsBind())
-          return;
+        if (HandleIsBind()) {
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandleAlarmOnTime: not binded");
+            return;
+          }
+
 
         HandleAlarmOnTime(&curTime);
         HandleSleepReminder(&curTime);
 
         //以下弹窗被控制
-        if (HandleCanShowDialog())
-          return;
+        if (HandleCanShowDialog()) {
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandleAlarmOnTime: not show dialog");
+            return;
+        }
 
         HandleDrinkReminder(&curTime);  
         HandleHeartRateDetection(&curTime);  
@@ -426,11 +428,16 @@ extern "C"
     {
       bool state = false;
 
-      if (uapi_dev_runtime_get_saveele_status)
+      if (uapi_dev_runtime_get_saveele_status()) {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "saveele!");
         state = true;
-      if (uapi_dev_runtime_get_train_status)
+      }
+      
+      if (uapi_dev_runtime_get_train_status()) {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "training!");
         state = true;
-
+      }
+      
       return state;
     }
     
@@ -552,9 +559,13 @@ extern "C"
     }
 
     //心率周期检测
-    void HandleHeartRateDetection(const struct tm *curTime) {  
-        int heartRateDetectionInterval = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_DETECTED);  
-        if (heartRateDetectionInterval) {  
+    void HandleHeartRateDetection(const struct tm *curTime) {
+      int heartRateDetectionInterval =
+          OHOS::ConfigModel::GetInstance()->get_configData_int(
+              OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_DETECTED);
+      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);
             if (curTime->tm_min % heartRateDetectionInterval == 0 && curTime->tm_sec == 0) {  
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Automatic heart rate detection starts");  
                 // 开启心率检测  
diff --git a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
index 4ed137aaf..475b94b19 100644
--- a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
+++ b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
@@ -274,6 +274,7 @@ static void custom_cmd_service_check_task(void const *arg)
             break;
         case CUSTOM_CMD_MSG_BLE_ADV_CHECK:
             Check_ble_adv_status();
+            break;
         default:
             PRINT("Unknown CUSTOM_CMD_MSG cmd 0x%02X \r\n", mail.cmd);
             break;
-- 
2.17.1