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 086ffc6..03382bf 100644 (file)
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 c4509e6..301e513 100644 (file)
--- 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 4b95bd7..e28ebc2 100644 (file)
--- 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 {
 \r
   public static boolean do_broadCast_message_no_indication=false;\r
 \r
+  public static boolean needAllwaysAlarmFenceOut=false;\r
+  public static boolean needAllwaysAlarmAntiOff=false;\r
+\r
   public static void LoadMessageConfigs(){\r
     String tmp=Util.getSystemProperties("persist.sys.doBroadcastMSG");\r
     boolean ret=false;\r
@@ -395,6 +398,8 @@ public class Config {
       noSMSNotifyDialog=true;\r
       noVoiceNotifyDialog=true;\r
       needBroadcastAntiAlarm=true;\r
+      needAllwaysAlarmAntiOff=true;\r
+      needAllwaysAlarmFenceOut=true;\r
       noPPGSensor=false;\r
       noTempSensor=false;\r
     }\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 87d07d3..7a40d49 100644 (file)
--- 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 {
 \r
     public void checkAlarmMessage(){\r
 \r
-        if (runtime.Fence_Warning_flag>0){\r
+\r
+        if (runtime.Fence_Warning_flag>0 &&  Config.needAllwaysAlarmFenceOut){\r
             runtime.Fence_Warning_flag++;\r
             WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);\r
             runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_out_wall),2);\r
         }\r
-        if(runtime.Anti_off_flag>0){\r
+        if(runtime.Anti_off_flag>0 && Config.needAllwaysAlarmAntiOff){\r
             runtime.Anti_off_flag++;\r
             WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);\r
             if (runtime.getAntioffStatus()) {\r

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 abd83e2..c865968 100644 (file)
--- 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;\r
 import com.enqualcomm.support.utils.ICLogger;\r
 \r
+import com.enqualcomm.support.utils.Util;\r
 import com.enqualcomm.support.utils.VibrateUtil;\r
 import com.ic.protocols.protocolAPIHelper;\r
 \r
@@ -185,7 +186,8 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
         if (antioff==0) {\r
             intent.putExtra(KEY_ANTI_TXT, "");\r
             mContext.sendBroadcast(intent);\r
-            mRuntime.getContextProxy().sendMsgBroadcast(mContext.getResources().getString(R.string.alarm_wristband_on),0); //佩戴\r
+//            mRuntime.getContextProxy().sendMsgBroadcast(mContext.getResources().getString(R.string.alarm_wristband_on),0); //佩戴\r
+            Util.ShowToast(mRuntime,mContext.getResources().getString(R.string.alarm_wristband_on));\r
         }else{\r
             if (mRuntime.getAntioffStatus()==true){\r
                 intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r
@@ -195,7 +197,6 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
             mContext.sendBroadcast(intent);\r
         }\r
 \r
-\r
     }\r
 \r
     private void screen_on(){\r

diff --git a/app/version_code.properties b/app/version_code.properties
index f46ea86..b3d63c8 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Aug 12 20:43:40 CST 2020\r
-VERSION_CODE=497\r
+#Fri Aug 14 17:06:25 CST 2020\r
+VERSION_CODE=499\r