add field in CloudlocatioInfo class and update all sdk version
This commit is contained in:
8
.idea/dictionaries/zhongchao.xml
generated
Normal file
8
.idea/dictionaries/zhongchao.xml
generated
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<component name="ProjectDictionaryState">
|
||||||
|
<dictionary name="zhongchao">
|
||||||
|
<words>
|
||||||
|
<w>amap</w>
|
||||||
|
<w>coor</w>
|
||||||
|
</words>
|
||||||
|
</dictionary>
|
||||||
|
</component>
|
||||||
@@ -30,20 +30,20 @@ PASSWORD=xintai2018
|
|||||||
RELEASE=true
|
RELEASE=true
|
||||||
# AI CLOUD 云平台
|
# 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
|
# 网络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
|
||||||
|
|||||||
@@ -49,6 +49,12 @@ public class CloudLocationInfo implements Parcelable {
|
|||||||
*/
|
*/
|
||||||
private double speed;
|
private double speed;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 车辆类型
|
||||||
|
* 0:普通车辆、家用车
|
||||||
|
*/
|
||||||
|
private int vehicleType = 0;
|
||||||
|
|
||||||
public CloudLocationInfo() {
|
public CloudLocationInfo() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,6 +66,7 @@ public class CloudLocationInfo implements Parcelable {
|
|||||||
this.satelliteTime = System.currentTimeMillis();
|
this.satelliteTime = System.currentTimeMillis();
|
||||||
this.alt = info.alt;
|
this.alt = info.alt;
|
||||||
this.speed = info.speed;
|
this.speed = info.speed;
|
||||||
|
this.vehicleType = info.vehicleType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void convertCoor2GCJ02(){
|
public void convertCoor2GCJ02(){
|
||||||
@@ -78,6 +85,7 @@ public class CloudLocationInfo implements Parcelable {
|
|||||||
satelliteTime = in.readLong();
|
satelliteTime = in.readLong();
|
||||||
alt = in.readDouble();
|
alt = in.readDouble();
|
||||||
speed = in.readDouble();
|
speed = in.readDouble();
|
||||||
|
vehicleType = in.readInt();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -89,6 +97,7 @@ public class CloudLocationInfo implements Parcelable {
|
|||||||
dest.writeLong( satelliteTime );
|
dest.writeLong( satelliteTime );
|
||||||
dest.writeDouble( alt );
|
dest.writeDouble( alt );
|
||||||
dest.writeDouble( speed );
|
dest.writeDouble( speed );
|
||||||
|
dest.writeInt( vehicleType );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -164,6 +173,14 @@ public class CloudLocationInfo implements Parcelable {
|
|||||||
this.speed = speed;
|
this.speed = speed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getVehicleType() {
|
||||||
|
return vehicleType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setVehicleType(int vehicleType) {
|
||||||
|
this.vehicleType = vehicleType;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "CloudLocationInfo{" +
|
return "CloudLocationInfo{" +
|
||||||
@@ -174,12 +191,13 @@ public class CloudLocationInfo implements Parcelable {
|
|||||||
", satelliteTime=" + satelliteTime +
|
", satelliteTime=" + satelliteTime +
|
||||||
", alt=" + alt +
|
", alt=" + alt +
|
||||||
", speed=" + speed +
|
", speed=" + speed +
|
||||||
|
", vehicleType=" + vehicleType +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
|
|
||||||
public String print() {
|
public String print() {
|
||||||
return "CloudLocation{ lon: " + lon + " lat: " + lat + " heading: " + heading + " speed: "
|
return "CloudLocation{ lon: " + lon + " lat: " + lat + " heading: " + heading + " speed: "
|
||||||
+ speed + "}";
|
+ speed + " vehicleType: " + vehicleType + "}";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user