release V502

修复L004 5分钟 提示一次的问题。 兼容L004原来的逻辑+A9的逻辑。

diff --git a/app/release/ICSer_V501_2008171532_release.apk b/app/release/ICSer_V502_2008181704_release.apk
similarity index 79%
rename from app/release/ICSer_V501_2008171532_release.apk
rename to app/release/ICSer_V502_2008181704_release.apk
index 660ceaa..5cebee5 100644 (file)
Binary files a/app/release/ICSer_V501_2008171532_release.apk and b/app/release/ICSer_V502_2008181704_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index a391a9f..8368a44 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":501,"versionName":"2008171532","enabled":true,"outputFile":"ICSer_V501_2008171532_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V501_2008171532_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":502,"versionName":"2008181704","enabled":true,"outputFile":"ICSer_V502_2008181704_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V502_2008181704_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 a8dc5dd..5a32f7e 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -348,7 +348,7 @@ public class Config {
   public static boolean needAllwaysAlarmFenceOut=false;\r
   public static boolean needAllwaysAlarmAntiOff=false;\r
   public static boolean needTemperature_abnormal_alarm=false;\r
-\r
+  public static boolean A9_noBroadCastActionStrip=false;\r
   public static void LoadMessageConfigs(){\r
     String tmp=Util.getSystemProperties("persist.sys.doBroadcastMSG");\r
     boolean ret=false;\r
@@ -392,6 +392,9 @@ public class Config {
       noSMSNotifyDialog=true;\r
       noVoiceNotifyDialog=true;\r
       needBroadcastAntiAlarm=true;\r
+      needAllwaysAlarmAntiOff=false;\r
+      needAllwaysAlarmFenceOut=false;\r
+      needTemperature_abnormal_alarm=false;\r
       noPPGSensor=false;\r
       noTempSensor=false;\r
     }else if (custom_branch_name.equals("YQ") ||custom_branch_name.equals("YQ_EN")  ) { //A9-YQ\r
@@ -404,6 +407,7 @@ public class Config {
       needTemperature_abnormal_alarm=true;\r
       noPPGSensor=false;\r
       noTempSensor=false;\r
+      A9_noBroadCastActionStrip=true;\r
     }\r
     noPPGSensor=(ICJniUtils.isPPGavailable()==0);\r
     noTempSensor=(ICJniUtils.isTemperatureDevAvailable()==0);\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 77bfe46..ccb9158 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -184,10 +184,15 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
         intent.setAction(ACTION_ANTI_OFF);\r
         intent.putExtra(KEY_ANTI_EVENT,antioff);\r
         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
-            Util.ShowToast(mRuntime,mContext.getResources().getString(R.string.alarm_wristband_on));\r
+\r
+            if(Config.A9_noBroadCastActionStrip) {\r
+                Util.ShowToast(mRuntime,mContext.getResources().getString(R.string.alarm_wristband_on));\r
+                //                mRuntime.getContextProxy().sendMsgBroadcast(mContext.getResources().getString(R.string.alarm_wristband_on),0); //佩戴\r
+            }else{\r
+                intent.putExtra(KEY_ANTI_TXT, "");\r
+                mContext.sendBroadcast(intent);\r
+            }\r
+\r
         }else{\r
             if (mRuntime.getAntioffStatus()==true){\r
                 intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 7ecbf82..2349f1d 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Aug 17 15:32:14 CST 2020\r
-VERSION_CODE=501\r
+#Tue Aug 18 17:04:17 CST 2020\r
+VERSION_CODE=502\r