release V699

C5 根据客户需求默认取消BLE扫描 Beacon时的进入区域报警。只对逃逸进行报警。

diff --git a/app/release/ICSer_V698_2011151123_release.apk b/app/release/ICSer_V699_2011152138_release.apk
similarity index 78%
rename from app/release/ICSer_V698_2011151123_release.apk
rename to app/release/ICSer_V699_2011152138_release.apk
index 64122f7..8e7e64f 100644 (file)
Binary files a/app/release/ICSer_V698_2011151123_release.apk and b/app/release/ICSer_V699_2011152138_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 4c96598..7990f8b 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":698,"versionName":"2011151123","enabled":true,"outputFile":"ICSer_V698_2011151123_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V698_2011151123_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":699,"versionName":"2011152138","enabled":true,"outputFile":"ICSer_V699_2011152138_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V699_2011152138_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index dab0a41..f9b0fa2 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -160,7 +160,6 @@ public class Config {
   final static String KeyPolingCycleCheckAnti="PolingCycleCheckAnti";\r
   final static String KeyBleScanCycle="BleScanCycle";\r
 \r
-\r
   final static String KeyLastUnReadMessage="UnreadMsg";\r
 \r
 \r
@@ -432,6 +431,8 @@ public class Config {
   public static boolean L004_BroadCastActionStrip=false;\r
   public static boolean disable_ntp_server=false;\r
 \r
+  public static boolean noBLE_RelaseEscapeAlarm=true;\r
+\r
   public static void enable_NTP_Server(Context context,boolean enable){\r
     try {\r
       int autotime = Settings.Global.getInt(context.getContentResolver(),Settings.Global.AUTO_TIME);\r

diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 3d72341..1ff546a 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -209,9 +209,11 @@ public class LocationClient {
               if (runtime.bleInfo.last_is_in_area == false) {\r
                 //上一次不在区域内，这次进区域要报警\r
                 ICLogger.i("BT 进入区域内，且上次不在区域内，报警！");\r
-                //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用\r
-                StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
-                DeliverMessage(AL_CMD);\r
+                if(!Config.noBLE_RelaseEscapeAlarm) {\r
+                   //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用\r
+                  StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
+                  DeliverMessage(AL_CMD);\r
+                }\r
               }\r
             }\r
           } else {\r
@@ -243,10 +245,13 @@ public class LocationClient {
               if (runtime.bleInfo.last_is_in_area == false) {\r
                 //上一次不在区域内，这次进区域要报警\r
                 ICLogger.i("BT 进入区域内，且上次不在区域内，报警！");\r
-                //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用\r
-                StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
-                DeliverMessage(AL_CMD);\r
-                startSOSLocation = false;//如果已经报警，后面就不用再报了\r
+\r
+                if(!Config.noBLE_RelaseEscapeAlarm) {\r
+                  //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用\r
+                  StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
+                  DeliverMessage(AL_CMD);\r
+                  startSOSLocation = false;//如果已经报警，后面就不用再报了\r
+                }\r
               }\r
 \r
               if (startSOSLocation) {\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 98f5c03..85d175b 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Nov 15 11:23:08 CST 2020\r
-VERSION_CODE=698\r
+#Sun Nov 15 21:38:11 CST 2020\r
+VERSION_CODE=699\r