From: penglei <1624952103@qq.com> Date: Wed, 6 Nov 2024 10:42:14 +0000 (+0800) Subject: 添加睡眠卡片清除历史数据 X-Git-Tag: fd230_release_V1.3.102~112^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4d05bb7f095016b7b5654247ba157874544e9834;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 64ee7801b..4790e5eda 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -525,6 +525,7 @@ extern "C" // 睡眠弹窗 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "要睡觉啦!"); // 设置状态为睡眠 + OHOS::SleepModel::GetInstance().clean_sleep_data(); //清除历史数据 OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP); if (curTime->tm_hour == sleep_time_hour && curTime->tm_min == sleep_time_min && curTime->tm_sec == 0) diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h index dd3c62182..0b700654c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h @@ -87,6 +87,9 @@ namespace OHOS int get_sleep_goal(); int get_sleep_total(); + //清除睡眠数据 + void clean_sleep_data(void); + std::string get_rest_str(); // 解析入睡时间 std::string get_wake_str(); // 解析醒来时间 std::string get_goal_str(); // 解析目标休息时间 diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp index 2d9aeb2d9..1259119f9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: SLEPPNOTIFY24-06-26 19:36:48 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-10-19 18:48:26 + * @LastEditTime: 2024-11-06 18:28:20 * @FilePath: * /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp * @Description: @@ -63,6 +63,14 @@ namespace OHOS static uint32_t sleep_update_timestamp = 0; static uint32_t nap_update_timestamp = 0; + void SleepModel::clean_sleep_data(void) + { + sleep_update_timestamp = 0; + nap_update_timestamp = 0; + memset(&sleep_data,0,sizeof(SLEEP_T)); + memset(&nap_data, 0, sizeof(NAP_T)); + } + /*获取最新睡眠时间戳*/ uint32_t get_sleep_update_timestamp(void) {