Supported AndroidMessageOppoCategory, AndroidMessageOppoNotifyLevel for Push and MassPush.

2024-11-13 03:46:58 +00:00
parent c32d539146
commit 689a48e2ef
68 changed files with 108 additions and 414 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-1.36.2015
+1.36.2016
--- 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_;
 };
--- 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
--- 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_;
--- 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
--- 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
--- 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
--- 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
--- 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_;
--- 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
--- 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
--- 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<PushTask> getPushTask() const;
 	void setPushTask(const std::vector<PushTask> &pushTask);
 	long getAppKey() const;
 	void setAppKey(long appKey);

 private:
-	std::string accessKeyId_;
 	std::vector<PushTask> pushTask_;
 	long appKey_;
 };
--- 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_;
--- 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_;
--- 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_;
--- 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_;
--- 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
--- 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
--- 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
--- 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;
--- 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_;
 };
--- 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_;
 };
--- 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_;
 };
--- 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_;
 };
--- 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;
--- 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
--- 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_;
 };
--- 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_;
 };
--- 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_;
 };
--- 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_;
--- 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
--- 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_;
--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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);
 	}

--- 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_;
 }
--- 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_;
 }
--- 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);
-}
-
--- 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);
 	}

--- 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_;
 }
--- 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::PushTask> MassPushRequest::getPushTask() const {
  return pushTask_;
 }
@@ -44,6 +35,7 @@ void MassPushRequest::setPushTask(const std::vector<MassPushRequest::PushTask> &
  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<MassPushRequest::PushTask> &
    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<MassPushRequest::PushTask> &
    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));
--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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();

 }

--- 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_;
 }
--- 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);
 	}

--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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);
 	}

--- 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_;
 }
--- 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);
 	}

--- 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_;
 }
--- 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_;
 }
--- 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);
 	}

--- 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_;
 }
--- 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_;
 }
--- 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_;
 }
--- 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_;
 }