From: snickersun <scy@incartech.cn>
Date: Tue, 15 Sep 2020 09:49:45 +0000 (+0800)
Subject: release V616
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=21803d81c70063f33ebc24bf8c8e7b5c05884903;p=protocol_srv.git

release V616
FZD，MQTT协议状态赋值错误修正
---

diff --git a/app/release/ICSer_V615_2009142317_release.apk b/app/release/ICSer_V616_2009151746_release.apk
similarity index 78%
rename from app/release/ICSer_V615_2009142317_release.apk
rename to app/release/ICSer_V616_2009151746_release.apk
index cc3c2869..711bc170 100644
Binary files a/app/release/ICSer_V615_2009142317_release.apk and b/app/release/ICSer_V616_2009151746_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 57207e6f..b93dc5b6 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":615,"versionName":"2009142317","enabled":true,"outputFile":"ICSer_V615_2009142317_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V615_2009142317_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":616,"versionName":"2009151746","enabled":true,"outputFile":"ICSer_V616_2009151746_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V616_2009151746_release.apk","properties":{}}]
\ No newline at end of file
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 33be5291..1015ce3b 100644
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -327,14 +327,14 @@ public class Runtime {
     public void updateFZDDevStatusLowbat(boolean lowbattery){
 
         if(lowbattery){
-            fzdDevStatus&=0x00000001;
+            fzdDevStatus|=0x00000001;
         }else{
             fzdDevStatus&=~0x00000001;
         }
     }
     public void updateFZDDevStatusWeared(boolean weared) {
         if(weared){
-            fzdDevStatus&=0x00000008;
+            fzdDevStatus|=0x00000008;
         }else{
             fzdDevStatus&=~0x00000008;
         }
@@ -344,13 +344,13 @@ public class Runtime {
         if(moving){
             fzdDevStatus&=~0x00000010;
         }else{
-            fzdDevStatus&=0x00000010;
+            fzdDevStatus|=0x00000010;
         }
     }
 
     public void updateFZDDevStatusEscape(boolean escape){
         if(escape){
-            fzdDevStatus&=0x00040000;
+            fzdDevStatus|=0x00040000;
         }else{
             fzdDevStatus&=~0x00040000;
         }
@@ -361,10 +361,10 @@ public class Runtime {
 
         switch (_alarmType){
             case ALARM_SOS:
-                fzdDevStatus&=0x00010000;
+                fzdDevStatus |=0x00010000;
                 break;
             case ALARM_LOWBATTERY:
-                fzdDevStatus&=0x00020000;
+                fzdDevStatus |=0x00020000;
                 break;
             case ALARM_ANTIOFF:
 //                fzdDevStatus&=0x00000008;
@@ -379,13 +379,13 @@ public class Runtime {
                 break;
             case ALARM_CUTOFF:
             case ALARM_ILLEGAL_CUTOFF:
-                fzdDevStatus&=0x00100000;
+                fzdDevStatus|=0x00100000;
                 break;
             case ALARM_FALL:
-                fzdDevStatus&=0x00200000;
+                fzdDevStatus|=0x00200000;
                 break;
             case ALARM_ABNORMAL_HEART_RATE:
-                fzdDevStatus&=0x01000000;
+                fzdDevStatus|=0x01000000;
                 break;
             case ALARM_HEART_RATE_HIGH:
 //                alarmType1="08";
@@ -420,7 +420,7 @@ public class Runtime {
 //                alarmType1="18";
                 break;
             case ALARM_POWER_OFF:
-                fzdDevStatus&=0x00800000;
+                fzdDevStatus|=0x00800000;
                 break;
 
             case ALARM_ESCAPE:
@@ -432,6 +432,8 @@ public class Runtime {
                 break;
         }
 
+        ICLogger.i("setFZDDevStatus "+String.format("0x%x",fzdDevStatus)+" "+fzdDevStatus);
+
     }
   public String preCdmaInfo;
   
diff --git a/app/version_code.properties b/app/version_code.properties
index 13498fa4..268cb2d5 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Sep 14 23:17:08 CST 2020
-VERSION_CODE=615
+#Tue Sep 15 17:46:15 CST 2020
+VERSION_CODE=616