Merge pull request #35 from Liuchy1/master

add ios msg received

Author: Liuchy1

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

@@ -1,51 +1,76 @@
 package cn.jpush.api.report;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
 import cn.jpush.api.common.resp.BaseResult;
 import cn.jpush.api.common.resp.ResponseWrapper;
-
 import com.google.gson.annotations.Expose;
 import com.google.gson.reflect.TypeToken;
 
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
 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;
-	}
-	
+    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;
+        @Expose
+        public Winphone winphone;
+    }
+
     public static class Android {
-        @Expose public int received;
-        @Expose public int target;
-        @Expose public int online_push;
-        @Expose public int click;
-        @Expose public int msg_click;
+        @Expose
+        public int received;
+        @Expose
+        public int target;
+        @Expose
+        public int online_push;
+        @Expose
+        public int click;
+        @Expose
+        public int msg_click;
     }
-    
+
     public static class Ios {
-        @Expose public int apns_sent;
-        @Expose public int apns_target;
-        @Expose public int click;
-        @Expose public int target;
-        @Expose public int received;
-        @Expose public int msg_click;
+        @Expose
+        public int apns_sent;
+        @Expose
+        public int apns_target;
+        @Expose
+        public int click;
+        @Expose
+        public int target;
+        @Expose
+        public int received;
+        @Expose
+        public int msg_click;
+    }
+
+    public static class Winphone {
+        @Expose
+        public int mpns_target;
+        @Expose
+        public int mpns_sent;
+        @Expose
+        public int click;
     }
-    	
-	static MessagesResult fromResponse(ResponseWrapper responseWrapper) {
+
+    static MessagesResult fromResponse(ResponseWrapper responseWrapper) {
         MessagesResult result = new MessagesResult();
         if (responseWrapper.isServerResponse()) {
             result.messages = _gson.fromJson(responseWrapper.responseContent, MESSAGE_TYPE);
         }
-        
+
         result.setResponseWrapper(responseWrapper);
         return result;
-	}
-	
+    }
+
 }

src/main/java/cn/jpush/api/report/ReceivedsResult.java

@@ -1,35 +1,42 @@
 package cn.jpush.api.report;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
 import cn.jpush.api.common.resp.BaseResult;
 import cn.jpush.api.common.resp.ResponseWrapper;
-
 import com.google.gson.annotations.Expose;
 import com.google.gson.reflect.TypeToken;
 
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
 public class ReceivedsResult extends BaseResult {
-    private static final Type RECEIVED_TYPE = new TypeToken<List<Received>>(){}.getType();
-
-    @Expose public List<Received> received_list = new ArrayList<Received>();
-
-    
-	public static class Received {
-	    @Expose public long msg_id;
-	    @Expose public int android_received;
-	    @Expose public int ios_apns_sent;
-	}
-	
-	static ReceivedsResult fromResponse(ResponseWrapper responseWrapper) {
+    private static final Type RECEIVED_TYPE = new TypeToken<List<Received>>() {}.getType();
+
+    @Expose
+    public List<Received> received_list = new ArrayList<Received>();
+
+
+    public static class Received {
+        @Expose
+        public long msg_id;
+        @Expose
+        public int android_received;
+        @Expose
+        public int ios_apns_sent;
+        @Expose
+        public int ios_msg_receive;
+        @Expose
+        public int wp_mpns_sent;
+    }
+
+    static ReceivedsResult fromResponse(ResponseWrapper responseWrapper) {
         ReceivedsResult result = new ReceivedsResult();
         if (responseWrapper.isServerResponse()) {
             result.received_list = _gson.fromJson(responseWrapper.responseContent, RECEIVED_TYPE);
         }
-        
+
         result.setResponseWrapper(responseWrapper);
         return result;
-	}
-	
+    }
+
 }