From: luozheng <1732036298@qq.com> Date: Fri, 19 Jul 2024 06:53:32 +0000 (+0800) Subject: 解决喝水提醒跨天设置问题 X-Git-Tag: release_V1.2.70_20241020_135402~790 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9077d1847c905ffd0e0849a494d1f1b164ccd95d;p=mirrors%2FFD230.git 解决喝水提醒跨天设置问题 --- 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 2e9a11243..c21d3ad04 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -72,8 +72,10 @@ extern "C" #define SEDENTARY_TIME_RANGE (((curTime.tm_hour > sedentary_start_hour) || (curTime.tm_hour == sedentary_start_hour && curTime.tm_min >= sedentary_start_min)) && \ ((curTime.tm_hour < sedentary_stop_hour) || (curTime.tm_hour == sedentary_stop_hour && curTime.tm_min < sedentary_stop_min))) -#define DRINKREMIND_TIME_RANGE (((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))) +#define DRINKREMIND_TIME_RANGE ((((curTime.tm_hour > drinkreminder_start_hour && curTime.tm_hour < 24) || (curTime.tm_hour == drinkreminder_start_hour && curTime.tm_min >= drinkreminder_start_min)) && \ + ((curTime.tm_hour < drinkreminder_end_hour && curTime.tm_hour >= 0) || (curTime.tm_hour == drinkreminder_end_hour && curTime.tm_min < drinkreminder_end_min))) || \ + ((curTime.tm_hour >= 0 && curTime.tm_hour < drinkreminder_end_hour) || (curTime.tm_hour == drinkreminder_end_hour && curTime.tm_min < drinkreminder_end_min)) && \ + ((curTime.tm_hour > drinkreminder_start_hour - 24 || (curTime.tm_hour == drinkreminder_start_hour - 24 && curTime.tm_min >= drinkreminder_start_min)))) #define WAKE_TIME_RANGE (((wake_time_hour < sleep_time_hour) && \ ((curTime.tm_hour > wake_time_hour) || \ @@ -428,6 +430,7 @@ extern "C" // 判断当前时间是否在提醒时间段内 if (DRINKREMIND_TIME_RANGE) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " curTime.tm_sec = %d", curTime.tm_sec); double interval_time = (drinkreminder_freq == 0) ? 0.5 : drinkreminder_freq; // 频率设置 int interval_time_seconds = static_cast(interval_time * 60) * 60; // 设置的间隔时间秒数 int start_time_seconds = (drinkreminder_start_hour * 60 + drinkreminder_start_min) * 60; // 开始时间秒数 @@ -439,7 +442,7 @@ extern "C" drinkremind_expectedTime = start_time_seconds + interval_time_seconds; if (drinkremind_expectedTime >= hour_24_seconds) { - drinkremind_expectedTime = hour_24_seconds - drinkremind_expectedTime; + drinkremind_expectedTime = drinkremind_expectedTime - hour_24_seconds; } } else