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 38e0dfb..d70f8f1 100644 (file)
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 9aed73b..05c732c 100644 (file)
--- 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 2bd4b6d..f6a9f9a 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
-            String tmp=mac.replace(":","").toLowerCase().split(",")[0];\r
+            String tmp=mac.replace(":","").toLowerCase();\r
+            tmp=tmp.substring(0,tmp.indexOf(","));\r
             if (runtime.bleInfo.btMacList.contains(tmp)) {\r
               in_area = true;\r
               break;\r

diff --git a/app/version_code.properties b/app/version_code.properties
index f1551ee..6f30b4d 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 24 17:10:18 CST 2020\r
-VERSION_CODE=629\r
+#Thu Sep 24 18:45:56 CST 2020\r
+VERSION_CODE=630\r