From: snickersun Date: Tue, 17 Nov 2020 16:24:28 +0000 (+0800) Subject: release V705 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=0010583f5a382c20a7b17cc6a91c902101255582;p=protocol_srv.git 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 c54a1870..540082e8 100644 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 d10bd9a5..84ec72ac 100644 --- 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 a3c4ca66..03234974 100644 --- 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]; String Lat = tmplist[2]; String lon = tmplist[4]; + String latname= tmplist[3]; + String lonname=tmplist[5]; String fixed = tmplist[6]; String usedStarts = tmplist[7]; String hdop = tmplist[8]; @@ -338,7 +340,7 @@ public class NMEAListener implements NmeaListener, LocationListener { //定位 StringBuilder sb = new StringBuilder(); - sb.append("GPGGA, location time= " + TimeUtil.getLocalTime() + ", FixedCount=" + locationFixedCount + ", GPSTime=" + utctime + ", Lat=" + Lat + " (" + strLatitude + "), Lon=" + lon + " (" + strLongitude + "), fixed=" + fixed + ", hdop=" + hdop + ", usedStarts=" + usedStarts); + 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); ICLogger.i(sb.toString()); if (Config.LOG_TOFILE) ICLogger.logToFile( "GPS", sb.toString()); @@ -357,6 +359,7 @@ public class NMEAListener implements NmeaListener, LocationListener { */ runtime.getLocationInstance().setLocation(Lat, lon); runtime.getLocationInstance().setLocationGPS(strLatitude, strLongitude); + runtime.getLocationInstance().setLocationlatlonName(latname,lonname); runtime.getLocationInstance().setUsedStarts(Integer.valueOf(usedStarts.trim())); runtime.getLocationInstance().setHod(Float.valueOf(hdop.trim())); runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_FIXED); 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 beac5760..70b2873d 100644 --- 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; public String latGPSStr; public String lonGPSStr; + public String lat_name; + public String lon_name; public float hdop; } @@ -165,6 +167,11 @@ public class ICLocation { currentLP.lat=lat; currentLP.lon=lon; } + + public void setLocationlatlonName(String latname,String lonname){ + currentLP.lat_name=latname; + currentLP.lon_name=lonname; + } public void setLocation(String lat,String lon){ currentLP.latStr=lat; currentLP.lonStr=lon; 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 083da4fe..0aa989b2 100644 --- 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); String latStr=gpsp.getLocation().latStr; String lonStr=gpsp.getLocation().lonStr; + String latname=gpsp.getLocation().lat_name; + String lonname=gpsp.getLocation().lon_name; if (isGPSFixed()) { if (gpsp.getLocation().lonStr.isEmpty()) { - String gpsStr = String.format("%04d.%04dN%05d.%04dE%03d.%01d", lati, latl, loni, lonl, speedi, speedl); + String gpsStr = String.format("%04d.%04d%s%05d.%04d%s%03d.%01d", lati, latl,latname, loni, lonl,lonname, speedi, speedl); sb.append("A").append(gpsStr); }else{ String gpsStr = String.format("%sN%sE%03d.%01d", latStr.substring(0,9), lonStr.substring(0,10), speedi, speedl); @@ -908,17 +910,20 @@ public class Runtime { String latStr=gpsp.getLocation().latGPSStr; String lonStr=gpsp.getLocation().lonGPSStr; - + String latname=gpsp.getLocation().lat_name; + String lonname=gpsp.getLocation().lon_name; ICLogger.i(" UD isfixed "+isGPSFixed()+" is in area "+bleInfo.is_in_area); if(bleInfo.is_in_area==true){ latStr=bleInfo.gps_n; lonStr=bleInfo.gps_e; + latname=(latStr.trim().startsWith("-"))?"S":"N"; + lonname=(lonStr.trim().startsWith("-"))?"W":"E"; } String heading=String.valueOf(gpsp.getLocation().heading); int starcount=gpsp.getLocation().used_gps_numbs; if (isGPSFixed()|| bleInfo.is_in_area) { - String gpsStr = String.format(",%s,N,%s,E,%d.%02d,%s,0.0,%d", latStr, lonStr, speedi, speedl,heading,starcount); + String gpsStr = String.format(",%s,%s,%s,%s,%d.%02d,%s,0.0,%d", latStr,latname, lonStr,lonname, speedi, speedl,heading,starcount); sb.append("A").append(gpsStr); }else{ @@ -948,10 +953,12 @@ public class Runtime { String latStr=gpsp.getLocation().latGPSStr; String lonStr=gpsp.getLocation().lonGPSStr; String heading=String.valueOf(gpsp.getLocation().heading); + String latname=gpsp.getLocation().lat_name; + String lonname=gpsp.getLocation().lon_name; int starcount=gpsp.getLocation().used_gps_numbs; if (isGPSFixed()) { - String gpsStr = String.format(",%s,N,%s,E,%d.%02d,%s,0.0,%d", latStr, lonStr, speedi, speedl,heading,starcount); + String gpsStr = String.format(",%s,%s,%s,%s,%d.%02d,%s,0.0,%d", latStr,latname, lonStr,lonname, speedi, speedl,heading,starcount); sb.append("A").append(gpsStr); }else{ 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 3fd6ad52..930277e5 100644 --- 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; import android.text.TextUtils; +import com.enqualcomm.support.Config; import com.enqualcomm.support.ICContentProvider; import com.enqualcomm.support.bean.Alarm; import com.enqualcomm.support.bean.Antioff; @@ -1018,6 +1019,7 @@ public class DBHelper { values.put("TOPIC",msg.cmd()); values.put("CMD",msg.isFromCache()); long raw_contactID = ContentUris.parseId(cr.insert(ICContentProvider.PROTOCOL_CMD_RECORDS_URI, values)); + if (Config.LOG_TOFILE) ICLogger.logToFile( "APILog", " insert db " +raw_contactID+" "+msg.getDate()+msg.getTime()+" "+ msg.cmd()+" "+msg.isFromCache()); return raw_contactID; } 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 d0c4b432..d4f939d7 100644 --- 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 { } - public void send(StringMessage paramStringMessage) { + public void send(StringMessage msg) { - if(paramStringMessage==null) { + if(msg==null) { ICLogger.i(" StringMessage is null skip send!"); return ; } - sendMsg(paramStringMessage.isFromCache()); - ICLogger.logToFile("APILog",paramStringMessage.isFromCache()); - ICLogger.i(paramStringMessage.isFromCache()); + sendMsg(msg.isFromCache()); + ICLogger.logToFile("APILog","send "+msg.getIndex()+" "+msg.getDate()+msg.getTime()+" "+msg.cmd()+" "+msg.isFromCache()); + // ICLogger.i(paramStringMessage.isFromCache()); } diff --git a/app/version_code.properties b/app/version_code.properties index 7ae0fb6e..7f8578a7 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Tue Nov 17 14:49:39 CST 2020 -VERSION_CODE=704 +#Tue Nov 17 23:06:41 CST 2020 +VERSION_CODE=705