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 c57c7fb..11436e1 100644 (file)
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 ca6222f..bfe9cdb 100644 (file)
--- 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) {\r
 \r
         if (btNewScanResult.size() > 0) {\r
-          ICLogger.i("found bt mac " + btNewScanResult.size());\r
+          ICLogger.i("found bt mac " + btNewScanResult.size()+" btMacList "+runtime.bleInfo.btMacList.size());\r
           boolean in_area = false;\r
           for (String mac : btNewScanResult) {\r
-            if (runtime.bleInfo.btMacList.contains(mac)) {\r
+            ICLogger.i("bt mac "+mac.replace(":","").toLowerCase()+"  "+mac.toLowerCase());\r
+            if (runtime.bleInfo.btMacList.contains(mac.toLowerCase())||runtime.bleInfo.btMacList.contains(mac.replace(":","").toLowerCase())) {\r
               in_area = true;\r
               break;\r
             }\r
-            runtime.bleInfo.is_in_area = in_area;\r
           }\r
-\r
+          runtime.bleInfo.is_in_area = in_area;\r
 \r
         } else {\r
           runtime.bleInfo.is_in_area = false;\r
         }\r
-        ICLogger.i("Dev Is in Area " + runtime.bleInfo.is_in_area);\r
+        ICLogger.i("Bt Dev Is in Area " + runtime.bleInfo.is_in_area);\r
 \r
         if (runtime.bleInfo.is_in_area == false) {\r
-          ICLogger.i("不在区域内，开启定位流程");\r
+          ICLogger.i("BT 不在区域内，开启定位流程");\r
           startLocationProcess(runtime.getLocationInstance().getWorkingMod());\r
         }else{\r
-          ICLogger.i("在区域内，直接发送区域坐标即可！");\r
+          ICLogger.i("BT 在区域内，直接发送区域坐标即可！");\r
           StringMessage AP01_CMD = protocolAPIHelper.getGPSLocationMSG(runtime);\r
           Deliver.sendLocationMSG(AP01_CMD);\r
         }\r

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 073e5c1..f29ff1a 100644 (file)
--- 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;\r
         String lonStr=gpsp.getLocation().lonGPSStr;\r
 \r
+        ICLogger.i(" UD isfixed "+isGPSFixed()+" is in area "+bleInfo.is_in_area);\r
         if(bleInfo.is_in_area==true){\r
              latStr=bleInfo.gps_n;\r
              lonStr=bleInfo.gps_e;\r
@@ -644,6 +645,7 @@ public class Runtime {
             sb.append("V").append(gpsStr);\r
         }\r
 \r
+        ICLogger.i("UD "+sb.toString());\r
 \r
         return sb.toString();\r
     }\r

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 db00ffc..f38b45e 100644 (file)
--- 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 {
  */\r
         String[] list = data.split(CMDSPLIT);\r
         if (list.length >= 7) {\r
-            runtime.bleInfo.ble_area_id = list[1];\r
-            runtime.bleInfo.gps_n = list[2];\r
-            runtime.bleInfo.gps_e = list[4];\r
+            runtime.bleInfo.ble_area_id = list[1].trim();\r
+            runtime.bleInfo.gps_n = list[2].trim();\r
+            runtime.bleInfo.gps_e = list[4].trim();\r
             runtime.bleInfo.btMacList.clear();\r
             StringBuilder sb = new StringBuilder();\r
             sb.append("登录绑定 区域码" + list[1] + " ,GPS " + list[2] + "N," + list[4] + "E, BtMacs ");\r
             for (int i = 6; i < list.length; i++) {\r
-                runtime.bleInfo.btMacList.add(list[i]);\r
+                runtime.bleInfo.btMacList.add(list[i].trim().toLowerCase());\r
                 sb.append(",").append(list[i]);\r
             }\r
             ICLogger.i(sb.toString());\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 9f233db..a2a4817 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 10 18:59:36 CST 2020\r
-VERSION_CODE=611\r
+#Sat Sep 12 16:48:19 CST 2020\r
+VERSION_CODE=612\r