From: snickersun <scy@incartech.cn>
Date: Sun, 15 Nov 2020 03:25:26 +0000 (+0800)
Subject: release V698
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=3836ccf5b54356ddc8165b061d7c148a8cabca86;p=protocol_srv.git

release V698
修复Deliver中checkNeedServerResponse 空指针造成crash问题
---

diff --git a/app/release/ICSer_V697_2011150845_release.apk b/app/release/ICSer_V698_2011151123_release.apk
similarity index 78%
rename from app/release/ICSer_V697_2011150845_release.apk
rename to app/release/ICSer_V698_2011151123_release.apk
index 0a9b64ca..64122f7f 100644
Binary files a/app/release/ICSer_V697_2011150845_release.apk and b/app/release/ICSer_V698_2011151123_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 9a047e26..4c965982 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":697,"versionName":"2011150845","enabled":true,"outputFile":"ICSer_V697_2011150845_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V697_2011150845_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":698,"versionName":"2011151123","enabled":true,"outputFile":"ICSer_V698_2011151123_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V698_2011151123_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
index 6b0ddec6..ecc2cb11 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -155,12 +155,14 @@ public class Deliver extends AbstractConnectionService {
 
   private static void checkNeedServerResponse(StringMessage cmd){
 
-      if (cmd!=null && Config.protocol_no==Config.PROTOCOL_FZD  &&
-              (protocolAPIHelper.isCmdStr(cmd).equals("UD") || protocolAPIHelper.isCmdStr(cmd).equals("UD2"))){
-        NeedCheckServerResponse=false;
-      }else{
-        NeedCheckServerResponse=true;
-      }
+    if(cmd==null ||
+            (cmd!=null && Config.protocol_no==Config.PROTOCOL_FZD  &&
+                    (protocolAPIHelper.isCmdStr(cmd).equals("UD") || protocolAPIHelper.isCmdStr(cmd).equals("UD2")))
+    ){
+      NeedCheckServerResponse=false;
+    }else{
+      NeedCheckServerResponse=true;
+    }
   }
   public static void dumpMessage(StringMessage msg){
     /*
diff --git a/app/version_code.properties b/app/version_code.properties
index 4a2d3a06..98f5c030 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Nov 15 08:45:22 CST 2020
-VERSION_CODE=697
+#Sun Nov 15 11:23:08 CST 2020
+VERSION_CODE=698