From: snickersun <scy@incartech.cn>
Date: Sat, 12 Sep 2020 08:50:04 +0000 (+0800)
Subject: release V612
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=32203c6672ed7c3130178fd0c5899dfcb21edcd1;p=protocol_srv.git

release V612
mqtt 服务修正 BREQ 数据存储。
修正BT扫描比较函数，添加 信标扫描定位逻辑。
---

diff --git a/app/release/ICSer_V611_2009101859_release.apk b/app/release/ICSer_V612_2009121648_release.apk
similarity index 78%
rename from app/release/ICSer_V611_2009101859_release.apk
rename to app/release/ICSer_V612_2009121648_release.apk
index c57c7fbe..11436e1c 100644
Binary files a/app/release/ICSer_V611_2009101859_release.apk and b/app/release/ICSer_V612_2009121648_release.apk differ
diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index ca6222f6..bfe9cdbb 100644
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -125,27 +125,27 @@ public class LocationClient {
       public void OnScanFinished(ArrayList<String> btPairedScanResult, ArrayList<String> btNewScanResult) {
 
         if (btNewScanResult.size() > 0) {
-          ICLogger.i("found bt mac " + btNewScanResult.size());
+          ICLogger.i("found bt mac " + btNewScanResult.size()+" btMacList "+runtime.bleInfo.btMacList.size());
           boolean in_area = false;
           for (String mac : btNewScanResult) {
-            if (runtime.bleInfo.btMacList.contains(mac)) {
+            ICLogger.i("bt mac "+mac.replace(":","").toLowerCase()+"  "+mac.toLowerCase());
+            if (runtime.bleInfo.btMacList.contains(mac.toLowerCase())||runtime.bleInfo.btMacList.contains(mac.replace(":","").toLowerCase())) {
               in_area = true;
               break;
             }
-            runtime.bleInfo.is_in_area = in_area;
           }
-
+          runtime.bleInfo.is_in_area = in_area;
 
         } else {
           runtime.bleInfo.is_in_area = false;
         }
-        ICLogger.i("Dev Is in Area " + runtime.bleInfo.is_in_area);
+        ICLogger.i("Bt Dev Is in Area " + runtime.bleInfo.is_in_area);
 
         if (runtime.bleInfo.is_in_area == false) {
-          ICLogger.i("不在区域内，开启定位流程");
+          ICLogger.i("BT 不在区域内，开启定位流程");
           startLocationProcess(runtime.getLocationInstance().getWorkingMod());
         }else{
-          ICLogger.i("在区域内，直接发送区域坐标即可！");
+          ICLogger.i("BT 在区域内，直接发送区域坐标即可！");
           StringMessage AP01_CMD = protocolAPIHelper.getGPSLocationMSG(runtime);
           Deliver.sendLocationMSG(AP01_CMD);
         }
diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
index 073e5c16..f29ff1a9 100644
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -628,6 +628,7 @@ public class Runtime {
         String latStr=gpsp.getLocation().latGPSStr;
         String lonStr=gpsp.getLocation().lonGPSStr;
 
+        ICLogger.i(" UD isfixed "+isGPSFixed()+" is in area "+bleInfo.is_in_area);
         if(bleInfo.is_in_area==true){
              latStr=bleInfo.gps_n;
              lonStr=bleInfo.gps_e;
@@ -644,6 +645,7 @@ public class Runtime {
             sb.append("V").append(gpsStr);
         }
 
+        ICLogger.i("UD "+sb.toString());
 
         return sb.toString();
     }
diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt.java b/app/src/main/java/com/ic/protocols/protocol_mqtt.java
index db00ffc5..f38b45ec 100644
--- a/app/src/main/java/com/ic/protocols/protocol_mqtt.java
+++ b/app/src/main/java/com/ic/protocols/protocol_mqtt.java
@@ -229,14 +229,14 @@ public class protocol_mqtt {
  */
         String[] list = data.split(CMDSPLIT);
         if (list.length >= 7) {
-            runtime.bleInfo.ble_area_id = list[1];
-            runtime.bleInfo.gps_n = list[2];
-            runtime.bleInfo.gps_e = list[4];
+            runtime.bleInfo.ble_area_id = list[1].trim();
+            runtime.bleInfo.gps_n = list[2].trim();
+            runtime.bleInfo.gps_e = list[4].trim();
             runtime.bleInfo.btMacList.clear();
             StringBuilder sb = new StringBuilder();
             sb.append("登录绑定 区域码" + list[1] + " ,GPS " + list[2] + "N," + list[4] + "E, BtMacs ");
             for (int i = 6; i < list.length; i++) {
-                runtime.bleInfo.btMacList.add(list[i]);
+                runtime.bleInfo.btMacList.add(list[i].trim().toLowerCase());
                 sb.append(",").append(list[i]);
             }
             ICLogger.i(sb.toString());
diff --git a/app/version_code.properties b/app/version_code.properties
index 9f233db6..a2a48174 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 10 18:59:36 CST 2020
-VERSION_CODE=611
+#Sat Sep 12 16:48:19 CST 2020
+VERSION_CODE=612