From: SnickerSun <scy@incartech.cn>
Date: Wed, 22 Sep 2021 06:06:01 +0000 (+0800)
Subject: release ICProtocolV2  V958
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=e2af6e8bc07995610ca1e36dd1cd8c227f90e9bf;p=icsupport.git

release ICProtocolV2  V958
修复 Gator GPS定位数据格式
---

diff --git a/app/release/ICSer_V955_2109171904_release.apk b/app/release/ICSer_V958_2109221404_release.apk
similarity index 78%
rename from app/release/ICSer_V955_2109171904_release.apk
rename to app/release/ICSer_V958_2109221404_release.apk
index 0a1803d9..84e3bd65 100644
Binary files a/app/release/ICSer_V955_2109171904_release.apk and b/app/release/ICSer_V958_2109221404_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 2631e6f3..7bdb6411 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":955,"versionName":"2109171904","enabled":true,"outputFile":"ICSer_V955_2109171904_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V955_2109171904_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":958,"versionName":"2109221404","enabled":true,"outputFile":"ICSer_V958_2109221404_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V958_2109221404_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 f3048e53..f94e77e9 100644
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -1418,8 +1418,26 @@ public class Runtime {
 
         String latname = gpsp.getLocation().lat_name;
         String lonname = gpsp.getLocation().lon_name;
+        String latgpsstr=gpsp.getLocation().latStr;
+        String longpsstr=gpsp.getLocation().lonStr;
+        if(latgpsstr.length()>9){
+            latgpsstr=latgpsstr.substring(0,9);
+        }
+
+        if (longpsstr.length()>10){
+            longpsstr=longpsstr.substring(0,10);
+        }
+        String speedstr=String.format("%05f",gpsp.getLocation().speed);
+        if(speedstr.length()>5){
+            speedstr=speedstr.substring(0,5);
+        }
+
+        String headerstr=String.format("%06f", gpsp.getLocation().heading);
+        if(headerstr.length()>6){
+            headerstr=headerstr.substring(0,6);
+        }
         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%s", latgpsstr, latname, longpsstr, lonname, speedstr);
             sb.append("A").append(gpsStr);
         } else {
             String gpsStr = String.format("%04d.%04dN%05d.%04dE%03d.%01d", 0, 0, 0, 0, 0, 0);
@@ -1427,7 +1445,7 @@ public class Runtime {
         }
 
         sb.append(TimeUtil.getSystemTimeHHmmss());
-        sb.append(String.format("%06f", gpsp.getLocation().heading));
+        sb.append(headerstr);
 
         return sb.toString();
 
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java
index c8652286..5ab47bed 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java
@@ -107,7 +107,7 @@ public class ICLogger {
                 logConfigurator.setUseLogCatAppender(true);
                 logConfigurator.setLogCatPattern("%m%n");
                 logConfigurator.configure();// 设置提交
-                android.util.Log.d("CATCH", android.util.Log.getStackTraceString(new ThreadDeath()));
+//                android.util.Log.d("CATCH", android.util.Log.getStackTraceString(new ThreadDeath()));
 //        String logfilelist[]={"Log","GPS","Nmea","APILog","alarmCycle","Battery","LBS"};
                 //Log 和log目前是同一个配置
                 Log = Logger.getLogger("log");
diff --git a/app/version_code.properties b/app/version_code.properties
index d40775bc..a9d37904 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Sep 17 19:04:57 CST 2021
-VERSION_CODE=955
+#Wed Sep 22 14:04:04 CST 2021
+VERSION_CODE=958