release V705

修复南半球坐标问题，经纬度自动通过gps nmea解析识别。

diff --git a/app/release/ICSer_V704_2011171449_release.apk b/app/release/ICSer_V705_2011172306_release.apk
similarity index 78%
rename from app/release/ICSer_V704_2011171449_release.apk
rename to app/release/ICSer_V705_2011172306_release.apk
index c54a187..540082e 100644 (file)
Binary files a/app/release/ICSer_V704_2011171449_release.apk and b/app/release/ICSer_V705_2011172306_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index d10bd9a..84ec72a 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":704,"versionName":"2011171449","enabled":true,"outputFile":"ICSer_V704_2011171449_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V704_2011171449_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":705,"versionName":"2011172306","enabled":true,"outputFile":"ICSer_V705_2011172306_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V705_2011172306_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/NMEAListener.java b/app/src/main/java/com/enqualcomm/support/NMEAListener.java
index a3c4ca6..0323497 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/NMEAListener.java
+++ b/app/src/main/java/com/enqualcomm/support/NMEAListener.java
@@ -309,6 +309,8 @@ public class NMEAListener implements NmeaListener, LocationListener {
       String utctime = tmplist[1];\r
       String Lat = tmplist[2];\r
       String lon = tmplist[4];\r
+      String latname= tmplist[3];\r
+      String lonname=tmplist[5];\r
       String fixed = tmplist[6];\r
       String usedStarts = tmplist[7];\r
       String hdop = tmplist[8];\r
@@ -338,7 +340,7 @@ public class NMEAListener implements NmeaListener, LocationListener {
 \r
         //定位\r
         StringBuilder sb = new StringBuilder();\r
-        sb.append("GPGGA, location time= " + TimeUtil.getLocalTime() + ", FixedCount=" + locationFixedCount + ", GPSTime=" + utctime + ", Lat=" + Lat + " (" + strLatitude + "), Lon=" + lon + " (" + strLongitude + "), fixed=" + fixed + ", hdop=" + hdop + ", usedStarts=" + usedStarts);\r
+        sb.append("GPGGA, location time= " + TimeUtil.getLocalTime() + ", FixedCount=" + locationFixedCount + ", GPSTime=" + utctime + ", Lat("+latname+")=" + Lat + " (" + strLatitude + "), Lon("+lonname+")=" + lon + " (" + strLongitude + "), fixed=" + fixed + ", hdop=" + hdop + ", usedStarts=" + usedStarts);\r
         ICLogger.i(sb.toString());\r
         if (Config.LOG_TOFILE)\r
           ICLogger.logToFile( "GPS", sb.toString());\r
@@ -357,6 +359,7 @@ public class NMEAListener implements NmeaListener, LocationListener {
               */\r
           runtime.getLocationInstance().setLocation(Lat, lon);\r
           runtime.getLocationInstance().setLocationGPS(strLatitude, strLongitude);\r
+          runtime.getLocationInstance().setLocationlatlonName(latname,lonname);\r
           runtime.getLocationInstance().setUsedStarts(Integer.valueOf(usedStarts.trim()));\r
           runtime.getLocationInstance().setHod(Float.valueOf(hdop.trim()));\r
           runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_FIXED);\r

diff --git a/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java b/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java
index beac576..70b2873 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java
@@ -48,6 +48,8 @@ public class ICLocation {
         public String lonStr;\r
         public String latGPSStr;\r
         public String lonGPSStr;\r
+        public String lat_name;\r
+        public String lon_name;\r
         public float hdop;\r
     }\r
 \r
@@ -165,6 +167,11 @@ public class ICLocation {
         currentLP.lat=lat;\r
         currentLP.lon=lon;\r
     }\r
+\r
+    public void setLocationlatlonName(String latname,String lonname){\r
+        currentLP.lat_name=latname;\r
+        currentLP.lon_name=lonname;\r
+    }\r
     public void setLocation(String lat,String lon){\r
         currentLP.latStr=lat;\r
         currentLP.lonStr=lon;\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 083da4f..0aa989b 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -873,10 +873,12 @@ public class Runtime {
     int speedl=(int) ((gpsp.getLocation().speed - speedi)*10);\r
     String latStr=gpsp.getLocation().latStr;\r
     String lonStr=gpsp.getLocation().lonStr;\r
+    String latname=gpsp.getLocation().lat_name;\r
+    String lonname=gpsp.getLocation().lon_name;\r
     if (isGPSFixed())\r
     {\r
         if (gpsp.getLocation().lonStr.isEmpty()) {\r
-            String gpsStr = String.format("%04d.%04dN%05d.%04dE%03d.%01d", lati, latl, loni, lonl, speedi, speedl);\r
+            String gpsStr = String.format("%04d.%04d%s%05d.%04d%s%03d.%01d", lati, latl,latname, loni, lonl,lonname, speedi, speedl);\r
             sb.append("A").append(gpsStr);\r
         }else{\r
             String gpsStr = String.format("%sN%sE%03d.%01d", latStr.substring(0,9), lonStr.substring(0,10), speedi, speedl);\r
@@ -908,17 +910,20 @@ public class Runtime {
 \r
         String latStr=gpsp.getLocation().latGPSStr;\r
         String lonStr=gpsp.getLocation().lonGPSStr;\r
-\r
+        String latname=gpsp.getLocation().lat_name;\r
+        String lonname=gpsp.getLocation().lon_name;\r
         ICLogger.i(" UD isfixed "+isGPSFixed()+" is in area "+bleInfo.is_in_area);\r
         if(bleInfo.is_in_area==true){\r
              latStr=bleInfo.gps_n;\r
              lonStr=bleInfo.gps_e;\r
+             latname=(latStr.trim().startsWith("-"))?"S":"N";\r
+             lonname=(lonStr.trim().startsWith("-"))?"W":"E";\r
         }\r
         String heading=String.valueOf(gpsp.getLocation().heading);\r
         int starcount=gpsp.getLocation().used_gps_numbs;\r
         if (isGPSFixed()|| bleInfo.is_in_area)\r
         {\r
-            String gpsStr = String.format(",%s,N,%s,E,%d.%02d,%s,0.0,%d", latStr, lonStr, speedi, speedl,heading,starcount);\r
+            String gpsStr = String.format(",%s,%s,%s,%s,%d.%02d,%s,0.0,%d", latStr,latname, lonStr,lonname, speedi, speedl,heading,starcount);\r
             sb.append("A").append(gpsStr);\r
 \r
         }else{\r
@@ -948,10 +953,12 @@ public class Runtime {
         String latStr=gpsp.getLocation().latGPSStr;\r
         String lonStr=gpsp.getLocation().lonGPSStr;\r
         String heading=String.valueOf(gpsp.getLocation().heading);\r
+        String latname=gpsp.getLocation().lat_name;\r
+        String lonname=gpsp.getLocation().lon_name;\r
         int starcount=gpsp.getLocation().used_gps_numbs;\r
         if (isGPSFixed())\r
         {\r
-            String gpsStr = String.format(",%s,N,%s,E,%d.%02d,%s,0.0,%d", latStr, lonStr, speedi, speedl,heading,starcount);\r
+            String gpsStr = String.format(",%s,%s,%s,%s,%d.%02d,%s,0.0,%d", latStr,latname, lonStr,lonname, speedi, speedl,heading,starcount);\r
             sb.append("A").append(gpsStr);\r
 \r
         }else{\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
index 3fd6ad5..930277e 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
@@ -18,6 +18,7 @@ import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;\r
 import android.text.TextUtils;\r
 \r
+import com.enqualcomm.support.Config;\r
 import com.enqualcomm.support.ICContentProvider;\r
 import com.enqualcomm.support.bean.Alarm;\r
 import com.enqualcomm.support.bean.Antioff;\r
@@ -1018,6 +1019,7 @@ public class DBHelper {
     values.put("TOPIC",msg.cmd());\r
     values.put("CMD",msg.isFromCache());\r
     long raw_contactID = ContentUris.parseId(cr.insert(ICContentProvider.PROTOCOL_CMD_RECORDS_URI, values));\r
+    if (Config.LOG_TOFILE) ICLogger.logToFile( "APILog", " insert db " +raw_contactID+" "+msg.getDate()+msg.getTime()+" "+ msg.cmd()+" "+msg.isFromCache());\r
 \r
     return raw_contactID;\r
   }\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
index d0c4b43..d4f939d 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
@@ -305,15 +305,15 @@ public class NettyConnection implements Connection {
 \r
   }\r
   \r
-  public void send(StringMessage paramStringMessage) {\r
+  public void send(StringMessage msg) {\r
 \r
-      if(paramStringMessage==null) {\r
+      if(msg==null) {\r
         ICLogger.i(" StringMessage is null skip send!");\r
         return ;\r
       }\r
-      sendMsg(paramStringMessage.isFromCache());\r
-      ICLogger.logToFile("APILog",paramStringMessage.isFromCache());\r
-      ICLogger.i(paramStringMessage.isFromCache());\r
+      sendMsg(msg.isFromCache());\r
+      ICLogger.logToFile("APILog","send "+msg.getIndex()+" "+msg.getDate()+msg.getTime()+" "+msg.cmd()+" "+msg.isFromCache());\r
+    //  ICLogger.i(paramStringMessage.isFromCache());\r
 \r
   }\r
   \r

diff --git a/app/version_code.properties b/app/version_code.properties
index 7ae0fb6..7f8578a 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Nov 17 14:49:39 CST 2020\r
-VERSION_CODE=704\r
+#Tue Nov 17 23:06:41 CST 2020\r
+VERSION_CODE=705\r