Merge pull request #41 from jpush/dev

merge version 3.2.8
jpush · Dec 14, 2015 · 81a93ba · 81a93ba
2 parents 91e7107 + dcd48a8
commit 81a93ba
Show file tree

Hide file tree

Showing 14 changed files with 664 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@
 <dependency>
     <groupId>cn.jpush.api</groupId>
     <artifactId>jpush-client</artifactId>
-    <version>3.2.7</version>
+    <version>3.2.8</version>
 </dependency>
 ```
 ### jar 包方式
@@ -200,6 +200,26 @@
     }
 ```
 
+* 构建推送对象：推送内容包含SMS信息
+
+```Java
+    public static void testSendWithSMS() {
+        JPushClient jpushClient = new JPushClient(masterSecret, appKey);
+        try {
+            SMS sms = SMS.content("Test SMS", 10);
+            PushResult result = jpushClient.sendAndroidMessageWithAlias("Test SMS", "test sms", sms, "alias1");
+            LOG.info("Got result - " + result);
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+        }
+    }
+```
+
 ### 统计获取样例
 
 > 以下片断来自项目代码里的文件：example / cn.jpush.api.examples.ReportsExample
@@ -227,6 +247,7 @@
 
 > 以下片断来自项目代码里的文件：example / cn.jpush.api.examples.DeviceExample
 
+* 获取Tag Alias
 ```Java
     try {
         TagAliasResult result = jpushClient.getDeviceTagAlias(REGISTRATION_ID1);
@@ -243,6 +264,22 @@
     }
 ```
 
+* 绑定手机号
+
+```Java
+    try {
+        DefaultResult result =  jpushClient.bindMobile(REGISTRATION_ID1, "13000000000");
+        LOG.info("Got result " + result);
+    } catch (APIConnectionException e) {
+        LOG.error("Connection error. Should retry later. ", e);
+    } catch (APIRequestException e) {
+        LOG.error("Error response from JPush server. Should review and fix it. ", e);
+        LOG.info("HTTP Status: " + e.getStatus());
+        LOG.info("Error Code: " + e.getErrorCode());
+        LOG.info("Error Message: " + e.getErrorMessage());
+    }
+```
+
 ### Schedule 样例
 
 > 以下片断来自项目代码里的文件：example / cn.jpush.api.examples.ScheduleExample

diff --git a/example/main/java/cn/jpush/api/examples/DevcieExample.java b/example/main/java/cn/jpush/api/examples/DevcieExample.java
@@ -1,5 +1,6 @@
 package cn.jpush.api.examples;
 
+import cn.jpush.api.common.resp.DefaultResult;
 import cn.jpush.api.device.OnlineStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,6 +63,20 @@ public static void testGetUserOnlineStatus() {
 			LOG.info("Error Message: " + e.getErrorMessage());
 		}
 	}
+
+	public static void testBindMobile() {
+		try {
+			DefaultResult result =  jpushClient.bindMobile(REGISTRATION_ID1, "13000000000");
+			LOG.info("Got result " + result);
+		} catch (APIConnectionException e) {
+			LOG.error("Connection error. Should retry later. ", e);
+		} catch (APIRequestException e) {
+			LOG.error("Error response from JPush server. Should review and fix it. ", e);
+			LOG.info("HTTP Status: " + e.getStatus());
+			LOG.info("Error Code: " + e.getErrorCode());
+			LOG.info("Error Message: " + e.getErrorMessage());
+		}
+	}
 
 }
 

diff --git a/example/main/java/cn/jpush/api/examples/PushExample.java b/example/main/java/cn/jpush/api/examples/PushExample.java
@@ -1,6 +1,7 @@
 package cn.jpush.api.examples;
 
 import cn.jpush.api.common.ClientConfig;
+import cn.jpush.api.push.model.*;
 import cn.jpush.api.push.model.notification.IosAlert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,10 +10,6 @@
 import cn.jpush.api.common.resp.APIConnectionException;
 import cn.jpush.api.common.resp.APIRequestException;
 import cn.jpush.api.push.PushResult;
-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.PushPayload;
 import cn.jpush.api.push.model.audience.Audience;
 import cn.jpush.api.push.model.audience.AudienceTarget;
 import cn.jpush.api.push.model.notification.AndroidNotification;
@@ -178,5 +175,21 @@ public static void testSendIosAlert() {
         }
     }
 
+    public static void testSendWithSMS() {
+        JPushClient jpushClient = new JPushClient(masterSecret, appKey);
+        try {
+            SMS sms = SMS.content("Test SMS", 10);
+            PushResult result = jpushClient.sendAndroidMessageWithAlias("Test SMS", "test sms", sms, "alias1");
+            LOG.info("Got result - " + result);
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+        }
+    }
+
 }
 
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>cn.jpush.api</groupId>
 	<artifactId>jpush-client</artifactId>
-	<version>3.2.8-SNAPSHOT</version>
+	<version>3.2.8</version>
 	<packaging>jar</packaging>
 	<url>https://github.com/jpush/jpush-api-java-client</url>
 	<name>JPush API Java Client</name>