From: snickersun <scy@incartech.cn>
Date: Fri, 14 Aug 2020 09:12:37 +0000 (+0800)
Subject: release V499
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=e59fdbf3740dc72b17f41009960c1ac641ac5ed7;p=protocol_srv.git

release V499
1、wear on 只提示Toast
2、增加变量，保证只有A9-YQ/YQ_EN才会5分钟提醒一次未佩戴，出围栏报警
---

diff --git a/app/release/ICSer_V497_2008122043_release.apk b/app/release/ICSer_V499_2008141706_release.apk
similarity index 79%
rename from app/release/ICSer_V497_2008122043_release.apk
rename to app/release/ICSer_V499_2008141706_release.apk
index 086ffc6f..03382bf1 100644
Binary files a/app/release/ICSer_V497_2008122043_release.apk and b/app/release/ICSer_V499_2008141706_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index c4509e6a..301e5136 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":497,"versionName":"2008122043","enabled":true,"outputFile":"ICSer_V497_2008122043_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V497_2008122043_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":499,"versionName":"2008141706","enabled":true,"outputFile":"ICSer_V499_2008141706_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V499_2008141706_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 4b95bd7f..e28ebc2f 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -345,6 +345,9 @@ public class Config {
 
   public static boolean do_broadCast_message_no_indication=false;
 
+  public static boolean needAllwaysAlarmFenceOut=false;
+  public static boolean needAllwaysAlarmAntiOff=false;
+
   public static void LoadMessageConfigs(){
     String tmp=Util.getSystemProperties("persist.sys.doBroadcastMSG");
     boolean ret=false;
@@ -395,6 +398,8 @@ public class Config {
       noSMSNotifyDialog=true;
       noVoiceNotifyDialog=true;
       needBroadcastAntiAlarm=true;
+      needAllwaysAlarmAntiOff=true;
+      needAllwaysAlarmFenceOut=true;
       noPPGSensor=false;
       noTempSensor=false;
     }
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 87d07d32..7a40d49d 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -720,12 +720,13 @@ public class CoreService extends Service {
 
     public void checkAlarmMessage(){
 
-        if (runtime.Fence_Warning_flag>0){
+
+        if (runtime.Fence_Warning_flag>0 &&  Config.needAllwaysAlarmFenceOut){
             runtime.Fence_Warning_flag++;
             WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);
             runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_out_wall),2);
         }
-        if(runtime.Anti_off_flag>0){
+        if(runtime.Anti_off_flag>0 && Config.needAllwaysAlarmAntiOff){
             runtime.Anti_off_flag++;
             WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);
             if (runtime.getAntioffStatus()) {
diff --git a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
index abd83e24..c865968e 100644
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -19,6 +19,7 @@ import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.ICLogger;
 
+import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
 import com.ic.protocols.protocolAPIHelper;
 
@@ -185,7 +186,8 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
         if (antioff==0) {
             intent.putExtra(KEY_ANTI_TXT, "");
             mContext.sendBroadcast(intent);
-            mRuntime.getContextProxy().sendMsgBroadcast(mContext.getResources().getString(R.string.alarm_wristband_on),0); //佩戴
+//            mRuntime.getContextProxy().sendMsgBroadcast(mContext.getResources().getString(R.string.alarm_wristband_on),0); //佩戴
+            Util.ShowToast(mRuntime,mContext.getResources().getString(R.string.alarm_wristband_on));
         }else{
             if (mRuntime.getAntioffStatus()==true){
                 intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_Illegal_unlock));
@@ -195,7 +197,6 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
             mContext.sendBroadcast(intent);
         }
 
-
     }
 
     private void screen_on(){
diff --git a/app/version_code.properties b/app/version_code.properties
index f46ea862..b3d63c8e 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Aug 12 20:43:40 CST 2020
-VERSION_CODE=497
+#Fri Aug 14 17:06:25 CST 2020
+VERSION_CODE=499