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

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 26c949a..44c403b 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -378,6 +378,7 @@ public class Config {
     }\r
   }\r
   public static void LoadMessageConfigs(){\r
+\r
     String tmp=Util.getSystemProperties("persist.sys.doBroadcastMSG");\r
     boolean ret=false;\r
     if (tmp.equals("true"))\r
@@ -639,6 +640,13 @@ public class Config {
 \r
     }\r
 \r
+    public static void setNeedAntiOff(Context context,boolean enAnti){\r
+      SharPreferenceUtil.setPrefBoolean(context,"NeedAntiOff",enAnti);\r
+    }\r
+\r
+    public static boolean getNeedAntiOff(Context context){\r
+      return SharPreferenceUtil.getPrefBoolean(context,"NeedAntiOff", false);\r
+    }\r
     public static boolean enableSleep=false;\r
   /**\r
    * 参考数据，平均每分钟步数来判断，大于 KeepSitJudgementRefValue 认为没有坐着。小于等于这个值认为坐着。\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 993e17b..7bd3f4f 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -616,8 +616,12 @@ public class CoreService extends Service {
             resetStepCount();\r
         }\r
 \r
+        //初始化剪断，脱腕报警开关\r
+        runtime.setNeddReportCutoff(Config.getNeedAntiOff(this));\r
+\r
         //初始化消息相关配置\r
         Config.LoadMessageConfigs();\r
+\r
         if (Config.custom_branch_name.equals("H88")) {\r
 \r
             if (Config.getConfigInitFlag(this) == 0) {\r

diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
index 92227b8..c46e8a5 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -516,8 +516,8 @@ public class Runtime {
   }\r
 \r
   private boolean isNeedAntioff;\r
-  public boolean getAntioffStatus() { return this.isNeedAntioff; }\r
-  public void setAntioffStatus(boolean paramBoolean) { this.isNeedAntioff = paramBoolean; }\r
+  public boolean getNeedAntioff() { return this.isNeedAntioff; }\r
+  public void setNeedAntioff(boolean paramBoolean) { this.isNeedAntioff = paramBoolean; }\r
 \r
   private boolean isNeedReportcutoff=false;\r
   public boolean needReportCutoff(){\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 c26feae..911477a 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -281,10 +281,11 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
                 } catch (InterruptedException e) {\r
                     e.printStackTrace();\r
                 }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。\r
-                if (mRuntime.getAntioffStatus()){\r
+                if (mRuntime.getNeedAntioff()){\r
                     intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off));\r
+                    mContext.sendBroadcast(intent);\r
                 }\r
-                mContext.sendBroadcast(intent);\r
+\r
             }\r
 \r
         }\r
@@ -346,10 +347,11 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
                 } catch (InterruptedException e) {\r
                     e.printStackTrace();\r
                 }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。\r
-                if (mRuntime.getAntioffStatus()){\r
+                if (mRuntime.getNeedAntioff()){\r
                     intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off));\r
+                    mContext.sendBroadcast(intent);\r
                 }\r
-                mContext.sendBroadcast(intent);\r
+\r
             }\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 0df6158..a43a45d 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -1532,12 +1532,15 @@ public class protocol_ic {
             if (Config.custom_branch_name.equals("YQ")||Config.custom_branch_name.equals("YQ_EN")) {//AK-YQ\r
                 if (type.equals("1")) {\r
                     WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);\r
-                    runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success), 2);\r
-                    runtime.setAntioffStatus(true);\r
+//                    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
+                    runtime.setNeedAntioff(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
-                    runtime.setAntioffStatus(false);\r
+                    Config.setNeedAntiOff(runtime.getContextProxy().context,false);\r
+                    runtime.setNeedAntioff(false);\r
                     //1 分钟后重置\r
                     new Handler().postDelayed(new Runnable() {\r
                         @Override\r