Skip to content

Commit 28e37cf

Browse files
author
KenChoi1992
committed
使用 jiguang-common 依赖
1 parent 2adac24 commit 28e37cf

File tree

67 files changed

+275
-2070
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+275
-2070
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package cn.jpush.api.examples;
22

3-
import cn.jpush.api.JPushClient;
4-
import cn.jpush.api.common.ClientConfig;
53
import org.slf4j.Logger;
64
import org.slf4j.LoggerFactory;
75

6+
import cn.jiguang.commom.ClientConfig;
7+
import cn.jpush.api.JPushClient;
8+
89
public class ClientExample {
910
protected static final Logger LOG = LoggerFactory.getLogger(ClientExample.class);
1011

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package cn.jpush.api.examples;
22

3-
import cn.jpush.api.JPushClient;
4-
import cn.jpush.api.common.resp.APIConnectionException;
5-
import cn.jpush.api.common.resp.APIRequestException;
6-
import cn.jpush.api.common.resp.DefaultResult;
7-
import cn.jpush.api.device.OnlineStatus;
8-
import cn.jpush.api.device.TagAliasResult;
3+
import java.util.Map;
4+
95
import org.slf4j.Logger;
106
import org.slf4j.LoggerFactory;
117

12-
import java.util.Map;
8+
import cn.jiguang.common.resp.APIConnectionException;
9+
import cn.jiguang.common.resp.APIRequestException;
10+
import cn.jiguang.common.resp.DefaultResult;
11+
import cn.jpush.api.JPushClient;
12+
import cn.jpush.api.device.OnlineStatus;
13+
import cn.jpush.api.device.TagAliasResult;
1314

1415
public class DeviceExample {
1516
protected static final Logger LOG = LoggerFactory.getLogger(DeviceExample.class);

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
package cn.jpush.api.examples;
22

3+
import java.util.HashMap;
4+
import java.util.Map;
5+
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
8+
9+
import cn.jiguang.commom.ClientConfig;
10+
import cn.jiguang.common.resp.APIConnectionException;
11+
import cn.jiguang.common.resp.APIRequestException;
312
import cn.jpush.api.JPushClient;
4-
import cn.jpush.api.common.ClientConfig;
5-
import cn.jpush.api.common.resp.APIConnectionException;
6-
import cn.jpush.api.common.resp.APIRequestException;
713
import cn.jpush.api.push.PushResult;
8-
import cn.jpush.api.push.model.*;
14+
import cn.jpush.api.push.model.Message;
15+
import cn.jpush.api.push.model.Options;
16+
import cn.jpush.api.push.model.Platform;
17+
import cn.jpush.api.push.model.PushPayload;
18+
import cn.jpush.api.push.model.SMS;
919
import cn.jpush.api.push.model.audience.Audience;
1020
import cn.jpush.api.push.model.audience.AudienceTarget;
1121
import cn.jpush.api.push.model.notification.AndroidNotification;
1222
import cn.jpush.api.push.model.notification.IosAlert;
1323
import cn.jpush.api.push.model.notification.IosNotification;
1424
import cn.jpush.api.push.model.notification.Notification;
1525
import com.google.gson.JsonObject;
16-
import org.slf4j.Logger;
17-
import org.slf4j.LoggerFactory;
18-
19-
import java.util.HashMap;
20-
import java.util.Map;
2126

2227
public class PushExample {
2328
protected static final Logger LOG = LoggerFactory.getLogger(PushExample.class);
@@ -34,7 +39,8 @@ public class PushExample {
3439

3540
public static void main(String[] args) {
3641
// testSendPushWithCustomConfig();
37-
buildPushObject_with_extra();
42+
// testSendIosAlert();
43+
testSendPush();
3844
}
3945

4046

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

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

6+
import cn.jiguang.commom.TimeUnit;
7+
import cn.jiguang.common.resp.APIConnectionException;
8+
import cn.jiguang.common.resp.APIRequestException;
69
import cn.jpush.api.JPushClient;
7-
import cn.jpush.api.common.TimeUnit;
8-
import cn.jpush.api.common.resp.APIConnectionException;
9-
import cn.jpush.api.common.resp.APIRequestException;
1010
import cn.jpush.api.report.MessagesResult;
1111
import cn.jpush.api.report.ReceivedsResult;
1212
import cn.jpush.api.report.UsersResult;

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package cn.jpush.api.examples;
22

3+
import org.slf4j.Logger;
4+
import org.slf4j.LoggerFactory;
5+
6+
import cn.jiguang.commom.TimeUnit;
7+
import cn.jiguang.commom.Week;
8+
import cn.jiguang.common.resp.APIConnectionException;
9+
import cn.jiguang.common.resp.APIRequestException;
310
import cn.jpush.api.JPushClient;
4-
import cn.jpush.api.common.TimeUnit;
5-
import cn.jpush.api.common.Week;
6-
import cn.jpush.api.common.resp.APIConnectionException;
7-
import cn.jpush.api.common.resp.APIRequestException;
811
import cn.jpush.api.push.model.PushPayload;
912
import cn.jpush.api.schedule.ScheduleListResult;
1013
import cn.jpush.api.schedule.ScheduleResult;
1114
import cn.jpush.api.schedule.model.SchedulePayload;
1215
import cn.jpush.api.schedule.model.TriggerPayload;
13-
import org.slf4j.Logger;
14-
import org.slf4j.LoggerFactory;
1516

1617
public class ScheduleExample {
1718

‎pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
</scm>
4040

4141
<dependencies>
42+
<dependency>
43+
<groupId>cn.jpush.api</groupId>
44+
<artifactId>jiguang-common</artifactId>
45+
<version>0.1.2</version>
46+
</dependency>
4247
<dependency>
4348
<groupId>com.google.code.gson</groupId>
4449
<artifactId>gson</artifactId>

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

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
package cn.jpush.api;
22

3-
import cn.jpush.api.common.ClientConfig;
4-
import cn.jpush.api.common.TimeUnit;
5-
import cn.jpush.api.common.Week;
6-
import cn.jpush.api.common.connection.HttpProxy;
7-
import cn.jpush.api.common.resp.APIConnectionException;
8-
import cn.jpush.api.common.resp.APIRequestException;
9-
import cn.jpush.api.common.resp.BooleanResult;
10-
import cn.jpush.api.common.resp.DefaultResult;
11-
import cn.jpush.api.device.*;
3+
import java.util.Map;
4+
import java.util.Set;
5+
6+
import com.google.gson.JsonObject;
7+
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;
12+
import cn.jiguang.common.connection.HttpProxy;
13+
import cn.jiguang.common.resp.APIConnectionException;
14+
import cn.jiguang.common.resp.APIRequestException;
15+
import cn.jiguang.common.resp.BooleanResult;
16+
import cn.jiguang.common.resp.DefaultResult;
17+
import cn.jpush.api.device.AliasDeviceListResult;
18+
import cn.jpush.api.device.DeviceClient;
19+
import cn.jpush.api.device.OnlineStatus;
20+
import cn.jpush.api.device.TagAliasResult;
21+
import cn.jpush.api.device.TagListResult;
1222
import cn.jpush.api.push.PushClient;
1323
import cn.jpush.api.push.PushResult;
1424
import cn.jpush.api.push.model.Message;
@@ -27,11 +37,6 @@
2737
import cn.jpush.api.schedule.ScheduleResult;
2838
import cn.jpush.api.schedule.model.SchedulePayload;
2939
import cn.jpush.api.schedule.model.TriggerPayload;
30-
import cn.jpush.api.utils.Preconditions;
31-
import com.google.gson.JsonObject;
32-
33-
import java.util.Map;
34-
import java.util.Set;
3540

3641
/**
3742
* The global entrance of JPush API library.

‎src/main/java/cn/jpush/api/common/ClientConfig.java

Lines changed: 0 additions & 195 deletions
This file was deleted.

‎src/main/java/cn/jpush/api/common/DeviceType.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)