From 9d9e7f893c0177a94f68c76622ca9c3db97d8efa Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 9 Nov 2023 10:14:42 +0800 Subject: [PATCH] get column index from rdb result set Signed-off-by: Nicolas --- frameworks/ans/src/reminder_request.cpp | 44 +++--- frameworks/ans/src/reminder_request_alarm.cpp | 44 ++---- .../ans/src/reminder_request_calendar.cpp | 143 +++++------------- frameworks/ans/src/reminder_request_timer.cpp | 34 ++--- frameworks/ans/src/reminder_store.cpp | 60 +++++--- .../ans/test/unittest/reminder_store_test.cpp | 2 +- interfaces/inner_api/reminder_request.h | 49 ++++-- interfaces/inner_api/reminder_request_alarm.h | 3 +- .../inner_api/reminder_request_calendar.h | 2 - interfaces/inner_api/reminder_store.h | 15 +- 10 files changed, 164 insertions(+), 232 deletions(-) diff --git a/frameworks/ans/src/reminder_request.cpp b/frameworks/ans/src/reminder_request.cpp index 72bb9fc00..8904f2caa 100644 --- a/frameworks/ans/src/reminder_request.cpp +++ b/frameworks/ans/src/reminder_request.cpp @@ -478,12 +478,12 @@ int64_t ReminderRequest::RecoverInt64FromDb(const std::shared_ptrGetInt(ReminderStore::GetColumnIndex(columnName), value); + ReminderStore::GetInt32Val(resultSet, columnName, value); return static_cast(value); } case (DbRecoveryType::LONG): { int64_t value; - resultSet->GetLong(ReminderStore::GetColumnIndex(columnName), value); + ReminderStore::GetInt64Val(resultSet, columnName, value); return value; } default: { @@ -503,25 +503,25 @@ void ReminderRequest::RecoverFromDb(const std::shared_ptr } // reminderId - resultSet->GetInt(ReminderStore::GetColumnIndex(REMINDER_ID), reminderId_); + ReminderStore::GetInt32Val(resultSet, REMINDER_ID, reminderId_); // userId - resultSet->GetInt(ReminderStore::GetColumnIndex(USER_ID), userId_); + ReminderStore::GetInt32Val(resultSet, USER_ID, userId_); // bundleName - resultSet->GetString(ReminderStore::GetColumnIndex(PKG_NAME), bundleName_); + ReminderStore::GetStringVal(resultSet, PKG_NAME, bundleName_); // uid - resultSet->GetInt(ReminderStore::GetColumnIndex(UID), uid_); + ReminderStore::GetInt32Val(resultSet, UID, uid_); // isSystemApp std::string isSysApp; - resultSet->GetString(ReminderStore::GetColumnIndex(SYS_APP), isSysApp); + ReminderStore::GetStringVal(resultSet, SYS_APP, isSysApp); isSystemApp_ = isSysApp == "true" ? true : false; // reminderType int32_t reminderType; - resultSet->GetInt(ReminderStore::GetColumnIndex(REMINDER_TYPE), reminderType); + ReminderStore::GetInt32Val(resultSet, REMINDER_TYPE, reminderType); reminderType_ = ReminderType(reminderType); // reminderTime @@ -551,7 +551,7 @@ void ReminderRequest::RecoverFromDb(const std::shared_ptr // isExpired std::string isExpired; - resultSet->GetString(ReminderStore::GetColumnIndex(IS_EXPIRED), isExpired); + ReminderStore::GetStringVal(resultSet, IS_EXPIRED, isExpired); isExpired_ = isExpired == "true" ? true : false; // state @@ -565,39 +565,38 @@ void ReminderRequest::RecoverFromDb(const std::shared_ptr // slotType int32_t slotType; - resultSet->GetInt(ReminderStore::GetColumnIndex(SLOT_ID), slotType); + ReminderStore::GetInt32Val(resultSet, SLOT_ID, slotType); slotType_ = NotificationConstant::SlotType(slotType); // notification id - resultSet->GetInt(ReminderStore::GetColumnIndex(NOTIFICATION_ID), notificationId_); - + ReminderStore::GetInt32Val(resultSet, NOTIFICATION_ID, notificationId_); // title - resultSet->GetString(ReminderStore::GetColumnIndex(TITLE), title_); + ReminderStore::GetStringVal(resultSet, TITLE, title_); // content - resultSet->GetString(ReminderStore::GetColumnIndex(CONTENT), content_); + ReminderStore::GetStringVal(resultSet, CONTENT, content_); // snoozeContent - resultSet->GetString(ReminderStore::GetColumnIndex(SNOOZE_CONTENT), snoozeContent_); + ReminderStore::GetStringVal(resultSet, SNOOZE_CONTENT, snoozeContent_); // expiredContent - resultSet->GetString(ReminderStore::GetColumnIndex(EXPIRED_CONTENT), expiredContent_); + ReminderStore::GetStringVal(resultSet, EXPIRED_CONTENT, expiredContent_); InitNotificationRequest(); // must set before wantAgent & maxScreenWantAgent // wantAgent std::string wantAgent; - resultSet->GetString(ReminderStore::GetColumnIndex(AGENT), wantAgent); + ReminderStore::GetStringVal(resultSet, AGENT, wantAgent); RecoverWantAgent(wantAgent, 0); // maxScreenWantAgent std::string maxScreenWantAgent; - resultSet->GetString(ReminderStore::GetColumnIndex(MAX_SCREEN_AGENT), maxScreenWantAgent); + ReminderStore::GetStringVal(resultSet, MAX_SCREEN_AGENT, maxScreenWantAgent); RecoverWantAgent(maxScreenWantAgent, 1); // tapDismissed std::string tapDismissed; - resultSet->GetString(ReminderStore::GetColumnIndex(TAP_DISMISSED), tapDismissed); + ReminderStore::GetStringVal(resultSet, TAP_DISMISSED, tapDismissed); tapDismissed_ = tapDismissed == "true" ? true : false; // autoDeletedTime @@ -605,10 +604,10 @@ void ReminderRequest::RecoverFromDb(const std::shared_ptr static_cast(RecoverInt64FromDb(resultSet, AUTO_DELETED_TIME, DbRecoveryType::LONG)); // customButtonUri - resultSet->GetString(ReminderStore::GetColumnIndex(CUSTOM_BUTTON_URI), customButtonUri_); + ReminderStore::GetStringVal(resultSet, CUSTOM_BUTTON_URI, customButtonUri_); // groupId - resultSet->GetString(ReminderStore::GetColumnIndex(GROUP_ID), groupId_); + ReminderStore::GetStringVal(resultSet, GROUP_ID, groupId_); } void ReminderRequest::RecoverActionButton(const std::shared_ptr &resultSet) @@ -618,7 +617,7 @@ void ReminderRequest::RecoverActionButton(const std::shared_ptrGetString(ReminderStore::GetColumnIndex(ACTION_BUTTON_INFO), actionButtonInfo); + ReminderStore::GetStringVal(resultSet, ACTION_BUTTON_INFO, actionButtonInfo); std::vector multiButton = StringSplit(actionButtonInfo, SEP_BUTTON_MULTI); for (auto button : multiButton) { std::vector singleButton = StringSplit(button, SEP_BUTTON_SINGLE); @@ -1107,7 +1106,6 @@ bool ReminderRequest::Marshalling(Parcel &parcel) const WRITE_STRING_RETURN_FALSE_LOG(parcel, button.second.dataShareUpdate->uri, "dataShareUpdate's uri"); WRITE_STRING_RETURN_FALSE_LOG(parcel, button.second.dataShareUpdate->equalTo, "dataShareUpdate's equalTo"); WRITE_STRING_RETURN_FALSE_LOG(parcel, button.second.dataShareUpdate->valuesBucket, "dataShareUpdate's valuesBucket"); - } return true; } diff --git a/frameworks/ans/src/reminder_request_alarm.cpp b/frameworks/ans/src/reminder_request_alarm.cpp index 78d7c11fc..e0396953b 100644 --- a/frameworks/ans/src/reminder_request_alarm.cpp +++ b/frameworks/ans/src/reminder_request_alarm.cpp @@ -125,16 +125,6 @@ uint8_t ReminderRequestAlarm::GetMinute() const return minute_; } -bool ReminderRequestAlarm::OnDateTimeChange() -{ - return ReminderRequest::OnDateTimeChange(); -} - -bool ReminderRequestAlarm::OnTimeZoneChange() -{ - return ReminderRequest::OnTimeZoneChange(); -} - bool ReminderRequestAlarm::UpdateNextReminder() { ANSR_LOGD("UpdateNextReminder alarm time"); @@ -172,18 +162,12 @@ bool ReminderRequestAlarm::UpdateNextReminder() bool ReminderRequestAlarm::Marshalling(Parcel &parcel) const { - ReminderRequest::Marshalling(parcel); - - // write int - if (!parcel.WriteUint8(hour_)) { - ANSR_LOGE("Failed to write hour"); - return false; - } - if (!parcel.WriteUint8(minute_)) { - ANSR_LOGE("Failed to write minute"); - return false; + if (ReminderRequest::Marshalling(parcel)) { + WRITE_UINT8_RETURN_FALSE_LOG(parcel, hour_, "hour"); + WRITE_UINT8_RETURN_FALSE_LOG(parcel, minute_, "minute"); + return true; } - return true; + return false; } ReminderRequestAlarm *ReminderRequestAlarm::Unmarshalling(Parcel &parcel) @@ -203,20 +187,14 @@ ReminderRequestAlarm *ReminderRequestAlarm::Unmarshalling(Parcel &parcel) bool ReminderRequestAlarm::ReadFromParcel(Parcel &parcel) { - ReminderRequest::ReadFromParcel(parcel); + if (ReminderRequest::ReadFromParcel(parcel)) { + READ_UINT8_RETURN_FALSE_LOG(parcel, hour_, "hour"); + READ_UINT8_RETURN_FALSE_LOG(parcel, minute_, "minute"); - // read int - if (!parcel.ReadUint8(hour_)) { - ANSR_LOGE("Failed to read hour"); - return false; - } - if (!parcel.ReadUint8(minute_)) { - ANSR_LOGE("Failed to read minute"); - return false; + ANSR_LOGD("hour_=%{public}d, minute_=%{public}d", hour_, minute_); + return true; } - - ANSR_LOGD("hour_=%{public}d, minute_=%{public}d", hour_, minute_); - return true; + return false; } void ReminderRequestAlarm::RecoverFromDb(const std::shared_ptr &resultSet) diff --git a/frameworks/ans/src/reminder_request_calendar.cpp b/frameworks/ans/src/reminder_request_calendar.cpp index 9b725967d..4f6a3bbba 100644 --- a/frameworks/ans/src/reminder_request_calendar.cpp +++ b/frameworks/ans/src/reminder_request_calendar.cpp @@ -358,16 +358,6 @@ std::vector ReminderRequestCalendar::GetRepeatDays() const return repeatDays; } -bool ReminderRequestCalendar::OnDateTimeChange() -{ - return ReminderRequest::OnDateTimeChange(); -} - -bool ReminderRequestCalendar::OnTimeZoneChange() -{ - return ReminderRequest::OnTimeZoneChange(); -} - bool ReminderRequestCalendar::UpdateNextReminder() { ANSR_LOGD("UpdateNextReminder calendar time"); @@ -414,54 +404,22 @@ uint64_t ReminderRequestCalendar::PreGetNextTriggerTimeIgnoreSnooze(bool ignoreR bool ReminderRequestCalendar::Marshalling(Parcel &parcel) const { - ReminderRequest::Marshalling(parcel); - - // write int - if (!parcel.WriteUint16(year_)) { - ANSR_LOGE("Failed to write year"); - return false; - } - if (!parcel.WriteUint8(month_)) { - ANSR_LOGE("Failed to write month"); - return false; - } - if (!parcel.WriteUint8(day_)) { - ANSR_LOGE("Failed to write day"); - return false; - } - if (!parcel.WriteUint8(hour_)) { - ANSR_LOGE("Failed to write hour"); - return false; - } - if (!parcel.WriteUint8(minute_)) { - ANSR_LOGE("Failed to write minute"); - return false; - } - if (!parcel.WriteUint8(second_)) { - ANSR_LOGE("Failed to write second"); - return false; - } - if (!parcel.WriteUint16(repeatMonth_)) { - ANSR_LOGE("Failed to write repeatMonth"); - return false; - } - if (!parcel.WriteUint32(repeatDay_)) { - ANSR_LOGE("Failed to write repeateDay"); - return false; - } - if (!parcel.WriteUint16(firstDesignateYear_)) { - ANSR_LOGE("Failed to write firstDesignateYear"); - return false; - } - if (!parcel.WriteUint8(firstDesignateMonth_)) { - ANSR_LOGE("Failed to write firstDesignateMonth"); - return false; - } - if (!parcel.WriteUint8(firstDesignateDay_)) { - ANSR_LOGE("Failed to write firstDesignateDay"); - return false; - } - return true; + if (ReminderRequest::Marshalling(parcel)) { + // write int + WRITE_UINT16_RETURN_FALSE_LOG(parcel, year_, "year"); + WRITE_UINT8_RETURN_FALSE_LOG(parcel, month_, "month"); + WRITE_UINT8_RETURN_FALSE_LOG(parcel, day_, "day"); + WRITE_UINT8_RETURN_FALSE_LOG(parcel, hour_, "hour"); + WRITE_UINT8_RETURN_FALSE_LOG(parcel, minute_, "minute"); + WRITE_UINT8_RETURN_FALSE_LOG(parcel, second_, "second"); + WRITE_UINT16_RETURN_FALSE_LOG(parcel, repeatMonth_, "repeatMonth"); + WRITE_UINT32_RETURN_FALSE_LOG(parcel, repeatDay_, "repeatDay"); + WRITE_UINT16_RETURN_FALSE_LOG(parcel, firstDesignateYear_, "firstDesignateYear"); + WRITE_UINT8_RETURN_FALSE_LOG(parcel, firstDesignateMonth_, "firstDesignateMonth"); + WRITE_UINT8_RETURN_FALSE_LOG(parcel, firstDesignateDay_, "firstDesignateDay"); + return true; + } + return false; } ReminderRequestCalendar *ReminderRequestCalendar::Unmarshalling(Parcel &parcel) @@ -481,55 +439,26 @@ ReminderRequestCalendar *ReminderRequestCalendar::Unmarshalling(Parcel &parcel) bool ReminderRequestCalendar::ReadFromParcel(Parcel &parcel) { - ReminderRequest::ReadFromParcel(parcel); - - // read int - if (!parcel.ReadUint16(year_)) { - ANSR_LOGE("Failed to read year"); - return false; - } - if (!parcel.ReadUint8(month_)) { - ANSR_LOGE("Failed to read month"); - return false; - } - if (!parcel.ReadUint8(day_)) { - ANSR_LOGE("Failed to read day"); - return false; - } - if (!parcel.ReadUint8(hour_)) { - ANSR_LOGE("Failed to read hour"); - return false; - } - if (!parcel.ReadUint8(minute_)) { - ANSR_LOGE("Failed to read minute"); - return false; - } - if (!parcel.ReadUint8(second_)) { - ANSR_LOGE("Failed to read second"); - return false; - } - if (!parcel.ReadUint16(repeatMonth_)) { - ANSR_LOGE("Failed to read repeatMonth"); - return false; - } - if (!parcel.ReadUint32(repeatDay_)) { - ANSR_LOGE("Failed to read repeateDay"); - return false; - } - InitDateTime(); - if (!parcel.ReadUint16(firstDesignateYear_)) { - ANSR_LOGE("Failed to read firstDesignateYear"); - return false; - } - if (!parcel.ReadUint8(firstDesignateMonth_)) { - ANSR_LOGE("Failed to read firstDesignateMonth"); - return false; - } - if (!parcel.ReadUint8(firstDesignateDay_)) { - ANSR_LOGE("Failed to read firstDesignateDay"); - return false; - } - return true; + if (ReminderRequest::ReadFromParcel(parcel)) { + // read int + READ_UINT16_RETURN_FALSE_LOG(parcel, year_, "year"); + READ_UINT8_RETURN_FALSE_LOG(parcel, month_, "month"); + READ_UINT8_RETURN_FALSE_LOG(parcel, day_, "day"); + READ_UINT8_RETURN_FALSE_LOG(parcel, hour_, "hour"); + READ_UINT8_RETURN_FALSE_LOG(parcel, minute_, "minute"); + READ_UINT8_RETURN_FALSE_LOG(parcel, second_, "second"); + READ_UINT16_RETURN_FALSE_LOG(parcel, repeatMonth_, "repeatMonth"); + READ_UINT32_RETURN_FALSE_LOG(parcel, repeatDay_, "repeatDay"); + + InitDateTime(); + + READ_UINT16_RETURN_FALSE_LOG(parcel, firstDesignateYear_, "firstDesignateYear"); + READ_UINT8_RETURN_FALSE_LOG(parcel, firstDesignateMonth_, "firstDesignateMonth"); + READ_UINT8_RETURN_FALSE_LOG(parcel, firstDesignateDay_, "firstDesignateDay"); + + return true; + } + return false; } void ReminderRequestCalendar::RecoverFromDb(const std::shared_ptr &resultSet) diff --git a/frameworks/ans/src/reminder_request_timer.cpp b/frameworks/ans/src/reminder_request_timer.cpp index 8a35f2755..e8827184a 100644 --- a/frameworks/ans/src/reminder_request_timer.cpp +++ b/frameworks/ans/src/reminder_request_timer.cpp @@ -114,18 +114,13 @@ void ReminderRequestTimer::UpdateTimeInfo(const std::string &description) bool ReminderRequestTimer::Marshalling(Parcel &parcel) const { - ReminderRequest::Marshalling(parcel); - - // write int - if (!parcel.WriteUint64(firstRealTimeInMilliSeconds_)) { - ANSR_LOGE("Failed to write firstRealTimeInMilliSeconds"); - return false; - } - if (!parcel.WriteUint64(countDownTimeInSeconds_)) { - ANSR_LOGE("Failed to write countDownTimeInSeconds"); - return false; + if (ReminderRequest::Marshalling(parcel)) { + // write int + WRITE_UINT64_RETURN_FALSE_LOG(parcel, firstRealTimeInMilliSeconds_, "firstRealTimeInMilliSeconds"); + WRITE_UINT64_RETURN_FALSE_LOG(parcel, countDownTimeInSeconds_, "countDownTimeInSeconds"); + return true; } - return true; + return false; } ReminderRequestTimer *ReminderRequestTimer::Unmarshalling(Parcel &parcel) @@ -144,18 +139,13 @@ ReminderRequestTimer *ReminderRequestTimer::Unmarshalling(Parcel &parcel) bool ReminderRequestTimer::ReadFromParcel(Parcel &parcel) { - ReminderRequest::ReadFromParcel(parcel); - - // read int - if (!parcel.ReadUint64(firstRealTimeInMilliSeconds_)) { - ANSR_LOGE("Failed to read firstRealTimeInMilliSeconds"); - return false; - } - if (!parcel.ReadUint64(countDownTimeInSeconds_)) { - ANSR_LOGE("Failed to read countDownTimeInSeconds"); - return false; + if (ReminderRequest::ReadFromParcel(parcel)) { + // read int + READ_UINT64_RETURN_FALSE_LOG(parcel, firstRealTimeInMilliSeconds_, "firstRealTimeInMilliSeconds"); + READ_UINT64_RETURN_FALSE_LOG(parcel, countDownTimeInSeconds_, "countDownTimeInSeconds"); + return true; } - return true; + return false; } } } diff --git a/frameworks/ans/src/reminder_store.cpp b/frameworks/ans/src/reminder_store.cpp index ca636cebe..93b0486a5 100644 --- a/frameworks/ans/src/reminder_store.cpp +++ b/frameworks/ans/src/reminder_store.cpp @@ -29,9 +29,6 @@ namespace OHOS { namespace Notification { namespace { -const std::string REMINDER_DB_DIR = "/data/service/el1/public/notification/"; -const std::string REMINDER_DB_NAME = "notification.db"; -const std::string REMINDER_DB_TABLE = "reminder"; const uint32_t REMINDER_RDB_VERSION = 2; const int32_t STATE_FAIL = -1; std::vector columns; @@ -39,6 +36,9 @@ std::string g_sqlColumns; } const int32_t ReminderStore::STATE_OK = 0; +const std::string ReminderStore::REMINDER_DB_DIR = "/data/service/el1/public/notification/"; +const std::string ReminderStore::REMINDER_DB_NAME = "notification.db"; +const std::string ReminderStore::REMINDER_DB_TABLE = "reminder"; int32_t ReminderStore::ReminderStoreDataCallBack::OnCreate(NativeRdb::RdbStore &store) { @@ -277,17 +277,6 @@ std::shared_ptr ReminderStore::Query(const std::string &qu return rdbStore_->QuerySql(queryCondition, whereArgs); } -uint8_t ReminderStore::GetColumnIndex(const std::string& name) -{ - uint8_t index = 0; - for (auto it = columns.begin(); it != columns.end(); ++it) { - if (name == (*it)) { - break; - } - index++; - } - return index; -} int32_t ReminderStore::GetMaxId() { @@ -344,9 +333,10 @@ std::vector> ReminderStore::GetReminders(const std::string queryResultSet->IsAtLastRow(isAtLastRow); while (!isAtLastRow) { queryResultSet->GoToNextRow(); - sptr reminder; - reminder = BuildReminder(queryResultSet); - reminders.push_back(reminder); + sptr reminder = BuildReminder(queryResultSet); + if (reminder != nullptr) { + reminders.push_back(reminder); + } queryResultSet->IsAtLastRow(isAtLastRow); } ANSR_LOGD("Size=%{public}zu", reminders.size()); @@ -357,8 +347,8 @@ sptr ReminderStore::BuildReminder(const std::shared_ptrGetInt(ReminderStore::GetColumnIndex(ReminderRequest::REMINDER_TYPE), reminderType); - resultSet->GetInt(ReminderStore::GetColumnIndex(ReminderRequest::REMINDER_ID), reminderId); + GetInt32Val(resultSet, ReminderRequest::REMINDER_TYPE, reminderType); + GetInt32Val(resultSet, ReminderRequest::REMINDER_ID, reminderId); sptr reminder = nullptr; switch (reminderType) { @@ -416,19 +406,39 @@ bool ReminderStore::GetBundleOption(const int32_t &reminderId, sptr &resultSet, - const std::string &name, int32_t &value) const +void ReminderStore::GetInt32Val(const std::shared_ptr &resultSet, + const std::string &name, int32_t &value) { - int32_t columnIndex; + int32_t columnIndex = -1; resultSet->GetColumnIndex(name, columnIndex); + if (columnIndex == -1) { + ANSR_LOGE("the column %{public}s does not exsit.", name.c_str()); + return; + } resultSet->GetInt(columnIndex, value); } -void ReminderStore::GetStringVal(std::shared_ptr &resultSet, - const std::string &name, std::string &value) const +void ReminderStore::GetInt64Val(const std::shared_ptr& resultSet, + const std::string& name, int64_t& value) { - int32_t columnIndex; + int32_t columnIndex = -1; resultSet->GetColumnIndex(name, columnIndex); + if (columnIndex == -1) { + ANSR_LOGE("the column %{public}s does not exsit.", name.c_str()); + return; + } + resultSet->GetLong(columnIndex, value); +} + +void ReminderStore::GetStringVal(const std::shared_ptr &resultSet, + const std::string &name, std::string &value) +{ + int32_t columnIndex = -1; + resultSet->GetColumnIndex(name, columnIndex); + if (columnIndex == -1) { + ANSR_LOGE("the column %{public}s does not exsit.", name.c_str()); + return; + } resultSet->GetString(columnIndex, value); } diff --git a/frameworks/ans/test/unittest/reminder_store_test.cpp b/frameworks/ans/test/unittest/reminder_store_test.cpp index a487849e2..94aca0b66 100644 --- a/frameworks/ans/test/unittest/reminder_store_test.cpp +++ b/frameworks/ans/test/unittest/reminder_store_test.cpp @@ -42,6 +42,7 @@ public: void TearDown() { ReminderHelper::CancelAllReminders(); + NativeRdb::RdbHelper::DeleteRdbStore(ReminderStore::REMINDER_DB_DIR + ReminderStore::REMINDER_DB_NAME); } static sptr bundleOption_; }; @@ -157,7 +158,6 @@ HWTEST_F(ReminderStoreTest, Query_00001, Function | SmallTest | Level1) std::string queryCondition = "queryCondition"; std::string name = "it"; ReminderStore reminderStore; - reminderStore.GetColumnIndex(name); std::shared_ptr ret = reminderStore.Query(queryCondition); EXPECT_EQ(ret, nullptr); } diff --git a/interfaces/inner_api/reminder_request.h b/interfaces/inner_api/reminder_request.h index 9ef809258..a174bfa93 100644 --- a/interfaces/inner_api/reminder_request.h +++ b/interfaces/inner_api/reminder_request.h @@ -29,73 +29,97 @@ namespace OHOS { namespace Notification { #define READ_STRING_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.ReadString(value)) { \ + if (!((parcel).ReadString(value))) { \ ANSR_LOGE("Failed to read %s", msg); \ return false; \ } \ #define READ_BOOL_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.ReadBool(value)) { \ + if (!((parcel).ReadBool(value))) { \ ANSR_LOGE("Failed to read %s", msg); \ return false; \ } \ #define READ_INT64_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.ReadInt64(value)) { \ + if (!((parcel).ReadInt64(value))) { \ ANSR_LOGE("Failed to read %s", msg); \ return false; \ } \ #define READ_INT32_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.ReadInt32(value)) { \ + if (!((parcel).ReadInt32(value))) { \ ANSR_LOGE("Failed to read %s", msg); \ return false; \ } \ #define READ_UINT64_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.ReadUint64(value)) { \ + if (!((parcel).ReadUint64(value))) { \ + ANSR_LOGE("Failed to read %s", msg); \ + return false; \ + } \ + +#define READ_UINT32_RETURN_FALSE_LOG(parcel, value, msg) \ + if (!((parcel).ReadUint32(value))) { \ + ANSR_LOGE("Failed to read %s", msg); \ + return false; \ + } \ + +#define READ_UINT16_RETURN_FALSE_LOG(parcel, value, msg) \ + if (!((parcel).ReadUint16(value))) { \ ANSR_LOGE("Failed to read %s", msg); \ return false; \ } \ #define READ_UINT8_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.ReadUint8(value)) { \ + if (!((parcel).ReadUint8(value))) { \ ANSR_LOGE("Failed to read %s", msg); \ return false; \ } \ #define WRITE_STRING_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.WriteString(value)) { \ + if (!((parcel).WriteString(value))) { \ ANSR_LOGE("Failed to write %s", msg); \ return false; \ } \ #define WRITE_BOOL_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.WriteBool(value)) { \ + if (!((parcel).WriteBool(value))) { \ ANSR_LOGE("Failed to write %s", msg); \ return false; \ } \ #define WRITE_INT64_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.WriteInt64(value)) { \ + if (!(parcel.WriteInt64(value))) { \ ANSR_LOGE("Failed to write %s", msg); \ return false; \ } \ #define WRITE_INT32_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.WriteInt32(value)) { \ + if (!((parcel).WriteInt32(value))) { \ ANSR_LOGE("Failed to write %s", msg); \ return false; \ } \ #define WRITE_UINT64_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.WriteUint64(value)) { \ + if (!((parcel).WriteUint64(value))) { \ + ANSR_LOGE("Failed to write %s", msg); \ + return false; \ + } \ + +#define WRITE_UINT32_RETURN_FALSE_LOG(parcel, value, msg) \ + if (!((parcel).WriteUint32(value))) { \ + ANSR_LOGE("Failed to write %s", msg); \ + return false; \ + } \ + +#define WRITE_UINT16_RETURN_FALSE_LOG(parcel, value, msg) \ + if (!((parcel).WriteUint16(value))) { \ ANSR_LOGE("Failed to write %s", msg); \ return false; \ } \ #define WRITE_UINT8_RETURN_FALSE_LOG(parcel, value, msg) \ - if(!parcel.WriteUint8(value)) { \ + if (!((parcel).WriteUint8(value))) { \ ANSR_LOGE("Failed to write %s", msg); \ return false; \ } \ @@ -211,6 +235,7 @@ public: * The ability that is redirected to when the button is clicked. */ std::shared_ptr wantAgent; + /** * The ability that is updata App rdb. */ diff --git a/interfaces/inner_api/reminder_request_alarm.h b/interfaces/inner_api/reminder_request_alarm.h index 4bf99cffc..a70a57a96 100644 --- a/interfaces/inner_api/reminder_request_alarm.h +++ b/interfaces/inner_api/reminder_request_alarm.h @@ -70,8 +70,7 @@ public: * @return setted minute. */ uint8_t GetMinute() const; - virtual bool OnDateTimeChange() override; - virtual bool OnTimeZoneChange() override; + virtual bool UpdateNextReminder() override; /** diff --git a/interfaces/inner_api/reminder_request_calendar.h b/interfaces/inner_api/reminder_request_calendar.h index b519841cd..72b2cb620 100644 --- a/interfaces/inner_api/reminder_request_calendar.h +++ b/interfaces/inner_api/reminder_request_calendar.h @@ -112,8 +112,6 @@ public: std::vector GetRepeatMonths() const; std::vector GetRepeatDays() const; - virtual bool OnDateTimeChange() override; - virtual bool OnTimeZoneChange() override; virtual bool UpdateNextReminder() override; /** diff --git a/interfaces/inner_api/reminder_store.h b/interfaces/inner_api/reminder_store.h index 8bb3c166f..58be32314 100644 --- a/interfaces/inner_api/reminder_store.h +++ b/interfaces/inner_api/reminder_store.h @@ -39,10 +39,19 @@ public: bool GetBundleOption(const int32_t &reminderId, sptr &bundleOption) const; int32_t GetMaxId(); int64_t UpdateOrInsert(const sptr &reminder, const sptr &bundleOption); - static uint8_t GetColumnIndex(const std::string& name); + + static void GetInt32Val(const std::shared_ptr& resultSet, + const std::string& name, int32_t& value); + static void GetInt64Val(const std::shared_ptr& resultSet, + const std::string& name, int64_t& value); + static void GetStringVal(const std::shared_ptr& resultSet, + const std::string& name, std::string& value); static const int32_t STATE_OK; + static const std::string REMINDER_DB_DIR; + static const std::string REMINDER_DB_NAME; + static const std::string REMINDER_DB_TABLE; private: /** * @brief Inits the data in database when system boot on or proxy process reboot on. @@ -57,10 +66,6 @@ private: int32_t InitData(); sptr BuildReminder(const std::shared_ptr &resultSet); int32_t Delete(const std::string &deleteCondition); - void GetInt32Val(std::shared_ptr &resultSet, - const std::string &name, int32_t &value) const; - void GetStringVal(std::shared_ptr &resultSet, - const std::string &name, std::string &value) const; std::vector> GetReminders(const std::string &queryCondition); void GenerateData(const sptr &reminder, const sptr &bundleOption, NativeRdb::ValuesBucket &values) const; -- Gitee