From: snickersun <scy@incartech.cn>
Date: Thu, 24 Sep 2020 09:13:00 +0000 (+0800)
Subject: release L02ProtocolV2 V629
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d75d8c97ffadfe30e6358ada303c9ee368f7c6b0;p=protocol_srv.git

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 d9e6d9e7..38e0dfb7 100644
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 b127e662..9aed73b4 100644
--- 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 63ac23d6..2bd4b6d5 100644
--- 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;
           for (String mac : btNewScanResult) {
             ICLogger.i("bt mac "+mac.replace(":","").toLowerCase()+"  "+mac.toLowerCase());
-            if (runtime.bleInfo.btMacList.contains(mac.toLowerCase())||runtime.bleInfo.btMacList.contains(mac.replace(":","").toLowerCase())) {
+            String tmp=mac.replace(":","").toLowerCase().split(",")[0];
+            if (runtime.bleInfo.btMacList.contains(tmp)) {
               in_area = true;
               break;
             }
@@ -156,15 +157,27 @@ public class LocationClient {
         if(scanBLEOnly==true){
           if (runtime.bleInfo.is_in_area == false ) {
             runtime.updateFZDDevStatusEscape(true);
+            ICLogger.i("BT 不在区域内");
             if ( runtime.bleInfo.last_is_in_area==true) {
               //只有上一次在区域内，这次出区域才需要报警
+              ICLogger.i("BT 不在区域内，且上次在区域内，报警！");
               StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);
               DeliverMessage(AL_CMD);
             }
+          }else{
+            ICLogger.i("BT 在区域内！");
+            runtime.updateFZDDevStatusEscape(false);
           }
         }else {
           if (runtime.bleInfo.is_in_area == false) {
             ICLogger.i("BT 不在区域内，开启定位流程");
+            runtime.updateFZDDevStatusEscape(true);
+            if ( runtime.bleInfo.last_is_in_area==true) {
+              //只有上一次在区域内，这次出区域才需要报警
+              ICLogger.i("BT 不在区域内，且上次在区域内，报警！");
+              StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);
+              DeliverMessage(AL_CMD);
+            }
             startLocationProcess(runtime.getLocationInstance().getWorkingMod());
           } else {
             ICLogger.i("BT 在区域内，直接发送区域坐标即可！");
diff --git a/app/version_code.properties b/app/version_code.properties
index dfd67894..f1551eec 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 24 15:08:04 CST 2020
-VERSION_CODE=627
+#Thu Sep 24 17:10:18 CST 2020
+VERSION_CODE=629