release L02ProtocolV2 V629

修复 蓝牙扫描发现设备不在区域时的判断逻辑。
完善 蓝牙扫描第一次不在区域时，心跳时扫描和定位时扫描两种模式的报警判断逻辑

diff --git a/app/release/ICSer_V627_2009241508_release.apk b/app/release/ICSer_V629_2009241710_release.apk
similarity index 78%
rename from app/release/ICSer_V627_2009241508_release.apk
rename to app/release/ICSer_V629_2009241710_release.apk
index d9e6d9e..38e0dfb 100644 (file)
Binary files a/app/release/ICSer_V627_2009241508_release.apk and b/app/release/ICSer_V629_2009241710_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index b127e66..9aed73b 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":627,"versionName":"2009241508","enabled":true,"outputFile":"ICSer_V627_2009241508_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V627_2009241508_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":629,"versionName":"2009241710","enabled":true,"outputFile":"ICSer_V629_2009241710_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V629_2009241710_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 63ac23d..2bd4b6d 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -141,7 +141,8 @@ public class LocationClient {
           boolean in_area = false;\r
           for (String mac : btNewScanResult) {\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
+            String tmp=mac.replace(":","").toLowerCase().split(",")[0];\r
+            if (runtime.bleInfo.btMacList.contains(tmp)) {\r
               in_area = true;\r
               break;\r
             }\r
@@ -156,15 +157,27 @@ public class LocationClient {
         if(scanBLEOnly==true){\r
           if (runtime.bleInfo.is_in_area == false ) {\r
             runtime.updateFZDDevStatusEscape(true);\r
+            ICLogger.i("BT 不在区域内");\r
             if ( runtime.bleInfo.last_is_in_area==true) {\r
               //只有上一次在区域内，这次出区域才需要报警\r
+              ICLogger.i("BT 不在区域内，且上次在区域内，报警！");\r
               StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
               DeliverMessage(AL_CMD);\r
             }\r
+          }else{\r
+            ICLogger.i("BT 在区域内！");\r
+            runtime.updateFZDDevStatusEscape(false);\r
           }\r
         }else {\r
           if (runtime.bleInfo.is_in_area == false) {\r
             ICLogger.i("BT 不在区域内，开启定位流程");\r
+            runtime.updateFZDDevStatusEscape(true);\r
+            if ( runtime.bleInfo.last_is_in_area==true) {\r
+              //只有上一次在区域内，这次出区域才需要报警\r
+              ICLogger.i("BT 不在区域内，且上次在区域内，报警！");\r
+              StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
+              DeliverMessage(AL_CMD);\r
+            }\r
             startLocationProcess(runtime.getLocationInstance().getWorkingMod());\r
           } else {\r
             ICLogger.i("BT 在区域内，直接发送区域坐标即可！");\r

diff --git a/app/version_code.properties b/app/version_code.properties
index dfd6789..f1551ee 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 24 15:08:04 CST 2020\r
-VERSION_CODE=627\r
+#Thu Sep 24 17:10:18 CST 2020\r
+VERSION_CODE=629\r