From: snickersun <scy@incartech.cn>
Date: Sat, 11 Apr 2020 08:30:22 +0000 (+0800)
Subject: release V399
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=c7ddc3f6d40caad6806ea4ce729e753b2dc352f1;p=protocol_srv.git

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
index a3aadf2c..00000000
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
index 00000000..95e423ff
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 e71d2246..8ac59406 100644
--- 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 {
   
   private static boolean wakeLockWifiSet = false;
   
-  private String wifiDataForCm;
-
-
   private static  boolean wifiEnabled;
 
   public static Runnable delaySendMSG;
-//  public static boolean sendingMsg=false;
   private static Handler mSendMSGHandler=new Handler(new Handler.Callback() {
     @Override
     public boolean handleMessage(Message message) {
-
-//      switch (message.what){
-//        case 1:
-//          mSendMSGHandler.post(delaySendMSG);
-//          break;
-//        default:
-//          break;
-//      }
       return false;
     }
   });
@@ -127,24 +115,9 @@ public class Deliver extends AbstractConnectionService {
     delaySendMSG = new Runnable() {
       @Override
       public void run() {
-//        if (sendingMsg==true)
-//        {
-//          ICLogger.i("Sending MSG in Thread, skip this send Command.");
-//          return;
-//        }
-//        sendingMsg=true;
-//        while (getAndSendMsgFromQueue()==true) {
-//          try {
-//            Thread.sleep(5000);
-//          } catch (InterruptedException e) {
-//            e.printStackTrace();
-//          }
-//        }
         if (getAndSendMsgFromQueue()==true){
           mSendMSGHandler.postDelayed(delaySendMSG,5000L);
         }
-//        sendingMsg=false;
-//        ICLogger.i("exit delaySendMSG!");
       }
     };
   }
@@ -179,7 +152,9 @@ public class Deliver extends AbstractConnectionService {
     return ret;
   }
   public static void triggerSendThread() {
-    mSendMSGHandler.post(delaySendMSG);
+//    mSendMSGHandler.post(delaySendMSG);
+    ICLogger.i("triggerSendThread ");
+    delaySendMSG.run();
 //    mSendMSGHandler.sendEmptyMessage(1);
   }
 
@@ -233,53 +208,6 @@ public class Deliver extends AbstractConnectionService {
     }
     return ret;
   }
-//  private static void loadMessage2Queue() {
-//    byte b = 0;
-//    //一次只处理5条数据
-//    while (b < 5) {
-//      String str = fileCache.load();
-//      if (str != null) {
-//        byte b1 = ++b;
-//
-//        try {
-//          StringMessage stringMessage = new StringMessage(str);
-//          //如果在queue中添加失败，则写回cache中
-//          if (!queue.offerLast(stringMessage)) {
-////            fileCache.put(str);
-//          }
-//        } catch (Exception e) {
-//          e.printStackTrace();
-//        }
-//      }
-//    }
-//  }
-//  public static void saveQueue() {
-//    lock.lock();
-//    try {
-//      String str;
-//      if (!queue.isEmpty()) {
-//        StringBuilder stringBuilder = new StringBuilder();
-//        StringMessage stringMessage = queue.poll();
-//        while (stringMessage != null) {
-//            String cmd=stringMessage.isFromCache();
-//            stringBuilder.append(cmd);
-//            stringBuilder.append("\n");
-////            fileCache.put(cmd);
-//            stringMessage = queue.poll();
-//        }
-//        str = stringBuilder.toString();
-//      } else {
-//        str = null;
-//      }
-//      ICLogger.i("save queue to cache : \n"+str);
-//      lock.unlock();
-//      return;
-//    } finally {
-//      if (lock!=null &&lock.isLocked())
-//      lock.unlock();
-//    }
-//  }
-
 
 public static void sendLocationMSG( String Msg){
 
diff --git a/app/version_code.properties b/app/version_code.properties
index 51299841..70097607 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Apr 11 15:09:19 CST 2020
-VERSION_CODE=398
+#Sat Apr 11 16:27:31 CST 2020
+VERSION_CODE=399