系统：进行每秒回调判断条件优化

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 d748fb5..62e5091 100644 (file)
--- 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);\r
             return;\r
         }\r
-        \r
-        if(curTime.tm_sec%3==0)\r
-        do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_BLE_ADV_CHECK, nullptr, 0);\r
 \r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Scanning alarms - Current time: %02d:%02d:%02d",\r
-                      curTime.tm_hour, curTime.tm_min, curTime.tm_sec);\r
+        if (curTime.tm_sec % 3 == 0) {\r
+             do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_BLE_ADV_CHECK, nullptr, 0);\r
+          }\r
 \r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_alarmCtrA.state = %d,%02d:%02d", g_alarmCtrA.state,g_alarmCtrA.info.hour ,g_alarmCtrA.info.minute);\r
         if (g_alarmCtrA.state == ALARM_STATUS_RUNNING)\r
         {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Checking Alarm A");\r
@@ -395,15 +392,20 @@ extern "C"
         }\r
 \r
         //绑定判断\r
-        if (HandleIsBind())\r
-          return;\r
+        if (HandleIsBind()) {\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandleAlarmOnTime: not binded");\r
+            return;\r
+          }\r
+\r
 \r
         HandleAlarmOnTime(&curTime);\r
         HandleSleepReminder(&curTime);\r
 \r
         //以下弹窗被控制\r
-        if (HandleCanShowDialog())\r
-          return;\r
+        if (HandleCanShowDialog()) {\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandleAlarmOnTime: not show dialog");\r
+            return;\r
+        }\r
 \r
         HandleDrinkReminder(&curTime);  \r
         HandleHeartRateDetection(&curTime);  \r
@@ -426,11 +428,16 @@ extern "C"
     {\r
       bool state = false;\r
 \r
-      if (uapi_dev_runtime_get_saveele_status)\r
+      if (uapi_dev_runtime_get_saveele_status()) {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "saveele!");\r
         state = true;\r
-      if (uapi_dev_runtime_get_train_status)\r
+      }\r
+      \r
+      if (uapi_dev_runtime_get_train_status()) {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "training!");\r
         state = true;\r
-\r
+      }\r
+      \r
       return state;\r
     }\r
     \r
@@ -552,9 +559,13 @@ extern "C"
     }\r
 \r
     //心率周期检测\r
-    void HandleHeartRateDetection(const struct tm *curTime) {  \r
-        int heartRateDetectionInterval = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_DETECTED);  \r
-        if (heartRateDetectionInterval) {  \r
+    void HandleHeartRateDetection(const struct tm *curTime) {\r
+      int heartRateDetectionInterval =\r
+          OHOS::ConfigModel::GetInstance()->get_configData_int(\r
+              OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_DETECTED);\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
             if (curTime->tm_min % heartRateDetectionInterval == 0 && curTime->tm_sec == 0) {  \r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Automatic heart rate detection starts");  \r
                 // 开启心率检测  \r

diff --git a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
index 4ed137a..475b94b 100644 (file)
--- 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;