Skip to content

Commit 46d08fe

Browse files
KenChoi1992KenChoi1992
authored
Merge pull request #70 from jpush/dev
Dev
2 parents 165e3fd + 19e0dc1 commit 46d08fe

35 files changed

+316
-167
lines changed

‎.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<attribute name="maven.pomderived" value="true"/>
3030
</attributes>
3131
</classpathentry>
32-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
32+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
3333
<attributes>
3434
<attribute name="maven.pomderived" value="true"/>
3535
</attributes>

‎example/main/java/cn/jpush/api/examples/ClientExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55

6-
import cn.jiguang.commom.ClientConfig;
6+
import cn.jiguang.common.ClientConfig;
77
import cn.jpush.api.JPushClient;
88

99
public class ClientExample {

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

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
import java.util.HashMap;
44
import java.util.Map;
55

6+
import cn.jpush.api.push.model.notification.*;
7+
import com.google.gson.Gson;
8+
import com.google.gson.GsonBuilder;
69
import org.slf4j.Logger;
710
import org.slf4j.LoggerFactory;
811

9-
import cn.jiguang.commom.ClientConfig;
12+
import cn.jiguang.common.ClientConfig;
1013
import cn.jiguang.common.resp.APIConnectionException;
1114
import cn.jiguang.common.resp.APIRequestException;
1215
import cn.jpush.api.JPushClient;
@@ -18,10 +21,6 @@
1821
import cn.jpush.api.push.model.SMS;
1922
import cn.jpush.api.push.model.audience.Audience;
2023
import cn.jpush.api.push.model.audience.AudienceTarget;
21-
import cn.jpush.api.push.model.notification.AndroidNotification;
22-
import cn.jpush.api.push.model.notification.IosAlert;
23-
import cn.jpush.api.push.model.notification.IosNotification;
24-
import cn.jpush.api.push.model.notification.Notification;
2524
import com.google.gson.JsonObject;
2625

2726
public class PushExample {
@@ -40,7 +39,8 @@ public class PushExample {
4039
public static void main(String[] args) {
4140
// testSendPushWithCustomConfig();
4241
// testSendIosAlert();
43-
testSendPush();
42+
// testSendPush();
43+
testSendPush_fromJSON();
4444
}
4545

4646

@@ -51,8 +51,7 @@ public static void testSendPush() {
5151
JPushClient jpushClient = new JPushClient(masterSecret, appKey, null, clientConfig);
5252

5353
// For push, all you need do is to build PushPayload object.
54-
PushPayload payload = buildPushObject_all_all_alert();
55-
54+
PushPayload payload = buildPushObject_ios_tagAnd_alertWithExtrasAndMessage();
5655
try {
5756
PushResult result = jpushClient.sendPush(payload);
5857
LOG.info("Got result - " + result);
@@ -68,6 +67,32 @@ public static void testSendPush() {
6867
LOG.info("Msg ID: " + e.getMsgId());
6968
}
7069
}
70+
71+
//use String to build PushPayload instance
72+
public static void testSendPush_fromJSON() {
73+
ClientConfig clientConfig = ClientConfig.getInstance();
74+
JPushClient jpushClient = new JPushClient(masterSecret, appKey, null, clientConfig);
75+
Gson gson = new GsonBuilder()
76+
.registerTypeAdapter(PlatformNotification.class, new InterfaceAdapter<PlatformNotification>())
77+
.create();
78+
// Since the type of DeviceType is enum, thus the value should be uppercase, same with the AudienceType.
79+
String payloadString = "{\"platform\":{\"all\":false,\"deviceTypes\":[\"IOS\"]},\"audience\":{\"all\":false,\"targets\":[{\"audienceType\":\"TAG_AND\",\"values\":[\"tag1\",\"tag_all\"]}]},\"notification\":{\"notifications\":[{\"soundDisabled\":false,\"badgeDisabled\":false,\"sound\":\"happy\",\"badge\":\"5\",\"contentAvailable\":false,\"alert\":\"Test from API Example - alert\",\"extras\":{\"from\":\"JPush\"},\"type\":\"cn.jpush.api.push.model.notification.IosNotification\"}]},\"message\":{\"msgContent\":\"Test from API Example - msgContent\"},\"options\":{\"sendno\":1429488213,\"overrideMsgId\":0,\"timeToLive\":-1,\"apnsProduction\":true,\"bigPushDuration\":0}}";
80+
PushPayload payload = gson.fromJson(payloadString, PushPayload.class);
81+
try {
82+
PushResult result = jpushClient.sendPush(payload);
83+
LOG.info("Got result - " + result);
84+
85+
} catch (APIConnectionException e) {
86+
LOG.error("Connection error. Should retry later. ", e);
87+
88+
} catch (APIRequestException e) {
89+
LOG.error("Error response from JPush server. Should review and fix it. ", e);
90+
LOG.info("HTTP Status: " + e.getStatus());
91+
LOG.info("Error Code: " + e.getErrorCode());
92+
LOG.info("Error Message: " + e.getErrorMessage());
93+
LOG.info("Msg ID: " + e.getMsgId());
94+
}
95+
}
7196

7297
public static PushPayload buildPushObject_all_all_alert() {
7398
return PushPayload.alertAll(ALERT);
@@ -198,7 +223,7 @@ public static void testSendIosAlert() {
198223
JPushClient jpushClient = new JPushClient(masterSecret, appKey);
199224

200225
IosAlert alert = IosAlert.newBuilder()
201-
.setTitleAndBody("test alert", "test ios alert json")
226+
.setTitleAndBody("test alert", "subtitle", "test ios alert json")
202227
.setActionLocKey("PLAY")
203228
.build();
204229
try {

‎example/main/java/cn/jpush/api/examples/ReportsExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55

6-
import cn.jiguang.commom.TimeUnit;
6+
import cn.jiguang.common.TimeUnit;
77
import cn.jiguang.common.resp.APIConnectionException;
88
import cn.jiguang.common.resp.APIRequestException;
99
import cn.jpush.api.JPushClient;

‎example/main/java/cn/jpush/api/examples/ScheduleExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55

6-
import cn.jiguang.commom.TimeUnit;
7-
import cn.jiguang.commom.Week;
6+
import cn.jiguang.common.TimeUnit;
7+
import cn.jiguang.common.Week;
88
import cn.jiguang.common.resp.APIConnectionException;
99
import cn.jiguang.common.resp.APIRequestException;
1010
import cn.jpush.api.JPushClient;

‎pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,17 @@
4242
<dependency>
4343
<groupId>cn.jpush.api</groupId>
4444
<artifactId>jiguang-common</artifactId>
45-
<version>0.1.3</version>
45+
<version>0.1.6</version>
46+
<exclusions>
47+
<exclusion>
48+
<groupId>org.slf4j</groupId>
49+
<artifactId>slf4j-jdk14</artifactId>
50+
</exclusion>
51+
<exclusion>
52+
<groupId>org.slf4j</groupId>
53+
<artifactId>slf4j-nop</artifactId>
54+
</exclusion>
55+
</exclusions>
4656
</dependency>
4757
<dependency>
4858
<groupId>com.google.code.gson</groupId>

‎src/main/java/cn/jpush/api/JPushClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
import com.google.gson.JsonObject;
77

8-
import cn.jiguang.commom.ClientConfig;
9-
import cn.jiguang.commom.TimeUnit;
10-
import cn.jiguang.commom.Week;
11-
import cn.jiguang.commom.utils.Preconditions;
8+
import cn.jiguang.common.ClientConfig;
9+
import cn.jiguang.common.TimeUnit;
10+
import cn.jiguang.common.Week;
11+
import cn.jiguang.common.utils.Preconditions;
1212
import cn.jiguang.common.connection.HttpProxy;
1313
import cn.jiguang.common.resp.APIConnectionException;
1414
import cn.jiguang.common.resp.APIRequestException;

‎src/main/java/cn/jpush/api/device/DeviceClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import com.google.gson.JsonPrimitive;
1111
import com.google.gson.reflect.TypeToken;
1212

13-
import cn.jiguang.commom.ClientConfig;
14-
import cn.jiguang.commom.ServiceHelper;
15-
import cn.jiguang.commom.utils.Preconditions;
16-
import cn.jiguang.commom.utils.StringUtils;
13+
import cn.jiguang.common.ClientConfig;
14+
import cn.jiguang.common.ServiceHelper;
15+
import cn.jiguang.common.utils.Preconditions;
16+
import cn.jiguang.common.utils.StringUtils;
1717
import cn.jiguang.common.connection.HttpProxy;
1818
import cn.jiguang.common.connection.NativeHttpClient;
1919
import cn.jiguang.common.resp.APIConnectionException;

‎src/main/java/cn/jpush/api/push/PushClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import com.google.gson.JsonParseException;
44
import com.google.gson.JsonParser;
55

6-
import cn.jiguang.commom.ClientConfig;
7-
import cn.jiguang.commom.ServiceHelper;
8-
import cn.jiguang.commom.utils.Preconditions;
9-
import cn.jiguang.commom.utils.StringUtils;
6+
import cn.jiguang.common.ClientConfig;
7+
import cn.jiguang.common.ServiceHelper;
8+
import cn.jiguang.common.utils.Preconditions;
9+
import cn.jiguang.common.utils.StringUtils;
1010
import cn.jiguang.common.connection.HttpProxy;
1111
import cn.jiguang.common.connection.NativeHttpClient;
1212
import cn.jiguang.common.resp.APIConnectionException;

‎src/main/java/cn/jpush/api/push/model/Message.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.google.gson.JsonObject;
88
import com.google.gson.JsonPrimitive;
99

10-
import cn.jiguang.commom.utils.Preconditions;
10+
import cn.jiguang.common.utils.Preconditions;
1111

1212
public class Message implements PushModel {
1313
private static final String TITLE = "title";
@@ -82,7 +82,7 @@ public JsonElement toJSON() {
8282

8383
return json;
8484
}
85-
85+
8686
public static class Builder {
8787
private String title;
8888
private String msgContent;

0 commit comments

Comments
 (0)