From: snickersun <scy@incartech.cn>
Date: Thu, 24 Sep 2020 10:47:11 +0000 (+0800)
Subject: release ICL02ProtocolV2 V630
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=b88154aac6953e65cc0a693dd20ccc280436b9ac;p=protocol_srv.git

release ICL02ProtocolV2 V630
解决BLE扫描时结果可能 array出错问题。
---

diff --git a/app/release/ICSer_V629_2009241710_release.apk b/app/release/ICSer_V630_2009241845_release.apk
similarity index 78%
rename from app/release/ICSer_V629_2009241710_release.apk
rename to app/release/ICSer_V630_2009241845_release.apk
index 38e0dfb7..d70f8f18 100644
Binary files a/app/release/ICSer_V629_2009241710_release.apk and b/app/release/ICSer_V630_2009241845_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 9aed73b4..05c732c4 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"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
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":630,"versionName":"2009241845","enabled":true,"outputFile":"ICSer_V630_2009241845_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V630_2009241845_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 2bd4b6d5..f6a9f9af 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());
-            String tmp=mac.replace(":","").toLowerCase().split(",")[0];
+            String tmp=mac.replace(":","").toLowerCase();
+            tmp=tmp.substring(0,tmp.indexOf(","));
             if (runtime.bleInfo.btMacList.contains(tmp)) {
               in_area = true;
               break;
diff --git a/app/version_code.properties b/app/version_code.properties
index f1551eec..6f30b4d0 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 24 17:10:18 CST 2020
-VERSION_CODE=629
+#Thu Sep 24 18:45:56 CST 2020
+VERSION_CODE=630