add new field of realTime
This commit is contained in:
@@ -40,7 +40,7 @@ MOGO_PASSPORT_VERSION=1.0.51
|
||||
# 常链接
|
||||
MOGO_SOCKET_VERSION=1.0.51
|
||||
# 数据采集
|
||||
MOGO_REALTIME_VERSION=1.0.52
|
||||
MOGO_REALTIME_VERSION=1.0.53
|
||||
# 探路,道路事件发布,获取
|
||||
MOGO_TANLU_VERSION=1.0.51
|
||||
# 直播推流
|
||||
|
||||
@@ -5,8 +5,6 @@ import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
import android.support.annotation.RequiresApi;
|
||||
|
||||
import com.mogo.cloud.commons.utils.CoordinateUtils;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
@@ -69,14 +67,6 @@ public class CloudLocationInfo implements Parcelable {
|
||||
this.vehicleType = info.vehicleType;
|
||||
}
|
||||
|
||||
public void convertCoor2GCJ02(){
|
||||
double[] amapCoord = CoordinateUtils.transformWgsToGcj( lat, lon );
|
||||
if ( amapCoord != null ) {
|
||||
this.lat = amapCoord[1];
|
||||
this.lon = amapCoord[0];
|
||||
}
|
||||
}
|
||||
|
||||
protected CloudLocationInfo(Parcel in ) {
|
||||
lat = in.readDouble();
|
||||
lon = in.readDouble();
|
||||
|
||||
@@ -25,6 +25,9 @@ public class CloudRoadData implements Parcelable {
|
||||
private double lat;
|
||||
private double lon;
|
||||
|
||||
private double wgslat;
|
||||
private double wgslon;
|
||||
|
||||
private String uuid;
|
||||
private String sn;
|
||||
|
||||
@@ -76,6 +79,22 @@ public class CloudRoadData implements Parcelable {
|
||||
this.lon = lon;
|
||||
}
|
||||
|
||||
public double getWgslat() {
|
||||
return wgslat;
|
||||
}
|
||||
|
||||
public void setWgslat(double wgslat) {
|
||||
this.wgslat = wgslat;
|
||||
}
|
||||
|
||||
public double getWgslon() {
|
||||
return wgslon;
|
||||
}
|
||||
|
||||
public void setWgslon(double wgslon) {
|
||||
this.wgslon = wgslon;
|
||||
}
|
||||
|
||||
public double getSpeed() {
|
||||
return speed;
|
||||
}
|
||||
@@ -189,6 +208,8 @@ public class CloudRoadData implements Parcelable {
|
||||
dest.writeInt( this.fromType );
|
||||
dest.writeDouble( this.lat );
|
||||
dest.writeDouble( this.lon );
|
||||
dest.writeDouble( this.wgslat );
|
||||
dest.writeDouble( this.wgslon );
|
||||
dest.writeString( this.uuid );
|
||||
dest.writeString( this.sn );
|
||||
dest.writeDouble( this.speed );
|
||||
@@ -207,6 +228,8 @@ public class CloudRoadData implements Parcelable {
|
||||
this.fromType = in.readInt();
|
||||
this.lat = in.readDouble();
|
||||
this.lon = in.readDouble();
|
||||
this.wgslat = in.readDouble();
|
||||
this.wgslon = in.readDouble();
|
||||
this.uuid = in.readString();
|
||||
this.sn = in.readString();
|
||||
this.speed = in.readDouble();
|
||||
@@ -253,6 +276,8 @@ public class CloudRoadData implements Parcelable {
|
||||
", fromType=" + fromType +
|
||||
", lat=" + lat +
|
||||
", lon=" + lon +
|
||||
", wgslat=" + wgslat +
|
||||
", wgslon=" + wgslon +
|
||||
", uuid='" + uuid + '\'' +
|
||||
", sn='" + sn + '\'' +
|
||||
", speed=" + speed +
|
||||
|
||||
@@ -98,7 +98,6 @@ public class MogoRTKLocation {
|
||||
cloudLocationInfo.setSpeed(location.getSpeed());
|
||||
cloudLocationInfo.setSatelliteTime(location.getTime());
|
||||
cloudLocationInfo.setSystemTime(System.currentTimeMillis());
|
||||
cloudLocationInfo.convertCoor2GCJ02();
|
||||
locInfo = cloudLocationInfo;
|
||||
cacheList.add(cloudLocationInfo);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user