支持 iOS10 新特性，增加新字段

KenChoi1992 · KenChoi1992 · commit 0332236f66e8 · 2016-10-25T16:13:14.000+08:00
diff --git a/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java b/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java
@@ -35,6 +35,8 @@ public class IosNotification extends PlatformNotification {
     private static final String BADGE = "badge";
     private static final String SOUND = "sound";
     private static final String CONTENT_AVAILABLE = "content-available";
+    private static final String MUTABLE_CONTENT = "mutable-content";
+    private static final String SUBTITLE = "subtitle";
     private static final String CATEGORY = "category";
     
     private static final String ALERT_VALID_BADGE = "Badge number should be 0~99999, "
@@ -47,10 +49,13 @@ public class IosNotification extends PlatformNotification {
     private final String badge;
     private final boolean contentAvailable;
     private final String category;
+    private final boolean mutableContent;
+    private final String subtitle;
+
     
     private IosNotification(Object alert, String sound, String badge,
             boolean contentAvailable, boolean soundDisabled, boolean badgeDisabled, 
-            String category,
+            String category, boolean mutableContent, String subtitle,
             Map<String, String> extras, 
             Map<String, Number> numberExtras, 
             Map<String, Boolean> booleanExtras, 
@@ -63,6 +68,8 @@ private IosNotification(Object alert, String sound, String badge,
         this.soundDisabled = soundDisabled;
         this.badgeDisabled = badgeDisabled;
         this.category = category;
+        this.mutableContent = mutableContent;
+        this.subtitle = subtitle;
     }
     
     public static Builder newBuilder() {
@@ -103,6 +110,13 @@ public JsonElement toJSON() {
         if (null != category) {
         	json.add(CATEGORY, new JsonPrimitive(category));
         }
+        if (mutableContent) {
+            json.add(MUTABLE_CONTENT, new JsonPrimitive(1));
+        }
+        if (null != subtitle) {
+            json.add(SUBTITLE, new JsonPrimitive(subtitle));
+        }
+
         
         return json;
     }
@@ -115,6 +129,8 @@ public static class Builder extends PlatformNotification.Builder<IosNotification
         private boolean soundDisabled = false;
         private boolean badgeDisabled = false;
         private String category;
+        private boolean mutableContent;
+        private String subtitle;
         
         protected Builder getThis() {
         	return this;
@@ -181,10 +197,20 @@ public Builder setAlert(Object alert) {
             return this;
         }
 
+        public Builder setMutableContent(boolean mutableContent) {
+            this.mutableContent = mutableContent;
+            return this;
+        }
+
+        public Builder setSubtitle(String subtitle) {
+            this.subtitle = subtitle;
+            return this;
+        }
+
 
         public IosNotification build() {
             return new IosNotification(alert, sound, badge, contentAvailable, 
-                    soundDisabled, badgeDisabled, category,  
+                    soundDisabled, badgeDisabled, category, mutableContent, subtitle,
             		extrasBuilder, numberExtrasBuilder, booleanExtrasBuilder, jsonExtrasBuilder);
         }
     }
diff --git a/src/test/java/cn/jpush/api/push/PushClientTest.java b/src/test/java/cn/jpush/api/push/PushClientTest.java
@@ -1,14 +1,18 @@
 package cn.jpush.api.push;
 
-import static cn.jpush.api.examples.PushExample.buildPushObject_ios_tagAnd_alertWithExtrasAndMessage;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import cn.jiguang.commom.ClientConfig;
 import cn.jpush.api.JPushClient;
 import cn.jpush.api.examples.PushExample;
+import cn.jpush.api.push.model.Message;
+import cn.jpush.api.push.model.Options;
 import cn.jpush.api.push.model.Platform;
+import cn.jpush.api.push.model.audience.Audience;
 import cn.jpush.api.push.model.notification.InterfaceAdapter;
+import cn.jpush.api.push.model.notification.IosNotification;
+import cn.jpush.api.push.model.notification.Notification;
 import cn.jpush.api.push.model.notification.PlatformNotification;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -52,6 +56,25 @@ public void testSendPush() {
         }
     }
 
+    private static PushPayload buildPushObject_ios_tagAnd_alertWithExtrasAndMessage() {
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.ios())
+                .setAudience(Audience.tag_and("tag1", "tag_all"))
+                .setNotification(Notification.newBuilder()
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                .setAlert(ALERT)
+                                .setBadge(5)
+                                .setSound("happy")
+                                .addExtra("from", "JPush")
+                                .build())
+                        .build())
+                .setMessage(Message.content(MSG_CONTENT))
+                .setOptions(Options.newBuilder()
+                        .setApnsProduction(true)
+                        .build())
+                .build();
+    }
+
     @Test(expected = IllegalArgumentException.class)
     public void test_invalid_json() {
         PushClient pushClient = new PushClient(MASTER_SECRET, APP_KEY);
