Merge pull request #19 from zhiheng12138/master

多包名功能代码

Author: zhiheng12138

README.md

@@ -6,6 +6,9 @@
 
 ## 更新日志
 
+### [2018-11-06]V1.2.7.20181228_release
+*  多包名功能代码
+
 ### [2018-11-06]V1.2.7.20181106_release
 *  fastjson升级版本1.2.51，fix远程代码执行高危安全漏洞
 

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.meizu.flyme</groupId>
     <artifactId>push-server-sdk</artifactId>
-    <version>1.2.7.20181106_release</version>
+    <version>1.2.7.20181128_release</version>
 
     <packaging>jar</packaging>
     <name>MeizuPushSDK</name>

src/main/java/com/meizu/push/sdk/server/IFlymePush.java

@@ -236,6 +236,9 @@ public ResultPack<Long> getTaskId(PushType pushType, Message message) throws IOE
 
             VarnishedMessageJson messageJson = new VarnishedMessageJson(noticeBarInfo, noticeExpandInfo, clickTypeInfo, pushTimeInfo, advanceInfo);
             addParameter(body, "messageJson", JSON.toJSONString(messageJson));
+            if (message.getRestrictedPackageNames() != null) {
+                addParameter(body, "restrictedPackageNames", array2Str(message.getRestrictedPackageNames()));
+            }
         }
 
         HttpResult httpResult = super.post(useSSL, _url, body.toString());
@@ -392,7 +395,9 @@ public ResultPack<Long> pushToApp(PushType pushType, Message message) throws IOE
 
             VarnishedMessageJson messageJson = new VarnishedMessageJson(noticeBarInfo, noticeExpandInfo, clickTypeInfo, pushTimeInfo, advanceInfo);
             addParameter(body, "messageJson", JSON.toJSONString(messageJson));
-
+            if (message.getRestrictedPackageNames() != null) {
+                addParameter(body, "restrictedPackageNames", array2Str(message.getRestrictedPackageNames()));
+            }
         }
 
         HttpResult httpResult = super.post(useSSL, _url, body.toString());
@@ -485,7 +490,9 @@ public ResultPack<Long> pushToTag(PushType pushType, Message message, List<Strin
 
             VarnishedMessageJson messageJson = new VarnishedMessageJson(noticeBarInfo, noticeExpandInfo, clickTypeInfo, pushTimeInfo, advanceInfo);
             addParameter(body, "messageJson", JSON.toJSONString(messageJson));
-
+            if (message.getRestrictedPackageNames() != null) {
+                addParameter(body, "restrictedPackageNames", array2Str(message.getRestrictedPackageNames()));
+            }
         }
 
         HttpResult httpResult = super.post(useSSL, _url, body.toString());
@@ -648,6 +655,9 @@ private ResultPack<PushResult> pushMessageNoRetry(UserType userType, PushType pu
         } else {
             return ResultPack.failed("appId is empty");
         }
+        if (message.getRestrictedPackageNames() != null) {
+            addParameter(body, "restrictedPackageNames", array2Str(message.getRestrictedPackageNames()));
+        }
         if (PushType.DIRECT == pushType) {
             UnVarnishedMessage msgInfo = (UnVarnishedMessage) message;
 
@@ -771,6 +781,16 @@ private ResultPack<PushResult> pushMessageByTaskIdNoRetry(UserType userType, Pus
         }
     }
 
+    private String array2Str(String[] restrictedPackageNames) {
+        if (restrictedPackageNames == null || restrictedPackageNames.length == 0) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder(restrictedPackageNames[0]);
+        for (int i = 1; i < restrictedPackageNames.length; ++i) {
+            sb.append(",").append(restrictedPackageNames[i]);
+        }
+        return sb.toString();
+    }
 
     enum UserType {
 

src/main/java/com/meizu/push/sdk/server/model/push/Message.java

@@ -7,21 +7,20 @@
  * @date 2016年7月15日
  * @time 下午7:23:15
  */
-public abstract class Message implements Serializable{
+public abstract class Message implements Serializable {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 平台注册应用ID
      */
     private Long appId;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
+    /**
+     * 多包名列表
+     */
+    private String[] restrictedPackageNames;
+
 
     public Long getAppId() {
         return appId;
@@ -30,4 +29,12 @@ public Long getAppId() {
     public void setAppId(Long appId) {
         this.appId = appId;
     }
+
+    public String[] getRestrictedPackageNames() {
+        return restrictedPackageNames;
+    }
+
+    public void setRestrictedPackageNames(String[] restrictedPackageNames) {
+        this.restrictedPackageNames = restrictedPackageNames;
+    }
 }

src/main/java/com/meizu/push/sdk/server/model/push/UnVarnishedMessage.java

@@ -96,6 +96,7 @@ public String toString() {
 
     protected UnVarnishedMessage(UnVarnishedMessage.Builder builder) {
         super.setAppId(builder.appId);
+        super.setRestrictedPackageNames(builder.restrictedPackageNames);
         this.title = builder.title;
         this.content = builder.content;
         this.isOffLine = builder.isOffLine;
@@ -109,6 +110,7 @@ protected UnVarnishedMessage(UnVarnishedMessage.Builder builder) {
 
     public static final class Builder {
         private Long appId;
+        private String[] restrictedPackageNames;
         private String title;
         private String content;
         private boolean isOffLine = Boolean.TRUE;
@@ -162,6 +164,11 @@ public UnVarnishedMessage.Builder startTime(Date startTime) {
             this.startTime = startTime;
             return this;
         }
+        
+        public UnVarnishedMessage.Builder restrictedPackageNames(String[] restrictedPackageNames) {
+            this.restrictedPackageNames = restrictedPackageNames;
+            return this;
+        }
 
         public UnVarnishedMessage build() {
             return new UnVarnishedMessage(this);

src/main/java/com/meizu/push/sdk/server/model/push/VarnishedMessage.java

@@ -158,6 +158,7 @@ public VarnishedMessage() {
 
     public VarnishedMessage(VarnishedMessage.Builder builder) {
         super.setAppId(builder.appId);
+        super.setRestrictedPackageNames(builder.restrictedPackageNames);
         this.noticeBarType = builder.noticeBarType;
         this.title = builder.title;
         this.content = builder.content;
@@ -336,6 +337,11 @@ public static final class Builder {
          */
         private Long appId;
 
+        /**
+         * 多包名列表
+         */
+        private String[] restrictedPackageNames;
+
     /* =============通知栏样式 begin=============  */
         /**
          * 通知栏类型(0, "默认"),(1, "图片") , 【必填，值为0或者1】
@@ -597,6 +603,11 @@ public VarnishedMessage.Builder extra(String key, String value) {
             return this;
         }
 
+        public VarnishedMessage.Builder restrictedPackageNames(String[] restrictedPackageNames) {
+            this.restrictedPackageNames = restrictedPackageNames;
+            return this;
+        }
+        
         public VarnishedMessage.Builder notifyKey(String notifyKey) {
         	this.notifyKey = notifyKey;
         	return this;