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 52095ae..331d420 100644 (file)
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 fb22db3..e02bbe8 100644 (file)
--- 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 44c403b..f3eb577 100644 (file)
--- 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);\r
 \r
     }\r
+  public static void setNeedCutOff(Context context,boolean enAnti){\r
+    SharPreferenceUtil.setPrefBoolean(context,"NeedCutOff",enAnti);\r
+  }\r
 \r
+  public static boolean getNeedCutOff(Context context){\r
+    return SharPreferenceUtil.getPrefBoolean(context,"NeedCutOff", false);\r
+  }\r
     public static void setNeedAntiOff(Context context,boolean enAnti){\r
       SharPreferenceUtil.setPrefBoolean(context,"NeedAntiOff",enAnti);\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 7bd3f4f..8e7c7f8 100644 (file)
--- 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 {
         }\r
 \r
         //初始化剪断，脱腕报警开关\r
-        runtime.setNeddReportCutoff(Config.getNeedAntiOff(this));\r
+        runtime.setNeddReportCutoff(Config.getNeedCutOff(this));\r
+        runtime.setNeedAntioff(Config.getNeedAntiOff(this));\r
 \r
         //初始化消息相关配置\r
         Config.LoadMessageConfigs();\r

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 9ffa57c..122fa2c 100644 (file)
--- 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 {
       }\r
     }\r
 \r
-    this.mRuntime.setAntioffStatus(var1);\r
+    this.mRuntime.setNeedAntioff(var1);\r
     return var1;\r
   }\r
 \r

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 a43a45d..87b814b 100644 (file)
--- 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);\r
                     Util.ShowToast(runtime,runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success));\r
                     Config.setNeedAntiOff(runtime.getContextProxy().context,true);\r
+                    Config.setNeedCutOff(runtime.getContextProxy().context,true);\r
                     runtime.setNeedAntioff(true);\r
+                    runtime.setNeddReportCutoff(true);\r
                 } else {\r
                     WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);\r
                     runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_unbind_success), 2);\r
                     Config.setNeedAntiOff(runtime.getContextProxy().context,false);\r
+                    Config.setNeedCutOff(runtime.getContextProxy().context,false);\r
                     runtime.setNeedAntioff(false);\r
+                    runtime.setNeddReportCutoff(false);\r
                     //1 分钟后重置\r
                     new Handler().postDelayed(new Runnable() {\r
                         @Override\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 35d8aca..e1af902 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 17 21:23:55 CST 2020\r
-VERSION_CODE=620\r
+#Sat Sep 19 18:13:35 CST 2020\r
+VERSION_CODE=622\r