Supported AndroidTargetUserType. AndroidHonorTargetUserType for Push and MassPush.

push/src/model/MassPushRequest.cc

@@ -62,6 +62,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 + ".AndroidHonorTargetUserType", std::to_string(pushTaskObj.androidHonorTargetUserType));
     setBodyParameter(pushTaskObjStr + ".AndroidNotificationVivoChannel", pushTaskObj.androidNotificationVivoChannel);
     setBodyParameter(pushTaskObjStr + ".iOSNotificationCategory", pushTaskObj.iOSNotificationCategory);
     setBodyParameter(pushTaskObjStr + ".AndroidNotificationXiaomiChannel", pushTaskObj.androidNotificationXiaomiChannel);
@@ -93,6 +94,7 @@ void MassPushRequest::setPushTask(const std::vector<MassPushRequest::PushTask> &
     setBodyParameter(pushTaskObjStr + ".AndroidHuaweiReceiptId", pushTaskObj.androidHuaweiReceiptId);
     setBodyParameter(pushTaskObjStr + ".AndroidNotificationHonorChannel", pushTaskObj.androidNotificationHonorChannel);
     setBodyParameter(pushTaskObjStr + ".AndroidXiaomiImageUrl", pushTaskObj.androidXiaomiImageUrl);
+    setBodyParameter(pushTaskObjStr + ".AndroidTargetUserType", std::to_string(pushTaskObj.androidTargetUserType));
     setBodyParameter(pushTaskObjStr + ".AndroidPopupBody", pushTaskObj.androidPopupBody);
     setBodyParameter(pushTaskObjStr + ".AndroidBigPictureUrl", pushTaskObj.androidBigPictureUrl);
     setBodyParameter(pushTaskObjStr + ".iOSSilentNotification", pushTaskObj.iOSSilentNotification ? "true" : "false");

push/src/model/PushMessageToAndroidRequest.cc

@@ -25,6 +25,15 @@ PushMessageToAndroidRequest::PushMessageToAndroidRequest()
 
 PushMessageToAndroidRequest::~PushMessageToAndroidRequest() {}
 
+bool PushMessageToAndroidRequest::getStoreOffline() const {
+  return storeOffline_;
+}
+
+void PushMessageToAndroidRequest::setStoreOffline(bool storeOffline) {
+  storeOffline_ = storeOffline;
+  setParameter(std::string("StoreOffline"), storeOffline ? "true" : "false");
+}
+
 std::string PushMessageToAndroidRequest::getTitle() const {
   return title_;
 }

push/src/model/PushMessageToiOSRequest.cc

@@ -25,6 +25,15 @@ PushMessageToiOSRequest::PushMessageToiOSRequest()
 
 PushMessageToiOSRequest::~PushMessageToiOSRequest() {}
 
+bool PushMessageToiOSRequest::getStoreOffline() const {
+  return storeOffline_;
+}
+
+void PushMessageToiOSRequest::setStoreOffline(bool storeOffline) {
+  storeOffline_ = storeOffline;
+  setParameter(std::string("StoreOffline"), storeOffline ? "true" : "false");
+}
+
 std::string PushMessageToiOSRequest::getTitle() const {
   return title_;
 }

push/src/model/PushNoticeToAndroidRequest.cc

@@ -34,6 +34,15 @@ void PushNoticeToAndroidRequest::setExtParameters(const std::string &extParamete
   setParameter(std::string("ExtParameters"), extParameters);
 }
 
+bool PushNoticeToAndroidRequest::getStoreOffline() const {
+  return storeOffline_;
+}
+
+void PushNoticeToAndroidRequest::setStoreOffline(bool storeOffline) {
+  storeOffline_ = storeOffline;
+  setParameter(std::string("StoreOffline"), storeOffline ? "true" : "false");
+}
+
 std::string PushNoticeToAndroidRequest::getTitle() const {
   return title_;
 }

push/src/model/PushRequest.cc

@@ -205,6 +205,15 @@ void PushRequest::setAndroidImageUrl(const std::string &androidImageUrl) {
   setParameter(std::string("AndroidImageUrl"), androidImageUrl);
 }
 
+int PushRequest::getAndroidHonorTargetUserType() const {
+  return androidHonorTargetUserType_;
+}
+
+void PushRequest::setAndroidHonorTargetUserType(int androidHonorTargetUserType) {
+  androidHonorTargetUserType_ = androidHonorTargetUserType;
+  setParameter(std::string("AndroidHonorTargetUserType"), std::to_string(androidHonorTargetUserType));
+}
+
 std::string PushRequest::getAndroidNotificationVivoChannel() const {
   return androidNotificationVivoChannel_;
 }
@@ -511,6 +520,15 @@ void PushRequest::setAndroidXiaomiImageUrl(const std::string &androidXiaomiImage
   setParameter(std::string("AndroidXiaomiImageUrl"), androidXiaomiImageUrl);
 }
 
+int PushRequest::getAndroidTargetUserType() const {
+  return androidTargetUserType_;
+}
+
+void PushRequest::setAndroidTargetUserType(int androidTargetUserType) {
+  androidTargetUserType_ = androidTargetUserType;
+  setParameter(std::string("AndroidTargetUserType"), std::to_string(androidTargetUserType));
+}
+
 std::string PushRequest::getSmsTemplateName() const {
   return smsTemplateName_;
 }

push/src/model/QueryDeviceInfoResult.cc

@@ -60,6 +60,10 @@ void QueryDeviceInfoResult::parse(const std::string &payload)
 		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["Model"].isNull())
+		deviceInfo_.model = deviceInfoNode["Model"].asString();
 
 }