From: TrillGates <williamtrillgates@gmail.com>
Date: Thu, 29 Jul 2021 11:54:54 +0000 (+0800)
Subject: fixed sos status reset failed issues.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=4812bd0407b3617b9c3d6e452e6cc8fd43535b8a;p=icsupport.git

fixed sos status reset failed issues.
---

diff --git a/app/release/ICSer_V899_2107231000_release.apk b/app/release/ICSer_V902_2107291726_release.apk
similarity index 77%
rename from app/release/ICSer_V899_2107231000_release.apk
rename to app/release/ICSer_V902_2107291726_release.apk
index a571eded..2fa9a57c 100644
Binary files a/app/release/ICSer_V899_2107231000_release.apk and b/app/release/ICSer_V902_2107291726_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index bc07dc58..970d188f 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":901,"versionName":"2107271436","enabled":true,"outputFile":"ICSer_V901_2107271436_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V901_2107271436_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":902,"versionName":"2107291726","enabled":true,"outputFile":"ICSer_V902_2107291726_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V902_2107291726_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 37b83557..bc30bd8a 100644
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -562,6 +562,13 @@ public class LocationClient {
                         } else {
                             DeliverMessage(waningmsg);
                         }
+                        //add by TrillGates.
+                        //解决多次上传sos状态的问题
+                        //发完以后，干掉这玩意
+                        if (runtime.getG_alarm() == Runtime.AlarmType.ALARM_SOS) {
+                            ICLogger.d("remove sos flag..");
+                            runtime.setAlarmType(Runtime.AlarmType.ALARM_REMOVE_SOS);
+                        }
                     }
                 }
 
@@ -682,7 +689,6 @@ public class LocationClient {
                     stopCheckLocationResult();
 
 
-
                     String msg = "Location Fixed Type " + runtime.getLocationInstance().getLocationType() + " at " + runtime.getLocationInstance().getLocationTime() + " timeout " + timeout;
                     ICLogger.i(msg);
 
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 26b9e401..919d39e8 100644
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -280,6 +280,10 @@ public class Runtime {
 
     private AlarmType g_alarm = AlarmType.ALARM_NONE;
 
+    public AlarmType getG_alarm() {
+        return g_alarm;
+    }
+
     private String alarmType = "00";
 
     public String getAlarmType() {
@@ -290,15 +294,15 @@ public class Runtime {
     private int fzdDevStatus = 0x00000000;
 
 
-    public String getGatorAlarmType(){
+    public String getGatorAlarmType() {
         //报警类型：0x0 无报警；0x02 SOS报警；0x08 电池低电量报警；0x20 设备脱离
-        String gatorAlarm="0";
-        if (alarmType.equals("01")){//SOS
-            gatorAlarm="2";
-        }else if (alarmType.equals("02")){//低电
-            gatorAlarm="8";
-        }else if (alarmType.equals("03")){//脱落报警
-            gatorAlarm="20";
+        String gatorAlarm = "0";
+        if (alarmType.equals("01")) {//SOS
+            gatorAlarm = "2";
+        } else if (alarmType.equals("02")) {//低电
+            gatorAlarm = "8";
+        } else if (alarmType.equals("03")) {//脱落报警
+            gatorAlarm = "20";
         }
         return gatorAlarm;
     }
@@ -403,6 +407,7 @@ public class Runtime {
                 alarmType = "00";
                 break;
         }
+        ICLogger.d("alarmType == > " + alarmType);
         return true;
     }
 
@@ -504,7 +509,7 @@ public class Runtime {
     }
 
     public void setFZDDevStatus(AlarmType _alarmType) {
-
+        ICLogger.d("_alarmType == > " + _alarmType);
         switch (_alarmType) {
             case ALARM_SOS:
                 fzdDevStatus |= 0x00010000;
@@ -1319,11 +1324,11 @@ public class Runtime {
         StringBuilder sb = new StringBuilder();
 
         int i = 0;
-        if (gpsp.getLBSdata().wifi_aps.size()>0) {
+        if (gpsp.getLBSdata().wifi_aps.size() > 0) {
             sb.append(gpsp.getLBSdata().wifi_aps.size());
             for (String mac : gpsp.getLBSdata().wifi_aps.keySet()) {
                 String APName = "AP" + i;
-                sb.append(",").append(String.format("%1$02d",APName.length())).append(",");
+                sb.append(",").append(String.format("%1$02d", APName.length())).append(",");
                 sb.append(APName).append(",");
                 sb.append(mac).append(",");
                 sb.append(gpsp.getLBSdata().wifi_aps.get(mac));
@@ -1332,17 +1337,18 @@ public class Runtime {
         }
         return sb.toString();
     }
+
     private static String mGatorLBSMultiStationData = "";
 
     public void setGatorLBSMultiStationData(String data) {
         mGatorLBSMultiStationData = data;
     }
 
-    public String getGatorLBSMultiStationData(){
+    public String getGatorLBSMultiStationData() {
         return mGatorLBSMultiStationData;
     }
 
-    public String getGatorGPSLocationData(){
+    public String getGatorGPSLocationData() {
         /**150728A2934.0133N10627.2544E000.0141830309.62
          * 消息字段	字段值	类型	长度（字节）	说明
          * 日期	YYMMDD	N_STRING	6	年月日各占 2  个字节
@@ -1355,7 +1361,7 @@ public class Runtime {
          * 时间	HHmmSS	N_STRING	6	时分秒各占 2  个字节
          * 方向		N_STRING	6
          */
-        StringBuilder sb=new StringBuilder();
+        StringBuilder sb = new StringBuilder();
         sb.append(TimeUtil.getSystemDateYYMMDD());
         //        2232.9806N11404.9355E000.1: 北纬22度32.9806分，东经114度04.9355分，速度为000.1 km/h，如经纬度无效,可默认全为0,如0000.0000N00000.0000E
 //        纬度格式为： ddmm.mmmm ，长度不足长度前补0
@@ -1364,7 +1370,7 @@ public class Runtime {
         String latname = gpsp.getLocation().lat_name;
         String lonname = gpsp.getLocation().lon_name;
         if (isGPSFixed()) {
-            String gpsStr = String.format("%s%s%s%s%05f", gpsp.getLocation().latGPSStr,latname, gpsp.getLocation().lonGPSStr,lonname, gpsp.getLocation().speed);
+            String gpsStr = String.format("%s%s%s%s%05f", gpsp.getLocation().latGPSStr, latname, gpsp.getLocation().lonGPSStr, lonname, gpsp.getLocation().speed);
             sb.append("A").append(gpsStr);
         } else {
             String gpsStr = String.format("%04d.%04dN%05d.%04dE%03d.%01d", 0, 0, 0, 0, 0, 0);
@@ -1372,11 +1378,12 @@ public class Runtime {
         }
 
         sb.append(TimeUtil.getSystemTimeHHmmss());
-        sb.append(String.format("%06f",gpsp.getLocation().heading));
+        sb.append(String.format("%06f", gpsp.getLocation().heading));
 
         return sb.toString();
 
     }
+
     public boolean sleepDataReported = false;
 
 
diff --git a/app/version_code.properties b/app/version_code.properties
index 4f894196..f29a9eaf 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Jul 27 14:36:38 CST 2021
-VERSION_CODE=901
+#Thu Jul 29 17:26:00 CST 2021
+VERSION_CODE=902