From: luozheng <1732036298@qq.com> Date: Thu, 18 Jul 2024 03:33:44 +0000 (+0800) Subject: 喝水提醒优化修改:不在提醒时间段内且计数器大于0就重置计数器 X-Git-Tag: release_V1.2.70_20241020_135402~798 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9662ca21f8e744be26ea0405c1c1340f87bc23fb;p=mirrors%2FFD230.git 喝水提醒优化修改:不在提醒时间段内且计数器大于0就重置计数器 --- 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 4180251d6..cbc1c6f35 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -423,29 +423,39 @@ extern "C" else if (drinkreminder_switch == 2) { // 判断当前时间是否在提醒时间段内 - if ((curTime.tm_hour > drinkreminder_start_hour || - (curTime.tm_hour == drinkreminder_start_hour && curTime.tm_min >= drinkreminder_start_min)) && - (curTime.tm_hour < drinkreminder_end_hour || - (curTime.tm_hour == drinkreminder_end_hour && curTime.tm_min < drinkreminder_end_min))) - { - double interval_time = (drinkreminder_freq == 0) ? 0.5 : drinkreminder_freq; // 频率设置 + bool isInReminderPeriod = (curTime.tm_hour > drinkreminder_start_hour || + (curTime.tm_hour == drinkreminder_start_hour && curTime.tm_min >= drinkreminder_start_min)) && + (curTime.tm_hour < drinkreminder_end_hour || + (curTime.tm_hour == drinkreminder_end_hour && curTime.tm_min < drinkreminder_end_min)); - int currentMinutes = curTime.tm_hour * 60 + curTime.tm_min; // 当前时间分钟数 - int start_time_Minutes = drinkreminder_start_hour * 60 + drinkreminder_start_min; // 开始时间分钟数 + if (isInReminderPeriod) + { + double interval_time = (drinkreminder_freq == 0) ? 0.5 : drinkreminder_freq; // 频率设置 + int currentMinutes = curTime.tm_hour * 60 + curTime.tm_min; // 当前时间的分钟数 + int start_time_Minutes = drinkreminder_start_hour * 60 + drinkreminder_start_min; // 开始时间的分钟数 int drinkremind_max_cnt = (drinkreminder_end_hour * 60 + drinkreminder_end_min - start_time_Minutes) / (interval_time * 60); // 检查提醒次数 if (drinkremind_cnt < drinkremind_max_cnt) { - if (currentMinutes == (start_time_Minutes + interval_time * 60 * drinkremind_cnt) && curTime.tm_sec == 0) + int expectedTime = start_time_Minutes + static_cast(interval_time * 60 * drinkremind_cnt) + static_cast(interval_time * 60); + if (currentMinutes == expectedTime && curTime.tm_sec == 0) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "该喝水了!!该喝水了!!"); drinkremind_cnt++; // 增加提醒计数 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "drinkremind_max_cnt = %d , drinkremind_cnt = %d", drinkremind_max_cnt, drinkremind_cnt); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "curTime:%d:%d", curTime.tm_hour, curTime.tm_min); AlarmEventPublish(TOPIC_EVENT_DRINKREMINDER, NULL, 0); } } } + else + { + if (drinkremind_cnt > 0) // 只有在计数器大于0时才重置 + { + drinkremind_cnt = 0; // 重置计数器 + } + } } } // 心率周期检测 [0 1 5 10]