From: snickersun <scy@incartech.cn>
Date: Tue, 15 Dec 2020 09:53:05 +0000 (+0800)
Subject: 添加佩戴状态变化时间，时间字符串格式 yyyyMMddHHmmss
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=01d671dafa6dbd4b8147b9899a2e969776f07648;p=protocol_srv.git

添加佩戴状态变化时间，时间字符串格式 yyyyMMddHHmmss
persist.sys.ic.weared_time
persist.sys.ic.antioff_time
---

diff --git a/app/release/ICSer_V725_2012041851_release.apk b/app/release/ICSer_V725_2012041851_release.apk
deleted file mode 100644
index caf96588..00000000
Binary files a/app/release/ICSer_V725_2012041851_release.apk and /dev/null differ
diff --git a/app/release/output.json b/app/release/output.json
index 459405f2..ae227e17 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":725,"versionName":"2012041851","enabled":true,"outputFile":"ICSer_V725_2012041851_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V725_2012041851_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":726,"versionName":"2012071623","enabled":true,"outputFile":"ICSer_V726_2012071623_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V726_2012071623_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index b7a39bea..3535df3d 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -810,7 +810,7 @@ public class CoreService extends Service {
 
 
 
-        Config.setHeartBeatCycle(this,alarmCycle); //临时设置为3分钟，给L03测试用。测试断线问题未解决，取消测试。
+        Config.setHeartBeatCycle(this,alarmCycle); //临时设置为5分钟，给L03测试用。测试断线问题未解决，取消测试。
         //初始化ServerHeartBeat Cycle
         Config.loadHearBeatSetting(runtime);
         //初始化PPG，LocationMod，LocationCycle
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 d1eb6396..045bfc0d 100644
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -22,6 +22,7 @@ import com.enqualcomm.support.utils.AlarmHelper;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.ICLogger;
 
+import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
 import com.ic.protocols.protocolAPIHelper;
@@ -45,6 +46,12 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
     Connection mConnection;
 
     private SensorManager mSensorManager;
+    //current_anti_status == 2 表示表带 锁定 ， ==12 表示表带非法解锁
+    //current_anti_status == 0 表示佩戴       ==10 表示脱腕
+    public static final int STATUS_ANTI_OFF = 10; //10 表示脱腕
+    public static final int STATUS_WEARED = 0; //0 表示佩戴
+    public static final int STATUS_CUT_OFF = 12; //12 表示表带非法解锁
+    public static final int STATUS_LOCK_ON = 2; // 2 表示表带 锁定
 
     private static int current_anti_status=10; //0 佩戴， 大于0 表示脱腕
     private static int ant_status_event_reported=0; // 0 表示无消息， 1表示有消息需要发送， 大于1表示timeout时间内又有新消息，可以忽略不计
@@ -93,9 +100,11 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
         Intent intent=new Intent(ACTION_ANTI_OFF0);
         if(antioff){
             Util.setSystemProperties("persist.sys.ic_antioff", "true");
+            Util.setSystemProperties("persist.sys.ic.antioff_time", TimeUtil.getSystemTimeyyyyMMddHHmmss());
             intent.putExtra(KEY_ANTI_EVENT,1);
         }else {
             Util.setSystemProperties("persist.sys.ic_antioff", "false");
+            Util.setSystemProperties("persist.sys.ic.weared_time", TimeUtil.getSystemTimeyyyyMMddHHmmss());
             intent.putExtra(KEY_ANTI_EVENT,0);
         }
         mContext.sendBroadcast(intent);
@@ -111,7 +120,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
         //current_anti_status == 0 表示佩戴       ==10 表示脱腕
 
         switch(current_anti_status){
-            case 2:
+            case STATUS_LOCK_ON:
                 //锁定
             {
                 if (Config.needBroadcastCutoffAlarm) {
@@ -128,7 +137,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
 
             }
                 break;
-            case 12:
+            case STATUS_CUT_OFF:
             {
                 //非法解锁
                 if(Config.needBroadcastCutoffAlarm) {
@@ -149,7 +158,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
 //            }
             }
                 break;
-            case 0:
+            case STATUS_WEARED:
                 //佩戴
             {
                 if (Config.needBroadcastAntiAlarm) {
@@ -173,7 +182,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
 //            }
             }
                 break;
-            case 10:
+            case STATUS_ANTI_OFF:
             {
                 //脱腕
                 if(Config.needBroadcastAntiAlarm) {