PushPayload中增加inapp_message的参数支持

Author: RuiboZhang1

example/main/java/cn/jpush/api/examples/PushExample.java

@@ -32,8 +32,8 @@ public class PushExample {
     protected static final Logger LOG = LoggerFactory.getLogger(PushExample.class);
 
     // demo App defined in resources/jpush-api.conf 
-    protected static final String APP_KEY = "32f266ea08c3b3d7a059b378";
-    protected static final String MASTER_SECRET = "03b3ab9ae0a099ef26dd2168";
+    protected static final String APP_KEY = "8f02a4fa717a6235734d92de";
+    protected static final String MASTER_SECRET = "cf6de29f9e66432ba4ac1c32";
     protected static final String GROUP_PUSH_KEY = "2c88a01e073a0fe4fc7b167c";
     protected static final String GROUP_MASTER_SECRET = "b11314807507e2bcfdeebe2e";
 
@@ -281,7 +281,7 @@ public static PushPayload buildPushObject_android_and_ios() {
                 .setPlatform(Platform.android_ios())
                 .setAudience(Audience.all())
                 .setNotification(Notification.newBuilder()
-                        .setAiOpportunity(true)
+                        .setAiOpportunity(false)
                         .setAlert("testing alert content")
                         .addPlatformNotification(AndroidNotification.newBuilder()
                                 .setTitle("Android Title")

src/main/java/cn/jpush/api/push/model/InappMessage.java

@@ -0,0 +1,47 @@
+package cn.jpush.api.push.model;
+
+import cn.jiguang.common.utils.Preconditions;
+
+import cn.jpush.api.push.model.notification.Notification;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+
+public class InappMessage implements PushModel{
+
+    private boolean inappMessage;
+
+    private InappMessage(boolean inappMessage) {
+        this.inappMessage = inappMessage;
+    }
+
+    public static Builder newBuilder() { return new Builder(); }
+
+    public static InappMessage inappMessage(boolean inappMessage) {
+        return newBuilder().setInappMessage(inappMessage).build();
+    }
+
+
+    @Override
+    public JsonElement toJSON() {
+        JsonObject json = new JsonObject();
+
+        json.addProperty("inapp_message", inappMessage);
+
+        return json;
+    }
+
+
+    public static class Builder {
+        private boolean inappMessage;
+
+        public Builder setInappMessage(boolean inappMessage) {
+            this.inappMessage = inappMessage;
+            return this;
+        }
+
+        public InappMessage build() {
+            return new InappMessage(inappMessage);
+        }
+    }
+}

src/main/java/cn/jpush/api/push/model/PushPayload.java

@@ -31,6 +31,7 @@ public class PushPayload implements PushModel {
     private static final String PLATFORM = "platform";
     private static final String AUDIENCE = "audience";
     private static final String NOTIFICATION = "notification";
+    private static final String INAPPMESSAGE = "inapp_message";
     private static final String MESSAGE = "message";
     private static final String OPTIONS = "options";
     private static final String SMS = "sms_message";
@@ -52,6 +53,7 @@ public class PushPayload implements PushModel {
     private final Platform platform;
     private final Audience audience;
     private final Notification notification;
+    private final InappMessage inappMessage;
     private final Message message;
     private Options options;
     private SMS sms;
@@ -60,10 +62,11 @@ public class PushPayload implements PushModel {
     protected Map<String, JsonObject> custom;
 
     private PushPayload(Platform platform, Audience audience, 
-            Notification notification, Message message, Options options, SMS sms, String cid, String target, Map<String, JsonObject> custom) {
+            Notification notification, InappMessage inappMessage, Message message, Options options, SMS sms, String cid, String target, Map<String, JsonObject> custom) {
         this.platform = platform;
         this.audience = audience;
         this.notification = notification;
+        this.inappMessage = inappMessage;
         this.message = message;
         this.options = options;
         this.sms = sms;
@@ -186,6 +189,9 @@ public JsonElement toJSON() {
         if (null != notification) {
             json.add(NOTIFICATION, notification.toJSON());
         }
+        if (null != inappMessage) {
+            json.add(INAPPMESSAGE, inappMessage.toJSON());
+        }
         if (null != message) {
             json.add(MESSAGE, message.toJSON());
         }
@@ -261,6 +267,7 @@ public static class Builder {
         private Platform platform = null;
         private Audience audience = null;
         private Notification notification = null;
+        private InappMessage inappMessage = null;
         private Message message = null;
         private Options options = null;
         private SMS sms = null;
@@ -291,6 +298,11 @@ public Builder setNotification(Notification notification) {
             this.notification = notification;
             return this;
         }
+
+        public Builder setInappMessage(InappMessage inappMessage) {
+            this.inappMessage = inappMessage;
+            return this;
+        }
 
         public Builder setMessage(Message message) {
             this.message = message;
@@ -336,7 +348,7 @@ public PushPayload build() {
                 options = Options.sendno();
             }
 
-            return new PushPayload(platform, audience, notification, message, options, sms, cid, target, custom);
+            return new PushPayload(platform, audience, notification, inappMessage, message, options, sms, cid, target, custom);
         }
     }
 }