From 689a48e2ef2c94213a7354ff0b2f6d99912e18fb Mon Sep 17 00:00:00 2001 From: sdk-team Date: Wed, 13 Nov 2024 03:46:58 +0000 Subject: [PATCH] Supported AndroidMessageOppoCategory, AndroidMessageOppoNotifyLevel for Push and MassPush. --- VERSION | 2 +- .../push/model/BindAliasRequest.h | 3 -- .../push/model/BindPhoneRequest.h | 3 -- .../alibabacloud/push/model/BindTagRequest.h | 3 -- .../push/model/CancelPushRequest.h | 3 -- .../push/model/CheckDeviceRequest.h | 3 -- .../push/model/CheckDevicesRequest.h | 3 -- .../model/CompleteContinuouslyPushRequest.h | 3 -- .../push/model/ContinuouslyPushRequest.h | 3 -- .../push/model/ListSummaryAppsRequest.h | 3 -- .../alibabacloud/push/model/ListTagsRequest.h | 3 -- .../alibabacloud/push/model/MassPushRequest.h | 6 +-- .../push/model/PushMessageToAndroidRequest.h | 3 -- .../push/model/PushMessageToiOSRequest.h | 3 -- .../push/model/PushNoticeToAndroidRequest.h | 3 -- .../push/model/PushNoticeToiOSRequest.h | 3 -- .../alibabacloud/push/model/PushRequest.h | 18 ++++--- .../push/model/QueryAliasesRequest.h | 3 -- .../push/model/QueryDeviceInfoRequest.h | 3 -- .../push/model/QueryDeviceInfoResult.h | 4 +- .../push/model/QueryDeviceStatRequest.h | 3 -- .../push/model/QueryDevicesByAccountRequest.h | 3 -- .../push/model/QueryDevicesByAliasRequest.h | 3 -- .../push/model/QueryPushStatByAppRequest.h | 3 -- .../push/model/QueryPushStatByAppResult.h | 2 +- .../push/model/QueryPushStatByMsgRequest.h | 3 -- .../push/model/QueryTagsRequest.h | 3 -- .../push/model/QueryUniqueDeviceStatRequest.h | 3 -- .../push/model/RemoveTagRequest.h | 3 -- .../push/model/UnbindAliasRequest.h | 3 -- .../push/model/UnbindPhoneRequest.h | 3 -- .../push/model/UnbindTagRequest.h | 3 -- push/src/model/BindAliasRequest.cc | 9 ---- push/src/model/BindPhoneRequest.cc | 9 ---- push/src/model/BindTagRequest.cc | 9 ---- push/src/model/CancelPushRequest.cc | 9 ---- push/src/model/CheckDeviceRequest.cc | 9 ---- push/src/model/CheckDevicesRequest.cc | 9 ---- push/src/model/CheckDevicesResult.cc | 4 +- .../model/CompleteContinuouslyPushRequest.cc | 9 ---- push/src/model/ContinuouslyPushRequest.cc | 9 ---- push/src/model/ListSummaryAppsRequest.cc | 9 ---- push/src/model/ListSummaryAppsResult.cc | 4 +- push/src/model/ListTagsRequest.cc | 9 ---- push/src/model/MassPushRequest.cc | 12 ++--- push/src/model/PushMessageToAndroidRequest.cc | 9 ---- push/src/model/PushMessageToiOSRequest.cc | 9 ---- push/src/model/PushNoticeToAndroidRequest.cc | 9 ---- push/src/model/PushNoticeToiOSRequest.cc | 9 ---- push/src/model/PushRequest.cc | 54 ++++++++++++------- push/src/model/QueryAliasesRequest.cc | 9 ---- push/src/model/QueryDeviceInfoRequest.cc | 9 ---- push/src/model/QueryDeviceInfoResult.cc | 32 +++++------ push/src/model/QueryDeviceStatRequest.cc | 9 ---- push/src/model/QueryDeviceStatResult.cc | 8 +-- .../src/model/QueryDevicesByAccountRequest.cc | 9 ---- push/src/model/QueryDevicesByAliasRequest.cc | 9 ---- push/src/model/QueryPushStatByAppRequest.cc | 9 ---- push/src/model/QueryPushStatByAppResult.cc | 24 ++++----- push/src/model/QueryPushStatByMsgRequest.cc | 9 ---- push/src/model/QueryPushStatByMsgResult.cc | 24 ++++----- push/src/model/QueryTagsRequest.cc | 9 ---- .../src/model/QueryUniqueDeviceStatRequest.cc | 9 ---- push/src/model/QueryUniqueDeviceStatResult.cc | 4 +- push/src/model/RemoveTagRequest.cc | 9 ---- push/src/model/UnbindAliasRequest.cc | 9 ---- push/src/model/UnbindPhoneRequest.cc | 9 ---- push/src/model/UnbindTagRequest.cc | 9 ---- 68 files changed, 108 insertions(+), 414 deletions(-) diff --git a/VERSION b/VERSION index 87dd666cd..fea134335 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.2015 \ No newline at end of file +1.36.2016 \ No newline at end of file diff --git a/push/include/alibabacloud/push/model/BindAliasRequest.h b/push/include/alibabacloud/push/model/BindAliasRequest.h index 464f3e881..37524e6a7 100644 --- a/push/include/alibabacloud/push/model/BindAliasRequest.h +++ b/push/include/alibabacloud/push/model/BindAliasRequest.h @@ -32,8 +32,6 @@ public: ~BindAliasRequest(); std::string getDeviceId() const; void setDeviceId(const std::string &deviceId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getAliasName() const; void setAliasName(const std::string &aliasName); long getAppKey() const; @@ -41,7 +39,6 @@ public: private: std::string deviceId_; - std::string accessKeyId_; std::string aliasName_; long appKey_; }; diff --git a/push/include/alibabacloud/push/model/BindPhoneRequest.h b/push/include/alibabacloud/push/model/BindPhoneRequest.h index 1c2c30dfc..04e46a0d1 100644 --- a/push/include/alibabacloud/push/model/BindPhoneRequest.h +++ b/push/include/alibabacloud/push/model/BindPhoneRequest.h @@ -34,15 +34,12 @@ public: void setPhoneNumber(const std::string &phoneNumber); std::string getDeviceId() const; void setDeviceId(const std::string &deviceId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); private: std::string phoneNumber_; std::string deviceId_; - std::string accessKeyId_; long appKey_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/BindTagRequest.h b/push/include/alibabacloud/push/model/BindTagRequest.h index 99c2946dc..9e78bd423 100644 --- a/push/include/alibabacloud/push/model/BindTagRequest.h +++ b/push/include/alibabacloud/push/model/BindTagRequest.h @@ -32,8 +32,6 @@ public: ~BindTagRequest(); std::string getKeyType() const; void setKeyType(const std::string &keyType); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getTagName() const; void setTagName(const std::string &tagName); std::string getClientKey() const; @@ -43,7 +41,6 @@ public: private: std::string keyType_; - std::string accessKeyId_; std::string tagName_; std::string clientKey_; long appKey_; diff --git a/push/include/alibabacloud/push/model/CancelPushRequest.h b/push/include/alibabacloud/push/model/CancelPushRequest.h index 16f353d4a..5b82905f1 100644 --- a/push/include/alibabacloud/push/model/CancelPushRequest.h +++ b/push/include/alibabacloud/push/model/CancelPushRequest.h @@ -32,14 +32,11 @@ public: ~CancelPushRequest(); long getMessageId() const; void setMessageId(long messageId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); private: long messageId_; - std::string accessKeyId_; long appKey_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/CheckDeviceRequest.h b/push/include/alibabacloud/push/model/CheckDeviceRequest.h index e0af5f2a5..dbb730c7b 100644 --- a/push/include/alibabacloud/push/model/CheckDeviceRequest.h +++ b/push/include/alibabacloud/push/model/CheckDeviceRequest.h @@ -32,14 +32,11 @@ public: ~CheckDeviceRequest(); std::string getDeviceId() const; void setDeviceId(const std::string &deviceId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); private: std::string deviceId_; - std::string accessKeyId_; long appKey_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/CheckDevicesRequest.h b/push/include/alibabacloud/push/model/CheckDevicesRequest.h index 4f7804303..aa6165796 100644 --- a/push/include/alibabacloud/push/model/CheckDevicesRequest.h +++ b/push/include/alibabacloud/push/model/CheckDevicesRequest.h @@ -32,14 +32,11 @@ public: ~CheckDevicesRequest(); std::string getDeviceIds() const; void setDeviceIds(const std::string &deviceIds); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); private: std::string deviceIds_; - std::string accessKeyId_; long appKey_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/CompleteContinuouslyPushRequest.h b/push/include/alibabacloud/push/model/CompleteContinuouslyPushRequest.h index 8452a4e80..147c90edb 100644 --- a/push/include/alibabacloud/push/model/CompleteContinuouslyPushRequest.h +++ b/push/include/alibabacloud/push/model/CompleteContinuouslyPushRequest.h @@ -32,14 +32,11 @@ public: ~CompleteContinuouslyPushRequest(); std::string getMessageId() const; void setMessageId(const std::string &messageId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); private: std::string messageId_; - std::string accessKeyId_; long appKey_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/ContinuouslyPushRequest.h b/push/include/alibabacloud/push/model/ContinuouslyPushRequest.h index fd48abf94..7e0ca7a11 100644 --- a/push/include/alibabacloud/push/model/ContinuouslyPushRequest.h +++ b/push/include/alibabacloud/push/model/ContinuouslyPushRequest.h @@ -32,8 +32,6 @@ public: ~ContinuouslyPushRequest(); std::string getMessageId() const; void setMessageId(const std::string &messageId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getTarget() const; void setTarget(const std::string &target); long getAppKey() const; @@ -43,7 +41,6 @@ public: private: std::string messageId_; - std::string accessKeyId_; std::string target_; long appKey_; std::string targetValue_; diff --git a/push/include/alibabacloud/push/model/ListSummaryAppsRequest.h b/push/include/alibabacloud/push/model/ListSummaryAppsRequest.h index 85046ff08..84e558c8e 100644 --- a/push/include/alibabacloud/push/model/ListSummaryAppsRequest.h +++ b/push/include/alibabacloud/push/model/ListSummaryAppsRequest.h @@ -30,11 +30,8 @@ class ALIBABACLOUD_PUSH_EXPORT ListSummaryAppsRequest : public RpcServiceRequest public: ListSummaryAppsRequest(); ~ListSummaryAppsRequest(); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); private: - std::string accessKeyId_; }; } // namespace Model } // namespace Push diff --git a/push/include/alibabacloud/push/model/ListTagsRequest.h b/push/include/alibabacloud/push/model/ListTagsRequest.h index e891df35c..f2f79b6e4 100644 --- a/push/include/alibabacloud/push/model/ListTagsRequest.h +++ b/push/include/alibabacloud/push/model/ListTagsRequest.h @@ -30,13 +30,10 @@ class ALIBABACLOUD_PUSH_EXPORT ListTagsRequest : public RpcServiceRequest { public: ListTagsRequest(); ~ListTagsRequest(); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); private: - std::string accessKeyId_; long appKey_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/MassPushRequest.h b/push/include/alibabacloud/push/model/MassPushRequest.h index 092de7b24..3a89902d3 100644 --- a/push/include/alibabacloud/push/model/MassPushRequest.h +++ b/push/include/alibabacloud/push/model/MassPushRequest.h @@ -30,6 +30,7 @@ class ALIBABACLOUD_PUSH_EXPORT MassPushRequest : public RpcServiceRequest { public: struct PushTask { int androidNotificationBarType; + int androidMessageOppoNotifyLevel; std::string body; std::string deviceType; std::string pushTime; @@ -50,6 +51,7 @@ public: int androidNotificationBarPriority; std::string expireTime; std::string androidImageUrl; + std::string androidNotificationThreadId; int androidHonorTargetUserType; std::string harmonyRemindBody; std::string androidNotificationVivoChannel; @@ -113,6 +115,7 @@ public: bool androidRemind; std::string harmonyInboxContent; std::string androidActivity; + std::string androidMessageOppoCategory; int androidNotificationNotifyId; std::string targetValue; int harmonyBadgeSetNum; @@ -121,15 +124,12 @@ public: }; MassPushRequest(); ~MassPushRequest(); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::vector getPushTask() const; void setPushTask(const std::vector &pushTask); long getAppKey() const; void setAppKey(long appKey); private: - std::string accessKeyId_; std::vector pushTask_; long appKey_; }; diff --git a/push/include/alibabacloud/push/model/PushMessageToAndroidRequest.h b/push/include/alibabacloud/push/model/PushMessageToAndroidRequest.h index 4e3713623..e774c64f1 100644 --- a/push/include/alibabacloud/push/model/PushMessageToAndroidRequest.h +++ b/push/include/alibabacloud/push/model/PushMessageToAndroidRequest.h @@ -34,8 +34,6 @@ public: void setTitle(const std::string &title); std::string getBody() const; void setBody(const std::string &body); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); bool getStoreOffline() const; void setStoreOffline(bool storeOffline); std::string getJobKey() const; @@ -50,7 +48,6 @@ public: private: std::string title_; std::string body_; - std::string accessKeyId_; bool storeOffline_; std::string jobKey_; std::string target_; diff --git a/push/include/alibabacloud/push/model/PushMessageToiOSRequest.h b/push/include/alibabacloud/push/model/PushMessageToiOSRequest.h index bb0b384fd..dfb1a79b0 100644 --- a/push/include/alibabacloud/push/model/PushMessageToiOSRequest.h +++ b/push/include/alibabacloud/push/model/PushMessageToiOSRequest.h @@ -34,8 +34,6 @@ public: void setTitle(const std::string &title); std::string getBody() const; void setBody(const std::string &body); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); bool getStoreOffline() const; void setStoreOffline(bool storeOffline); std::string getJobKey() const; @@ -50,7 +48,6 @@ public: private: std::string title_; std::string body_; - std::string accessKeyId_; bool storeOffline_; std::string jobKey_; std::string target_; diff --git a/push/include/alibabacloud/push/model/PushNoticeToAndroidRequest.h b/push/include/alibabacloud/push/model/PushNoticeToAndroidRequest.h index f684c34e9..73efc93a2 100644 --- a/push/include/alibabacloud/push/model/PushNoticeToAndroidRequest.h +++ b/push/include/alibabacloud/push/model/PushNoticeToAndroidRequest.h @@ -34,8 +34,6 @@ public: void setTitle(const std::string &title); std::string getBody() const; void setBody(const std::string &body); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getExtParameters() const; void setExtParameters(const std::string &extParameters); bool getStoreOffline() const; @@ -52,7 +50,6 @@ public: private: std::string title_; std::string body_; - std::string accessKeyId_; std::string extParameters_; bool storeOffline_; std::string jobKey_; diff --git a/push/include/alibabacloud/push/model/PushNoticeToiOSRequest.h b/push/include/alibabacloud/push/model/PushNoticeToiOSRequest.h index 84509b6b3..6caef2ea2 100644 --- a/push/include/alibabacloud/push/model/PushNoticeToiOSRequest.h +++ b/push/include/alibabacloud/push/model/PushNoticeToiOSRequest.h @@ -34,8 +34,6 @@ public: void setTitle(const std::string &title); std::string getBody() const; void setBody(const std::string &body); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getExtParameters() const; void setExtParameters(const std::string &extParameters); std::string getApnsEnv() const; @@ -52,7 +50,6 @@ public: private: std::string title_; std::string body_; - std::string accessKeyId_; std::string extParameters_; std::string apnsEnv_; std::string jobKey_; diff --git a/push/include/alibabacloud/push/model/PushRequest.h b/push/include/alibabacloud/push/model/PushRequest.h index 4a42d62d2..120cc4fbf 100644 --- a/push/include/alibabacloud/push/model/PushRequest.h +++ b/push/include/alibabacloud/push/model/PushRequest.h @@ -32,6 +32,8 @@ public: ~PushRequest(); int getAndroidNotificationBarType() const; void setAndroidNotificationBarType(int androidNotificationBarType); + int getAndroidMessageOppoNotifyLevel() const; + void setAndroidMessageOppoNotifyLevel(int androidMessageOppoNotifyLevel); std::string getDeviceType() const; void setDeviceType(const std::string &deviceType); std::string getPushTime() const; @@ -90,10 +92,10 @@ public: void setIOSExtParameters(const std::string &iOSExtParameters); std::string getAndroidXiaomiImageUrl() const; void setAndroidXiaomiImageUrl(const std::string &androidXiaomiImageUrl); - std::string getSmsTemplateName() const; - void setSmsTemplateName(const std::string &smsTemplateName); std::string getHarmonyUri() const; void setHarmonyUri(const std::string &harmonyUri); + std::string getSmsTemplateName() const; + void setSmsTemplateName(const std::string &smsTemplateName); std::string getHarmonyExtParameters() const; void setHarmonyExtParameters(const std::string &harmonyExtParameters); std::string getAndroidBigPictureUrl() const; @@ -144,6 +146,8 @@ public: void setIOSMusic(const std::string &iOSMusic); bool getIOSMutableContent() const; void setIOSMutableContent(bool iOSMutableContent); + std::string getAndroidNotificationThreadId() const; + void setAndroidNotificationThreadId(const std::string &androidNotificationThreadId); int getAndroidHonorTargetUserType() const; void setAndroidHonorTargetUserType(int androidHonorTargetUserType); std::string getHarmonyRemindBody() const; @@ -194,8 +198,6 @@ public: void setAndroidBigBody(const std::string &androidBigBody); std::string getTitle() const; void setTitle(const std::string &title); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); int getHarmonyBadgeAddNum() const; void setHarmonyBadgeAddNum(int harmonyBadgeAddNum); bool getHarmonyTestMessage() const; @@ -220,11 +222,14 @@ public: void setTarget(const std::string &target); std::string getHarmonyInboxContent() const; void setHarmonyInboxContent(const std::string &harmonyInboxContent); + std::string getAndroidMessageOppoCategory() const; + void setAndroidMessageOppoCategory(const std::string &androidMessageOppoCategory); std::string getAndroidXiaoMiActivity() const; void setAndroidXiaoMiActivity(const std::string &androidXiaoMiActivity); private: int androidNotificationBarType_; + int androidMessageOppoNotifyLevel_; std::string deviceType_; std::string pushTime_; int sendSpeed_; @@ -254,8 +259,8 @@ private: int androidRenderStyle_; std::string iOSExtParameters_; std::string androidXiaomiImageUrl_; - std::string smsTemplateName_; std::string harmonyUri_; + std::string smsTemplateName_; std::string harmonyExtParameters_; std::string androidBigPictureUrl_; bool iOSSilentNotification_; @@ -281,6 +286,7 @@ private: std::string androidMessageHuaweiCategory_; std::string iOSMusic_; bool iOSMutableContent_; + std::string androidNotificationThreadId_; int androidHonorTargetUserType_; std::string harmonyRemindBody_; std::string androidNotificationVivoChannel_; @@ -306,7 +312,6 @@ private: std::string harmonyImageUrl_; std::string androidBigBody_; std::string title_; - std::string accessKeyId_; int harmonyBadgeAddNum_; bool harmonyTestMessage_; int androidBadgeAddNum_; @@ -319,6 +324,7 @@ private: std::string harmonyActionType_; std::string target_; std::string harmonyInboxContent_; + std::string androidMessageOppoCategory_; std::string androidXiaoMiActivity_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/QueryAliasesRequest.h b/push/include/alibabacloud/push/model/QueryAliasesRequest.h index 3b1df8a4f..8f84bd171 100644 --- a/push/include/alibabacloud/push/model/QueryAliasesRequest.h +++ b/push/include/alibabacloud/push/model/QueryAliasesRequest.h @@ -32,14 +32,11 @@ public: ~QueryAliasesRequest(); std::string getDeviceId() const; void setDeviceId(const std::string &deviceId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); private: std::string deviceId_; - std::string accessKeyId_; long appKey_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/QueryDeviceInfoRequest.h b/push/include/alibabacloud/push/model/QueryDeviceInfoRequest.h index d531c9490..7f145e460 100644 --- a/push/include/alibabacloud/push/model/QueryDeviceInfoRequest.h +++ b/push/include/alibabacloud/push/model/QueryDeviceInfoRequest.h @@ -32,14 +32,11 @@ public: ~QueryDeviceInfoRequest(); std::string getDeviceId() const; void setDeviceId(const std::string &deviceId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); private: std::string deviceId_; - std::string accessKeyId_; long appKey_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/QueryDeviceInfoResult.h b/push/include/alibabacloud/push/model/QueryDeviceInfoResult.h index c1c6cb3ec..06c88d7bc 100644 --- a/push/include/alibabacloud/push/model/QueryDeviceInfoResult.h +++ b/push/include/alibabacloud/push/model/QueryDeviceInfoResult.h @@ -34,13 +34,13 @@ namespace AlibabaCloud public: struct DeviceInfo { - std::string lastOnlineTime; std::string brand; + std::string lastOnlineTime; std::string account; std::string deviceType; + std::string alias; std::string deviceId; std::string deviceToken; - std::string alias; std::string model; std::string phoneNumber; bool online; diff --git a/push/include/alibabacloud/push/model/QueryDeviceStatRequest.h b/push/include/alibabacloud/push/model/QueryDeviceStatRequest.h index 5a95eca3d..0cc54249b 100644 --- a/push/include/alibabacloud/push/model/QueryDeviceStatRequest.h +++ b/push/include/alibabacloud/push/model/QueryDeviceStatRequest.h @@ -36,8 +36,6 @@ public: void setStartTime(const std::string &startTime); std::string getDeviceType() const; void setDeviceType(const std::string &deviceType); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); std::string getQueryType() const; @@ -47,7 +45,6 @@ private: std::string endTime_; std::string startTime_; std::string deviceType_; - std::string accessKeyId_; long appKey_; std::string queryType_; }; diff --git a/push/include/alibabacloud/push/model/QueryDevicesByAccountRequest.h b/push/include/alibabacloud/push/model/QueryDevicesByAccountRequest.h index 81af2b553..4d536085e 100644 --- a/push/include/alibabacloud/push/model/QueryDevicesByAccountRequest.h +++ b/push/include/alibabacloud/push/model/QueryDevicesByAccountRequest.h @@ -30,15 +30,12 @@ class ALIBABACLOUD_PUSH_EXPORT QueryDevicesByAccountRequest : public RpcServiceR public: QueryDevicesByAccountRequest(); ~QueryDevicesByAccountRequest(); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); std::string getAccount() const; void setAccount(const std::string &account); private: - std::string accessKeyId_; long appKey_; std::string account_; }; diff --git a/push/include/alibabacloud/push/model/QueryDevicesByAliasRequest.h b/push/include/alibabacloud/push/model/QueryDevicesByAliasRequest.h index 5fc3948a8..f1b29584b 100644 --- a/push/include/alibabacloud/push/model/QueryDevicesByAliasRequest.h +++ b/push/include/alibabacloud/push/model/QueryDevicesByAliasRequest.h @@ -30,15 +30,12 @@ class ALIBABACLOUD_PUSH_EXPORT QueryDevicesByAliasRequest : public RpcServiceReq public: QueryDevicesByAliasRequest(); ~QueryDevicesByAliasRequest(); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getAlias() const; void setAlias(const std::string &alias); long getAppKey() const; void setAppKey(long appKey); private: - std::string accessKeyId_; std::string alias_; long appKey_; }; diff --git a/push/include/alibabacloud/push/model/QueryPushStatByAppRequest.h b/push/include/alibabacloud/push/model/QueryPushStatByAppRequest.h index 6e099e26c..5a8d3974c 100644 --- a/push/include/alibabacloud/push/model/QueryPushStatByAppRequest.h +++ b/push/include/alibabacloud/push/model/QueryPushStatByAppRequest.h @@ -34,8 +34,6 @@ public: void setEndTime(const std::string &endTime); std::string getStartTime() const; void setStartTime(const std::string &startTime); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getGranularity() const; void setGranularity(const std::string &granularity); long getAppKey() const; @@ -44,7 +42,6 @@ public: private: std::string endTime_; std::string startTime_; - std::string accessKeyId_; std::string granularity_; long appKey_; }; diff --git a/push/include/alibabacloud/push/model/QueryPushStatByAppResult.h b/push/include/alibabacloud/push/model/QueryPushStatByAppResult.h index 5adf8e008..b1e759058 100644 --- a/push/include/alibabacloud/push/model/QueryPushStatByAppResult.h +++ b/push/include/alibabacloud/push/model/QueryPushStatByAppResult.h @@ -39,8 +39,8 @@ namespace AlibabaCloud long smsSkipCount; long smsFailedCount; long smsReceiveFailedCount; - std::string time; long deletedCount; + std::string time; long smsReceiveSuccessCount; long receivedCount; long sentCount; diff --git a/push/include/alibabacloud/push/model/QueryPushStatByMsgRequest.h b/push/include/alibabacloud/push/model/QueryPushStatByMsgRequest.h index 507a79fac..072985975 100644 --- a/push/include/alibabacloud/push/model/QueryPushStatByMsgRequest.h +++ b/push/include/alibabacloud/push/model/QueryPushStatByMsgRequest.h @@ -32,14 +32,11 @@ public: ~QueryPushStatByMsgRequest(); long getMessageId() const; void setMessageId(long messageId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); private: long messageId_; - std::string accessKeyId_; long appKey_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/QueryTagsRequest.h b/push/include/alibabacloud/push/model/QueryTagsRequest.h index e2302f503..6b34f7d11 100644 --- a/push/include/alibabacloud/push/model/QueryTagsRequest.h +++ b/push/include/alibabacloud/push/model/QueryTagsRequest.h @@ -32,8 +32,6 @@ public: ~QueryTagsRequest(); std::string getKeyType() const; void setKeyType(const std::string &keyType); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getClientKey() const; void setClientKey(const std::string &clientKey); long getAppKey() const; @@ -41,7 +39,6 @@ public: private: std::string keyType_; - std::string accessKeyId_; std::string clientKey_; long appKey_; }; diff --git a/push/include/alibabacloud/push/model/QueryUniqueDeviceStatRequest.h b/push/include/alibabacloud/push/model/QueryUniqueDeviceStatRequest.h index ba7e23c07..4171dcb10 100644 --- a/push/include/alibabacloud/push/model/QueryUniqueDeviceStatRequest.h +++ b/push/include/alibabacloud/push/model/QueryUniqueDeviceStatRequest.h @@ -34,8 +34,6 @@ public: void setEndTime(const std::string &endTime); std::string getStartTime() const; void setStartTime(const std::string &startTime); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getGranularity() const; void setGranularity(const std::string &granularity); long getAppKey() const; @@ -44,7 +42,6 @@ public: private: std::string endTime_; std::string startTime_; - std::string accessKeyId_; std::string granularity_; long appKey_; }; diff --git a/push/include/alibabacloud/push/model/RemoveTagRequest.h b/push/include/alibabacloud/push/model/RemoveTagRequest.h index d12961682..211356fbb 100644 --- a/push/include/alibabacloud/push/model/RemoveTagRequest.h +++ b/push/include/alibabacloud/push/model/RemoveTagRequest.h @@ -30,15 +30,12 @@ class ALIBABACLOUD_PUSH_EXPORT RemoveTagRequest : public RpcServiceRequest { public: RemoveTagRequest(); ~RemoveTagRequest(); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getTagName() const; void setTagName(const std::string &tagName); long getAppKey() const; void setAppKey(long appKey); private: - std::string accessKeyId_; std::string tagName_; long appKey_; }; diff --git a/push/include/alibabacloud/push/model/UnbindAliasRequest.h b/push/include/alibabacloud/push/model/UnbindAliasRequest.h index d3748da3d..bd97af190 100644 --- a/push/include/alibabacloud/push/model/UnbindAliasRequest.h +++ b/push/include/alibabacloud/push/model/UnbindAliasRequest.h @@ -32,8 +32,6 @@ public: ~UnbindAliasRequest(); std::string getDeviceId() const; void setDeviceId(const std::string &deviceId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getAliasName() const; void setAliasName(const std::string &aliasName); long getAppKey() const; @@ -43,7 +41,6 @@ public: private: std::string deviceId_; - std::string accessKeyId_; std::string aliasName_; long appKey_; bool unbindAll_; diff --git a/push/include/alibabacloud/push/model/UnbindPhoneRequest.h b/push/include/alibabacloud/push/model/UnbindPhoneRequest.h index 6c9bf13f6..544e66513 100644 --- a/push/include/alibabacloud/push/model/UnbindPhoneRequest.h +++ b/push/include/alibabacloud/push/model/UnbindPhoneRequest.h @@ -32,14 +32,11 @@ public: ~UnbindPhoneRequest(); std::string getDeviceId() const; void setDeviceId(const std::string &deviceId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); long getAppKey() const; void setAppKey(long appKey); private: std::string deviceId_; - std::string accessKeyId_; long appKey_; }; } // namespace Model diff --git a/push/include/alibabacloud/push/model/UnbindTagRequest.h b/push/include/alibabacloud/push/model/UnbindTagRequest.h index 1bf49aa63..79858e186 100644 --- a/push/include/alibabacloud/push/model/UnbindTagRequest.h +++ b/push/include/alibabacloud/push/model/UnbindTagRequest.h @@ -32,8 +32,6 @@ public: ~UnbindTagRequest(); std::string getKeyType() const; void setKeyType(const std::string &keyType); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); std::string getTagName() const; void setTagName(const std::string &tagName); std::string getClientKey() const; @@ -43,7 +41,6 @@ public: private: std::string keyType_; - std::string accessKeyId_; std::string tagName_; std::string clientKey_; long appKey_; diff --git a/push/src/model/BindAliasRequest.cc b/push/src/model/BindAliasRequest.cc index c635b3ec4..8840c268c 100644 --- a/push/src/model/BindAliasRequest.cc +++ b/push/src/model/BindAliasRequest.cc @@ -34,15 +34,6 @@ void BindAliasRequest::setDeviceId(const std::string &deviceId) { setParameter(std::string("DeviceId"), deviceId); } -std::string BindAliasRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void BindAliasRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string BindAliasRequest::getAliasName() const { return aliasName_; } diff --git a/push/src/model/BindPhoneRequest.cc b/push/src/model/BindPhoneRequest.cc index c4fef8279..dfe797eb2 100644 --- a/push/src/model/BindPhoneRequest.cc +++ b/push/src/model/BindPhoneRequest.cc @@ -43,15 +43,6 @@ void BindPhoneRequest::setDeviceId(const std::string &deviceId) { setParameter(std::string("DeviceId"), deviceId); } -std::string BindPhoneRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void BindPhoneRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long BindPhoneRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/BindTagRequest.cc b/push/src/model/BindTagRequest.cc index a7b584c05..8ceb0d2be 100644 --- a/push/src/model/BindTagRequest.cc +++ b/push/src/model/BindTagRequest.cc @@ -34,15 +34,6 @@ void BindTagRequest::setKeyType(const std::string &keyType) { setParameter(std::string("KeyType"), keyType); } -std::string BindTagRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void BindTagRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string BindTagRequest::getTagName() const { return tagName_; } diff --git a/push/src/model/CancelPushRequest.cc b/push/src/model/CancelPushRequest.cc index a197c0c34..836ccb248 100644 --- a/push/src/model/CancelPushRequest.cc +++ b/push/src/model/CancelPushRequest.cc @@ -34,15 +34,6 @@ void CancelPushRequest::setMessageId(long messageId) { setParameter(std::string("MessageId"), std::to_string(messageId)); } -std::string CancelPushRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void CancelPushRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long CancelPushRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/CheckDeviceRequest.cc b/push/src/model/CheckDeviceRequest.cc index c46d91332..dc3b76036 100644 --- a/push/src/model/CheckDeviceRequest.cc +++ b/push/src/model/CheckDeviceRequest.cc @@ -34,15 +34,6 @@ void CheckDeviceRequest::setDeviceId(const std::string &deviceId) { setParameter(std::string("DeviceId"), deviceId); } -std::string CheckDeviceRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void CheckDeviceRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long CheckDeviceRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/CheckDevicesRequest.cc b/push/src/model/CheckDevicesRequest.cc index 0afe30f3c..c55419e82 100644 --- a/push/src/model/CheckDevicesRequest.cc +++ b/push/src/model/CheckDevicesRequest.cc @@ -34,15 +34,6 @@ void CheckDevicesRequest::setDeviceIds(const std::string &deviceIds) { setParameter(std::string("DeviceIds"), deviceIds); } -std::string CheckDevicesRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void CheckDevicesRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long CheckDevicesRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/CheckDevicesResult.cc b/push/src/model/CheckDevicesResult.cc index 5514762e0..002ebb105 100644 --- a/push/src/model/CheckDevicesResult.cc +++ b/push/src/model/CheckDevicesResult.cc @@ -43,10 +43,10 @@ void CheckDevicesResult::parse(const std::string &payload) for (auto valueDeviceCheckInfosDeviceCheckInfo : allDeviceCheckInfosNode) { DeviceCheckInfo deviceCheckInfosObject; - if(!valueDeviceCheckInfosDeviceCheckInfo["DeviceId"].isNull()) - deviceCheckInfosObject.deviceId = valueDeviceCheckInfosDeviceCheckInfo["DeviceId"].asString(); if(!valueDeviceCheckInfosDeviceCheckInfo["Available"].isNull()) deviceCheckInfosObject.available = valueDeviceCheckInfosDeviceCheckInfo["Available"].asString() == "true"; + if(!valueDeviceCheckInfosDeviceCheckInfo["DeviceId"].isNull()) + deviceCheckInfosObject.deviceId = valueDeviceCheckInfosDeviceCheckInfo["DeviceId"].asString(); deviceCheckInfos_.push_back(deviceCheckInfosObject); } diff --git a/push/src/model/CompleteContinuouslyPushRequest.cc b/push/src/model/CompleteContinuouslyPushRequest.cc index d21d83afe..2c88b5069 100644 --- a/push/src/model/CompleteContinuouslyPushRequest.cc +++ b/push/src/model/CompleteContinuouslyPushRequest.cc @@ -34,15 +34,6 @@ void CompleteContinuouslyPushRequest::setMessageId(const std::string &messageId) setParameter(std::string("MessageId"), messageId); } -std::string CompleteContinuouslyPushRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void CompleteContinuouslyPushRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long CompleteContinuouslyPushRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/ContinuouslyPushRequest.cc b/push/src/model/ContinuouslyPushRequest.cc index 7c861822f..aa846d6a2 100644 --- a/push/src/model/ContinuouslyPushRequest.cc +++ b/push/src/model/ContinuouslyPushRequest.cc @@ -34,15 +34,6 @@ void ContinuouslyPushRequest::setMessageId(const std::string &messageId) { setParameter(std::string("MessageId"), messageId); } -std::string ContinuouslyPushRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void ContinuouslyPushRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string ContinuouslyPushRequest::getTarget() const { return target_; } diff --git a/push/src/model/ListSummaryAppsRequest.cc b/push/src/model/ListSummaryAppsRequest.cc index d0bd9b0b9..4d7c9ab6b 100644 --- a/push/src/model/ListSummaryAppsRequest.cc +++ b/push/src/model/ListSummaryAppsRequest.cc @@ -25,12 +25,3 @@ ListSummaryAppsRequest::ListSummaryAppsRequest() ListSummaryAppsRequest::~ListSummaryAppsRequest() {} -std::string ListSummaryAppsRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void ListSummaryAppsRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - diff --git a/push/src/model/ListSummaryAppsResult.cc b/push/src/model/ListSummaryAppsResult.cc index 39d9ce566..3ec9d5732 100644 --- a/push/src/model/ListSummaryAppsResult.cc +++ b/push/src/model/ListSummaryAppsResult.cc @@ -43,10 +43,10 @@ void ListSummaryAppsResult::parse(const std::string &payload) for (auto valueSummaryAppInfosSummaryAppInfo : allSummaryAppInfosNode) { SummaryAppInfo summaryAppInfosObject; - if(!valueSummaryAppInfosSummaryAppInfo["AppName"].isNull()) - summaryAppInfosObject.appName = valueSummaryAppInfosSummaryAppInfo["AppName"].asString(); if(!valueSummaryAppInfosSummaryAppInfo["AppKey"].isNull()) summaryAppInfosObject.appKey = std::stol(valueSummaryAppInfosSummaryAppInfo["AppKey"].asString()); + if(!valueSummaryAppInfosSummaryAppInfo["AppName"].isNull()) + summaryAppInfosObject.appName = valueSummaryAppInfosSummaryAppInfo["AppName"].asString(); summaryAppInfos_.push_back(summaryAppInfosObject); } diff --git a/push/src/model/ListTagsRequest.cc b/push/src/model/ListTagsRequest.cc index c078a83f1..2145d712e 100644 --- a/push/src/model/ListTagsRequest.cc +++ b/push/src/model/ListTagsRequest.cc @@ -25,15 +25,6 @@ ListTagsRequest::ListTagsRequest() ListTagsRequest::~ListTagsRequest() {} -std::string ListTagsRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void ListTagsRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long ListTagsRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/MassPushRequest.cc b/push/src/model/MassPushRequest.cc index 9b7a2b00c..2a8bf4194 100644 --- a/push/src/model/MassPushRequest.cc +++ b/push/src/model/MassPushRequest.cc @@ -25,15 +25,6 @@ MassPushRequest::MassPushRequest() MassPushRequest::~MassPushRequest() {} -std::string MassPushRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void MassPushRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::vector MassPushRequest::getPushTask() const { return pushTask_; } @@ -44,6 +35,7 @@ void MassPushRequest::setPushTask(const std::vector & auto pushTaskObj = pushTask.at(dep1); std::string pushTaskObjStr = std::string("PushTask") + "." + std::to_string(dep1 + 1); setBodyParameter(pushTaskObjStr + ".AndroidNotificationBarType", std::to_string(pushTaskObj.androidNotificationBarType)); + setBodyParameter(pushTaskObjStr + ".AndroidMessageOppoNotifyLevel", std::to_string(pushTaskObj.androidMessageOppoNotifyLevel)); setBodyParameter(pushTaskObjStr + ".Body", pushTaskObj.body); setBodyParameter(pushTaskObjStr + ".DeviceType", pushTaskObj.deviceType); setBodyParameter(pushTaskObjStr + ".PushTime", pushTaskObj.pushTime); @@ -64,6 +56,7 @@ void MassPushRequest::setPushTask(const std::vector & setBodyParameter(pushTaskObjStr + ".AndroidNotificationBarPriority", std::to_string(pushTaskObj.androidNotificationBarPriority)); setBodyParameter(pushTaskObjStr + ".ExpireTime", pushTaskObj.expireTime); setBodyParameter(pushTaskObjStr + ".AndroidImageUrl", pushTaskObj.androidImageUrl); + setBodyParameter(pushTaskObjStr + ".AndroidNotificationThreadId", pushTaskObj.androidNotificationThreadId); setBodyParameter(pushTaskObjStr + ".AndroidHonorTargetUserType", std::to_string(pushTaskObj.androidHonorTargetUserType)); setBodyParameter(pushTaskObjStr + ".HarmonyRemindBody", pushTaskObj.harmonyRemindBody); setBodyParameter(pushTaskObjStr + ".AndroidNotificationVivoChannel", pushTaskObj.androidNotificationVivoChannel); @@ -127,6 +120,7 @@ void MassPushRequest::setPushTask(const std::vector & setBodyParameter(pushTaskObjStr + ".AndroidRemind", pushTaskObj.androidRemind ? "true" : "false"); setBodyParameter(pushTaskObjStr + ".HarmonyInboxContent", pushTaskObj.harmonyInboxContent); setBodyParameter(pushTaskObjStr + ".AndroidActivity", pushTaskObj.androidActivity); + setBodyParameter(pushTaskObjStr + ".AndroidMessageOppoCategory", pushTaskObj.androidMessageOppoCategory); setBodyParameter(pushTaskObjStr + ".AndroidNotificationNotifyId", std::to_string(pushTaskObj.androidNotificationNotifyId)); setBodyParameter(pushTaskObjStr + ".TargetValue", pushTaskObj.targetValue); setBodyParameter(pushTaskObjStr + ".HarmonyBadgeSetNum", std::to_string(pushTaskObj.harmonyBadgeSetNum)); diff --git a/push/src/model/PushMessageToAndroidRequest.cc b/push/src/model/PushMessageToAndroidRequest.cc index 99780b081..3aeda2bcf 100644 --- a/push/src/model/PushMessageToAndroidRequest.cc +++ b/push/src/model/PushMessageToAndroidRequest.cc @@ -43,15 +43,6 @@ void PushMessageToAndroidRequest::setBody(const std::string &body) { setParameter(std::string("Body"), body); } -std::string PushMessageToAndroidRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void PushMessageToAndroidRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - bool PushMessageToAndroidRequest::getStoreOffline() const { return storeOffline_; } diff --git a/push/src/model/PushMessageToiOSRequest.cc b/push/src/model/PushMessageToiOSRequest.cc index 0550d6a34..da1cc6b22 100644 --- a/push/src/model/PushMessageToiOSRequest.cc +++ b/push/src/model/PushMessageToiOSRequest.cc @@ -43,15 +43,6 @@ void PushMessageToiOSRequest::setBody(const std::string &body) { setParameter(std::string("Body"), body); } -std::string PushMessageToiOSRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void PushMessageToiOSRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - bool PushMessageToiOSRequest::getStoreOffline() const { return storeOffline_; } diff --git a/push/src/model/PushNoticeToAndroidRequest.cc b/push/src/model/PushNoticeToAndroidRequest.cc index 05401734a..2e53c3c66 100644 --- a/push/src/model/PushNoticeToAndroidRequest.cc +++ b/push/src/model/PushNoticeToAndroidRequest.cc @@ -43,15 +43,6 @@ void PushNoticeToAndroidRequest::setBody(const std::string &body) { setParameter(std::string("Body"), body); } -std::string PushNoticeToAndroidRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void PushNoticeToAndroidRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string PushNoticeToAndroidRequest::getExtParameters() const { return extParameters_; } diff --git a/push/src/model/PushNoticeToiOSRequest.cc b/push/src/model/PushNoticeToiOSRequest.cc index 75a4845ca..27a2707f8 100644 --- a/push/src/model/PushNoticeToiOSRequest.cc +++ b/push/src/model/PushNoticeToiOSRequest.cc @@ -43,15 +43,6 @@ void PushNoticeToiOSRequest::setBody(const std::string &body) { setParameter(std::string("Body"), body); } -std::string PushNoticeToiOSRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void PushNoticeToiOSRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string PushNoticeToiOSRequest::getExtParameters() const { return extParameters_; } diff --git a/push/src/model/PushRequest.cc b/push/src/model/PushRequest.cc index a06063d9a..e7eae100a 100644 --- a/push/src/model/PushRequest.cc +++ b/push/src/model/PushRequest.cc @@ -34,6 +34,15 @@ void PushRequest::setAndroidNotificationBarType(int androidNotificationBarType) setParameter(std::string("AndroidNotificationBarType"), std::to_string(androidNotificationBarType)); } +int PushRequest::getAndroidMessageOppoNotifyLevel() const { + return androidMessageOppoNotifyLevel_; +} + +void PushRequest::setAndroidMessageOppoNotifyLevel(int androidMessageOppoNotifyLevel) { + androidMessageOppoNotifyLevel_ = androidMessageOppoNotifyLevel; + setParameter(std::string("AndroidMessageOppoNotifyLevel"), std::to_string(androidMessageOppoNotifyLevel)); +} + std::string PushRequest::getDeviceType() const { return deviceType_; } @@ -295,15 +304,6 @@ void PushRequest::setAndroidXiaomiImageUrl(const std::string &androidXiaomiImage setParameter(std::string("AndroidXiaomiImageUrl"), androidXiaomiImageUrl); } -std::string PushRequest::getSmsTemplateName() const { - return smsTemplateName_; -} - -void PushRequest::setSmsTemplateName(const std::string &smsTemplateName) { - smsTemplateName_ = smsTemplateName; - setParameter(std::string("SmsTemplateName"), smsTemplateName); -} - std::string PushRequest::getHarmonyUri() const { return harmonyUri_; } @@ -313,6 +313,15 @@ void PushRequest::setHarmonyUri(const std::string &harmonyUri) { setParameter(std::string("HarmonyUri"), harmonyUri); } +std::string PushRequest::getSmsTemplateName() const { + return smsTemplateName_; +} + +void PushRequest::setSmsTemplateName(const std::string &smsTemplateName) { + smsTemplateName_ = smsTemplateName; + setParameter(std::string("SmsTemplateName"), smsTemplateName); +} + std::string PushRequest::getHarmonyExtParameters() const { return harmonyExtParameters_; } @@ -538,6 +547,15 @@ void PushRequest::setIOSMutableContent(bool iOSMutableContent) { setParameter(std::string("iOSMutableContent"), iOSMutableContent ? "true" : "false"); } +std::string PushRequest::getAndroidNotificationThreadId() const { + return androidNotificationThreadId_; +} + +void PushRequest::setAndroidNotificationThreadId(const std::string &androidNotificationThreadId) { + androidNotificationThreadId_ = androidNotificationThreadId; + setParameter(std::string("AndroidNotificationThreadId"), androidNotificationThreadId); +} + int PushRequest::getAndroidHonorTargetUserType() const { return androidHonorTargetUserType_; } @@ -763,15 +781,6 @@ void PushRequest::setTitle(const std::string &title) { setParameter(std::string("Title"), title); } -std::string PushRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void PushRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - int PushRequest::getHarmonyBadgeAddNum() const { return harmonyBadgeAddNum_; } @@ -880,6 +889,15 @@ void PushRequest::setHarmonyInboxContent(const std::string &harmonyInboxContent) setParameter(std::string("HarmonyInboxContent"), harmonyInboxContent); } +std::string PushRequest::getAndroidMessageOppoCategory() const { + return androidMessageOppoCategory_; +} + +void PushRequest::setAndroidMessageOppoCategory(const std::string &androidMessageOppoCategory) { + androidMessageOppoCategory_ = androidMessageOppoCategory; + setParameter(std::string("AndroidMessageOppoCategory"), androidMessageOppoCategory); +} + std::string PushRequest::getAndroidXiaoMiActivity() const { return androidXiaoMiActivity_; } diff --git a/push/src/model/QueryAliasesRequest.cc b/push/src/model/QueryAliasesRequest.cc index fb376f1ed..82ddea6e4 100644 --- a/push/src/model/QueryAliasesRequest.cc +++ b/push/src/model/QueryAliasesRequest.cc @@ -34,15 +34,6 @@ void QueryAliasesRequest::setDeviceId(const std::string &deviceId) { setParameter(std::string("DeviceId"), deviceId); } -std::string QueryAliasesRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void QueryAliasesRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long QueryAliasesRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/QueryDeviceInfoRequest.cc b/push/src/model/QueryDeviceInfoRequest.cc index af7bb816c..0e25495d6 100644 --- a/push/src/model/QueryDeviceInfoRequest.cc +++ b/push/src/model/QueryDeviceInfoRequest.cc @@ -34,15 +34,6 @@ void QueryDeviceInfoRequest::setDeviceId(const std::string &deviceId) { setParameter(std::string("DeviceId"), deviceId); } -std::string QueryDeviceInfoRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void QueryDeviceInfoRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long QueryDeviceInfoRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/QueryDeviceInfoResult.cc b/push/src/model/QueryDeviceInfoResult.cc index fc3c4c427..c59bc5728 100644 --- a/push/src/model/QueryDeviceInfoResult.cc +++ b/push/src/model/QueryDeviceInfoResult.cc @@ -42,28 +42,28 @@ void QueryDeviceInfoResult::parse(const std::string &payload) auto deviceInfoNode = value["DeviceInfo"]; if(!deviceInfoNode["Account"].isNull()) deviceInfo_.account = deviceInfoNode["Account"].asString(); - if(!deviceInfoNode["LastOnlineTime"].isNull()) - deviceInfo_.lastOnlineTime = deviceInfoNode["LastOnlineTime"].asString(); - if(!deviceInfoNode["PhoneNumber"].isNull()) - deviceInfo_.phoneNumber = deviceInfoNode["PhoneNumber"].asString(); - if(!deviceInfoNode["PushEnabled"].isNull()) - deviceInfo_.pushEnabled = deviceInfoNode["PushEnabled"].asString() == "true"; - if(!deviceInfoNode["DeviceType"].isNull()) - deviceInfo_.deviceType = deviceInfoNode["DeviceType"].asString(); - if(!deviceInfoNode["DeviceId"].isNull()) - deviceInfo_.deviceId = deviceInfoNode["DeviceId"].asString(); - if(!deviceInfoNode["Online"].isNull()) - deviceInfo_.online = deviceInfoNode["Online"].asString() == "true"; - if(!deviceInfoNode["Tags"].isNull()) - deviceInfo_.tags = deviceInfoNode["Tags"].asString(); - if(!deviceInfoNode["DeviceToken"].isNull()) - deviceInfo_.deviceToken = deviceInfoNode["DeviceToken"].asString(); if(!deviceInfoNode["Alias"].isNull()) deviceInfo_.alias = deviceInfoNode["Alias"].asString(); if(!deviceInfoNode["Brand"].isNull()) deviceInfo_.brand = deviceInfoNode["Brand"].asString(); + if(!deviceInfoNode["DeviceId"].isNull()) + deviceInfo_.deviceId = deviceInfoNode["DeviceId"].asString(); + if(!deviceInfoNode["DeviceToken"].isNull()) + deviceInfo_.deviceToken = deviceInfoNode["DeviceToken"].asString(); + if(!deviceInfoNode["DeviceType"].isNull()) + deviceInfo_.deviceType = deviceInfoNode["DeviceType"].asString(); + if(!deviceInfoNode["LastOnlineTime"].isNull()) + deviceInfo_.lastOnlineTime = deviceInfoNode["LastOnlineTime"].asString(); if(!deviceInfoNode["Model"].isNull()) deviceInfo_.model = deviceInfoNode["Model"].asString(); + if(!deviceInfoNode["Online"].isNull()) + deviceInfo_.online = deviceInfoNode["Online"].asString() == "true"; + if(!deviceInfoNode["PhoneNumber"].isNull()) + deviceInfo_.phoneNumber = deviceInfoNode["PhoneNumber"].asString(); + if(!deviceInfoNode["PushEnabled"].isNull()) + deviceInfo_.pushEnabled = deviceInfoNode["PushEnabled"].asString() == "true"; + if(!deviceInfoNode["Tags"].isNull()) + deviceInfo_.tags = deviceInfoNode["Tags"].asString(); } diff --git a/push/src/model/QueryDeviceStatRequest.cc b/push/src/model/QueryDeviceStatRequest.cc index bee32b833..3dad23b7c 100644 --- a/push/src/model/QueryDeviceStatRequest.cc +++ b/push/src/model/QueryDeviceStatRequest.cc @@ -52,15 +52,6 @@ void QueryDeviceStatRequest::setDeviceType(const std::string &deviceType) { setParameter(std::string("DeviceType"), deviceType); } -std::string QueryDeviceStatRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void QueryDeviceStatRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long QueryDeviceStatRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/QueryDeviceStatResult.cc b/push/src/model/QueryDeviceStatResult.cc index acb6e3642..502932498 100644 --- a/push/src/model/QueryDeviceStatResult.cc +++ b/push/src/model/QueryDeviceStatResult.cc @@ -43,12 +43,12 @@ void QueryDeviceStatResult::parse(const std::string &payload) for (auto valueAppDeviceStatsAppDeviceStat : allAppDeviceStatsNode) { AppDeviceStat appDeviceStatsObject; - if(!valueAppDeviceStatsAppDeviceStat["Time"].isNull()) - appDeviceStatsObject.time = valueAppDeviceStatsAppDeviceStat["Time"].asString(); - if(!valueAppDeviceStatsAppDeviceStat["DeviceType"].isNull()) - appDeviceStatsObject.deviceType = valueAppDeviceStatsAppDeviceStat["DeviceType"].asString(); if(!valueAppDeviceStatsAppDeviceStat["Count"].isNull()) appDeviceStatsObject.count = std::stol(valueAppDeviceStatsAppDeviceStat["Count"].asString()); + if(!valueAppDeviceStatsAppDeviceStat["DeviceType"].isNull()) + appDeviceStatsObject.deviceType = valueAppDeviceStatsAppDeviceStat["DeviceType"].asString(); + if(!valueAppDeviceStatsAppDeviceStat["Time"].isNull()) + appDeviceStatsObject.time = valueAppDeviceStatsAppDeviceStat["Time"].asString(); appDeviceStats_.push_back(appDeviceStatsObject); } diff --git a/push/src/model/QueryDevicesByAccountRequest.cc b/push/src/model/QueryDevicesByAccountRequest.cc index dabf44d7a..12b8d83eb 100644 --- a/push/src/model/QueryDevicesByAccountRequest.cc +++ b/push/src/model/QueryDevicesByAccountRequest.cc @@ -25,15 +25,6 @@ QueryDevicesByAccountRequest::QueryDevicesByAccountRequest() QueryDevicesByAccountRequest::~QueryDevicesByAccountRequest() {} -std::string QueryDevicesByAccountRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void QueryDevicesByAccountRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long QueryDevicesByAccountRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/QueryDevicesByAliasRequest.cc b/push/src/model/QueryDevicesByAliasRequest.cc index d9ecbaa8f..9fe9328ff 100644 --- a/push/src/model/QueryDevicesByAliasRequest.cc +++ b/push/src/model/QueryDevicesByAliasRequest.cc @@ -25,15 +25,6 @@ QueryDevicesByAliasRequest::QueryDevicesByAliasRequest() QueryDevicesByAliasRequest::~QueryDevicesByAliasRequest() {} -std::string QueryDevicesByAliasRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void QueryDevicesByAliasRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string QueryDevicesByAliasRequest::getAlias() const { return alias_; } diff --git a/push/src/model/QueryPushStatByAppRequest.cc b/push/src/model/QueryPushStatByAppRequest.cc index 20ce1ffa5..2b6fd3661 100644 --- a/push/src/model/QueryPushStatByAppRequest.cc +++ b/push/src/model/QueryPushStatByAppRequest.cc @@ -43,15 +43,6 @@ void QueryPushStatByAppRequest::setStartTime(const std::string &startTime) { setParameter(std::string("StartTime"), startTime); } -std::string QueryPushStatByAppRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void QueryPushStatByAppRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string QueryPushStatByAppRequest::getGranularity() const { return granularity_; } diff --git a/push/src/model/QueryPushStatByAppResult.cc b/push/src/model/QueryPushStatByAppResult.cc index fad0eb6a9..011a7f0a4 100644 --- a/push/src/model/QueryPushStatByAppResult.cc +++ b/push/src/model/QueryPushStatByAppResult.cc @@ -43,28 +43,28 @@ void QueryPushStatByAppResult::parse(const std::string &payload) for (auto valueAppPushStatsAppPushStat : allAppPushStatsNode) { AppPushStat appPushStatsObject; - if(!valueAppPushStatsAppPushStat["Time"].isNull()) - appPushStatsObject.time = valueAppPushStatsAppPushStat["Time"].asString(); + if(!valueAppPushStatsAppPushStat["AcceptCount"].isNull()) + appPushStatsObject.acceptCount = std::stol(valueAppPushStatsAppPushStat["AcceptCount"].asString()); if(!valueAppPushStatsAppPushStat["DeletedCount"].isNull()) appPushStatsObject.deletedCount = std::stol(valueAppPushStatsAppPushStat["DeletedCount"].asString()); if(!valueAppPushStatsAppPushStat["OpenedCount"].isNull()) appPushStatsObject.openedCount = std::stol(valueAppPushStatsAppPushStat["OpenedCount"].asString()); - if(!valueAppPushStatsAppPushStat["SmsReceiveSuccessCount"].isNull()) - appPushStatsObject.smsReceiveSuccessCount = std::stol(valueAppPushStatsAppPushStat["SmsReceiveSuccessCount"].asString()); - if(!valueAppPushStatsAppPushStat["SmsSkipCount"].isNull()) - appPushStatsObject.smsSkipCount = std::stol(valueAppPushStatsAppPushStat["SmsSkipCount"].asString()); - if(!valueAppPushStatsAppPushStat["SmsReceiveFailedCount"].isNull()) - appPushStatsObject.smsReceiveFailedCount = std::stol(valueAppPushStatsAppPushStat["SmsReceiveFailedCount"].asString()); - if(!valueAppPushStatsAppPushStat["SmsFailedCount"].isNull()) - appPushStatsObject.smsFailedCount = std::stol(valueAppPushStatsAppPushStat["SmsFailedCount"].asString()); if(!valueAppPushStatsAppPushStat["ReceivedCount"].isNull()) appPushStatsObject.receivedCount = std::stol(valueAppPushStatsAppPushStat["ReceivedCount"].asString()); if(!valueAppPushStatsAppPushStat["SentCount"].isNull()) appPushStatsObject.sentCount = std::stol(valueAppPushStatsAppPushStat["SentCount"].asString()); + if(!valueAppPushStatsAppPushStat["SmsFailedCount"].isNull()) + appPushStatsObject.smsFailedCount = std::stol(valueAppPushStatsAppPushStat["SmsFailedCount"].asString()); + if(!valueAppPushStatsAppPushStat["SmsReceiveFailedCount"].isNull()) + appPushStatsObject.smsReceiveFailedCount = std::stol(valueAppPushStatsAppPushStat["SmsReceiveFailedCount"].asString()); + if(!valueAppPushStatsAppPushStat["SmsReceiveSuccessCount"].isNull()) + appPushStatsObject.smsReceiveSuccessCount = std::stol(valueAppPushStatsAppPushStat["SmsReceiveSuccessCount"].asString()); if(!valueAppPushStatsAppPushStat["SmsSentCount"].isNull()) appPushStatsObject.smsSentCount = std::stol(valueAppPushStatsAppPushStat["SmsSentCount"].asString()); - if(!valueAppPushStatsAppPushStat["AcceptCount"].isNull()) - appPushStatsObject.acceptCount = std::stol(valueAppPushStatsAppPushStat["AcceptCount"].asString()); + if(!valueAppPushStatsAppPushStat["SmsSkipCount"].isNull()) + appPushStatsObject.smsSkipCount = std::stol(valueAppPushStatsAppPushStat["SmsSkipCount"].asString()); + if(!valueAppPushStatsAppPushStat["Time"].isNull()) + appPushStatsObject.time = valueAppPushStatsAppPushStat["Time"].asString(); appPushStats_.push_back(appPushStatsObject); } diff --git a/push/src/model/QueryPushStatByMsgRequest.cc b/push/src/model/QueryPushStatByMsgRequest.cc index 5296a6e6d..97408ba2d 100644 --- a/push/src/model/QueryPushStatByMsgRequest.cc +++ b/push/src/model/QueryPushStatByMsgRequest.cc @@ -34,15 +34,6 @@ void QueryPushStatByMsgRequest::setMessageId(long messageId) { setParameter(std::string("MessageId"), std::to_string(messageId)); } -std::string QueryPushStatByMsgRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void QueryPushStatByMsgRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long QueryPushStatByMsgRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/QueryPushStatByMsgResult.cc b/push/src/model/QueryPushStatByMsgResult.cc index edbb73d39..b1863a006 100644 --- a/push/src/model/QueryPushStatByMsgResult.cc +++ b/push/src/model/QueryPushStatByMsgResult.cc @@ -43,28 +43,28 @@ void QueryPushStatByMsgResult::parse(const std::string &payload) for (auto valuePushStatsPushStat : allPushStatsNode) { PushStat pushStatsObject; - if(!valuePushStatsPushStat["MessageId"].isNull()) - pushStatsObject.messageId = valuePushStatsPushStat["MessageId"].asString(); + if(!valuePushStatsPushStat["AcceptCount"].isNull()) + pushStatsObject.acceptCount = std::stol(valuePushStatsPushStat["AcceptCount"].asString()); if(!valuePushStatsPushStat["DeletedCount"].isNull()) pushStatsObject.deletedCount = std::stol(valuePushStatsPushStat["DeletedCount"].asString()); + if(!valuePushStatsPushStat["MessageId"].isNull()) + pushStatsObject.messageId = valuePushStatsPushStat["MessageId"].asString(); if(!valuePushStatsPushStat["OpenedCount"].isNull()) pushStatsObject.openedCount = std::stol(valuePushStatsPushStat["OpenedCount"].asString()); - if(!valuePushStatsPushStat["SmsReceiveSuccessCount"].isNull()) - pushStatsObject.smsReceiveSuccessCount = std::stol(valuePushStatsPushStat["SmsReceiveSuccessCount"].asString()); - if(!valuePushStatsPushStat["SmsSkipCount"].isNull()) - pushStatsObject.smsSkipCount = std::stol(valuePushStatsPushStat["SmsSkipCount"].asString()); - if(!valuePushStatsPushStat["SmsReceiveFailedCount"].isNull()) - pushStatsObject.smsReceiveFailedCount = std::stol(valuePushStatsPushStat["SmsReceiveFailedCount"].asString()); - if(!valuePushStatsPushStat["SmsFailedCount"].isNull()) - pushStatsObject.smsFailedCount = std::stol(valuePushStatsPushStat["SmsFailedCount"].asString()); if(!valuePushStatsPushStat["ReceivedCount"].isNull()) pushStatsObject.receivedCount = std::stol(valuePushStatsPushStat["ReceivedCount"].asString()); if(!valuePushStatsPushStat["SentCount"].isNull()) pushStatsObject.sentCount = std::stol(valuePushStatsPushStat["SentCount"].asString()); + if(!valuePushStatsPushStat["SmsFailedCount"].isNull()) + pushStatsObject.smsFailedCount = std::stol(valuePushStatsPushStat["SmsFailedCount"].asString()); + if(!valuePushStatsPushStat["SmsReceiveFailedCount"].isNull()) + pushStatsObject.smsReceiveFailedCount = std::stol(valuePushStatsPushStat["SmsReceiveFailedCount"].asString()); + if(!valuePushStatsPushStat["SmsReceiveSuccessCount"].isNull()) + pushStatsObject.smsReceiveSuccessCount = std::stol(valuePushStatsPushStat["SmsReceiveSuccessCount"].asString()); if(!valuePushStatsPushStat["SmsSentCount"].isNull()) pushStatsObject.smsSentCount = std::stol(valuePushStatsPushStat["SmsSentCount"].asString()); - if(!valuePushStatsPushStat["AcceptCount"].isNull()) - pushStatsObject.acceptCount = std::stol(valuePushStatsPushStat["AcceptCount"].asString()); + if(!valuePushStatsPushStat["SmsSkipCount"].isNull()) + pushStatsObject.smsSkipCount = std::stol(valuePushStatsPushStat["SmsSkipCount"].asString()); pushStats_.push_back(pushStatsObject); } diff --git a/push/src/model/QueryTagsRequest.cc b/push/src/model/QueryTagsRequest.cc index c031c8c13..b229b17d1 100644 --- a/push/src/model/QueryTagsRequest.cc +++ b/push/src/model/QueryTagsRequest.cc @@ -34,15 +34,6 @@ void QueryTagsRequest::setKeyType(const std::string &keyType) { setParameter(std::string("KeyType"), keyType); } -std::string QueryTagsRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void QueryTagsRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string QueryTagsRequest::getClientKey() const { return clientKey_; } diff --git a/push/src/model/QueryUniqueDeviceStatRequest.cc b/push/src/model/QueryUniqueDeviceStatRequest.cc index 2e11a6078..1b58b2e25 100644 --- a/push/src/model/QueryUniqueDeviceStatRequest.cc +++ b/push/src/model/QueryUniqueDeviceStatRequest.cc @@ -43,15 +43,6 @@ void QueryUniqueDeviceStatRequest::setStartTime(const std::string &startTime) { setParameter(std::string("StartTime"), startTime); } -std::string QueryUniqueDeviceStatRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void QueryUniqueDeviceStatRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string QueryUniqueDeviceStatRequest::getGranularity() const { return granularity_; } diff --git a/push/src/model/QueryUniqueDeviceStatResult.cc b/push/src/model/QueryUniqueDeviceStatResult.cc index e6e6ed958..015e09d9c 100644 --- a/push/src/model/QueryUniqueDeviceStatResult.cc +++ b/push/src/model/QueryUniqueDeviceStatResult.cc @@ -43,10 +43,10 @@ void QueryUniqueDeviceStatResult::parse(const std::string &payload) for (auto valueAppDeviceStatsAppDeviceStat : allAppDeviceStatsNode) { AppDeviceStat appDeviceStatsObject; - if(!valueAppDeviceStatsAppDeviceStat["Time"].isNull()) - appDeviceStatsObject.time = valueAppDeviceStatsAppDeviceStat["Time"].asString(); if(!valueAppDeviceStatsAppDeviceStat["Count"].isNull()) appDeviceStatsObject.count = std::stol(valueAppDeviceStatsAppDeviceStat["Count"].asString()); + if(!valueAppDeviceStatsAppDeviceStat["Time"].isNull()) + appDeviceStatsObject.time = valueAppDeviceStatsAppDeviceStat["Time"].asString(); appDeviceStats_.push_back(appDeviceStatsObject); } diff --git a/push/src/model/RemoveTagRequest.cc b/push/src/model/RemoveTagRequest.cc index a59e213ae..ab2536203 100644 --- a/push/src/model/RemoveTagRequest.cc +++ b/push/src/model/RemoveTagRequest.cc @@ -25,15 +25,6 @@ RemoveTagRequest::RemoveTagRequest() RemoveTagRequest::~RemoveTagRequest() {} -std::string RemoveTagRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void RemoveTagRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string RemoveTagRequest::getTagName() const { return tagName_; } diff --git a/push/src/model/UnbindAliasRequest.cc b/push/src/model/UnbindAliasRequest.cc index f5098b9c1..56e701101 100644 --- a/push/src/model/UnbindAliasRequest.cc +++ b/push/src/model/UnbindAliasRequest.cc @@ -34,15 +34,6 @@ void UnbindAliasRequest::setDeviceId(const std::string &deviceId) { setParameter(std::string("DeviceId"), deviceId); } -std::string UnbindAliasRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void UnbindAliasRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string UnbindAliasRequest::getAliasName() const { return aliasName_; } diff --git a/push/src/model/UnbindPhoneRequest.cc b/push/src/model/UnbindPhoneRequest.cc index aaab3feec..64a005ac9 100644 --- a/push/src/model/UnbindPhoneRequest.cc +++ b/push/src/model/UnbindPhoneRequest.cc @@ -34,15 +34,6 @@ void UnbindPhoneRequest::setDeviceId(const std::string &deviceId) { setParameter(std::string("DeviceId"), deviceId); } -std::string UnbindPhoneRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void UnbindPhoneRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - long UnbindPhoneRequest::getAppKey() const { return appKey_; } diff --git a/push/src/model/UnbindTagRequest.cc b/push/src/model/UnbindTagRequest.cc index f353e0e3d..ff80a6dc2 100644 --- a/push/src/model/UnbindTagRequest.cc +++ b/push/src/model/UnbindTagRequest.cc @@ -34,15 +34,6 @@ void UnbindTagRequest::setKeyType(const std::string &keyType) { setParameter(std::string("KeyType"), keyType); } -std::string UnbindTagRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void UnbindTagRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - std::string UnbindTagRequest::getTagName() const { return tagName_; }