diff --git a/.idea/dictionaries/zhongchao.xml b/.idea/dictionaries/zhongchao.xml new file mode 100644 index 0000000..2c1b626 --- /dev/null +++ b/.idea/dictionaries/zhongchao.xml @@ -0,0 +1,8 @@ + + + + amap + coor + + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 294cdd2..9f8431d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,20 +30,20 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.0.32-SNAPSHOT +MOGO_UTILS_VERSION=1.0.33-SNAPSHOT # 网络请求 -MOGO_NETWORK_VERSION=1.0.32-SNAPSHOT +MOGO_NETWORK_VERSION=1.0.33-SNAPSHOT # 网络DNS -MOGO_HTTPDNS_VERSION=1.0.32-SNAPSHOT +MOGO_HTTPDNS_VERSION=1.0.33-SNAPSHOT # 鉴权 -MOGO_PASSPORT_VERSION=1.0.32-SNAPSHOT +MOGO_PASSPORT_VERSION=1.0.33-SNAPSHOT # 常链接 -MOGO_SOCKET_VERSION=1.0.32-SNAPSHOT +MOGO_SOCKET_VERSION=1.0.33-SNAPSHOT # 数据采集 -MOGO_REALTIME_VERSION=1.0.32-SNAPSHOT +MOGO_REALTIME_VERSION=1.0.33-SNAPSHOT # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.0.32-SNAPSHOT +MOGO_TANLU_VERSION=1.0.33-SNAPSHOT # 直播推流 -MOGO_LIVE_VERSION=1.0.32-SNAPSHOT +MOGO_LIVE_VERSION=1.0.33-SNAPSHOT # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.32-SNAPSHOT +MOGO_TRAFFICLIVE_VERSION=1.0.33-SNAPSHOT diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/CloudLocationInfo.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/CloudLocationInfo.java index d2b6259..a4c35ed 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/CloudLocationInfo.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/CloudLocationInfo.java @@ -49,6 +49,12 @@ public class CloudLocationInfo implements Parcelable { */ private double speed; + /** + * 车辆类型 + * 0:普通车辆、家用车 + */ + private int vehicleType = 0; + public CloudLocationInfo() { } @@ -60,6 +66,7 @@ public class CloudLocationInfo implements Parcelable { this.satelliteTime = System.currentTimeMillis(); this.alt = info.alt; this.speed = info.speed; + this.vehicleType = info.vehicleType; } public void convertCoor2GCJ02(){ @@ -78,6 +85,7 @@ public class CloudLocationInfo implements Parcelable { satelliteTime = in.readLong(); alt = in.readDouble(); speed = in.readDouble(); + vehicleType = in.readInt(); } @Override @@ -89,6 +97,7 @@ public class CloudLocationInfo implements Parcelable { dest.writeLong( satelliteTime ); dest.writeDouble( alt ); dest.writeDouble( speed ); + dest.writeInt( vehicleType ); } @Override @@ -164,6 +173,14 @@ public class CloudLocationInfo implements Parcelable { this.speed = speed; } + public int getVehicleType() { + return vehicleType; + } + + public void setVehicleType(int vehicleType) { + this.vehicleType = vehicleType; + } + @Override public String toString() { return "CloudLocationInfo{" + @@ -174,12 +191,13 @@ public class CloudLocationInfo implements Parcelable { ", satelliteTime=" + satelliteTime + ", alt=" + alt + ", speed=" + speed + + ", vehicleType=" + vehicleType + '}'; } public String print() { return "CloudLocation{ lon: " + lon + " lat: " + lat + " heading: " + heading + " speed: " - + speed + "}"; + + speed + " vehicleType: " + vehicleType + "}"; } @Override