From: snickersun <scy@incartech.cn>
Date: Tue, 6 Apr 2021 12:53:04 +0000 (+0800)
Subject: release 774
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=3c8417ce78080356d7b1e8714c2bb38de5c1f072;p=protocol_srv.git

release 774
修正 CUT 和 ANTI EVENT_TYPE value ，解决佩戴消息误报成剪断的问题。
---

diff --git a/app/release/ICSer_V773_2104021759_release.apk b/app/release/ICSer_V774_2104062040_release.apk
similarity index 78%
rename from app/release/ICSer_V773_2104021759_release.apk
rename to app/release/ICSer_V774_2104062040_release.apk
index aa3598a7..e419b451 100644
Binary files a/app/release/ICSer_V773_2104021759_release.apk and b/app/release/ICSer_V774_2104062040_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index b7f13cbe..3e6cc5a7 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":773,"versionName":"2104021759","enabled":true,"outputFile":"ICSer_V773_2104021759_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V773_2104021759_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":774,"versionName":"2104062040","enabled":true,"outputFile":"ICSer_V774_2104062040_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V774_2104062040_release.apk","properties":{}}]
\ No newline at end of file
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 1993f452..17267beb 100644
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -34,6 +34,8 @@ import static com.enqualcomm.support.Constants.ACTION_CHECK_CUTOFF_EVENT;
 import static com.enqualcomm.support.Constants.ACTION_CUT_OFF;
 import static com.enqualcomm.support.Constants.KEY_ANTI_EVENT;
 import static com.enqualcomm.support.Constants.KEY_ANTI_TXT;
+import static com.enqualcomm.support.service.InputEventReader.EVENT_TYPE_ANTI;
+import static com.enqualcomm.support.service.InputEventReader.EVENT_TYPE_CUT;
 import static java.lang.Thread.sleep;
 
 
@@ -69,14 +71,14 @@ public class AntiMonitorService extends AbstractInvokeHandlerService implements
 
     @Override
     public void onInputEventRecevied(int type, int event) {
-        if(event==2 || event == 12){
+        if(type==EVENT_TYPE_CUT && event >0 ){
             current_cut_status = event;
             cut_status_event_reported++;
             ICLogger.i("近距离 " + current_cut_status + " input event " + cut_status_event_reported + " times !");
             cut_event_receivedTime = System.currentTimeMillis();
             reset_timer_cut();
 
-        }else {
+        }else if (type==EVENT_TYPE_ANTI && event >0){
             current_anti_status = event;
             ant_status_event_reported++;
             ICLogger.i("近距离 " + current_anti_status + " input event " + ant_status_event_reported + " times !");
diff --git a/app/src/main/java/com/enqualcomm/support/service/InputEventReader.java b/app/src/main/java/com/enqualcomm/support/service/InputEventReader.java
index 30bf2f30..5cb33f32 100644
--- a/app/src/main/java/com/enqualcomm/support/service/InputEventReader.java
+++ b/app/src/main/java/com/enqualcomm/support/service/InputEventReader.java
@@ -8,7 +8,7 @@ import java.io.FileInputStream;
 
 public class InputEventReader {
     public static final int EVENT_TYPE_ANTI=0;
-    public static final int EVENT_TYPE_CUT=0;
+    public static final int EVENT_TYPE_CUT=1;
     public static final int EVENT_ANTI_OFF=10;
     public static final int EVENT_WEARED=1;
     public static final int EVENT_CUT_OFF=12;
@@ -88,7 +88,7 @@ public class InputEventReader {
      */
         int ret=0;
         byte int_bytes[]=new byte[4];
-        if(eventMsgs.length==48){
+        if(eventMsgs.length%16==0){
             int eventtype,eventvalue;
             long eventcode;
             for(int i=0;i<eventMsgs.length/16;i++)
diff --git a/app/version_code.properties b/app/version_code.properties
index 51ebd3f3..8bf0c10f 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Apr 02 17:59:55 CST 2021
-VERSION_CODE=773
+#Tue Apr 06 20:40:30 CST 2021
+VERSION_CODE=774