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 638d41e..ef7a2e5 100644 (file)
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 cbb9371..a698c3f 100644 (file)
--- 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 c96b77b..6049949 100644 (file)
--- 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\r
       public void run() {\r
         sendloopruning=true;\r
-        while(getAndSendMsgFromQueue()==true)\r
-        {\r
-          //数据发送成功，则5秒后进行下一轮发送\r
-          Util.mSleep(5000);\r
-        } //没有数据可以发送，则退出sendloop\r
-        sendloopruning=false;\r
+        if (getAndSendMsgFromQueue()==true){\r
+          //数据发送成功，则5秒后进行下一轮发送(while 循环用sleep会很占资源造成死锁\r
+          mSendMSGHandler.postDelayed(delaySendMSG,5000L);\r
+        }else{\r
+          //没有数据可以发送，则退出sendloop\r
+          sendloopruning=false;\r
+        }\r
       }\r
     };\r
   }\r
@@ -219,6 +220,7 @@ public class Deliver extends AbstractConnectionService {
 \r
               if( Config.discard_cmd_after_retryfailed) {\r
                 if (msgWait.getIndex() >= 0) {\r
+                  //有些协议需要对盲点数据进行修改（盲点数据可能是不同的topic)，在此对数据修改后更新数据库\r
                   mRuntime.getDbHelper().updateCMDRecord(msgWait.getIndex(), 3);//设置为盲点不发送\r
                 }\r
                 dumpMessage(msgWait);\r
@@ -245,11 +247,6 @@ public class Deliver extends AbstractConnectionService {
               if(msgSent==null) {\r
                 //如果没有丢弃的数据，直接查找未发送的数据进行\r
                 msgSent = mRuntime.getDbHelper().queryNotSentCMDRecord();\r
-              }else{\r
-                //有些协议需要修改，在此对数据修改后再发出。\r
-                if (msgSent.haveSent()==3){\r
-                  //发送前，可能需要修改命令，修改后再发送。\r
-                }\r
               }\r
             }\r
             dumpMessage(msgSent);\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 5080984..80a2876 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Nov 19 18:29:05 CST 2020\r
-VERSION_CODE=711\r
+#Thu Nov 19 20:53:48 CST 2020\r
+VERSION_CODE=712\r