From: snickersun <scy@incartech.cn>
Date: Mon, 16 Nov 2020 10:31:32 +0000 (+0800)
Subject: release V701
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=c791ac0b81781c6798704fefa495910467ea4285;p=protocol_srv.git

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 8090ae52..76ec441e 100644
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 0771807d..d7b4398f 100644
--- 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 1ff546a4..d6b54596 100644
--- 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 {
 
                 StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);
                 DeliverMessage(AL_CMD);
+                runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);
                 startSOSLocation = false; //如果已经报警，后面就不用再报了
               }
 
               if (startSOSLocation) {
                 StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);
                 DeliverMessage(AL_CMD);
+                runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);
                 startSOSLocation = false;
               }
               if (startNomalLocation) {
@@ -250,6 +252,7 @@ public class LocationClient {
                   //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用
                   StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);
                   DeliverMessage(AL_CMD);
+                  runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);
                   startSOSLocation = false;//如果已经报警，后面就不用再报了
                 }
               }
@@ -257,6 +260,7 @@ public class LocationClient {
               if (startSOSLocation) {
                 StringMessage AP01_CMD = protocolAPIHelper.getWarningMSG(runtime);
                 DeliverMessage(AP01_CMD);
+                runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);
                 startSOSLocation = false;
               }
               if (startNomalLocation) {
@@ -612,6 +616,7 @@ public class LocationClient {
               if (startSOSLocation==true){
                 StringMessage AP10_CMD = protocolAPIHelper.getWarningMSG(runtime);
                 DeliverMessage(AP10_CMD);
+                runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);
                 startSOSLocation=false;
               }
 
@@ -688,6 +693,7 @@ public class LocationClient {
               if (startSOSLocation==true){
                 StringMessage AP10_CMD = protocolAPIHelper.getWarningMSG(runtime);
                 DeliverMessage(AP10_CMD);
+                runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);
                 startSOSLocation=false;
               }
               if(startNomalLocation=true){
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 bc26c6ad..083da4fe 100644
--- 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, //消息未读
       ALARM_MSGREAD, //消息已读
       ALARM_NONE,
+      ALARM_REMOVE_SOS,//附加的，专门给防走丢用来清除SOS标志用的
     };
 
   private AlarmType g_alarm=AlarmType.ALARM_NONE;
@@ -465,6 +466,9 @@ public class Runtime {
             case ALARM_ESCAPE:
                 updateFZDDevStatusEscape(true);
                 break;
+            case ALARM_REMOVE_SOS:
+                fzdDevStatus &=~0x00010000;
+                break;
             case ALARM_NONE:
             default:
 //                alarmType1="00000000";
diff --git a/app/version_code.properties b/app/version_code.properties
index 9434acba..5c09df8a 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Nov 16 15:02:14 CST 2020
-VERSION_CODE=700
+#Mon Nov 16 18:29:46 CST 2020
+VERSION_CODE=701