fix the bug Access_time 协议格式错误

bulezeng(曾卫进) · bulezeng(曾卫进) · commit d44895fcef4c · 2018-11-30T15:25:45.000+08:00
diff --git a/src/main/java/com/tencent/xinge/bean/Message.java b/src/main/java/com/tencent/xinge/bean/Message.java
@@ -22,8 +22,8 @@ public class Message {
     private String content;
 
     @JsonProperty("accept_time")
-//    private ArrayList<AcceptTimePair> accept_time;
-    private Object accept_time;
+    private ArrayList<TimeInterval> accept_time;
+//    private Object accept_time;
 
     @JsonProperty("xg_media_resources")
     private Object xgMediaResources;
@@ -66,11 +66,11 @@ public void setContent(String content) {
         this.content = content;
     }
 
-    public Object getAccept_time() {
+    public ArrayList<TimeInterval> getAccept_time() {
         return accept_time;
     }
 
-    public void setAccept_time(Object accept_time) {
+    public void setAccept_time(ArrayList<TimeInterval> accept_time) {
         this.accept_time = accept_time;
     }
 
diff --git a/src/test/java/com/tencent/xinge/push/app/PushAccountListIOSTest.java b/src/test/java/com/tencent/xinge/push/app/PushAccountListIOSTest.java
@@ -35,8 +35,10 @@ public void testPushAccountListIOS() {
         accountList.add("xg_account");
         accountList.add("xg_account1");
 
+       ArrayList<TimeInterval> accepTimeList = new ArrayList<TimeInterval>();
         TimeInterval accepTime = new TimeInterval(0,0,23,59);
-        message.setAccept_time(accepTime);
+        accepTimeList.add(accepTime);
+        message.setAccept_time(accepTimeList);
 
         PushAppRequest pushAppRequest = new PushAppRequest();
         pushAppRequest.setPlatform(Platform.ios);

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ public class Message {`
`22`	`22`	`private String content;`
`23`	`23`
`24`	`24`	`@JsonProperty("accept_time")`
`25`		`-// private ArrayList<AcceptTimePair> accept_time;`
`26`		`- private Object accept_time;`
	`25`	`+ private ArrayList<TimeInterval> accept_time;`
	`26`	`+// private Object accept_time;`
`27`	`27`
`28`	`28`	`@JsonProperty("xg_media_resources")`
`29`	`29`	`private Object xgMediaResources;`
`@@ -66,11 +66,11 @@ public void setContent(String content) {`
`66`	`66`	`this.content = content;`
`67`	`67`	`}`
`68`	`68`
`69`		`- public Object getAccept_time() {`
	`69`	`+ public ArrayList<TimeInterval> getAccept_time() {`
`70`	`70`	`return accept_time;`
`71`	`71`	`}`
`72`	`72`
`73`		`- public void setAccept_time(Object accept_time) {`
	`73`	`+ public void setAccept_time(ArrayList<TimeInterval> accept_time) {`
`74`	`74`	`this.accept_time = accept_time;`
`75`	`75`	`}`
`76`	`76`