From: snickersun <scy@incartech.cn>
Date: Sat, 19 Sep 2020 10:15:11 +0000 (+0800)
Subject: release V622
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=7cd9704c8c4d153c441923ff46f35156c4c2e621;p=protocol_srv.git

release V622
锁定提醒 改为 文字提示，且去掉提示声音。并保证没有解锁前，重启也保留配置。
---

diff --git a/app/release/ICSer_V620_2009172123_release.apk b/app/release/ICSer_V622_2009191813_release.apk
similarity index 78%
rename from app/release/ICSer_V620_2009172123_release.apk
rename to app/release/ICSer_V622_2009191813_release.apk
index 52095ae8..331d4203 100644
Binary files a/app/release/ICSer_V620_2009172123_release.apk and b/app/release/ICSer_V622_2009191813_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index fb22db3b..e02bbe8f 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":620,"versionName":"2009172123","enabled":true,"outputFile":"ICSer_V620_2009172123_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V620_2009172123_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":622,"versionName":"2009191813","enabled":true,"outputFile":"ICSer_V622_2009191813_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V622_2009191813_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 44c403b9..f3eb5773 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -639,7 +639,13 @@ public class Config {
         return Util.getSystemPropertiesInt("persist.sys."+Constants.SHAREKEY_SETTING_SLEEP_SCORE,0);
 
     }
+  public static void setNeedCutOff(Context context,boolean enAnti){
+    SharPreferenceUtil.setPrefBoolean(context,"NeedCutOff",enAnti);
+  }
 
+  public static boolean getNeedCutOff(Context context){
+    return SharPreferenceUtil.getPrefBoolean(context,"NeedCutOff", false);
+  }
     public static void setNeedAntiOff(Context context,boolean enAnti){
       SharPreferenceUtil.setPrefBoolean(context,"NeedAntiOff",enAnti);
     }
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 7bd3f4ff..8e7c7f89 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -617,7 +617,8 @@ public class CoreService extends Service {
         }
 
         //初始化剪断，脱腕报警开关
-        runtime.setNeddReportCutoff(Config.getNeedAntiOff(this));
+        runtime.setNeddReportCutoff(Config.getNeedCutOff(this));
+        runtime.setNeedAntioff(Config.getNeedAntiOff(this));
 
         //初始化消息相关配置
         Config.LoadMessageConfigs();
diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
index 9ffa57ca..122fa2c7 100644
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -451,7 +451,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
       }
     }
 
-    this.mRuntime.setAntioffStatus(var1);
+    this.mRuntime.setNeedAntioff(var1);
     return var1;
   }
 
diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index a43a45d1..87b814bf 100644
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -1535,12 +1535,16 @@ public class protocol_ic {
 //                    runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success), 2);
                     Util.ShowToast(runtime,runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success));
                     Config.setNeedAntiOff(runtime.getContextProxy().context,true);
+                    Config.setNeedCutOff(runtime.getContextProxy().context,true);
                     runtime.setNeedAntioff(true);
+                    runtime.setNeddReportCutoff(true);
                 } else {
                     WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);
                     runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_unbind_success), 2);
                     Config.setNeedAntiOff(runtime.getContextProxy().context,false);
+                    Config.setNeedCutOff(runtime.getContextProxy().context,false);
                     runtime.setNeedAntioff(false);
+                    runtime.setNeddReportCutoff(false);
                     //1 分钟后重置
                     new Handler().postDelayed(new Runnable() {
                         @Override
diff --git a/app/version_code.properties b/app/version_code.properties
index 35d8aca3..e1af9021 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 17 21:23:55 CST 2020
-VERSION_CODE=620
+#Sat Sep 19 18:13:35 CST 2020
+VERSION_CODE=622