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 cc3c286..711bc17 100644 (file)
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 57207e6..b93dc5b 100644 (file)
--- 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 33be529..1015ce3 100644 (file)
--- 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){\r
 \r
         if(lowbattery){\r
-            fzdDevStatus&=0x00000001;\r
+            fzdDevStatus|=0x00000001;\r
         }else{\r
             fzdDevStatus&=~0x00000001;\r
         }\r
     }\r
     public void updateFZDDevStatusWeared(boolean weared) {\r
         if(weared){\r
-            fzdDevStatus&=0x00000008;\r
+            fzdDevStatus|=0x00000008;\r
         }else{\r
             fzdDevStatus&=~0x00000008;\r
         }\r
@@ -344,13 +344,13 @@ public class Runtime {
         if(moving){\r
             fzdDevStatus&=~0x00000010;\r
         }else{\r
-            fzdDevStatus&=0x00000010;\r
+            fzdDevStatus|=0x00000010;\r
         }\r
     }\r
 \r
     public void updateFZDDevStatusEscape(boolean escape){\r
         if(escape){\r
-            fzdDevStatus&=0x00040000;\r
+            fzdDevStatus|=0x00040000;\r
         }else{\r
             fzdDevStatus&=~0x00040000;\r
         }\r
@@ -361,10 +361,10 @@ public class Runtime {
 \r
         switch (_alarmType){\r
             case ALARM_SOS:\r
-                fzdDevStatus&=0x00010000;\r
+                fzdDevStatus |=0x00010000;\r
                 break;\r
             case ALARM_LOWBATTERY:\r
-                fzdDevStatus&=0x00020000;\r
+                fzdDevStatus |=0x00020000;\r
                 break;\r
             case ALARM_ANTIOFF:\r
 //                fzdDevStatus&=0x00000008;\r
@@ -379,13 +379,13 @@ public class Runtime {
                 break;\r
             case ALARM_CUTOFF:\r
             case ALARM_ILLEGAL_CUTOFF:\r
-                fzdDevStatus&=0x00100000;\r
+                fzdDevStatus|=0x00100000;\r
                 break;\r
             case ALARM_FALL:\r
-                fzdDevStatus&=0x00200000;\r
+                fzdDevStatus|=0x00200000;\r
                 break;\r
             case ALARM_ABNORMAL_HEART_RATE:\r
-                fzdDevStatus&=0x01000000;\r
+                fzdDevStatus|=0x01000000;\r
                 break;\r
             case ALARM_HEART_RATE_HIGH:\r
 //                alarmType1="08";\r
@@ -420,7 +420,7 @@ public class Runtime {
 //                alarmType1="18";\r
                 break;\r
             case ALARM_POWER_OFF:\r
-                fzdDevStatus&=0x00800000;\r
+                fzdDevStatus|=0x00800000;\r
                 break;\r
 \r
             case ALARM_ESCAPE:\r
@@ -432,6 +432,8 @@ public class Runtime {
                 break;\r
         }\r
 \r
+        ICLogger.i("setFZDDevStatus "+String.format("0x%x",fzdDevStatus)+" "+fzdDevStatus);\r
+\r
     }\r
   public String preCdmaInfo;\r
   \r

diff --git a/app/version_code.properties b/app/version_code.properties
index 13498fa..268cb2d 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Sep 14 23:17:08 CST 2020\r
-VERSION_CODE=615\r
+#Tue Sep 15 17:46:15 CST 2020\r
+VERSION_CODE=616\r