diff --git a/frameworks/ans/native/src/reminder_request.cpp b/frameworks/ans/native/src/reminder_request.cpp
index 5adbeee6ce012ad980c68c0de62d65253e8be3f1..db3ae73883735aec8e9e0adeb306269ef4b2f44e 100644
--- a/frameworks/ans/native/src/reminder_request.cpp
+++ b/frameworks/ans/native/src/reminder_request.cpp
@@ -26,6 +26,11 @@
namespace OHOS {
namespace Notification {
+namespace
+{
+const int BASE_YEAR = 1900;
+}
+
int32_t ReminderRequest::GLOBAL_ID = 0;
const uint64_t ReminderRequest::INVALID_LONG_LONG_VALUE = 0;
const uint16_t ReminderRequest::INVALID_U16_VALUE = 0;
@@ -38,7 +43,6 @@ const uint8_t ReminderRequest::REMINDER_STATUS_ACTIVE = 1;
const uint8_t ReminderRequest::REMINDER_STATUS_ALERTING = 2;
const uint8_t ReminderRequest::REMINDER_STATUS_SHOWING = 4;
const uint8_t ReminderRequest::REMINDER_STATUS_SNOOZE = 8;
-const int ReminderRequest::BASE_YEAR = 1900;
const std::string ReminderRequest::NOTIFICATION_LABEL = "REMINDER_AGENT";
const std::string ReminderRequest::REMINDER_EVENT_ALARM_ALERT = "ohos.event.notification.reminder.ALARM_ALERT";
const std::string ReminderRequest::REMINDER_EVENT_CLOSE_ALERT = "ohos.event.notification.reminder.CLOSE_ALERT";
@@ -51,6 +55,38 @@ const std::string ReminderRequest::SEP_BUTTON_SINGLE = "";
const std::string ReminderRequest::SEP_BUTTON_MULTI = "";
const std::string ReminderRequest::SEP_WANT_AGENT = "";
+// For database recovery.
+const std::string ReminderRequest::REMINDER_ID = "reminder_id";
+const std::string ReminderRequest::PKG_NAME = "package_name";
+const std::string ReminderRequest::USER_ID = "user_id";
+const std::string ReminderRequest::UID = "uid";
+const std::string ReminderRequest::APP_LABEL = "app_label";
+const std::string ReminderRequest::REMINDER_TYPE = "reminder_type";
+const std::string ReminderRequest::REMINDER_TIME = "reminder_time";
+const std::string ReminderRequest::TRIGGER_TIME = "trigger_time";
+const std::string ReminderRequest::RTC_TRIGGER_TIME = "rtc_trigger_time";
+const std::string ReminderRequest::TIME_INTERVAL = "time_interval";
+const std::string ReminderRequest::SNOOZE_TIMES = "snooze_times";
+const std::string ReminderRequest::DYNAMIC_SNOOZE_TIMES = "dynamic_snooze_times";
+const std::string ReminderRequest::RING_DURATION = "ring_duration";
+const std::string ReminderRequest::IS_EXPIRED = "is_expired";
+const std::string ReminderRequest::IS_ACTIVE = "is_active";
+const std::string ReminderRequest::STATE = "state";
+const std::string ReminderRequest::ZONE_ID = "zone_id";
+const std::string ReminderRequest::HAS_SCHEDULED_TIMEOUT = "has_ScheduledTimeout";
+const std::string ReminderRequest::ACTION_BUTTON_INFO = "button_info";
+const std::string ReminderRequest::SLOT_ID = "slot_id";
+const std::string ReminderRequest::NOTIFICATION_ID = "notification_id";
+const std::string ReminderRequest::TITLE = "title";
+const std::string ReminderRequest::CONTENT = "content";
+const std::string ReminderRequest::SNOOZE_CONTENT = "snooze_content";
+const std::string ReminderRequest::EXPIRED_CONTENT = "expired_content";
+const std::string ReminderRequest::AGENT = "agent";
+const std::string ReminderRequest::MAX_SCREEN_AGENT = "maxScreen_agent";
+
+std::string ReminderRequest::sqlOfAddColumns = "";
+std::vector ReminderRequest::columns;
+
ReminderRequest::ReminderRequest()
{
InitServerObj();
@@ -1386,7 +1422,7 @@ void ReminderRequest::UpdateNotificationBundleInfo()
notificationRequest_->SetOwnerBundleName(bundleName_);
notificationRequest_->SetCreatorBundleName(bundleName_);
notificationRequest_->SetCreatorUid(uid_);
- ErrCode errCode = OHOS::AccountSA::OsAccountManager::GetOsAccountLocalIdFromUid(uid_, userId_);
+ ErrCode errCode = AccountSA::OsAccountManager::GetOsAccountLocalIdFromUid(uid_, userId_);
if (errCode != ERR_OK) {
ANSR_LOGE("GetOsAccountLocalIdFromUid fail.");
return;
@@ -1549,38 +1585,7 @@ void ReminderRequest::AppendValuesBucket(const sptr &reminder,
}
}
-const std::string ReminderRequest::REMINDER_ID = "reminder_id";
-const std::string ReminderRequest::PKG_NAME = "package_name";
-const std::string ReminderRequest::USER_ID = "user_id";
-const std::string ReminderRequest::UID = "uid";
-const std::string ReminderRequest::APP_LABEL = "app_label";
-const std::string ReminderRequest::REMINDER_TYPE = "reminder_type";
-const std::string ReminderRequest::REMINDER_TIME = "reminder_time";
-const std::string ReminderRequest::TRIGGER_TIME = "trigger_time";
-const std::string ReminderRequest::RTC_TRIGGER_TIME = "rtc_trigger_time";
-const std::string ReminderRequest::TIME_INTERVAL = "time_interval";
-const std::string ReminderRequest::SNOOZE_TIMES = "snooze_times";
-const std::string ReminderRequest::DYNAMIC_SNOOZE_TIMES = "dynamic_snooze_times";
-const std::string ReminderRequest::RING_DURATION = "ring_duration";
-const std::string ReminderRequest::IS_EXPIRED = "is_expired";
-const std::string ReminderRequest::IS_ACTIVE = "is_active";
-const std::string ReminderRequest::STATE = "state";
-const std::string ReminderRequest::ZONE_ID = "zone_id";
-const std::string ReminderRequest::HAS_SCHEDULED_TIMEOUT = "has_ScheduledTimeout";
-const std::string ReminderRequest::ACTION_BUTTON_INFO = "button_info";
-const std::string ReminderRequest::SLOT_ID = "slot_id";
-const std::string ReminderRequest::NOTIFICATION_ID = "notification_id";
-const std::string ReminderRequest::TITLE = "title";
-const std::string ReminderRequest::CONTENT = "content";
-const std::string ReminderRequest::SNOOZE_CONTENT = "snooze_content";
-const std::string ReminderRequest::EXPIRED_CONTENT = "expired_content";
-const std::string ReminderRequest::AGENT = "agent";
-const std::string ReminderRequest::MAX_SCREEN_AGENT = "maxScreen_agent";
-
-std::string ReminderRequest::sqlOfAddColumns = "";
-std::vector ReminderRequest::columns;
-
-void ReminderRequest::Init()
+void ReminderRequest::InitDbColumns()
{
AddColumn(REMINDER_ID, "INTEGER PRIMARY KEY", false);
AddColumn(PKG_NAME, "TEXT NOT NULL", false);
diff --git a/frameworks/ans/native/src/reminder_request_alarm.cpp b/frameworks/ans/native/src/reminder_request_alarm.cpp
index 532202d0c16ec1303648c7cb19319e21a6164c5a..bd13cae5627e48d8931d0119e54c83d161622512 100644
--- a/frameworks/ans/native/src/reminder_request_alarm.cpp
+++ b/frameworks/ans/native/src/reminder_request_alarm.cpp
@@ -29,6 +29,11 @@ const uint8_t ReminderRequestAlarm::MINUTES_PER_HOUR = 60;
const int8_t ReminderRequestAlarm::INVALID_INT_VALUE = -1;
const int8_t ReminderRequestAlarm::DEFAULT_SNOOZE_TIMES = 3;
+// For database recovery.
+const std::string ReminderRequestAlarm::REPEAT_DAYS_OF_WEEK = "repeat_days_of_week";
+const std::string ReminderRequestAlarm::ALARM_HOUR = "alarm_hour";
+const std::string ReminderRequestAlarm::ALARM_MINUTE = "alarm_minute";
+
ReminderRequestAlarm::ReminderRequestAlarm(uint8_t hour, uint8_t minute, const std::vector daysOfWeek)
: ReminderRequest(ReminderRequest::ReminderType::ALARM)
{
@@ -332,11 +337,7 @@ void ReminderRequestAlarm::AppendValuesBucket(const sptr &remin
values.PutInt(ALARM_MINUTE, minute);
}
-const std::string ReminderRequestAlarm::REPEAT_DAYS_OF_WEEK = "repeat_days_of_week";
-const std::string ReminderRequestAlarm::ALARM_HOUR = "alarm_hour";
-const std::string ReminderRequestAlarm::ALARM_MINUTE = "alarm_minute";
-
-void ReminderRequestAlarm::Init()
+void ReminderRequestAlarm::InitDbColumns()
{
ReminderRequest::AddColumn(REPEAT_DAYS_OF_WEEK, "INT", false);
ReminderRequest::AddColumn(ALARM_HOUR, "INT", false);
diff --git a/frameworks/ans/native/src/reminder_request_calendar.cpp b/frameworks/ans/native/src/reminder_request_calendar.cpp
index 746c2adcd41a1106367610d0f0c7d2e6a010a9f3..80d072d0dbb760d237a4b0ad96f75dde76b4f73d 100644
--- a/frameworks/ans/native/src/reminder_request_calendar.cpp
+++ b/frameworks/ans/native/src/reminder_request_calendar.cpp
@@ -25,6 +25,18 @@ const uint8_t ReminderRequestCalendar::JANUARY = 1;
const uint8_t ReminderRequestCalendar::DECEMBER = 12;
const uint8_t ReminderRequestCalendar::DEFAULT_SNOOZE_TIMES = 3;
+// For database recovery.
+const std::string ReminderRequestCalendar::REPEAT_DAYS = "repeat_days";
+const std::string ReminderRequestCalendar::REPEAT_MONTHS = "repeat_months";
+const std::string ReminderRequestCalendar::FIRST_DESIGNATE_YEAR = "first_designate_year";
+const std::string ReminderRequestCalendar::FIRST_DESIGNATE_MONTH = "first_designate_month";
+const std::string ReminderRequestCalendar::FIRST_DESIGNATE_DAY = "first_designate_day";
+const std::string ReminderRequestCalendar::CALENDAR_YEAR = "calendar_year";
+const std::string ReminderRequestCalendar::CALENDAR_MONTH = "calendar_month";
+const std::string ReminderRequestCalendar::CALENDAR_DAY = "calendar_day";
+const std::string ReminderRequestCalendar::CALENDAR_HOUR = "calendar_hour";
+const std::string ReminderRequestCalendar::CALENDAR_MINUTE = "calendar_minute";
+
ReminderRequestCalendar::ReminderRequestCalendar(const tm &dateTime,
const std::vector &repeatMonths, const std::vector &repeatDays)
: ReminderRequest(ReminderRequest::ReminderType::CALENDAR)
@@ -576,18 +588,7 @@ void ReminderRequestCalendar::AppendValuesBucket(const sptr &re
values.PutInt(CALENDAR_MINUTE, minute);
}
-const std::string ReminderRequestCalendar::REPEAT_DAYS = "repeat_days";
-const std::string ReminderRequestCalendar::REPEAT_MONTHS = "repeat_months";
-const std::string ReminderRequestCalendar::FIRST_DESIGNATE_YEAR = "first_designate_year";
-const std::string ReminderRequestCalendar::FIRST_DESIGNATE_MONTH = "first_designate_month";
-const std::string ReminderRequestCalendar::FIRST_DESIGNATE_DAY = "first_designate_day";
-const std::string ReminderRequestCalendar::CALENDAR_YEAR = "calendar_year";
-const std::string ReminderRequestCalendar::CALENDAR_MONTH = "calendar_month";
-const std::string ReminderRequestCalendar::CALENDAR_DAY = "calendar_day";
-const std::string ReminderRequestCalendar::CALENDAR_HOUR = "calendar_hour";
-const std::string ReminderRequestCalendar::CALENDAR_MINUTE = "calendar_minute";
-
-void ReminderRequestCalendar::Init()
+void ReminderRequestCalendar::InitDbColumns()
{
ReminderRequest::AddColumn(REPEAT_DAYS, "INT", false);
ReminderRequest::AddColumn(REPEAT_MONTHS, "INT", false);
diff --git a/frameworks/ans/native/src/reminder_store.cpp b/frameworks/ans/native/src/reminder_store.cpp
index b63bcaea32a1504d5901cd6107a3aea6d5fa9925..cee45f370db2e4f71917525d02ce36bf7521b573 100644
--- a/frameworks/ans/native/src/reminder_store.cpp
+++ b/frameworks/ans/native/src/reminder_store.cpp
@@ -28,15 +28,17 @@
namespace OHOS {
namespace Notification {
-const std::string ReminderStore::REMINDER_DB_DIR = "/data/system_ce/ans_standard/";
-const std::string ReminderStore::REMINDER_DB_NAME = "reminder.db";
-const std::string ReminderStore::REMINDER_DB_TABLE = "reminder";
-const uint32_t ReminderStore::REMINDER_RDB_VERSION = 1;
-const int32_t ReminderStore::STATE_FAIL = -1;
+namespace
+{
+ const std::string REMINDER_DB_DIR = "/data/system_ce/ans_standard/";
+ const std::string REMINDER_DB_NAME = "reminder.db";
+ const std::string REMINDER_DB_TABLE = "reminder";
+ const uint32_t REMINDER_RDB_VERSION = 1;
+ const int32_t STATE_FAIL = -1;
+ std::vector columns;
+}
+
const int32_t ReminderStore::STATE_OK = 0;
-const uint16_t ReminderStore::TIME_INTERVAL_FOR_DELETE = 1800;
-const uint16_t ReminderStore::MILLI_SECONDS = 1000;
-std::vector ReminderStore::columns;
int32_t ReminderStore::ReminderStoreDataCallBack::OnCreate(NativeRdb::RdbStore &store)
{
@@ -66,13 +68,13 @@ int32_t ReminderStore::Init()
}
}
- ReminderRequest::Init();
- ReminderRequestCalendar::Init();
- ReminderRequestAlarm::Init();
- ReminderStore::columns.insert(ReminderStore::columns.begin(),
+ ReminderRequest::InitDbColumns();
+ ReminderRequestCalendar::InitDbColumns();
+ ReminderRequestAlarm::InitDbColumns();
+ columns.insert(columns.begin(),
ReminderRequest::columns.begin(), ReminderRequest::columns.end());
- std::string dbConfig = ReminderStore::REMINDER_DB_DIR + ReminderStore::REMINDER_DB_NAME;
+ std::string dbConfig = REMINDER_DB_DIR + REMINDER_DB_NAME;
NativeRdb::RdbStoreConfig config_(dbConfig);
ReminderStoreDataCallBack rdbDataCallBack_;
rdbStore_ = NativeRdb::RdbHelper::GetRdbStore(config_, REMINDER_RDB_VERSION, rdbDataCallBack_, errCode);
@@ -124,7 +126,7 @@ int32_t ReminderStore::InitData()
ANSR_LOGE("Init data failed.");
return STATE_FAIL;
}
- return STATE_OK;
+ return ReminderStore::STATE_OK;
}
int32_t ReminderStore::Delete(int32_t reminderId)
@@ -259,7 +261,7 @@ std::shared_ptr ReminderStore::Query(const std::s
uint8_t ReminderStore::GetColumnIndex(const std::string& name)
{
uint8_t index = 0;
- for (auto it = ReminderStore::columns.begin(); it != ReminderStore::columns.end(); ++it) {
+ for (auto it = columns.begin(); it != columns.end(); ++it) {
if (name == (*it)) {
break;
}
diff --git a/interfaces/innerkits/ans/native/include/reminder_request.h b/interfaces/innerkits/ans/native/include/reminder_request.h
index f4585d1deb5efb3c9e2cf5341fcdecf86afcf70d..798913b6a582a95a44c45f2c865a8cb2862a4563 100644
--- a/interfaces/innerkits/ans/native/include/reminder_request.h
+++ b/interfaces/innerkits/ans/native/include/reminder_request.h
@@ -607,7 +607,7 @@ public:
static const uint8_t REMINDER_STATUS_SNOOZE;
// For database recovery.
- static void Init();
+ static void InitDbColumns();
static const std::string REMINDER_ID;
static const std::string PKG_NAME;
static const std::string USER_ID;
@@ -664,8 +664,6 @@ protected:
*/
static void AddColumn(const std::string &name, const std::string &type, const bool &isEnd);
- static const int BASE_YEAR;
-
private:
void AddActionButtons(const bool includeSnooze);
void AddRemovalWantAgent();
diff --git a/interfaces/innerkits/ans/native/include/reminder_request_alarm.h b/interfaces/innerkits/ans/native/include/reminder_request_alarm.h
index b0f562507939de534ab7055b15a1a1dfc2011101..705dbf0a03945b6e2c1cbb4773573dcfb991881e 100644
--- a/interfaces/innerkits/ans/native/include/reminder_request_alarm.h
+++ b/interfaces/innerkits/ans/native/include/reminder_request_alarm.h
@@ -109,7 +109,7 @@ public:
const sptr &bundleOption, NativeRdb::ValuesBucket &values);
// For database recovery.
- static void Init();
+ static void InitDbColumns();
protected:
virtual uint64_t PreGetNextTriggerTimeIgnoreSnooze(bool ignoreRepeat, bool forceToGetNext) const override;
diff --git a/interfaces/innerkits/ans/native/include/reminder_request_calendar.h b/interfaces/innerkits/ans/native/include/reminder_request_calendar.h
index 9d022dc7d002633612488e780b8b6382654d71d6..f5d0e7a358bb9120abc5c9c1c55d6726dc91611a 100644
--- a/interfaces/innerkits/ans/native/include/reminder_request_calendar.h
+++ b/interfaces/innerkits/ans/native/include/reminder_request_calendar.h
@@ -147,7 +147,7 @@ public:
static uint8_t GetDaysOfMonth(const uint16_t &year, const uint8_t &month);
// For database recovery.
- static void Init();
+ static void InitDbColumns();
protected:
virtual uint64_t PreGetNextTriggerTimeIgnoreSnooze(bool ignoreRepeat, bool forceToGetNext) const override;
diff --git a/interfaces/innerkits/ans/native/include/reminder_store.h b/interfaces/innerkits/ans/native/include/reminder_store.h
index 8e49fded8d3f0590461b5a6504fe5026ef14c9af..cea23b096fecfb5139dbfac9d72a145b5e0152be 100644
--- a/interfaces/innerkits/ans/native/include/reminder_store.h
+++ b/interfaces/innerkits/ans/native/include/reminder_store.h
@@ -41,8 +41,6 @@ public:
int64_t UpdateOrInsert(const sptr &reminder, const sptr &bundleOption);
static uint8_t GetColumnIndex(const std::string& name);
- static std::vector columns;
- static const int32_t STATE_FAIL;
static const int32_t STATE_OK;
private:
@@ -71,13 +69,6 @@ private:
std::shared_ptr Query(const std::string &queryCondition) const;
int64_t Update(const sptr &reminder, const sptr &bundleOption);
- static const std::string REMINDER_DB_DIR;
- static const std::string REMINDER_DB_NAME;
- static const std::string REMINDER_DB_TABLE;
- static const uint32_t REMINDER_RDB_VERSION;
- static const uint16_t TIME_INTERVAL_FOR_DELETE;
- static const uint16_t MILLI_SECONDS;
-
class ReminderStoreDataCallBack : public NativeRdb::RdbOpenCallback {
public:
int32_t OnCreate(NativeRdb::RdbStore &rdbStore) override;