release V399

优化BP16执行立即返回，即时消息不再加入消息队列，历史消息还是通过post队列发送。
 解决明明已经定位也有发送定位信息不及时的问题。去掉立即发送定位信息时的post指令，直接立即执行。

diff --git a/app/release/ICSer_V398_2004111509_release.apk b/app/release/ICSer_V398_2004111509_release.apk
deleted file mode 100644 (file)
index a3aadf2..0000000
Binary files a/app/release/ICSer_V398_2004111509_release.apk and /dev/null differ

diff --git a/app/release/ICSer_V399_2004111627_release.apk b/app/release/ICSer_V399_2004111627_release.apk
new file mode 100644 (file)
index 0000000..95e423f
Binary files /dev/null and b/app/release/ICSer_V399_2004111627_release.apk differ

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 e71d224..8ac5940 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -101,24 +101,12 @@ public class Deliver extends AbstractConnectionService {
   \r
   private static boolean wakeLockWifiSet = false;\r
   \r
-  private String wifiDataForCm;\r
-\r
-\r
   private static  boolean wifiEnabled;\r
 \r
   public static Runnable delaySendMSG;\r
-//  public static boolean sendingMsg=false;\r
   private static Handler mSendMSGHandler=new Handler(new Handler.Callback() {\r
     @Override\r
     public boolean handleMessage(Message message) {\r
-\r
-//      switch (message.what){\r
-//        case 1:\r
-//          mSendMSGHandler.post(delaySendMSG);\r
-//          break;\r
-//        default:\r
-//          break;\r
-//      }\r
       return false;\r
     }\r
   });\r
@@ -127,24 +115,9 @@ public class Deliver extends AbstractConnectionService {
     delaySendMSG = new Runnable() {\r
       @Override\r
       public void run() {\r
-//        if (sendingMsg==true)\r
-//        {\r
-//          ICLogger.i("Sending MSG in Thread, skip this send Command.");\r
-//          return;\r
-//        }\r
-//        sendingMsg=true;\r
-//        while (getAndSendMsgFromQueue()==true) {\r
-//          try {\r
-//            Thread.sleep(5000);\r
-//          } catch (InterruptedException e) {\r
-//            e.printStackTrace();\r
-//          }\r
-//        }\r
         if (getAndSendMsgFromQueue()==true){\r
           mSendMSGHandler.postDelayed(delaySendMSG,5000L);\r
         }\r
-//        sendingMsg=false;\r
-//        ICLogger.i("exit delaySendMSG!");\r
       }\r
     };\r
   }\r
@@ -179,7 +152,9 @@ public class Deliver extends AbstractConnectionService {
     return ret;\r
   }\r
   public static void triggerSendThread() {\r
-    mSendMSGHandler.post(delaySendMSG);\r
+//    mSendMSGHandler.post(delaySendMSG);\r
+    ICLogger.i("triggerSendThread ");\r
+    delaySendMSG.run();\r
 //    mSendMSGHandler.sendEmptyMessage(1);\r
   }\r
 \r
@@ -233,53 +208,6 @@ public class Deliver extends AbstractConnectionService {
     }\r
     return ret;\r
   }\r
-//  private static void loadMessage2Queue() {\r
-//    byte b = 0;\r
-//    //一次只处理5条数据\r
-//    while (b < 5) {\r
-//      String str = fileCache.load();\r
-//      if (str != null) {\r
-//        byte b1 = ++b;\r
-//\r
-//        try {\r
-//          StringMessage stringMessage = new StringMessage(str);\r
-//          //如果在queue中添加失败，则写回cache中\r
-//          if (!queue.offerLast(stringMessage)) {\r
-////            fileCache.put(str);\r
-//          }\r
-//        } catch (Exception e) {\r
-//          e.printStackTrace();\r
-//        }\r
-//      }\r
-//    }\r
-//  }\r
-//  public static void saveQueue() {\r
-//    lock.lock();\r
-//    try {\r
-//      String str;\r
-//      if (!queue.isEmpty()) {\r
-//        StringBuilder stringBuilder = new StringBuilder();\r
-//        StringMessage stringMessage = queue.poll();\r
-//        while (stringMessage != null) {\r
-//            String cmd=stringMessage.isFromCache();\r
-//            stringBuilder.append(cmd);\r
-//            stringBuilder.append("\n");\r
-////            fileCache.put(cmd);\r
-//            stringMessage = queue.poll();\r
-//        }\r
-//        str = stringBuilder.toString();\r
-//      } else {\r
-//        str = null;\r
-//      }\r
-//      ICLogger.i("save queue to cache : \n"+str);\r
-//      lock.unlock();\r
-//      return;\r
-//    } finally {\r
-//      if (lock!=null &&lock.isLocked())\r
-//      lock.unlock();\r
-//    }\r
-//  }\r
-\r
 \r
 public static void sendLocationMSG( String Msg){\r
 \r

diff --git a/app/version_code.properties b/app/version_code.properties
index 5129984..7009760 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Apr 11 15:09:19 CST 2020\r
-VERSION_CODE=398\r
+#Sat Apr 11 16:27:31 CST 2020\r
+VERSION_CODE=399\r