From: luozheng <1732036298@qq.com> Date: Fri, 19 Jul 2024 03:19:24 +0000 (+0800) Subject: 实现喝水提醒功能(隔天的还有问题) X-Git-Tag: release_V1.2.70_20241020_135402~791 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=c8259e9acc141077d525c02549d637903b811dd9;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 1d6a05512..2e9a11243 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -65,13 +65,16 @@ extern "C" static int drinkreminder_end_min = 0; /*喝水提醒结束分钟*/ static int drinkreminder_freq = 0; /*喝水提醒频率*/ static int drinkreminder_goal = 0; /*喝水提醒目标ml*/ - static int drinkremind_cnt = 0; // 喝水提醒计数器 + static int drinkremind_expectedTime = 0; static int sleep_notify_time_min = 0; static int sleep_notify_time_hour = 0; #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 WAKE_TIME_RANGE (((wake_time_hour < sleep_time_hour) && \ ((curTime.tm_hour > wake_time_hour) || \ (curTime.tm_hour == wake_time_hour && curTime.tm_min >= wake_time_min)) && \ @@ -423,38 +426,42 @@ extern "C" else if (drinkreminder_switch == 2) { // 判断当前时间是否在提醒时间段内 - 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)); - - if (isInReminderPeriod) + if (DRINKREMIND_TIME_RANGE) { - 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) + 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; // 开始时间秒数 + int current_seconds = (curTime.tm_hour * 60 + curTime.tm_min) * 60; // 当前时间的秒数 + int hour_24_seconds = 24 * 60 * 60; + if (uapi_dev_runtime_get_drinkremind_status() == 0) { - int expectedTime = start_time_Minutes + static_cast(interval_time * 60 * drinkremind_cnt); - if (currentMinutes == expectedTime && curTime.tm_sec == 0) + uapi_dev_runtime_set_drinkremind_status(1); + drinkremind_expectedTime = start_time_seconds + interval_time_seconds; + if (drinkremind_expectedTime >= hour_24_seconds) + { + drinkremind_expectedTime = hour_24_seconds - drinkremind_expectedTime; + } + } + else + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "current_seconds = %d,drinkremind_expectedTime = %d", current_seconds, drinkremind_expectedTime); + if (current_seconds == drinkremind_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); + drinkremind_expectedTime = current_seconds + interval_time_seconds; + if (drinkremind_expectedTime >= hour_24_seconds) + { + drinkremind_expectedTime = hour_24_seconds - drinkremind_expectedTime; + } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "current_seconds = %d,drinkremind_expectedTime = %d", current_seconds, drinkremind_expectedTime); AlarmEventPublish(TOPIC_EVENT_DRINKREMINDER, NULL, 0); } } } - else + else if (!DRINKREMIND_TIME_RANGE && uapi_dev_runtime_get_drinkremind_status() == 1) { - if (drinkremind_cnt > 0) // 只有在计数器大于0时才重置 - { - drinkremind_cnt = 0; // 重置计数器 - } + uapi_dev_runtime_set_drinkremind_status(0); } } } diff --git a/code/sdk/drivers/peripheral/utils/custom_runtime.c b/code/sdk/drivers/peripheral/utils/custom_runtime.c index f8a717f2e..1e74fca85 100644 --- a/code/sdk/drivers/peripheral/utils/custom_runtime.c +++ b/code/sdk/drivers/peripheral/utils/custom_runtime.c @@ -72,6 +72,7 @@ typedef struct uint8_t sleep_status; uint8_t nap_status; uint8_t sedentary_status; + uint8_t drinkremind_status; } runtime_status_t; @@ -311,3 +312,11 @@ uint8_t uapi_dev_runtime_get_sedentary_status(void) return g_runtime.sedentary_status; } +void uapi_dev_runtime_set_drinkremind_status(uint8_t status) +{ + g_runtime.drinkremind_status=status; +} +uint8_t uapi_dev_runtime_get_drinkremind_status(void) +{ + return g_runtime.drinkremind_status; +} diff --git a/code/sdk/drivers/peripheral/utils/custom_runtime.h b/code/sdk/drivers/peripheral/utils/custom_runtime.h index dba14183b..109ef63b0 100644 --- a/code/sdk/drivers/peripheral/utils/custom_runtime.h +++ b/code/sdk/drivers/peripheral/utils/custom_runtime.h @@ -53,7 +53,8 @@ void uapi_dev_runtime_set_nap_status(uint8_t status); uint8_t uapi_dev_runtime_get_nap_status(void); void uapi_dev_runtime_set_sedentary_status(uint8_t status); uint8_t uapi_dev_runtime_get_sedentary_status(void); - +void uapi_dev_runtime_set_drinkremind_status(uint8_t status); +uint8_t uapi_dev_runtime_get_drinkremind_status(void); /***************************************cat1 runtime 变量设置获取函数**************************************************/