release V445

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

diff --git a/app/app.iml b/app/app.iml
index 96972aa..ebbc230 100644 (file)
--- 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"/>\r
     <orderEntry type="library" name="Gradle: io.reactivex:rxandroid:1.1.0@aar" level="project"/>\r
     <orderEntry type="module" module-name="dNSCache"/>\r
+    <orderEntry type="module" module-name="dNSCache"/>\r
+    <orderEntry type="module" module-name="dNSCache"/>\r
+    <orderEntry type="module" module-name="dNSCache"/>\r
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK"/>\r
   </component>\r
 </module>\r

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 c640431..8ee46f3 100644 (file)
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 5d7e35c..6548d13 100644 (file)
--- 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 {
 \r
   public static boolean noTempSensor=false;\r
   public static boolean noPPGSensor=false;\r
-\r
+  public static boolean needBroadcastAntiAlarm=true;\r
   static  {\r
   \r
   }\r
@@ -396,6 +396,7 @@ public class Config {
       noVoiceNotifyDialog=false;\r
       noPPGSensor=false;\r
       noTempSensor=false;\r
+      needBroadcastAntiAlarm=false;\r
     }else if  ((c41_branch_name.equals("AK")) ){\r
       noPPGSensor=false;\r
       noTempSensor=false;\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 43bdf43..1b2f33c 100644 (file)
--- 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;\r
 import android.os.PowerManager;\r
 \r
+import com.enqualcomm.support.Config;\r
 import com.enqualcomm.support.CoreService;\r
 import com.enqualcomm.support.bean.Runtime;\r
 import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;\r
@@ -58,7 +59,10 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
         }\r
          if (current_anti_status==0){\r
             //佩戴\r
-        //    play_notify();\r
+             if(Config.needBroadcastAntiAlarm) {\r
+                 play_notify();\r
+                 send_anti_event_broadcast(0);\r
+             }\r
             mRuntime.setAlarmType(Runtime.AlarmType.ALARM_WEARED);\r
             String msg=protocolAPIHelper.getWarningMSG(mRuntime);\r
             Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！\r
@@ -67,11 +71,14 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
 //            } catch (InterruptedException e) {\r
 //                e.printStackTrace();\r
 //            }\r
-//            send_anti_event_broadcast(0);\r
+\r
         }else{\r
              //脱腕\r
-        //     play_notify();\r
-          //   screen_on();\r
+             if(Config.needBroadcastAntiAlarm) {\r
+                 play_notify();\r
+                 screen_on();\r
+                 send_anti_event_broadcast(1);\r
+             }\r
              mRuntime.setAlarmType(Runtime.AlarmType.ALARM_ANTIOFF);\r
             String msg=protocolAPIHelper.getWarningMSG(mRuntime);\r
             Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！\r
@@ -80,7 +87,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
 //            } catch (InterruptedException e) {\r
 //                e.printStackTrace();\r
 //            }\r
-//            send_anti_event_broadcast(1);\r
+\r
         }\r
 \r
         last_send_antoff_event=current_anti_status;\r

diff --git a/app/version_code.properties b/app/version_code.properties
index e75c472..a6432c5 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Jul 13 00:22:23 CST 2020\r
-VERSION_CODE=443\r
+#Tue Jul 14 10:23:08 CST 2020\r
+VERSION_CODE=445\r