diff --git a/CHANGELOG b/CHANGELOG index f65ada638..b82bc0270 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2021-08-31 Version: 1.36.864 +- Supported AndroidBigPictureUrl, AndroidInboxBody, AndroidImageUrl, AndroidOppoImageId, AndroidXiaomiImageUrl, iOSNotificationThreadId for Push and MassPush. + 2021-08-31 Version: 1.36.863 - Release BeautifyBody. diff --git a/VERSION b/VERSION index ea1846fc7..cd61c9aa4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.863 \ No newline at end of file +1.36.864 \ 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 34a19da0b..82cd8ec95 100644 --- a/push/include/alibabacloud/push/model/MassPushRequest.h +++ b/push/include/alibabacloud/push/model/MassPushRequest.h @@ -34,12 +34,6 @@ namespace AlibabaCloud struct PushTask { int androidNotificationBarType; - std::string androidExtParameters; - int iOSBadge; - std::string androidBigBody; - bool iOSBadgeAutoIncrement; - std::string androidOpenType; - std::string title; std::string body; std::string deviceType; std::string pushTime; @@ -47,8 +41,6 @@ namespace AlibabaCloud std::string androidNotificationHuaweiChannel; std::string androidPopupActivity; std::string iOSRemindBody; - std::string androidRenderStyle; - std::string iOSExtParameters; std::string androidNotifyType; std::string androidPopupTitle; std::string iOSMusic; @@ -56,30 +48,43 @@ namespace AlibabaCloud bool iOSMutableContent; int androidNotificationBarPriority; std::string expireTime; + std::string androidImageUrl; std::string androidNotificationVivoChannel; - std::string androidPopupBody; std::string iOSNotificationCategory; std::string androidNotificationXiaomiChannel; bool storeOffline; - bool iOSSilentNotification; + std::string androidInboxBody; std::string jobKey; - std::string target; - std::string androidBigTitle; std::string androidOpenUrl; - std::string androidNotificationChannel; - bool androidRemind; - std::string androidActivity; std::string androidXiaoMiNotifyBody; std::string iOSSubtitle; std::string androidXiaomiBigPictureUrl; bool iOSRemind; - int androidNotificationNotifyId; - std::string targetValue; + std::string iOSNotificationThreadId; std::string androidMusic; - std::string androidXiaoMiActivity; - std::string androidXiaoMiNotifyTitle; std::string iOSNotificationCollapseId; std::string pushType; + std::string androidExtParameters; + int iOSBadge; + std::string androidBigBody; + bool iOSBadgeAutoIncrement; + std::string androidOpenType; + std::string title; + std::string androidRenderStyle; + std::string iOSExtParameters; + std::string androidXiaomiImageUrl; + std::string androidPopupBody; + std::string androidBigPictureUrl; + bool iOSSilentNotification; + std::string target; + std::string androidBigTitle; + std::string androidNotificationChannel; + bool androidRemind; + std::string androidActivity; + int androidNotificationNotifyId; + std::string targetValue; + std::string androidXiaoMiNotifyTitle; + std::string androidXiaoMiActivity; }; public: diff --git a/push/include/alibabacloud/push/model/PushRequest.h b/push/include/alibabacloud/push/model/PushRequest.h index 9a64b9940..cf96a6f1d 100644 --- a/push/include/alibabacloud/push/model/PushRequest.h +++ b/push/include/alibabacloud/push/model/PushRequest.h @@ -67,6 +67,8 @@ namespace AlibabaCloud void setAndroidNotificationBarPriority(int androidNotificationBarPriority); std::string getExpireTime()const; void setExpireTime(const std::string& expireTime); + std::string getAndroidImageUrl()const; + void setAndroidImageUrl(const std::string& androidImageUrl); std::string getAndroidNotificationVivoChannel()const; void setAndroidNotificationVivoChannel(const std::string& androidNotificationVivoChannel); std::string getIOSNotificationCategory()const; @@ -77,6 +79,8 @@ namespace AlibabaCloud void setStoreOffline(bool storeOffline); std::string getSmsParams()const; void setSmsParams(const std::string& smsParams); + std::string getAndroidInboxBody()const; + void setAndroidInboxBody(const std::string& androidInboxBody); std::string getJobKey()const; void setJobKey(const std::string& jobKey); std::string getAndroidOpenUrl()const; @@ -89,6 +93,8 @@ namespace AlibabaCloud void setAndroidXiaomiBigPictureUrl(const std::string& androidXiaomiBigPictureUrl); bool getIOSRemind()const; void setIOSRemind(bool iOSRemind); + std::string getIOSNotificationThreadId()const; + void setIOSNotificationThreadId(const std::string& iOSNotificationThreadId); std::string getAndroidMusic()const; void setAndroidMusic(const std::string& androidMusic); std::string getIOSNotificationCollapseId()const; @@ -115,10 +121,14 @@ namespace AlibabaCloud void setAndroidRenderStyle(int androidRenderStyle); std::string getIOSExtParameters()const; 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 getAndroidPopupBody()const; void setAndroidPopupBody(const std::string& androidPopupBody); + std::string getAndroidBigPictureUrl()const; + void setAndroidBigPictureUrl(const std::string& androidBigPictureUrl); bool getIOSSilentNotification()const; void setIOSSilentNotification(bool iOSSilentNotification); std::string getTarget()const; @@ -161,17 +171,20 @@ namespace AlibabaCloud bool iOSMutableContent_; int androidNotificationBarPriority_; std::string expireTime_; + std::string androidImageUrl_; std::string androidNotificationVivoChannel_; std::string iOSNotificationCategory_; std::string androidNotificationXiaomiChannel_; bool storeOffline_; std::string smsParams_; + std::string androidInboxBody_; std::string jobKey_; std::string androidOpenUrl_; std::string androidXiaoMiNotifyBody_; std::string iOSSubtitle_; std::string androidXiaomiBigPictureUrl_; bool iOSRemind_; + std::string iOSNotificationThreadId_; std::string androidMusic_; std::string iOSNotificationCollapseId_; std::string pushType_; @@ -185,8 +198,10 @@ namespace AlibabaCloud int smsDelaySecs_; int androidRenderStyle_; std::string iOSExtParameters_; + std::string androidXiaomiImageUrl_; std::string smsTemplateName_; std::string androidPopupBody_; + std::string androidBigPictureUrl_; bool iOSSilentNotification_; std::string target_; std::string androidBigTitle_; diff --git a/push/src/model/MassPushRequest.cc b/push/src/model/MassPushRequest.cc index 957b34f46..0f2ed5187 100644 --- a/push/src/model/MassPushRequest.cc +++ b/push/src/model/MassPushRequest.cc @@ -50,12 +50,6 @@ void MassPushRequest::setPushTask(const std::vector& pushTask) auto pushTaskObj = pushTask.at(dep1); std::string pushTaskObjStr = "PushTask." + std::to_string(dep1 + 1); setParameter(pushTaskObjStr + ".AndroidNotificationBarType", std::to_string(pushTaskObj.androidNotificationBarType)); - setParameter(pushTaskObjStr + ".AndroidExtParameters", pushTaskObj.androidExtParameters); - setParameter(pushTaskObjStr + ".IOSBadge", std::to_string(pushTaskObj.iOSBadge)); - setParameter(pushTaskObjStr + ".AndroidBigBody", pushTaskObj.androidBigBody); - setParameter(pushTaskObjStr + ".IOSBadgeAutoIncrement", pushTaskObj.iOSBadgeAutoIncrement ? "true" : "false"); - setParameter(pushTaskObjStr + ".AndroidOpenType", pushTaskObj.androidOpenType); - setParameter(pushTaskObjStr + ".Title", pushTaskObj.title); setParameter(pushTaskObjStr + ".Body", pushTaskObj.body); setParameter(pushTaskObjStr + ".DeviceType", pushTaskObj.deviceType); setParameter(pushTaskObjStr + ".PushTime", pushTaskObj.pushTime); @@ -63,8 +57,6 @@ void MassPushRequest::setPushTask(const std::vector& pushTask) setParameter(pushTaskObjStr + ".AndroidNotificationHuaweiChannel", pushTaskObj.androidNotificationHuaweiChannel); setParameter(pushTaskObjStr + ".AndroidPopupActivity", pushTaskObj.androidPopupActivity); setParameter(pushTaskObjStr + ".IOSRemindBody", pushTaskObj.iOSRemindBody); - setParameter(pushTaskObjStr + ".AndroidRenderStyle", pushTaskObj.androidRenderStyle); - setParameter(pushTaskObjStr + ".IOSExtParameters", pushTaskObj.iOSExtParameters); setParameter(pushTaskObjStr + ".AndroidNotifyType", pushTaskObj.androidNotifyType); setParameter(pushTaskObjStr + ".AndroidPopupTitle", pushTaskObj.androidPopupTitle); setParameter(pushTaskObjStr + ".IOSMusic", pushTaskObj.iOSMusic); @@ -72,30 +64,43 @@ void MassPushRequest::setPushTask(const std::vector& pushTask) setParameter(pushTaskObjStr + ".IOSMutableContent", pushTaskObj.iOSMutableContent ? "true" : "false"); setParameter(pushTaskObjStr + ".AndroidNotificationBarPriority", std::to_string(pushTaskObj.androidNotificationBarPriority)); setParameter(pushTaskObjStr + ".ExpireTime", pushTaskObj.expireTime); + setParameter(pushTaskObjStr + ".AndroidImageUrl", pushTaskObj.androidImageUrl); setParameter(pushTaskObjStr + ".AndroidNotificationVivoChannel", pushTaskObj.androidNotificationVivoChannel); - setParameter(pushTaskObjStr + ".AndroidPopupBody", pushTaskObj.androidPopupBody); setParameter(pushTaskObjStr + ".IOSNotificationCategory", pushTaskObj.iOSNotificationCategory); setParameter(pushTaskObjStr + ".AndroidNotificationXiaomiChannel", pushTaskObj.androidNotificationXiaomiChannel); setParameter(pushTaskObjStr + ".StoreOffline", pushTaskObj.storeOffline ? "true" : "false"); - setParameter(pushTaskObjStr + ".IOSSilentNotification", pushTaskObj.iOSSilentNotification ? "true" : "false"); + setParameter(pushTaskObjStr + ".AndroidInboxBody", pushTaskObj.androidInboxBody); setParameter(pushTaskObjStr + ".JobKey", pushTaskObj.jobKey); - setParameter(pushTaskObjStr + ".Target", pushTaskObj.target); - setParameter(pushTaskObjStr + ".AndroidBigTitle", pushTaskObj.androidBigTitle); setParameter(pushTaskObjStr + ".AndroidOpenUrl", pushTaskObj.androidOpenUrl); - setParameter(pushTaskObjStr + ".AndroidNotificationChannel", pushTaskObj.androidNotificationChannel); - setParameter(pushTaskObjStr + ".AndroidRemind", pushTaskObj.androidRemind ? "true" : "false"); - setParameter(pushTaskObjStr + ".AndroidActivity", pushTaskObj.androidActivity); setParameter(pushTaskObjStr + ".AndroidXiaoMiNotifyBody", pushTaskObj.androidXiaoMiNotifyBody); setParameter(pushTaskObjStr + ".IOSSubtitle", pushTaskObj.iOSSubtitle); setParameter(pushTaskObjStr + ".AndroidXiaomiBigPictureUrl", pushTaskObj.androidXiaomiBigPictureUrl); setParameter(pushTaskObjStr + ".IOSRemind", pushTaskObj.iOSRemind ? "true" : "false"); - setParameter(pushTaskObjStr + ".AndroidNotificationNotifyId", std::to_string(pushTaskObj.androidNotificationNotifyId)); - setParameter(pushTaskObjStr + ".TargetValue", pushTaskObj.targetValue); + setParameter(pushTaskObjStr + ".IOSNotificationThreadId", pushTaskObj.iOSNotificationThreadId); setParameter(pushTaskObjStr + ".AndroidMusic", pushTaskObj.androidMusic); - setParameter(pushTaskObjStr + ".AndroidXiaoMiActivity", pushTaskObj.androidXiaoMiActivity); - setParameter(pushTaskObjStr + ".AndroidXiaoMiNotifyTitle", pushTaskObj.androidXiaoMiNotifyTitle); setParameter(pushTaskObjStr + ".IOSNotificationCollapseId", pushTaskObj.iOSNotificationCollapseId); setParameter(pushTaskObjStr + ".PushType", pushTaskObj.pushType); + setParameter(pushTaskObjStr + ".AndroidExtParameters", pushTaskObj.androidExtParameters); + setParameter(pushTaskObjStr + ".IOSBadge", std::to_string(pushTaskObj.iOSBadge)); + setParameter(pushTaskObjStr + ".AndroidBigBody", pushTaskObj.androidBigBody); + setParameter(pushTaskObjStr + ".IOSBadgeAutoIncrement", pushTaskObj.iOSBadgeAutoIncrement ? "true" : "false"); + setParameter(pushTaskObjStr + ".AndroidOpenType", pushTaskObj.androidOpenType); + setParameter(pushTaskObjStr + ".Title", pushTaskObj.title); + setParameter(pushTaskObjStr + ".AndroidRenderStyle", pushTaskObj.androidRenderStyle); + setParameter(pushTaskObjStr + ".IOSExtParameters", pushTaskObj.iOSExtParameters); + setParameter(pushTaskObjStr + ".AndroidXiaomiImageUrl", pushTaskObj.androidXiaomiImageUrl); + setParameter(pushTaskObjStr + ".AndroidPopupBody", pushTaskObj.androidPopupBody); + setParameter(pushTaskObjStr + ".AndroidBigPictureUrl", pushTaskObj.androidBigPictureUrl); + setParameter(pushTaskObjStr + ".IOSSilentNotification", pushTaskObj.iOSSilentNotification ? "true" : "false"); + setParameter(pushTaskObjStr + ".Target", pushTaskObj.target); + setParameter(pushTaskObjStr + ".AndroidBigTitle", pushTaskObj.androidBigTitle); + setParameter(pushTaskObjStr + ".AndroidNotificationChannel", pushTaskObj.androidNotificationChannel); + setParameter(pushTaskObjStr + ".AndroidRemind", pushTaskObj.androidRemind ? "true" : "false"); + setParameter(pushTaskObjStr + ".AndroidActivity", pushTaskObj.androidActivity); + setParameter(pushTaskObjStr + ".AndroidNotificationNotifyId", std::to_string(pushTaskObj.androidNotificationNotifyId)); + setParameter(pushTaskObjStr + ".TargetValue", pushTaskObj.targetValue); + setParameter(pushTaskObjStr + ".AndroidXiaoMiNotifyTitle", pushTaskObj.androidXiaoMiNotifyTitle); + setParameter(pushTaskObjStr + ".AndroidXiaoMiActivity", pushTaskObj.androidXiaoMiActivity); } } diff --git a/push/src/model/PushRequest.cc b/push/src/model/PushRequest.cc index fd2e4ca32..e9acefdd6 100644 --- a/push/src/model/PushRequest.cc +++ b/push/src/model/PushRequest.cc @@ -203,6 +203,17 @@ void PushRequest::setExpireTime(const std::string& expireTime) setParameter("ExpireTime", expireTime); } +std::string PushRequest::getAndroidImageUrl()const +{ + return androidImageUrl_; +} + +void PushRequest::setAndroidImageUrl(const std::string& androidImageUrl) +{ + androidImageUrl_ = androidImageUrl; + setParameter("AndroidImageUrl", androidImageUrl); +} + std::string PushRequest::getAndroidNotificationVivoChannel()const { return androidNotificationVivoChannel_; @@ -258,6 +269,17 @@ void PushRequest::setSmsParams(const std::string& smsParams) setParameter("SmsParams", smsParams); } +std::string PushRequest::getAndroidInboxBody()const +{ + return androidInboxBody_; +} + +void PushRequest::setAndroidInboxBody(const std::string& androidInboxBody) +{ + androidInboxBody_ = androidInboxBody; + setParameter("AndroidInboxBody", androidInboxBody); +} + std::string PushRequest::getJobKey()const { return jobKey_; @@ -324,6 +346,17 @@ void PushRequest::setIOSRemind(bool iOSRemind) setParameter("IOSRemind", iOSRemind ? "true" : "false"); } +std::string PushRequest::getIOSNotificationThreadId()const +{ + return iOSNotificationThreadId_; +} + +void PushRequest::setIOSNotificationThreadId(const std::string& iOSNotificationThreadId) +{ + iOSNotificationThreadId_ = iOSNotificationThreadId; + setParameter("IOSNotificationThreadId", iOSNotificationThreadId); +} + std::string PushRequest::getAndroidMusic()const { return androidMusic_; @@ -467,6 +500,17 @@ void PushRequest::setIOSExtParameters(const std::string& iOSExtParameters) setParameter("IOSExtParameters", iOSExtParameters); } +std::string PushRequest::getAndroidXiaomiImageUrl()const +{ + return androidXiaomiImageUrl_; +} + +void PushRequest::setAndroidXiaomiImageUrl(const std::string& androidXiaomiImageUrl) +{ + androidXiaomiImageUrl_ = androidXiaomiImageUrl; + setParameter("AndroidXiaomiImageUrl", androidXiaomiImageUrl); +} + std::string PushRequest::getSmsTemplateName()const { return smsTemplateName_; @@ -489,6 +533,17 @@ void PushRequest::setAndroidPopupBody(const std::string& androidPopupBody) setParameter("AndroidPopupBody", androidPopupBody); } +std::string PushRequest::getAndroidBigPictureUrl()const +{ + return androidBigPictureUrl_; +} + +void PushRequest::setAndroidBigPictureUrl(const std::string& androidBigPictureUrl) +{ + androidBigPictureUrl_ = androidBigPictureUrl; + setParameter("AndroidBigPictureUrl", androidBigPictureUrl); +} + bool PushRequest::getIOSSilentNotification()const { return iOSSilentNotification_;