修复导致序列化错误和空指针异常的BUG

Author: 许丹侠

pom.xml

@@ -39,11 +39,11 @@
 	</scm>
 
 	<dependencies>
-        <!--<dependency>-->
-            <!--<groupId>cn.jpush.api</groupId>-->
-            <!--<artifactId>jiguang-common</artifactId>-->
-            <!--<version>1.1.6</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jiguang-common</artifactId>
+            <version>1.1.7</version>
+        </dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>

src/main/java/cn/jpush/api/push/PushClient.java

@@ -304,7 +304,7 @@ private String getEncryptData(String payloadData) {
      * @return
      */
     private String getEncryptData(PushPayload pushPayload) {
-        if (_encryptType.isEmpty()) {
+        if (StringUtils.isEmpty(_encryptType)) {
             return pushPayload.toString();
         }
         if (EncryptKeys.ENCRYPT_SMS2_TYPE.equals(_encryptType)) {
@@ -327,7 +327,7 @@ private String getEncryptData(PushPayload pushPayload) {
      * @return
      */
     private String getEncryptData(String pushPayload, Audience audience) {
-        if (_encryptType.isEmpty()) {
+        if (StringUtils.isEmpty(_encryptType)) {
             return pushPayload;
         }
         if (EncryptKeys.ENCRYPT_SMS2_TYPE.equals(_encryptType)) {

src/main/java/cn/jpush/api/schedule/ScheduleClient.java

@@ -1,5 +1,6 @@
 package cn.jpush.api.schedule;
 
+import com.google.gson.annotations.Expose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,6 +15,8 @@
 import cn.jiguang.common.resp.ResponseWrapper;
 import cn.jpush.api.schedule.model.SchedulePayload;
 
+import java.util.List;
+
 public class ScheduleClient {
 
     private static final Logger LOG = LoggerFactory.getLogger(ScheduleClient.class);

src/main/java/cn/jpush/api/schedule/ScheduleMsgIdsResult.java

@@ -15,7 +15,7 @@ public class ScheduleMsgIdsResult extends BaseResult{
 
     @Expose int count;
 
-    @Expose List<JsonObject> msgids;
+    @Expose List<String> msgids;
 
 	public int getCount() {
 		return count;
@@ -25,11 +25,11 @@ public void setCount(int count) {
 		this.count = count;
 	}
 
-	public List<JsonObject> getMsgids() {
+	public List<String> getMsgids() {
 		return msgids;
 	}
 
-	public void setMsgids(List<JsonObject> msgids) {
+	public void setMsgids(List<String> msgids) {
 		this.msgids = msgids;
 	}