From 53a30188245627add6eaefc179b6bde77228bd85 Mon Sep 17 00:00:00 2001 From: derek Date: Tue, 15 Feb 2022 10:42:17 +0800 Subject: [PATCH 1/3] bugfix Signed-off-by: derek Change-Id: I948470d090cca7f178a35027873cc76c2031b2ee --- services/ans/src/reminder_data_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/ans/src/reminder_data_manager.cpp b/services/ans/src/reminder_data_manager.cpp index 18f09d8b6..14a67456d 100644 --- a/services/ans/src/reminder_data_manager.cpp +++ b/services/ans/src/reminder_data_manager.cpp @@ -324,8 +324,8 @@ void ReminderDataManager::CloseReminder(const sptr &reminder, b StopTimerLocked(TimerType::TRIGGER_TIMER); } if (alertingReminderId_ == reminderId) { - StopTimerLocked(TimerType::ALERTING_TIMER); StopSoundAndVibrationLocked(reminder); + StopTimerLocked(TimerType::ALERTING_TIMER); } reminder->OnClose(true); RemoveFromShowedReminders(reminder); -- Gitee From 3ef7d491af7d100f2eeb5f89eac7d55da1372426 Mon Sep 17 00:00:00 2001 From: derek Date: Tue, 15 Feb 2022 11:03:37 +0800 Subject: [PATCH 2/3] bugfix Signed-off-by: derek Change-Id: Id16dda2ce4d96f8be4b3d716912d130e6122a368 --- services/ans/src/reminder_data_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/ans/src/reminder_data_manager.cpp b/services/ans/src/reminder_data_manager.cpp index 14a67456d..0eebcf1a7 100644 --- a/services/ans/src/reminder_data_manager.cpp +++ b/services/ans/src/reminder_data_manager.cpp @@ -57,8 +57,8 @@ void ReminderDataManager::CancelReminder( StopTimerLocked(TimerType::TRIGGER_TIMER); } if (alertingReminderId_ == reminderId) { - StopTimerLocked(TimerType::ALERTING_TIMER); StopSoundAndVibrationLocked(reminder); + StopTimerLocked(TimerType::ALERTING_TIMER); } int32_t id = reminderId; RemoveReminderLocked(id); @@ -572,8 +572,8 @@ void ReminderDataManager::SnoozeReminderImpl(sptr &reminder) // 1) Snooze the reminder by manual if (alertingReminderId_ == reminder->GetReminderId()) { - StopTimerLocked(TimerType::ALERTING_TIMER); StopSoundAndVibrationLocked(reminder); + StopTimerLocked(TimerType::ALERTING_TIMER); } reminder->OnSnooze(); -- Gitee From b83398b9b9d92f4bd144b935ef3401a193068436 Mon Sep 17 00:00:00 2001 From: derek Date: Tue, 15 Feb 2022 12:05:32 +0800 Subject: [PATCH 3/3] fix alarm repeatDay error Signed-off-by: derek Change-Id: I06ca22bab974704404962434550c36fe234d93af --- frameworks/ans/native/src/reminder_request_alarm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/ans/native/src/reminder_request_alarm.cpp b/frameworks/ans/native/src/reminder_request_alarm.cpp index f1334689b..2c0de6b23 100644 --- a/frameworks/ans/native/src/reminder_request_alarm.cpp +++ b/frameworks/ans/native/src/reminder_request_alarm.cpp @@ -109,7 +109,7 @@ uint64_t ReminderRequestAlarm::GetNextTriggerTime(bool forceToGetNext) const } ANSR_LOGD("Now: year=%{public}d, mon=%{public}d, day=%{public}d, hour=%{public}d, " - "min=%{public}d, sec=%{public}d, week=%{public}d, \n Target: tar_hour=%{public}d, tar_min=%{public}d", + "min=%{public}d, sec=%{public}d, week=%{public}d, Target: tar_hour=%{public}d, tar_min=%{public}d", GetActualTime(TimeTransferType::YEAR, nowTime->tm_year), GetActualTime(TimeTransferType::MONTH, nowTime->tm_mon), nowTime->tm_mday, nowTime->tm_hour, nowTime->tm_min, nowTime->tm_sec, @@ -159,7 +159,7 @@ int8_t ReminderRequestAlarm::GetNextAlarm(const time_t now, const time_t target) if (repeatDays_ == 0) { return INVALID_INT_VALUE; } - int today = gmtime(&now)->tm_wday; + int today = GetActualTime(TimeTransferType::WEEK, gmtime(&now)->tm_wday); int dayCount = now >= target ? 1 : 0; for (; dayCount <= DAYS_PER_WEEK; dayCount++) { int day = (today + dayCount) % DAYS_PER_WEEK; -- Gitee