From: snickersun <scy@incartech.cn>
Date: Thu, 19 Nov 2020 14:25:18 +0000 (+0800)
Subject: release 712
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=aee64e653b3ca5ab01bcd744c48935c04983cb83;p=protocol_srv.git

release 712
等待5秒上传改回为 handler post函数，Thread.sleep占用系统资源过大，会造成长时间死锁。
---

diff --git a/app/release/ICSer_V711_2011191829_release.apk b/app/release/ICSer_V712_2011192053_release.apk
similarity index 78%
rename from app/release/ICSer_V711_2011191829_release.apk
rename to app/release/ICSer_V712_2011192053_release.apk
index 638d41eb..ef7a2e56 100644
Binary files a/app/release/ICSer_V711_2011191829_release.apk and b/app/release/ICSer_V712_2011192053_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index cbb93710..a698c3f3 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":711,"versionName":"2011191829","enabled":true,"outputFile":"ICSer_V711_2011191829_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V711_2011191829_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":712,"versionName":"2011192053","enabled":true,"outputFile":"ICSer_V712_2011192053_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V712_2011192053_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 c96b77b4..6049949a 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -106,12 +106,13 @@ public class Deliver extends AbstractConnectionService {
       @Override
       public void run() {
         sendloopruning=true;
-        while(getAndSendMsgFromQueue()==true)
-        {
-          //数据发送成功，则5秒后进行下一轮发送
-          Util.mSleep(5000);
-        } //没有数据可以发送，则退出sendloop
-        sendloopruning=false;
+        if (getAndSendMsgFromQueue()==true){
+          //数据发送成功，则5秒后进行下一轮发送(while 循环用sleep会很占资源造成死锁
+          mSendMSGHandler.postDelayed(delaySendMSG,5000L);
+        }else{
+          //没有数据可以发送，则退出sendloop
+          sendloopruning=false;
+        }
       }
     };
   }
@@ -219,6 +220,7 @@ public class Deliver extends AbstractConnectionService {
 
               if( Config.discard_cmd_after_retryfailed) {
                 if (msgWait.getIndex() >= 0) {
+                  //有些协议需要对盲点数据进行修改（盲点数据可能是不同的topic)，在此对数据修改后更新数据库
                   mRuntime.getDbHelper().updateCMDRecord(msgWait.getIndex(), 3);//设置为盲点不发送
                 }
                 dumpMessage(msgWait);
@@ -245,11 +247,6 @@ public class Deliver extends AbstractConnectionService {
               if(msgSent==null) {
                 //如果没有丢弃的数据，直接查找未发送的数据进行
                 msgSent = mRuntime.getDbHelper().queryNotSentCMDRecord();
-              }else{
-                //有些协议需要修改，在此对数据修改后再发出。
-                if (msgSent.haveSent()==3){
-                  //发送前，可能需要修改命令，修改后再发送。
-                }
               }
             }
             dumpMessage(msgSent);
diff --git a/app/version_code.properties b/app/version_code.properties
index 50809848..80a2876a 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Nov 19 18:29:05 CST 2020
-VERSION_CODE=711
+#Thu Nov 19 20:53:48 CST 2020
+VERSION_CODE=712