1 新增simple 推送相关使用模板 2 新增多账号推送接口

bulezeng(曾卫进) · bulezeng(曾卫进) · commit 5f01eb3ec4b4 · 2019-02-14T12:24:18.000+08:00
diff --git a/src/main/java/com/tencent/xinge/XingeAppSimple.java b/src/main/java/com/tencent/xinge/XingeAppSimple.java
@@ -98,7 +98,7 @@ public JSONObject pushAccountAndroid(String title, String content, String accoun
         pushAppRequest.setAudience_type(AudienceType.account);
         pushAppRequest.setPlatform(Platform.android);
         pushAppRequest.setMessage_type(MessageType.notify);
-
+        pushAppRequest.setAccount_push_type(1);
         Message message = new Message();
         message.setTitle(title);
         message.setContent(content);
diff --git a/src/main/java/com/tencent/xinge/push/app/PushAppRequest.java b/src/main/java/com/tencent/xinge/push/app/PushAppRequest.java
@@ -87,6 +87,9 @@ public class PushAppRequest {
     @ApiModelProperty(value = "账号列表推送、设备列表推送时必需")
     private String push_id;
 
+    @JsonProperty("account_push_type")
+    @ApiModelProperty(value = "账号列表推送 时设置, 是否往所有绑定设备上进行推送 0:否, 1:是")
+    private int account_push_type = 0;
 
     private final static ObjectMapper mapper = new ObjectMapper();
 
@@ -101,6 +104,14 @@ public String toString() {
         }
         return repoStr;
     }
+    
+    public int getAccount_push_type() {
+        return account_push_type;
+    }
+
+    public void setAccount_push_type(int account_push_type) {
+        this.account_push_type = account_push_type;
+    }
 
     public String getSend_time() {
         return send_time;
diff --git a/src/test/java/com/tencent/xinge/XingeAppSimpleTest.java b/src/test/java/com/tencent/xinge/XingeAppSimpleTest.java
@@ -13,7 +13,7 @@ public class XingeAppSimpleTest {
     private String secretKeyAndroid = "00f4272930388ad7b9d6335e51757d07";
     private String appIdIOS = "88c715375044d";
     private String secretKeyIOS = "04c86cafb4e31d583e3b843ea078a59e";
-    private String url = "http://10.242.131.147:8080/";
+    private String url = "https://openapi.xg.qq.com/";
     @Before
     public void init() {
         xingeAndroid = new XingeAppSimple(appIdAndroid, secretKeyAndroid, url);
diff --git a/src/test/java/com/tencent/xinge/push/app/PushSingleTokenAndroidTest.java b/src/test/java/com/tencent/xinge/push/app/PushSingleTokenAndroidTest.java
@@ -6,6 +6,8 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 public class PushSingleTokenAndroidTest extends BaseXgTest {
 
@@ -28,13 +30,15 @@ public void testPushSingleTokenAndroid() {
         messageAndroid.setIcon_type(0);
         messageAndroid.setStyle_id(1);
 
+        Map<String, String> custom_content = new HashMap();
+        custom_content.put("testKey", "testValue");
+        messageAndroid.setCustom_content(custom_content);
         Message message = new Message();
 
         message.setAndroid(messageAndroid);
         message.setTitle("testPushSingleTokenAndroid");
         message.setContent("from Java SDK");
 
-
         PushAppRequest pushAppRequest = new PushAppRequest();
         pushAppRequest.setAudience_type(AudienceType.token);
         pushAppRequest.setPlatform(Platform.android);
@@ -48,7 +52,6 @@ public void testPushSingleTokenAndroid() {
         pushAppRequest.setSend_time("1111111");
         pushAppRequest.setStat_tag("test");
 
-
         System.out.println(pushAppRequest.toString());
         System.out.println(xingeAndroid.pushApp(pushAppRequest.toString()));
 
