diff --git a/VERSION b/VERSION index d89c718ba..50b129040 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1503 \ No newline at end of file +1.36.1504 \ No newline at end of file diff --git a/push/include/alibabacloud/push/model/MassPushRequest.h b/push/include/alibabacloud/push/model/MassPushRequest.h index c59637154..7ff9dde86 100644 --- a/push/include/alibabacloud/push/model/MassPushRequest.h +++ b/push/include/alibabacloud/push/model/MassPushRequest.h @@ -38,6 +38,7 @@ public: std::string androidPopupActivity; std::string iOSRemindBody; bool trim; + std::string androidMessageVivoCategory; std::string androidNotifyType; std::string androidPopupTitle; std::string androidMessageHuaweiCategory; @@ -61,6 +62,7 @@ public: std::string androidXiaomiBigPictureUrl; bool iOSRemind; std::string iOSNotificationThreadId; + int androidHuaweiTargetUserType; std::string androidMusic; std::string iOSNotificationCollapseId; std::string androidMessageHuaweiUrgency; @@ -74,6 +76,7 @@ public: std::string title; std::string androidRenderStyle; std::string iOSExtParameters; + std::string androidHuaweiReceiptId; std::string androidNotificationHonorChannel; std::string androidXiaomiImageUrl; std::string androidPopupBody; diff --git a/push/include/alibabacloud/push/model/PushRequest.h b/push/include/alibabacloud/push/model/PushRequest.h index b3df8d904..5ee742058 100644 --- a/push/include/alibabacloud/push/model/PushRequest.h +++ b/push/include/alibabacloud/push/model/PushRequest.h @@ -50,6 +50,8 @@ public: void setIOSRemindBody(const std::string &iOSRemindBody); bool getTrim() const; void setTrim(bool trim); + std::string getAndroidMessageVivoCategory() const; + void setAndroidMessageVivoCategory(const std::string &androidMessageVivoCategory); std::string getAndroidNotifyType() const; void setAndroidNotifyType(const std::string &androidNotifyType); std::string getAndroidPopupTitle() const; @@ -98,6 +100,8 @@ public: void setIOSRemind(bool iOSRemind); std::string getIOSNotificationThreadId() const; void setIOSNotificationThreadId(const std::string &iOSNotificationThreadId); + int getAndroidHuaweiTargetUserType() const; + void setAndroidHuaweiTargetUserType(int androidHuaweiTargetUserType); std::string getAndroidMusic() const; void setAndroidMusic(const std::string &androidMusic); std::string getIOSNotificationCollapseId() const; @@ -128,6 +132,8 @@ public: void setAndroidRenderStyle(int androidRenderStyle); std::string getIOSExtParameters() const; void setIOSExtParameters(const std::string &iOSExtParameters); + std::string getAndroidHuaweiReceiptId() const; + void setAndroidHuaweiReceiptId(const std::string &androidHuaweiReceiptId); std::string getAndroidNotificationHonorChannel() const; void setAndroidNotificationHonorChannel(const std::string &androidNotificationHonorChannel); std::string getAndroidXiaomiImageUrl() const; @@ -178,6 +184,7 @@ private: std::string androidPopupActivity_; std::string iOSRemindBody_; bool trim_; + std::string androidMessageVivoCategory_; std::string androidNotifyType_; std::string androidPopupTitle_; std::string androidMessageHuaweiCategory_; @@ -202,6 +209,7 @@ private: std::string androidXiaomiBigPictureUrl_; bool iOSRemind_; std::string iOSNotificationThreadId_; + int androidHuaweiTargetUserType_; std::string androidMusic_; std::string iOSNotificationCollapseId_; std::string androidMessageHuaweiUrgency_; @@ -217,6 +225,7 @@ private: int smsDelaySecs_; int androidRenderStyle_; std::string iOSExtParameters_; + std::string androidHuaweiReceiptId_; std::string androidNotificationHonorChannel_; std::string androidXiaomiImageUrl_; std::string smsTemplateName_; diff --git a/push/src/model/MassPushRequest.cc b/push/src/model/MassPushRequest.cc index 579474483..0625c9b62 100644 --- a/push/src/model/MassPushRequest.cc +++ b/push/src/model/MassPushRequest.cc @@ -52,6 +52,7 @@ void MassPushRequest::setPushTask(const std::vector & setBodyParameter(pushTaskObjStr + ".AndroidPopupActivity", pushTaskObj.androidPopupActivity); setBodyParameter(pushTaskObjStr + ".iOSRemindBody", pushTaskObj.iOSRemindBody); setBodyParameter(pushTaskObjStr + ".Trim", pushTaskObj.trim ? "true" : "false"); + setBodyParameter(pushTaskObjStr + ".AndroidMessageVivoCategory", pushTaskObj.androidMessageVivoCategory); setBodyParameter(pushTaskObjStr + ".AndroidNotifyType", pushTaskObj.androidNotifyType); setBodyParameter(pushTaskObjStr + ".AndroidPopupTitle", pushTaskObj.androidPopupTitle); setBodyParameter(pushTaskObjStr + ".AndroidMessageHuaweiCategory", pushTaskObj.androidMessageHuaweiCategory); @@ -75,6 +76,7 @@ void MassPushRequest::setPushTask(const std::vector & setBodyParameter(pushTaskObjStr + ".AndroidXiaomiBigPictureUrl", pushTaskObj.androidXiaomiBigPictureUrl); setBodyParameter(pushTaskObjStr + ".iOSRemind", pushTaskObj.iOSRemind ? "true" : "false"); setBodyParameter(pushTaskObjStr + ".iOSNotificationThreadId", pushTaskObj.iOSNotificationThreadId); + setBodyParameter(pushTaskObjStr + ".AndroidHuaweiTargetUserType", std::to_string(pushTaskObj.androidHuaweiTargetUserType)); setBodyParameter(pushTaskObjStr + ".AndroidMusic", pushTaskObj.androidMusic); setBodyParameter(pushTaskObjStr + ".iOSNotificationCollapseId", pushTaskObj.iOSNotificationCollapseId); setBodyParameter(pushTaskObjStr + ".AndroidMessageHuaweiUrgency", pushTaskObj.androidMessageHuaweiUrgency); @@ -88,6 +90,7 @@ void MassPushRequest::setPushTask(const std::vector & setBodyParameter(pushTaskObjStr + ".Title", pushTaskObj.title); setBodyParameter(pushTaskObjStr + ".AndroidRenderStyle", pushTaskObj.androidRenderStyle); setBodyParameter(pushTaskObjStr + ".iOSExtParameters", pushTaskObj.iOSExtParameters); + setBodyParameter(pushTaskObjStr + ".AndroidHuaweiReceiptId", pushTaskObj.androidHuaweiReceiptId); setBodyParameter(pushTaskObjStr + ".AndroidNotificationHonorChannel", pushTaskObj.androidNotificationHonorChannel); setBodyParameter(pushTaskObjStr + ".AndroidXiaomiImageUrl", pushTaskObj.androidXiaomiImageUrl); setBodyParameter(pushTaskObjStr + ".AndroidPopupBody", pushTaskObj.androidPopupBody); diff --git a/push/src/model/PushRequest.cc b/push/src/model/PushRequest.cc index 4980f59a5..709265897 100644 --- a/push/src/model/PushRequest.cc +++ b/push/src/model/PushRequest.cc @@ -115,6 +115,15 @@ void PushRequest::setTrim(bool trim) { setParameter(std::string("Trim"), trim ? "true" : "false"); } +std::string PushRequest::getAndroidMessageVivoCategory() const { + return androidMessageVivoCategory_; +} + +void PushRequest::setAndroidMessageVivoCategory(const std::string &androidMessageVivoCategory) { + androidMessageVivoCategory_ = androidMessageVivoCategory; + setParameter(std::string("AndroidMessageVivoCategory"), androidMessageVivoCategory); +} + std::string PushRequest::getAndroidNotifyType() const { return androidNotifyType_; } @@ -331,6 +340,15 @@ void PushRequest::setIOSNotificationThreadId(const std::string &iOSNotificationT setParameter(std::string("iOSNotificationThreadId"), iOSNotificationThreadId); } +int PushRequest::getAndroidHuaweiTargetUserType() const { + return androidHuaweiTargetUserType_; +} + +void PushRequest::setAndroidHuaweiTargetUserType(int androidHuaweiTargetUserType) { + androidHuaweiTargetUserType_ = androidHuaweiTargetUserType; + setParameter(std::string("AndroidHuaweiTargetUserType"), std::to_string(androidHuaweiTargetUserType)); +} + std::string PushRequest::getAndroidMusic() const { return androidMusic_; } @@ -466,6 +484,15 @@ void PushRequest::setIOSExtParameters(const std::string &iOSExtParameters) { setParameter(std::string("iOSExtParameters"), iOSExtParameters); } +std::string PushRequest::getAndroidHuaweiReceiptId() const { + return androidHuaweiReceiptId_; +} + +void PushRequest::setAndroidHuaweiReceiptId(const std::string &androidHuaweiReceiptId) { + androidHuaweiReceiptId_ = androidHuaweiReceiptId; + setParameter(std::string("AndroidHuaweiReceiptId"), androidHuaweiReceiptId); +} + std::string PushRequest::getAndroidNotificationHonorChannel() const { return androidNotificationHonorChannel_; }