diff --git a/services/distributed/include/soft_bus/distributed_publish_service.h b/services/distributed/include/soft_bus/distributed_publish_service.h index 56525f573b9554dfba8b76b7237cf36fe120bc87..27a116cde8a66796ed3636d3b8f0297fe8100a5b 100644 --- a/services/distributed/include/soft_bus/distributed_publish_service.h +++ b/services/distributed/include/soft_bus/distributed_publish_service.h @@ -42,22 +42,22 @@ private: void SendNotifictionRequest(const std::shared_ptr request, const DistributedDeviceInfo& peerDevice, bool isSyncNotification); void SetNotificationButtons(const sptr notificationRequest, - NotificationConstant::SlotType slotType, std::shared_ptr& requestBox); + NotificationConstant::SlotType slotType, std::shared_ptr& requestBox); void SetNotificationContent(const std::shared_ptr &content, - NotificationContent::Type type, std::shared_ptr& requestBox); + NotificationContent::Type type, std::shared_ptr& requestBox); #else void PublishNotification(const std::shared_ptr& boxMessage); void PublishSynchronousLiveView(const std::shared_ptr& boxMessage); private: - void MakeNotificationButtons(const NotifticationRequestBox& box, + void MakeNotificationButtons(const NotificationRequestBox& box, NotificationConstant::SlotType slotType, sptr& request); - void MakeNotifictaionContent(const NotifticationRequestBox& box, sptr& request, + void MakeNotificationContent(const NotificationRequestBox& box, sptr& request, bool isCommonLiveView, int32_t contentType); - void MakeNotifictaionIcon(const NotifticationRequestBox& box, sptr& request, + void MakeNotificationIcon(const NotificationRequestBox& box, sptr& request, bool isCommonLiveView); - void MakeNotifictaionReminderFlag(const NotifticationRequestBox& box, + void MakeNotificationReminderFlag(const NotificationRequestBox& box, sptr& request); - void MakeNotifictaionBasicContent(const NotifticationRequestBox& box, sptr& request, + void MakeNotificationBasicContent(const NotificationRequestBox& box, sptr& request, int32_t contentType); #endif }; diff --git a/services/distributed/include/soft_bus/distributed_service.h b/services/distributed/include/soft_bus/distributed_service.h index 14b48ee78bf086eee9c1edad5a0455a3c4e52d42..87c43b3bb684ea7b71e962487b467cbf850df5ae 100644 --- a/services/distributed/include/soft_bus/distributed_service.h +++ b/services/distributed/include/soft_bus/distributed_service.h @@ -79,17 +79,17 @@ private: void PublishNotifictaion(const std::shared_ptr& boxMessage); void HandleDeviceState(const std::shared_ptr& boxMessage); void HandleResponseSync(const std::shared_ptr& boxMessage); - void MakeNotifictaionContent(const NotifticationRequestBox& box, sptr& request, + void MakeNotificationContent(const NotificationRequestBox& box, sptr& request, bool isCommonLiveView, int32_t contentType); - void MakeNotifictaionIcon(const NotifticationRequestBox& box, sptr& request, + void MakeNotificationIcon(const NotificationRequestBox& box, sptr& request, bool isCommonLiveView); - void SetNotifictaionContent(const NotifticationRequestBox& box, sptr& request, + void SetNotifictaionContent(const NotificationRequestBox& box, sptr& request, int32_t contentType); - void MakeNotifictaionReminderFlag(const NotifticationRequestBox& box, sptr& request); + void MakeNotificationReminderFlag(const NotificationRequestBox& box, sptr& request); void RemoveNotification(const std::shared_ptr& boxMessage); void RemoveNotifications(const std::shared_ptr& boxMessage); void SetNotificationContent(const std::shared_ptr &content, - NotificationContent::Type type, std::shared_ptr& requestBox); + NotificationContent::Type type, std::shared_ptr& requestBox); void GetNeedUpdateDevice(bool updatedExit, const std::string& bundleName, std::vector& updateDeviceList); void TriggerJumpApplication(const std::string& hashCode); @@ -98,8 +98,8 @@ private: void ReplyOperationResponse(const std::string& hashCode, const NotificationResponseBox& responseBox, OperationType operationType, uint32_t result); void SetNotificationButtons(const sptr notificationRequest, - NotificationConstant::SlotType slotType, std::shared_ptr& requestBox); - void MakeNotificationButtons(const NotifticationRequestBox& box, NotificationConstant::SlotType slotType, + NotificationConstant::SlotType slotType, std::shared_ptr& requestBox); + void MakeNotificationButtons(const NotificationRequestBox& box, NotificationConstant::SlotType slotType, sptr& request); int32_t GetCurrentActiveUserId(); void TriggerReplyWantAgent(const sptr request, std::string actionName, diff --git a/services/distributed/include/soft_bus/distributed_subscribe_service.h b/services/distributed/include/soft_bus/distributed_subscribe_service.h index 1fd77efd36fa0d0292f258148ad8ce56be5ee168..50bb62aa45f557eca9198bf24f432e06d6caf1a1 100644 --- a/services/distributed/include/soft_bus/distributed_subscribe_service.h +++ b/services/distributed/include/soft_bus/distributed_subscribe_service.h @@ -24,8 +24,8 @@ namespace Notification { class DistributedSubscribeService { public: static DistributedSubscribeService& GetInstance(); - void SubscribeNotifictaion(const DistributedDeviceInfo peerDevice); - void UnSubscribeNotifictaion(const std::string &deviceId); + void SubscribeNotification(const DistributedDeviceInfo peerDevice); + void UnSubscribeNotification(const std::string &deviceId); private: std::map> subscriberMap_; }; diff --git a/services/distributed/include/tlv_box/request_box.h b/services/distributed/include/tlv_box/request_box.h index dc1a0f7f7935d8328ff766b58533425eea244be9..c122e2754add8186a8614a685498fbda65a26bef 100644 --- a/services/distributed/include/tlv_box/request_box.h +++ b/services/distributed/include/tlv_box/request_box.h @@ -25,10 +25,10 @@ namespace OHOS { namespace Notification { -class NotifticationRequestBox : public BoxBase { +class NotificationRequestBox : public BoxBase { public: - NotifticationRequestBox(); - NotifticationRequestBox(std::shared_ptr box); + NotificationRequestBox(); + NotificationRequestBox(std::shared_ptr box); bool SetNotificationHashCode(const std::string& hasdCode); bool SetSlotType(int32_t type); bool SetContentType(int32_t type); diff --git a/services/distributed/src/soft_bus/distributed_operation_service.cpp b/services/distributed/src/soft_bus/distributed_operation_service.cpp index 15762ce0a0ca4aa7046ec2cfcf1da3beaab7d61f..aff2813e155405243370915798de436cfbc3852c 100644 --- a/services/distributed/src/soft_bus/distributed_operation_service.cpp +++ b/services/distributed/src/soft_bus/distributed_operation_service.cpp @@ -263,7 +263,7 @@ void DistributedOperationService::TriggerJumpApplication(const std::string& hash #else int32_t DistributedOperationService::OnOperationResponse( - const std::shared_ptr & operationInfo, const DistributedDeviceInfo& device) + const std::shared_ptr& operationInfo, const DistributedDeviceInfo& device) { std::shared_ptr responseBox = std::make_shared(); ANS_LOGI("dans OnResponse %{public}s", operationInfo->Dump().c_str()); diff --git a/services/distributed/src/soft_bus/distributed_publish_service.cpp b/services/distributed/src/soft_bus/distributed_publish_service.cpp index 47abc88b1c826b58cb4bbbdf6d053eb0a434ed21..421e96ad771860c02fe5de242741111c42ab52e7 100644 --- a/services/distributed/src/soft_bus/distributed_publish_service.cpp +++ b/services/distributed/src/soft_bus/distributed_publish_service.cpp @@ -60,7 +60,7 @@ struct TransferNotification { std::string expandedTitle; }; -void ConvertBoxToLongContent(const TransferNotification& notificationItem, const NotifticationRequestBox& box, +void ConvertBoxToLongContent(const TransferNotification& notificationItem, const NotificationRequestBox& box, sptr& request) { auto pContent = std::make_shared(); @@ -76,7 +76,7 @@ void ConvertBoxToLongContent(const TransferNotification& notificationItem, const request->SetContent(content); } -void ConvertBoxToMultileContent(const TransferNotification& notificationItem, const NotifticationRequestBox& box, +void ConvertBoxToMultileContent(const TransferNotification& notificationItem, const NotificationRequestBox& box, sptr& request) { auto pContent = std::make_shared(); @@ -94,7 +94,7 @@ void ConvertBoxToMultileContent(const TransferNotification& notificationItem, co request->SetContent(content); } -void ConvertBoxToPictureContent(const TransferNotification& notificationItem, const NotifticationRequestBox& box, +void ConvertBoxToPictureContent(const TransferNotification& notificationItem, const NotificationRequestBox& box, sptr& request) { auto pContent = std::make_shared(); @@ -110,7 +110,7 @@ void ConvertBoxToPictureContent(const TransferNotification& notificationItem, co request->SetContent(content); } -void DistributedService::SetNotifictaionContent(const NotifticationRequestBox& box, sptr& request, +void DistributedService::SetNotifictaionContent(const NotificationRequestBox& box, sptr& request, int32_t contentType) { TransferNotification notificationItem; @@ -161,7 +161,7 @@ void DistributedService::SetNotifictaionContent(const NotifticationRequestBox& b } } -void DistributedService::MakeNotifictaionContent(const NotifticationRequestBox& box, sptr& request, +void DistributedService::MakeNotificationContent(const NotificationRequestBox& box, sptr& request, bool isCommonLiveView, int32_t contentType) { if (isCommonLiveView) { @@ -193,7 +193,7 @@ void DistributedService::MakeNotifictaionContent(const NotifticationRequestBox& SetNotifictaionContent(box, request, contentType); } -void DistributedService::MakeNotifictaionIcon(const NotifticationRequestBox& box, sptr& request, +void DistributedService::MakeNotificationIcon(const NotificationRequestBox& box, sptr& request, bool isCommonLiveView) { std::shared_ptr icon; @@ -218,7 +218,7 @@ void DistributedService::MakeNotifictaionIcon(const NotifticationRequestBox& box } } -void DistributedService::MakeNotifictaionReminderFlag(const NotifticationRequestBox& box, +void DistributedService::MakeNotificationReminderFlag(const NotificationRequestBox& box, sptr& request) { int32_t type = 0; @@ -240,7 +240,7 @@ void DistributedService::MakeNotifictaionReminderFlag(const NotifticationRequest request->SetLabel(DISTRIBUTED_LABEL); } -void DistributedService::MakeNotificationButtons(const NotifticationRequestBox& box, +void DistributedService::MakeNotificationButtons(const NotificationRequestBox& box, NotificationConstant::SlotType slotType, sptr& request) { if (request != nullptr && slotType == NotificationConstant::SlotType::SOCIAL_COMMUNICATION) { @@ -265,7 +265,7 @@ void DistributedService::PublishNotifictaion(const std::shared_ptr& boxM } int32_t slotType = 0; int32_t contentType = 0; - NotifticationRequestBox requestBox = NotifticationRequestBox(boxMessage); + NotificationRequestBox requestBox = NotificationRequestBox(boxMessage); bool isCommonLiveView = false; if (requestBox.GetSlotType(slotType) && requestBox.GetContentType(contentType)) { isCommonLiveView = @@ -273,9 +273,9 @@ void DistributedService::PublishNotifictaion(const std::shared_ptr& boxM (static_cast(slotType) == NotificationConstant::SlotType::LIVE_VIEW); } MakeNotificationButtons(requestBox, static_cast(slotType), request); - MakeNotifictaionContent(requestBox, request, isCommonLiveView, contentType); - MakeNotifictaionIcon(requestBox, request, isCommonLiveView); - MakeNotifictaionReminderFlag(requestBox, request); + MakeNotificationContent(requestBox, request, isCommonLiveView, contentType); + MakeNotificationIcon(requestBox, request, isCommonLiveView); + MakeNotificationReminderFlag(requestBox, request); int result = IN_PROCESS_CALL(NotificationHelper::PublishNotification(*request)); ANS_LOGD("Dans publish result = %{public}d.", result); } diff --git a/services/distributed/src/soft_bus/distributed_publish_service_v2.cpp b/services/distributed/src/soft_bus/distributed_publish_service_v2.cpp index 41a845933ed5fb223871478f688d72f2e1a0209b..833a12bfc2847cff244d7693c0c989a7f8bacc36 100644 --- a/services/distributed/src/soft_bus/distributed_publish_service_v2.cpp +++ b/services/distributed/src/soft_bus/distributed_publish_service_v2.cpp @@ -211,7 +211,7 @@ void DistributedPublishService::SyncNotifictionList(const DistributedDeviceInfo& void DistributedPublishService::SendNotifictionRequest(const std::shared_ptr request, const DistributedDeviceInfo& peerDevice, bool isSyncNotification) { - std::shared_ptr requestBox = std::make_shared(); + std::shared_ptr requestBox = std::make_shared(); if (request == nullptr || request->GetNotificationRequestPoint() == nullptr) { return; } @@ -259,7 +259,7 @@ void DistributedPublishService::SendNotifictionRequest(const std::shared_ptr notificationRequest, - NotificationConstant::SlotType slotType, std::shared_ptr& requestBox) + NotificationConstant::SlotType slotType, std::shared_ptr& requestBox) { if (slotType == NotificationConstant::SlotType::SOCIAL_COMMUNICATION) { auto actionButtons = notificationRequest->GetActionButtons(); @@ -292,7 +292,7 @@ void DistributedPublishService::PublishNotification(const std::shared_ptr(slotType) == NotificationConstant::SlotType::LIVE_VIEW); } MakeNotificationButtons(requestBox, static_cast(slotType), request); - MakeNotifictaionContent(requestBox, request, isCommonLiveView, contentType); - MakeNotifictaionIcon(requestBox, request, isCommonLiveView); - MakeNotifictaionReminderFlag(requestBox, request); + MakeNotificationContent(requestBox, request, isCommonLiveView, contentType); + MakeNotificationIcon(requestBox, request, isCommonLiveView); + MakeNotificationReminderFlag(requestBox, request); int result = IN_PROCESS_CALL(NotificationHelper::PublishNotification(*request)); ANS_LOGI("Dans publish message %{public}s %{public}d.", request->GetDistributedHashCode().c_str(), result); } @@ -361,7 +361,7 @@ void DistributedPublishService::PublishSynchronousLiveView(const std::shared_ptr } } -void DistributedPublishService::MakeNotificationButtons(const NotifticationRequestBox& box, +void DistributedPublishService::MakeNotificationButtons(const NotificationRequestBox& box, NotificationConstant::SlotType slotType, sptr& request) { if (request != nullptr && slotType == NotificationConstant::SlotType::SOCIAL_COMMUNICATION) { @@ -377,7 +377,7 @@ void DistributedPublishService::MakeNotificationButtons(const NotifticationReque } } -void DistributedPublishService::MakeNotifictaionReminderFlag(const NotifticationRequestBox& box, +void DistributedPublishService::MakeNotificationReminderFlag(const NotificationRequestBox& box, sptr& request) { int32_t type = 0; @@ -399,7 +399,7 @@ void DistributedPublishService::MakeNotifictaionReminderFlag(const Notiftication request->SetLabel(DISTRIBUTED_LABEL); } -void DistributedPublishService::MakeNotifictaionIcon(const NotifticationRequestBox& box, +void DistributedPublishService::MakeNotificationIcon(const NotificationRequestBox& box, sptr& request, bool isCommonLiveView) { std::shared_ptr icon; @@ -424,7 +424,7 @@ void DistributedPublishService::MakeNotifictaionIcon(const NotifticationRequestB } } -void DistributedPublishService::MakeNotifictaionContent(const NotifticationRequestBox& box, +void DistributedPublishService::MakeNotificationContent(const NotificationRequestBox& box, sptr& request, bool isCommonLiveView, int32_t contentType) { if (isCommonLiveView) { @@ -453,7 +453,7 @@ void DistributedPublishService::MakeNotifictaionContent(const NotifticationReque } return; } - MakeNotifictaionBasicContent(box, request, contentType); + MakeNotificationBasicContent(box, request, contentType); } struct TransferNotification { @@ -464,7 +464,7 @@ struct TransferNotification { std::string expandedTitle; }; -static void ConvertBoxToLongContent(const TransferNotification& notificationItem, const NotifticationRequestBox& box, +static void ConvertBoxToLongContent(const TransferNotification& notificationItem, const NotificationRequestBox& box, sptr& request) { auto pContent = std::make_shared(); @@ -480,7 +480,7 @@ static void ConvertBoxToLongContent(const TransferNotification& notificationItem request->SetContent(content); } -static void ConvertBoxToMultileContent(const TransferNotification& notificationItem, const NotifticationRequestBox& box, +static void ConvertBoxToMultileContent(const TransferNotification& notificationItem, const NotificationRequestBox& box, sptr& request) { auto pContent = std::make_shared(); @@ -498,7 +498,7 @@ static void ConvertBoxToMultileContent(const TransferNotification& notificationI request->SetContent(content); } -static void ConvertBoxToPictureContent(const TransferNotification& notificationItem, const NotifticationRequestBox& box, +static void ConvertBoxToPictureContent(const TransferNotification& notificationItem, const NotificationRequestBox& box, sptr& request) { auto pContent = std::make_shared(); @@ -514,7 +514,7 @@ static void ConvertBoxToPictureContent(const TransferNotification& notificationI request->SetContent(content); } -void DistributedPublishService::MakeNotifictaionBasicContent(const NotifticationRequestBox& box, +void DistributedPublishService::MakeNotificationBasicContent(const NotificationRequestBox& box, sptr& request, int32_t contentType) { TransferNotification notificationItem; diff --git a/services/distributed/src/soft_bus/distributed_subscribe_service.cpp b/services/distributed/src/soft_bus/distributed_subscribe_service.cpp index 01f5a9c4fb4351857babf40ffba7a52f90c21e41..ef428bfe17f24066ee0df26e27998057fc2a252f 100644 --- a/services/distributed/src/soft_bus/distributed_subscribe_service.cpp +++ b/services/distributed/src/soft_bus/distributed_subscribe_service.cpp @@ -128,7 +128,7 @@ void DistributedService::UnSubscribeNotifictaion(const std::string &deviceId, ui } void DistributedService::SetNotificationContent(const std::shared_ptr &content, - NotificationContent::Type type, std::shared_ptr& requestBox) + NotificationContent::Type type, std::shared_ptr& requestBox) { if (content == nullptr || content->GetNotificationContent() == nullptr) { return; @@ -182,7 +182,7 @@ void DistributedService::SetNotificationContent(const std::shared_ptr notificationRequest, - NotificationConstant::SlotType slotType, std::shared_ptr& requestBox) + NotificationConstant::SlotType slotType, std::shared_ptr& requestBox) { if (notificationRequest == nullptr) { return; @@ -212,7 +212,7 @@ void DistributedService::SetNotificationButtons(const sptr void DistributedService::SendNotifictionRequest(const std::shared_ptr request, const DistributedDeviceInfo& peerDevice, bool isSyncNotification) { - std::shared_ptr requestBox = std::make_shared(); + std::shared_ptr requestBox = std::make_shared(); if (request == nullptr || request->GetNotificationRequestPoint() == nullptr) { return; } diff --git a/services/distributed/src/soft_bus/distributed_subscribe_service_v2.cpp b/services/distributed/src/soft_bus/distributed_subscribe_service_v2.cpp index 28a7b7b979e7757cb363327b7bc14e56b605166b..27d937d9507951aa797f4c9639eef7132e0b38cc 100644 --- a/services/distributed/src/soft_bus/distributed_subscribe_service_v2.cpp +++ b/services/distributed/src/soft_bus/distributed_subscribe_service_v2.cpp @@ -58,7 +58,7 @@ DistributedSubscribeService& DistributedSubscribeService::GetInstance() return distributedSubscribeService; } -void DistributedSubscribeService::SubscribeNotifictaion(const DistributedDeviceInfo peerDevice) +void DistributedSubscribeService::SubscribeNotification(const DistributedDeviceInfo peerDevice) { if (DistributedDeviceService::GetInstance().CheckDeviceExist(peerDevice.deviceId_)) { ANS_LOGI("Local device no %{public}s .", StringAnonymous(peerDevice.deviceId_).c_str()); @@ -95,7 +95,7 @@ void DistributedSubscribeService::SubscribeNotifictaion(const DistributedDeviceI StringAnonymous(peerDevice.deviceId_).c_str(), peerDevice.deviceType_, userId, result); } -void DistributedSubscribeService::UnSubscribeNotifictaion(const std::string &deviceId) +void DistributedSubscribeService::UnSubscribeNotification(const std::string &deviceId) { DistributedDeviceService::GetInstance().DeleteDeviceInfo(deviceId); auto iter = subscriberMap_.find(deviceId); diff --git a/services/distributed/src/tlv_box/request_box.cpp b/services/distributed/src/tlv_box/request_box.cpp index 475200c6cb0e9cc0cc66893346b66e81c5caee6a..a8b1d6d7be9cd9cccbf65a53d3bff33ffa36a088 100644 --- a/services/distributed/src/tlv_box/request_box.cpp +++ b/services/distributed/src/tlv_box/request_box.cpp @@ -22,7 +22,7 @@ namespace OHOS { namespace Notification { -NotifticationRequestBox::NotifticationRequestBox() +NotificationRequestBox::NotificationRequestBox() { if (box_ == nullptr) { return; @@ -30,11 +30,11 @@ NotifticationRequestBox::NotifticationRequestBox() box_->SetMessageType(PUBLISH_NOTIFICATION); } -NotifticationRequestBox::NotifticationRequestBox(std::shared_ptr box) : BoxBase(box) +NotificationRequestBox::NotificationRequestBox(std::shared_ptr box) : BoxBase(box) { } -bool NotifticationRequestBox::SetNotificationHashCode(const std::string& hasdCode) +bool NotificationRequestBox::SetNotificationHashCode(const std::string& hasdCode) { if (box_ == nullptr) { return false; @@ -42,7 +42,7 @@ bool NotifticationRequestBox::SetNotificationHashCode(const std::string& hasdCod return box_->PutValue(std::make_shared(NOTIFICATION_HASHCODE, hasdCode)); } -bool NotifticationRequestBox::SetSlotType(int32_t type) +bool NotificationRequestBox::SetSlotType(int32_t type) { if (box_ == nullptr) { return false; @@ -50,7 +50,7 @@ bool NotifticationRequestBox::SetSlotType(int32_t type) return box_->PutValue(std::make_shared(NOTIFICATION_SLOT_TYPE, type)); } -bool NotifticationRequestBox::SetContentType(int32_t type) +bool NotificationRequestBox::SetContentType(int32_t type) { if (box_ == nullptr) { return false; @@ -58,7 +58,7 @@ bool NotifticationRequestBox::SetContentType(int32_t type) return box_->PutValue(std::make_shared(NOTIFICATION_CONTENT_TYPE, type)); } -bool NotifticationRequestBox::SetReminderFlag(int32_t flag) +bool NotificationRequestBox::SetReminderFlag(int32_t flag) { if (box_ == nullptr) { return false; @@ -66,7 +66,7 @@ bool NotifticationRequestBox::SetReminderFlag(int32_t flag) return box_->PutValue(std::make_shared(NOTIFICATION_REMINDERFLAG, flag)); } -bool NotifticationRequestBox::SetCreatorBundleName(const std::string& bundleName) +bool NotificationRequestBox::SetCreatorBundleName(const std::string& bundleName) { if (box_ == nullptr) { return false; @@ -74,7 +74,7 @@ bool NotifticationRequestBox::SetCreatorBundleName(const std::string& bundleName return box_->PutValue(std::make_shared(BUNDLE_NAME, bundleName)); } -bool NotifticationRequestBox::SetNotificationTitle(const std::string& title) +bool NotificationRequestBox::SetNotificationTitle(const std::string& title) { if (box_ == nullptr) { return false; @@ -89,7 +89,7 @@ bool NotifticationRequestBox::SetNotificationTitle(const std::string& title) return box_->PutValue(std::make_shared(NOTIFICATION_TITLE, title)); } -bool NotifticationRequestBox::SetNotificationText(const std::string& text) +bool NotificationRequestBox::SetNotificationText(const std::string& text) { if (box_ == nullptr) { return false; @@ -104,7 +104,7 @@ bool NotifticationRequestBox::SetNotificationText(const std::string& text) return box_->PutValue(std::make_shared(NOTIFICATION_CONTENT, text)); } -bool NotifticationRequestBox::SetNotificationAdditionalText(const std::string& text) +bool NotificationRequestBox::SetNotificationAdditionalText(const std::string& text) { if (box_ == nullptr) { return false; @@ -112,7 +112,7 @@ bool NotifticationRequestBox::SetNotificationAdditionalText(const std::string& t return box_->PutValue(std::make_shared(NOTIFICATION_ADDITIONAL_TEXT, text)); } -bool NotifticationRequestBox::SetNotificationBriefText(const std::string& text) +bool NotificationRequestBox::SetNotificationBriefText(const std::string& text) { if (box_ == nullptr) { return false; @@ -120,7 +120,7 @@ bool NotifticationRequestBox::SetNotificationBriefText(const std::string& text) return box_->PutValue(std::make_shared(NOTIFICATION_BRIEF_TEXT, text)); } -bool NotifticationRequestBox::SetNotificationExpandedTitle(const std::string& text) +bool NotificationRequestBox::SetNotificationExpandedTitle(const std::string& text) { if (box_ == nullptr) { return false; @@ -128,7 +128,7 @@ bool NotifticationRequestBox::SetNotificationExpandedTitle(const std::string& te return box_->PutValue(std::make_shared(NOTIFICATION_EXPANDED_TITLE, text)); } -bool NotifticationRequestBox::SetNotificationLongText(const std::string& text) +bool NotificationRequestBox::SetNotificationLongText(const std::string& text) { if (box_ == nullptr) { return false; @@ -136,17 +136,17 @@ bool NotifticationRequestBox::SetNotificationLongText(const std::string& text) return box_->PutValue(std::make_shared(NOTIFICATION_LONG_TITLE, text)); } -bool NotifticationRequestBox::SetNotificationAllLines(const std::vector& allLines) +bool NotificationRequestBox::SetNotificationAllLines(const std::vector& allLines) { return true; } -bool NotifticationRequestBox::SetNotificationBigPicture(const std::shared_ptr& bigPicture) +bool NotificationRequestBox::SetNotificationBigPicture(const std::shared_ptr& bigPicture) { return true; } -bool NotifticationRequestBox::SetNotificationActionName(const std::string& actionName) +bool NotificationRequestBox::SetNotificationActionName(const std::string& actionName) { if (box_ == nullptr) { return false; @@ -154,7 +154,7 @@ bool NotifticationRequestBox::SetNotificationActionName(const std::string& actio return box_->PutValue(std::make_shared(ACTION_BUTTON_NAME, actionName)); } -bool NotifticationRequestBox::SetNotificationUserInput(const std::string& userInput) +bool NotificationRequestBox::SetNotificationUserInput(const std::string& userInput) { if (box_ == nullptr) { return false; @@ -162,7 +162,7 @@ bool NotifticationRequestBox::SetNotificationUserInput(const std::string& userIn return box_->PutValue(std::make_shared(ACTION_USER_INPUT, userInput)); } -bool NotifticationRequestBox::SetBigIcon(const std::shared_ptr& bigIcon) +bool NotificationRequestBox::SetBigIcon(const std::shared_ptr& bigIcon) { if (box_ == nullptr) { return false; @@ -178,7 +178,7 @@ bool NotifticationRequestBox::SetBigIcon(const std::shared_ptr& return box_->PutValue(std::make_shared(NOTIFICATION_BIG_ICON, icon)); } -bool NotifticationRequestBox::SetOverlayIcon(const std::shared_ptr& overlayIcon) +bool NotificationRequestBox::SetOverlayIcon(const std::shared_ptr& overlayIcon) { if (box_ == nullptr) { return false; @@ -193,7 +193,7 @@ bool NotifticationRequestBox::SetOverlayIcon(const std::shared_ptrPutValue(std::make_shared(NOTIFICATION_OVERLAY_ICON, icon)); } -bool NotifticationRequestBox::SetCommonLiveView(const std::vector& byteSequence) +bool NotificationRequestBox::SetCommonLiveView(const std::vector& byteSequence) { if (box_ == nullptr) { return false; @@ -203,7 +203,7 @@ bool NotifticationRequestBox::SetCommonLiveView(const std::vector& byte begin, byteSequence.size())); } -bool NotifticationRequestBox::SetFinishTime(int64_t time) +bool NotificationRequestBox::SetFinishTime(int64_t time) { if (box_ == nullptr) { return false; @@ -211,7 +211,7 @@ bool NotifticationRequestBox::SetFinishTime(int64_t time) return box_->PutValue(std::make_shared(FINISH_DEADLINE_TIME, time)); } -bool NotifticationRequestBox::SetAutoDeleteTime(int64_t time) +bool NotificationRequestBox::SetAutoDeleteTime(int64_t time) { if (box_ == nullptr) { return false; @@ -219,7 +219,7 @@ bool NotifticationRequestBox::SetAutoDeleteTime(int64_t time) return box_->PutValue(std::make_shared(AUTO_DELETE_TIME, time)); } -bool NotifticationRequestBox::GetNotificationHashCode(std::string& hasdCode) const +bool NotificationRequestBox::GetNotificationHashCode(std::string& hasdCode) const { if (box_ == nullptr) { return false; @@ -227,7 +227,7 @@ bool NotifticationRequestBox::GetNotificationHashCode(std::string& hasdCode) con return box_->GetStringValue(NOTIFICATION_HASHCODE, hasdCode); } -bool NotifticationRequestBox::GetSlotType(int32_t& type) const +bool NotificationRequestBox::GetSlotType(int32_t& type) const { if (box_ == nullptr) { return false; @@ -235,7 +235,7 @@ bool NotifticationRequestBox::GetSlotType(int32_t& type) const return box_->GetInt32Value(NOTIFICATION_SLOT_TYPE, type); } -bool NotifticationRequestBox::GetContentType(int32_t& type) const +bool NotificationRequestBox::GetContentType(int32_t& type) const { if (box_ == nullptr) { return false; @@ -243,7 +243,7 @@ bool NotifticationRequestBox::GetContentType(int32_t& type) const return box_->GetInt32Value(NOTIFICATION_CONTENT_TYPE, type); } -bool NotifticationRequestBox::GetCreatorBundleName(std::string& bundleName) const +bool NotificationRequestBox::GetCreatorBundleName(std::string& bundleName) const { if (box_ == nullptr) { return false; @@ -251,7 +251,7 @@ bool NotifticationRequestBox::GetCreatorBundleName(std::string& bundleName) cons return box_->GetStringValue(BUNDLE_NAME, bundleName); } -bool NotifticationRequestBox::GetReminderFlag(int32_t& flag) const +bool NotificationRequestBox::GetReminderFlag(int32_t& flag) const { if (box_ == nullptr) { return false; @@ -259,7 +259,7 @@ bool NotifticationRequestBox::GetReminderFlag(int32_t& flag) const return box_->GetInt32Value(NOTIFICATION_REMINDERFLAG, flag); } -bool NotifticationRequestBox::GetNotificationTitle(std::string& title) const +bool NotificationRequestBox::GetNotificationTitle(std::string& title) const { if (box_ == nullptr) { return false; @@ -267,7 +267,7 @@ bool NotifticationRequestBox::GetNotificationTitle(std::string& title) const return box_->GetStringValue(NOTIFICATION_TITLE, title); } -bool NotifticationRequestBox::GetNotificationText(std::string& text) const +bool NotificationRequestBox::GetNotificationText(std::string& text) const { if (box_ == nullptr) { return false; @@ -275,7 +275,7 @@ bool NotifticationRequestBox::GetNotificationText(std::string& text) const return box_->GetStringValue(NOTIFICATION_CONTENT, text); } -bool NotifticationRequestBox::GetNotificationAdditionalText(std::string& text) const +bool NotificationRequestBox::GetNotificationAdditionalText(std::string& text) const { if (box_ == nullptr) { return false; @@ -283,7 +283,7 @@ bool NotifticationRequestBox::GetNotificationAdditionalText(std::string& text) c return box_->GetStringValue(NOTIFICATION_ADDITIONAL_TEXT, text); } -bool NotifticationRequestBox::GetNotificationBriefText(std::string& text) const +bool NotificationRequestBox::GetNotificationBriefText(std::string& text) const { if (box_ == nullptr) { return false; @@ -291,7 +291,7 @@ bool NotifticationRequestBox::GetNotificationBriefText(std::string& text) const return box_->GetStringValue(NOTIFICATION_BRIEF_TEXT, text); } -bool NotifticationRequestBox::GetNotificationExpandedTitle(std::string& text) const +bool NotificationRequestBox::GetNotificationExpandedTitle(std::string& text) const { if (box_ == nullptr) { return false; @@ -299,7 +299,7 @@ bool NotifticationRequestBox::GetNotificationExpandedTitle(std::string& text) co return box_->GetStringValue(NOTIFICATION_EXPANDED_TITLE, text); } -bool NotifticationRequestBox::GetNotificationLongText(std::string& text) const +bool NotificationRequestBox::GetNotificationLongText(std::string& text) const { if (box_ == nullptr) { return false; @@ -307,17 +307,17 @@ bool NotifticationRequestBox::GetNotificationLongText(std::string& text) const return box_->GetStringValue(NOTIFICATION_LONG_TITLE, text); } -bool NotifticationRequestBox::GetNotificationAllLines(std::vector& allLines) const +bool NotificationRequestBox::GetNotificationAllLines(std::vector& allLines) const { return true; } -bool NotifticationRequestBox::GetNotificationBigPicture(std::shared_ptr& bigPicture) const +bool NotificationRequestBox::GetNotificationBigPicture(std::shared_ptr& bigPicture) const { return true; } -bool NotifticationRequestBox::GetNotificationActionName(std::string& actionName) const +bool NotificationRequestBox::GetNotificationActionName(std::string& actionName) const { if (box_ == nullptr) { return false; @@ -325,7 +325,7 @@ bool NotifticationRequestBox::GetNotificationActionName(std::string& actionName) return box_->GetStringValue(ACTION_BUTTON_NAME, actionName); } -bool NotifticationRequestBox::GetNotificationUserInput(std::string& userInput) const +bool NotificationRequestBox::GetNotificationUserInput(std::string& userInput) const { if (box_ == nullptr) { return false; @@ -333,7 +333,7 @@ bool NotifticationRequestBox::GetNotificationUserInput(std::string& userInput) c return box_->GetStringValue(ACTION_USER_INPUT, userInput); } -bool NotifticationRequestBox::GetBigIcon(std::shared_ptr& bigIcon) const +bool NotificationRequestBox::GetBigIcon(std::shared_ptr& bigIcon) const { if (box_ == nullptr) { return false; @@ -347,7 +347,7 @@ bool NotifticationRequestBox::GetBigIcon(std::shared_ptr& bigIc return true; } -bool NotifticationRequestBox::GetOverlayIcon(std::shared_ptr& overlayIcon) const +bool NotificationRequestBox::GetOverlayIcon(std::shared_ptr& overlayIcon) const { if (box_ == nullptr) { return false; @@ -361,7 +361,7 @@ bool NotifticationRequestBox::GetOverlayIcon(std::shared_ptr& o return true; } -bool NotifticationRequestBox::GetCommonLiveView(std::vector& byteSequence) const +bool NotificationRequestBox::GetCommonLiveView(std::vector& byteSequence) const { if (box_ == nullptr) { return false; @@ -369,7 +369,7 @@ bool NotifticationRequestBox::GetCommonLiveView(std::vector& byteSequen return box_->GetBytes(NOTIFICATION_COMMON_LIVEVIEW, byteSequence); } -bool NotifticationRequestBox::GetFinishTime(int64_t& time) const +bool NotificationRequestBox::GetFinishTime(int64_t& time) const { if (box_ == nullptr) { return false; @@ -377,7 +377,7 @@ bool NotifticationRequestBox::GetFinishTime(int64_t& time) const return box_->GetInt64Value(FINISH_DEADLINE_TIME, time); } -bool NotifticationRequestBox::GetAutoDeleteTime(int64_t& time) const +bool NotificationRequestBox::GetAutoDeleteTime(int64_t& time) const { if (box_ == nullptr) { return false;