release V701

解决FZD，Mqtt时，SOS状态不能被清除问题。

diff --git a/app/release/ICSer_V700_2011161502_release.apk b/app/release/ICSer_V701_2011161829_release.apk
similarity index 78%
rename from app/release/ICSer_V700_2011161502_release.apk
rename to app/release/ICSer_V701_2011161829_release.apk
index 8090ae5..76ec441 100644 (file)
Binary files a/app/release/ICSer_V700_2011161502_release.apk and b/app/release/ICSer_V701_2011161829_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 0771807..d7b4398 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":700,"versionName":"2011161502","enabled":true,"outputFile":"ICSer_V700_2011161502_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V700_2011161502_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":701,"versionName":"2011161829","enabled":true,"outputFile":"ICSer_V701_2011161829_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V701_2011161829_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 1ff546a..d6b5459 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -227,12 +227,14 @@ public class LocationClient {
 \r
                 StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
                 DeliverMessage(AL_CMD);\r
+                runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);\r
                 startSOSLocation = false; //如果已经报警，后面就不用再报了\r
               }\r
 \r
               if (startSOSLocation) {\r
                 StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
                 DeliverMessage(AL_CMD);\r
+                runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);\r
                 startSOSLocation = false;\r
               }\r
               if (startNomalLocation) {\r
@@ -250,6 +252,7 @@ public class LocationClient {
                   //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用\r
                   StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
                   DeliverMessage(AL_CMD);\r
+                  runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);\r
                   startSOSLocation = false;//如果已经报警，后面就不用再报了\r
                 }\r
               }\r
@@ -257,6 +260,7 @@ public class LocationClient {
               if (startSOSLocation) {\r
                 StringMessage AP01_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
                 DeliverMessage(AP01_CMD);\r
+                runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);\r
                 startSOSLocation = false;\r
               }\r
               if (startNomalLocation) {\r
@@ -612,6 +616,7 @@ public class LocationClient {
               if (startSOSLocation==true){\r
                 StringMessage AP10_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
                 DeliverMessage(AP10_CMD);\r
+                runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);\r
                 startSOSLocation=false;\r
               }\r
 \r
@@ -688,6 +693,7 @@ public class LocationClient {
               if (startSOSLocation==true){\r
                 StringMessage AP10_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
                 DeliverMessage(AP10_CMD);\r
+                runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);\r
                 startSOSLocation=false;\r
               }\r
               if(startNomalLocation=true){\r

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 bc26c6a..083da4f 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -203,6 +203,7 @@ public class Runtime {
       ALARM_UNREADMSG, //消息未读\r
       ALARM_MSGREAD, //消息已读\r
       ALARM_NONE,\r
+      ALARM_REMOVE_SOS,//附加的，专门给防走丢用来清除SOS标志用的\r
     };\r
 \r
   private AlarmType g_alarm=AlarmType.ALARM_NONE;\r
@@ -465,6 +466,9 @@ public class Runtime {
             case ALARM_ESCAPE:\r
                 updateFZDDevStatusEscape(true);\r
                 break;\r
+            case ALARM_REMOVE_SOS:\r
+                fzdDevStatus &=~0x00010000;\r
+                break;\r
             case ALARM_NONE:\r
             default:\r
 //                alarmType1="00000000";\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 9434acb..5c09df8 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Nov 16 15:02:14 CST 2020\r
-VERSION_CODE=700\r
+#Mon Nov 16 18:29:46 CST 2020\r
+VERSION_CODE=701\r