Adding support for message api

Author: Javen

src/cn/jpush/api/JPushClient.java

@@ -4,6 +4,7 @@
 import cn.jpush.api.push.PushClient;
 import cn.jpush.api.push.PushResult;
 import cn.jpush.api.push.model.PushPayload;
+import cn.jpush.api.report.MessagesResult;
 import cn.jpush.api.report.ReceivedsResult;
 import cn.jpush.api.report.ReportClient;
 import cn.jpush.api.report.UsersResult;
@@ -69,6 +70,10 @@ public UsersResult getReportUsersCount(TimeUnit timeUnit, String start, int step
         return _reportClient.getUsersCount(timeUnit, start, step);
     }
 
+    public MessagesResult getReportMessagesCount(String msgIds) {
+        return _reportClient.getMessagesCount(msgIds);
+    }
+    
 
 }
 

src/cn/jpush/api/examples/ReportsExample.java

@@ -5,6 +5,7 @@
 
 import cn.jpush.api.JPushClient;
 import cn.jpush.api.common.TimeUnit;
+import cn.jpush.api.report.MessagesResult;
 import cn.jpush.api.report.ReceivedsResult;
 import cn.jpush.api.report.UsersResult;
 
@@ -17,7 +18,8 @@ public class ReportsExample {
 
 	public static void main(String[] args) {
 //		testGetReport();
-		testGetUsers();
+		testGetMessages();
+//		testGetUsers();
 	}
 
 
@@ -60,5 +62,25 @@ public static void testGetUsers() {
         }
     }
 
+    public static void testGetMessages() {
+        JPushClient jpushClient = new JPushClient(masterSecret, appKey);
+        MessagesResult result = jpushClient.getReportMessagesCount("1933834921");
+        
+        if (result.isResultOK()) {
+            LOG.info("Users Count - " + result);
+        } else {
+            if (result.getErrorCode() > 0) {
+                // 业务异常
+                LOG.warn("Service error - ErrorCode: "
+                        + result.getErrorCode() + ", ErrorMessage: "
+                        + result.getErrorMessage());
+            } else {
+                // 未到达 JPush
+                LOG.error("Other excepitons - "
+                        + result.getExceptionString());
+            }
+        }
+    }
+
 }
 

src/cn/jpush/api/report/MessagesResult.java

@@ -0,0 +1,47 @@
+package cn.jpush.api.report;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import cn.jpush.api.common.BaseResult;
+import cn.jpush.api.common.ResponseWrapper;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.reflect.TypeToken;
+
+public class MessagesResult extends BaseResult {
+    private static final Type MESSAGE_TYPE = new TypeToken<List<Message>>(){}.getType();
+
+    @Expose public List<Message> messages = new ArrayList<Message>();
+    
+	public static class Message {
+	    @Expose public long msg_id;
+	    @Expose public Android android;
+	    @Expose public Ios ios;
+	}
+	
+    public static class Android {
+        @Expose public int received;
+        @Expose public int target;
+        @Expose public int online_push;
+        @Expose public int click;
+    }
+    
+    public static class Ios {
+        @Expose public int apns_sent;
+        @Expose public int apns_target;
+        @Expose public int click;
+    }
+    	
+	public static MessagesResult fromResponse(ResponseWrapper responseWrapper) {
+        MessagesResult receivedsResult = new MessagesResult();
+        if (responseWrapper.isServerResponse()) {
+            receivedsResult.messages = _gson.fromJson(responseWrapper.responseContent, MESSAGE_TYPE);
+        }
+        
+        receivedsResult.setResponseWrapper(responseWrapper);
+        return receivedsResult;
+	}
+	
+}

src/cn/jpush/api/report/ReportClient.java

@@ -12,6 +12,7 @@ public class ReportClient {
     private static final String REPORT_HOST_NAME = "http://183.232.25.237:9900";   //"https://report.jpush.cn";
     private static final String REPORT_RECEIVE_PATH = "/v2/received";
     private static final String REPORT_USER_PATH = "/v3/user";
+    private static final String REPORT_MESSAGE_PATH = "/v3/message";
 
     private NativeHttpClient _httpClient = new NativeHttpClient();;
 
@@ -39,6 +40,16 @@ public ReceivedsResult getReceiveds(String msgIds) {
         return ReceivedsResult.fromResponse(response);
 	}
 
+    public MessagesResult getMessagesCount(String msgIds) {
+        checkMsgids(msgIds);
+        String authCode = ServiceHelper.getAuthorizationBase64(_appKey, _masterSecret);
+        
+        String url = REPORT_HOST_NAME + REPORT_MESSAGE_PATH + "?msg_ids=" + msgIds;
+        ResponseWrapper response = _httpClient.sendGet(url, null, authCode);
+        
+        return MessagesResult.fromResponse(response);
+    }
+    
     public UsersResult getUsersCount(TimeUnit timeUnit, String start, int step) {
         String authCode = ServiceHelper.getAuthorizationBase64(_appKey, _masterSecret);