From: snickersun <scy@incartech.cn>
Date: Sun, 15 Nov 2020 13:40:19 +0000 (+0800)
Subject: release V699
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=ee3671ec4e9769db4bc80c919236bbf42a6c8455;p=protocol_srv.git

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 64122f7f..8e7e64fd 100644
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 4c965982..7990f8bf 100644
--- 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 dab0a41f..f9b0fa29 100644
--- 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";
   final static String KeyBleScanCycle="BleScanCycle";
 
-
   final static String KeyLastUnReadMessage="UnreadMsg";
 
 
@@ -432,6 +431,8 @@ public class Config {
   public static boolean L004_BroadCastActionStrip=false;
   public static boolean disable_ntp_server=false;
 
+  public static boolean noBLE_RelaseEscapeAlarm=true;
+
   public static void enable_NTP_Server(Context context,boolean enable){
     try {
       int autotime = Settings.Global.getInt(context.getContentResolver(),Settings.Global.AUTO_TIME);
diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 3d723410..1ff546a4 100644
--- 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) {
                 //上一次不在区域内，这次进区域要报警
                 ICLogger.i("BT 进入区域内，且上次不在区域内，报警！");
-                //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用
-                StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);
-                DeliverMessage(AL_CMD);
+                if(!Config.noBLE_RelaseEscapeAlarm) {
+                   //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用
+                  StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);
+                  DeliverMessage(AL_CMD);
+                }
               }
             }
           } else {
@@ -243,10 +245,13 @@ public class LocationClient {
               if (runtime.bleInfo.last_is_in_area == false) {
                 //上一次不在区域内，这次进区域要报警
                 ICLogger.i("BT 进入区域内，且上次不在区域内，报警！");
-                //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用
-                StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);
-                DeliverMessage(AL_CMD);
-                startSOSLocation = false;//如果已经报警，后面就不用再报了
+
+                if(!Config.noBLE_RelaseEscapeAlarm) {
+                  //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用
+                  StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);
+                  DeliverMessage(AL_CMD);
+                  startSOSLocation = false;//如果已经报警，后面就不用再报了
+                }
               }
 
               if (startSOSLocation) {
diff --git a/app/version_code.properties b/app/version_code.properties
index 98f5c030..85d175b9 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Nov 15 11:23:08 CST 2020
-VERSION_CODE=698
+#Sun Nov 15 21:38:11 CST 2020
+VERSION_CODE=699