From: snickersun <scy@incartech.cn>
Date: Tue, 14 Jul 2020 02:27:19 +0000 (+0800)
Subject: release V445
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=7286293a63a98d21ff2d01e540bfc361ed7a928c;p=protocol_srv.git

release V445
 添加 AntiOff 报警音和广播。H88默认关闭此广播。
---

diff --git a/app/app.iml b/app/app.iml
index 96972aaf..ebbc2302 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -126,6 +126,9 @@
     <orderEntry type="library" name="Gradle: com.kymjs.rxvolley:rxvolley:1.1.3@aar" level="project"/>
     <orderEntry type="library" name="Gradle: io.reactivex:rxandroid:1.1.0@aar" level="project"/>
     <orderEntry type="module" module-name="dNSCache"/>
+    <orderEntry type="module" module-name="dNSCache"/>
+    <orderEntry type="module" module-name="dNSCache"/>
+    <orderEntry type="module" module-name="dNSCache"/>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK"/>
   </component>
 </module>
diff --git a/app/release/ICSer_V442_2007122252_release.apk b/app/release/ICSer_V445_2007141023_release.apk
similarity index 79%
rename from app/release/ICSer_V442_2007122252_release.apk
rename to app/release/ICSer_V445_2007141023_release.apk
index c640431a..8ee46f3d 100644
Binary files a/app/release/ICSer_V442_2007122252_release.apk and b/app/release/ICSer_V445_2007141023_release.apk differ
diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 5d7e35c7..6548d13c 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -58,7 +58,7 @@ public class Config {
 
   public static boolean noTempSensor=false;
   public static boolean noPPGSensor=false;
-
+  public static boolean needBroadcastAntiAlarm=true;
   static  {
   
   }
@@ -396,6 +396,7 @@ public class Config {
       noVoiceNotifyDialog=false;
       noPPGSensor=false;
       noTempSensor=false;
+      needBroadcastAntiAlarm=false;
     }else if  ((c41_branch_name.equals("AK")) ){
       noPPGSensor=false;
       noTempSensor=false;
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 43bdf438..1b2f33c1 100644
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -9,6 +9,7 @@ import android.hardware.SensorManager;
 import android.os.Message;
 import android.os.PowerManager;
 
+import com.enqualcomm.support.Config;
 import com.enqualcomm.support.CoreService;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
@@ -58,7 +59,10 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
         }
          if (current_anti_status==0){
             //佩戴
-        //    play_notify();
+             if(Config.needBroadcastAntiAlarm) {
+                 play_notify();
+                 send_anti_event_broadcast(0);
+             }
             mRuntime.setAlarmType(Runtime.AlarmType.ALARM_WEARED);
             String msg=protocolAPIHelper.getWarningMSG(mRuntime);
             Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！
@@ -67,11 +71,14 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
 //            } catch (InterruptedException e) {
 //                e.printStackTrace();
 //            }
-//            send_anti_event_broadcast(0);
+
         }else{
              //脱腕
-        //     play_notify();
-          //   screen_on();
+             if(Config.needBroadcastAntiAlarm) {
+                 play_notify();
+                 screen_on();
+                 send_anti_event_broadcast(1);
+             }
              mRuntime.setAlarmType(Runtime.AlarmType.ALARM_ANTIOFF);
             String msg=protocolAPIHelper.getWarningMSG(mRuntime);
             Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！
@@ -80,7 +87,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
 //            } catch (InterruptedException e) {
 //                e.printStackTrace();
 //            }
-//            send_anti_event_broadcast(1);
+
         }
 
         last_send_antoff_event=current_anti_status;
diff --git a/app/version_code.properties b/app/version_code.properties
index e75c4726..a6432c57 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Jul 13 00:22:23 CST 2020
-VERSION_CODE=443
+#Tue Jul 14 10:23:08 CST 2020
+VERSION_CODE=445