From: snickersun <scy@incartech.cn>
Date: Sat, 19 Sep 2020 10:08:48 +0000 (+0800)
Subject: 锁定提醒 改为 文字提示，且去掉提示声音。并保证没有解锁前，重启也保留配置。
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=eaaf5c9474f97b0ed56465a630ff8ddebec1d582;p=protocol_srv.git

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

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 26c949a7..44c403b9 100644
--- 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 {
     }
   }
   public static void LoadMessageConfigs(){
+
     String tmp=Util.getSystemProperties("persist.sys.doBroadcastMSG");
     boolean ret=false;
     if (tmp.equals("true"))
@@ -639,6 +640,13 @@ public class Config {
 
     }
 
+    public static void setNeedAntiOff(Context context,boolean enAnti){
+      SharPreferenceUtil.setPrefBoolean(context,"NeedAntiOff",enAnti);
+    }
+
+    public static boolean getNeedAntiOff(Context context){
+      return SharPreferenceUtil.getPrefBoolean(context,"NeedAntiOff", false);
+    }
     public static boolean enableSleep=false;
   /**
    * 参考数据，平均每分钟步数来判断，大于 KeepSitJudgementRefValue 认为没有坐着。小于等于这个值认为坐着。
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 993e17bc..7bd3f4ff 100644
--- 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();
         }
 
+        //初始化剪断，脱腕报警开关
+        runtime.setNeddReportCutoff(Config.getNeedAntiOff(this));
+
         //初始化消息相关配置
         Config.LoadMessageConfigs();
+
         if (Config.custom_branch_name.equals("H88")) {
 
             if (Config.getConfigInitFlag(this) == 0) {
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 92227b82..c46e8a58 100644
--- 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 {
   }
 
   private boolean isNeedAntioff;
-  public boolean getAntioffStatus() { return this.isNeedAntioff; }
-  public void setAntioffStatus(boolean paramBoolean) { this.isNeedAntioff = paramBoolean; }
+  public boolean getNeedAntioff() { return this.isNeedAntioff; }
+  public void setNeedAntioff(boolean paramBoolean) { this.isNeedAntioff = paramBoolean; }
 
   private boolean isNeedReportcutoff=false;
   public boolean needReportCutoff(){
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 c26feae5..911477a4 100644
--- 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) {
                     e.printStackTrace();
                 }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。
-                if (mRuntime.getAntioffStatus()){
+                if (mRuntime.getNeedAntioff()){
                     intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off));
+                    mContext.sendBroadcast(intent);
                 }
-                mContext.sendBroadcast(intent);
+
             }
 
         }
@@ -346,10 +347,11 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。
-                if (mRuntime.getAntioffStatus()){
+                if (mRuntime.getNeedAntioff()){
                     intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off));
+                    mContext.sendBroadcast(intent);
                 }
-                mContext.sendBroadcast(intent);
+
             }
 
         }
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 0df61581..a43a45d1 100644
--- 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
                 if (type.equals("1")) {
                     WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);
-                    runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success), 2);
-                    runtime.setAntioffStatus(true);
+//                    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);
+                    runtime.setNeedAntioff(true);
                 } else {
                     WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);
                     runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_unbind_success), 2);
-                    runtime.setAntioffStatus(false);
+                    Config.setNeedAntiOff(runtime.getContextProxy().context,false);
+                    runtime.setNeedAntioff(false);
                     //1 分钟后重置
                     new Handler().postDelayed(new Runnable() {
                         @Override