add new func of live module and realTime add new field

This commit is contained in:
zhongchao
2021-04-01 16:05:51 +08:00
parent 3a5281aa9f
commit d4792ce2ac
17 changed files with 623 additions and 128 deletions

View File

@@ -53,10 +53,30 @@ public class CloudLocationInfo implements Parcelable {
*/
private int vehicleType = 0;
/**
* 道路ID
*/
private String roadId;
/**
* 车道ID-2D路段
*/
private String laneId;
/**
* 车道号中心线编号为0中心线右侧编号为负数3车道通行Road的车道编号0-1-2-3
*/
private int laneNum;
/**
* 限速
*/
private double rateLimiting;
public CloudLocationInfo() {
}
public CloudLocationInfo(CloudLocationInfo info ) {
public CloudLocationInfo(CloudLocationInfo info) {
this.lat = info.getLat();
this.lon = info.getLon();
this.heading = info.getHeading();
@@ -65,9 +85,13 @@ public class CloudLocationInfo implements Parcelable {
this.alt = info.alt;
this.speed = info.speed;
this.vehicleType = info.vehicleType;
this.roadId = info.roadId;
this.laneId = info.laneId;
this.laneNum = info.laneNum;
this.rateLimiting = info.rateLimiting;
}
protected CloudLocationInfo(Parcel in ) {
protected CloudLocationInfo(Parcel in) {
lat = in.readDouble();
lon = in.readDouble();
heading = in.readDouble();
@@ -76,18 +100,26 @@ public class CloudLocationInfo implements Parcelable {
alt = in.readDouble();
speed = in.readDouble();
vehicleType = in.readInt();
roadId = in.readString();
laneId = in.readString();
laneNum = in.readInt();
rateLimiting = in.readDouble();
}
@Override
public void writeToParcel( Parcel dest, int flags ) {
dest.writeDouble( lat );
dest.writeDouble( lon );
dest.writeDouble( heading );
dest.writeLong( systemTime );
dest.writeLong( satelliteTime );
dest.writeDouble( alt );
dest.writeDouble( speed );
dest.writeInt( vehicleType );
public void writeToParcel(Parcel dest, int flags) {
dest.writeDouble(lat);
dest.writeDouble(lon);
dest.writeDouble(heading);
dest.writeLong(systemTime);
dest.writeLong(satelliteTime);
dest.writeDouble(alt);
dest.writeDouble(speed);
dest.writeInt(vehicleType);
dest.writeString(roadId);
dest.writeString(laneId);
dest.writeInt(laneNum);
dest.writeDouble(rateLimiting);
}
@Override
@@ -95,14 +127,14 @@ public class CloudLocationInfo implements Parcelable {
return 0;
}
public static final Creator< CloudLocationInfo > CREATOR = new Creator< CloudLocationInfo >() {
public static final Creator<CloudLocationInfo> CREATOR = new Creator<CloudLocationInfo>() {
@Override
public CloudLocationInfo createFromParcel( Parcel in ) {
return new CloudLocationInfo( in );
public CloudLocationInfo createFromParcel(Parcel in) {
return new CloudLocationInfo(in);
}
@Override
public CloudLocationInfo[] newArray( int size ) {
public CloudLocationInfo[] newArray(int size) {
return new CloudLocationInfo[size];
}
};
@@ -111,7 +143,7 @@ public class CloudLocationInfo implements Parcelable {
return lat;
}
public void setLat( double lat ) {
public void setLat(double lat) {
this.lat = lat;
}
@@ -119,7 +151,7 @@ public class CloudLocationInfo implements Parcelable {
return lon;
}
public void setLon( double lon ) {
public void setLon(double lon) {
this.lon = lon;
}
@@ -127,7 +159,7 @@ public class CloudLocationInfo implements Parcelable {
return heading;
}
public void setHeading( double heading ) {
public void setHeading(double heading) {
this.heading = heading;
}
@@ -135,7 +167,7 @@ public class CloudLocationInfo implements Parcelable {
return systemTime;
}
public void setSystemTime( long systemTime ) {
public void setSystemTime(long systemTime) {
this.systemTime = systemTime;
}
@@ -143,7 +175,7 @@ public class CloudLocationInfo implements Parcelable {
return satelliteTime;
}
public void setSatelliteTime( long satelliteTime ) {
public void setSatelliteTime(long satelliteTime) {
this.satelliteTime = satelliteTime;
}
@@ -151,7 +183,7 @@ public class CloudLocationInfo implements Parcelable {
return alt;
}
public void setAlt( double alt ) {
public void setAlt(double alt) {
this.alt = alt;
}
@@ -159,7 +191,7 @@ public class CloudLocationInfo implements Parcelable {
return speed;
}
public void setSpeed( double speed ) {
public void setSpeed(double speed) {
this.speed = speed;
}
@@ -171,6 +203,38 @@ public class CloudLocationInfo implements Parcelable {
this.vehicleType = vehicleType;
}
public String getRoadId() {
return roadId;
}
public void setRoadId(String roadId) {
this.roadId = roadId;
}
public String getLaneId() {
return laneId;
}
public void setLaneId(String laneId) {
this.laneId = laneId;
}
public int getLaneNum() {
return laneNum;
}
public void setLaneNum(int laneNum) {
this.laneNum = laneNum;
}
public double getRateLimiting() {
return rateLimiting;
}
public void setRateLimiting(double rateLimiting) {
this.rateLimiting = rateLimiting;
}
@Override
public String toString() {
return "CloudLocationInfo{" +
@@ -182,6 +246,10 @@ public class CloudLocationInfo implements Parcelable {
", alt=" + alt +
", speed=" + speed +
", vehicleType=" + vehicleType +
", roadId='" + roadId + '\'' +
", laneId='" + laneId + '\'' +
", laneNum=" + laneNum +
", rateLimiting=" + rateLimiting +
'}';
}
@@ -191,21 +259,21 @@ public class CloudLocationInfo implements Parcelable {
}
@Override
public boolean equals( Object o ) {
if ( this == o ) {
public boolean equals(Object o) {
if (this == o) {
return true;
}
if ( o == null || getClass() != o.getClass() ) {
if (o == null || getClass() != o.getClass()) {
return false;
}
CloudLocationInfo that = ( CloudLocationInfo ) o;
return Double.compare( that.lat, lat ) == 0 &&
Double.compare( that.lon, lon ) == 0;
CloudLocationInfo that = (CloudLocationInfo) o;
return Double.compare(that.lat, lat) == 0 &&
Double.compare(that.lon, lon) == 0;
}
@RequiresApi(api = Build.VERSION_CODES.KITKAT)
@Override
public int hashCode() {
return Objects.hash( lat, lon );
return Objects.hash(lat, lon);
}
}