File tree Expand file tree Collapse file tree 4 files changed +5
-18
lines changed
Expand file tree Collapse file tree 4 files changed +5
-18
lines changed Original file line number Diff line number Diff line change 22
33import cn .jpush .api .common .APIConnectionException ;
44import cn .jpush .api .common .APIRequestException ;
5+ import cn .jpush .api .common .BaseResult ;
56import cn .jpush .api .common .HttpProxy ;
67import cn .jpush .api .common .IHttpClient ;
78import cn .jpush .api .common .NativeHttpClient ;
@@ -122,7 +123,7 @@ public PushResult sendPushValidate(PushPayload pushPayload) throws APIConnection
122123
123124 ResponseWrapper response = _httpClient .sendPost (_baseUrl + PUSH_VALIDATE_PATH , pushPayload .toString ());
124125
125- return PushResult .fromResponse (response );
126+ return BaseResult .fromResponse (response , PushResult . class );
126127 }
127128
128129 public PushResult sendPush (String payloadString ) throws APIConnectionException , APIRequestException {
@@ -150,7 +151,7 @@ public PushResult sendPushValidate(String payloadString) throws APIConnectionExc
150151
151152 ResponseWrapper response = _httpClient .sendPost (_baseUrl + PUSH_VALIDATE_PATH , payloadString );
152153
153- return PushResult .fromResponse (response );
154+ return BaseResult .fromResponse (response , PushResult . class );
154155 }
155156
156157
Original file line number Diff line number Diff line change 11package cn .jpush .api .push ;
22
33import cn .jpush .api .common .BaseResult ;
4- import cn .jpush .api .common .ResponseWrapper ;
54
65import com .google .gson .annotations .Expose ;
76
@@ -10,18 +9,5 @@ public class PushResult extends BaseResult {
109 @ Expose public long msg_id ;
1110 @ Expose public int sendno ;
1211
13- public static PushResult fromResponse (ResponseWrapper responseWrapper ) {
14- PushResult pushResult = null ;
15-
16- if (responseWrapper .isServerResponse ()) {
17- pushResult = _gson .fromJson (responseWrapper .responseContent , PushResult .class );
18- } else {
19- pushResult = new PushResult ();
20- }
21-
22- pushResult .setResponseWrapper (responseWrapper );
23-
24- return pushResult ;
25- }
2612}
2713
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ public static class Ios {
3434 @ Expose public int click ;
3535 }
3636
37- public static MessagesResult fromResponse (ResponseWrapper responseWrapper ) {
37+ static MessagesResult fromResponse (ResponseWrapper responseWrapper ) {
3838 MessagesResult result = new MessagesResult ();
3939 if (responseWrapper .isServerResponse ()) {
4040 result .messages = _gson .fromJson (responseWrapper .responseContent , MESSAGE_TYPE );
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ public static class Received {
2222 @ Expose public int ios_apns_sent ;
2323 }
2424
25- public static ReceivedsResult fromResponse (ResponseWrapper responseWrapper ) {
25+ static ReceivedsResult fromResponse (ResponseWrapper responseWrapper ) {
2626 ReceivedsResult result = new ReceivedsResult ();
2727 if (responseWrapper .isServerResponse ()) {
2828 result .received_list = _gson .fromJson (responseWrapper .responseContent , RECEIVED_TYPE );
You can’t perform that action at this time.
0 commit comments