From ecfdc1815994778d6fac6d503d7d8cd5da49be97 Mon Sep 17 00:00:00 2001 From: derek Date: Wed, 16 Feb 2022 11:51:31 +0800 Subject: [PATCH 1/2] ut change output dir Signed-off-by: derek Change-Id: I455c9b262325473388804d4801ce920891ef860c --- frameworks/ans/native/test/unittest/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/ans/native/test/unittest/BUILD.gn b/frameworks/ans/native/test/unittest/BUILD.gn index dd864cd0b..b22463e32 100644 --- a/frameworks/ans/native/test/unittest/BUILD.gn +++ b/frameworks/ans/native/test/unittest/BUILD.gn @@ -15,7 +15,7 @@ import("//base/notification/ans_standard/notification.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "ans_reminder/unittest" +module_output_path = "ans_standard/unittest" ohos_unittest("ans_reminder_unit_test") { module_out_path = module_output_path -- Gitee From 8b0903dc7cdcaa48339263c0e9aecbe8441ee153 Mon Sep 17 00:00:00 2001 From: derek Date: Thu, 17 Feb 2022 12:07:29 +0800 Subject: [PATCH 2/2] sleep bugfix Signed-off-by: derek Change-Id: I71bb73ed923878269c178a722e09ef025f6ac025 --- services/ans/include/reminder_data_manager.h | 2 +- services/ans/src/reminder_data_manager.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/ans/include/reminder_data_manager.h b/services/ans/include/reminder_data_manager.h index c1167f1ba..fc73bfb34 100644 --- a/services/ans/include/reminder_data_manager.h +++ b/services/ans/include/reminder_data_manager.h @@ -362,7 +362,7 @@ private: * @param reason Indicates the description information. */ void TerminateAlerting(const sptr &reminder, const std::string &reason); - void TerminateAlerting(const uint16_t waitInMilli, const sptr &reminder); + void TerminateAlerting(const uint16_t waitInSecond, const sptr &reminder); /** * @brief Assign unique reminder id and save reminder in memory. diff --git a/services/ans/src/reminder_data_manager.cpp b/services/ans/src/reminder_data_manager.cpp index 0eebcf1a7..7866d6298 100644 --- a/services/ans/src/reminder_data_manager.cpp +++ b/services/ans/src/reminder_data_manager.cpp @@ -371,9 +371,9 @@ void ReminderDataManager::TerminateAlerting(const OHOS::EventFwk::Want &want) TerminateAlerting(reminder, "timeOut"); } -void ReminderDataManager::TerminateAlerting(const uint16_t waitInMilli, const sptr &reminder) +void ReminderDataManager::TerminateAlerting(const uint16_t waitInSecond, const sptr &reminder) { - sleep(waitInMilli); + sleep(waitInSecond); TerminateAlerting(reminder, "waitInMillis"); } @@ -521,7 +521,7 @@ void ReminderDataManager::ShowReminder(const sptr &reminder, co if (needScheduleTimeout) { StartTimer(reminder, TimerType::ALERTING_TIMER); } else { - TerminateAlerting(ReminderRequest::MILLI_SECONDS, reminder); + TerminateAlerting(1, reminder); } } else { reminder->OnShow(false, isSysTimeChanged, true); -- Gitee