From: snickersun <scy@incartech.cn>
Date: Tue, 18 Aug 2020 09:06:58 +0000 (+0800)
Subject: release V502
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=c56e9ae5828a8235f4d7961763b55e18cbf6af10;p=protocol_srv.git

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 660ceaae..5cebee57 100644
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 a391a9fe..8368a44a 100644
--- 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 a8dc5dd5..5a32f7ee 100644
--- 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;
   public static boolean needAllwaysAlarmAntiOff=false;
   public static boolean needTemperature_abnormal_alarm=false;
-
+  public static boolean A9_noBroadCastActionStrip=false;
   public static void LoadMessageConfigs(){
     String tmp=Util.getSystemProperties("persist.sys.doBroadcastMSG");
     boolean ret=false;
@@ -392,6 +392,9 @@ public class Config {
       noSMSNotifyDialog=true;
       noVoiceNotifyDialog=true;
       needBroadcastAntiAlarm=true;
+      needAllwaysAlarmAntiOff=false;
+      needAllwaysAlarmFenceOut=false;
+      needTemperature_abnormal_alarm=false;
       noPPGSensor=false;
       noTempSensor=false;
     }else if (custom_branch_name.equals("YQ") ||custom_branch_name.equals("YQ_EN")  ) { //A9-YQ
@@ -404,6 +407,7 @@ public class Config {
       needTemperature_abnormal_alarm=true;
       noPPGSensor=false;
       noTempSensor=false;
+      A9_noBroadCastActionStrip=true;
     }
     noPPGSensor=(ICJniUtils.isPPGavailable()==0);
     noTempSensor=(ICJniUtils.isTemperatureDevAvailable()==0);
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 77bfe460..ccb91589 100644
--- 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);
         intent.putExtra(KEY_ANTI_EVENT,antioff);
         if (antioff==0) {
-        //    intent.putExtra(KEY_ANTI_TXT, "");
-            //mContext.sendBroadcast(intent);
-//            mRuntime.getContextProxy().sendMsgBroadcast(mContext.getResources().getString(R.string.alarm_wristband_on),0); //佩戴
-            Util.ShowToast(mRuntime,mContext.getResources().getString(R.string.alarm_wristband_on));
+
+            if(Config.A9_noBroadCastActionStrip) {
+                Util.ShowToast(mRuntime,mContext.getResources().getString(R.string.alarm_wristband_on));
+                //                mRuntime.getContextProxy().sendMsgBroadcast(mContext.getResources().getString(R.string.alarm_wristband_on),0); //佩戴
+            }else{
+                intent.putExtra(KEY_ANTI_TXT, "");
+                mContext.sendBroadcast(intent);
+            }
+
         }else{
             if (mRuntime.getAntioffStatus()==true){
                 intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_Illegal_unlock));
diff --git a/app/version_code.properties b/app/version_code.properties
index 7ecbf829..2349f1d7 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Aug 17 15:32:14 CST 2020
-VERSION_CODE=501
+#Tue Aug 18 17:04:17 CST 2020
+VERSION_CODE=502