Commit a4a03037 authored by p x's avatar p x
Browse files

t

parent 65b50318
...@@ -24,4 +24,8 @@ public class MessageHeadInfo { ...@@ -24,4 +24,8 @@ public class MessageHeadInfo {
//控制内容 //控制内容
@Order(6) @Order(6)
private short controlContent; private short controlContent;
public short getDataType() {
return dataType;
}
} }
...@@ -7,7 +7,7 @@ public class VehicleMessageBody { ...@@ -7,7 +7,7 @@ public class VehicleMessageBody {
//车辆基础信息 //车辆基础信息
@Order(1) @Order(1)
private VehicleInfo vehicleInfo; private VehicleInfo vehicleInfo;
// //车辆辅助驾驶信息及状态信息 /****车辆辅助驾驶信息及状态信息*/
// @Order(2) // @Order(2)
// private VehicleStatusInfo vehicleStatusInfo; // private VehicleStatusInfo vehicleStatusInfo;
// //车辆自动驾驶信息 // //车辆自动驾驶信息
......
...@@ -4,6 +4,7 @@ import java.util.List; ...@@ -4,6 +4,7 @@ import java.util.List;
import com.cusc.adas.v2x.utils.FieldDef; import com.cusc.adas.v2x.utils.FieldDef;
import com.cusc.adas.v2x.utils.NumFlag; import com.cusc.adas.v2x.utils.NumFlag;
import com.cusc.adas.v2x.utils.OffsetDef;
import com.cusc.adas.v2x.utils.Order; import com.cusc.adas.v2x.utils.Order;
import com.cusc.adas.v2x.utils.RefNumFlag; import com.cusc.adas.v2x.utils.RefNumFlag;
...@@ -49,26 +50,30 @@ public class VehicleStatusInfo { ...@@ -49,26 +50,30 @@ public class VehicleStatusInfo {
private short dmsFlag; private short dmsFlag;
//里程 //里程
@Order(11) @Order(11)
private short mileage; private long mileage;
//sweeping状态 //sweeping状态
@Order(12) @Order(12)
private short sweepingFlag; private short sweepingFlag;
//watering状态 //watering状态
@Order(13) @Order(13)
private short wateringFlag; private short wateringFlag;
//油量 // 车辆运行状态数据 2-车辆辅助驾驶系统信息及其他状态信息数据结构(续)
//油量 对应车辆油量表读数,单位:0.1 L,
@Order(14) @Order(14)
@OffsetDef(value = 0.1)
private int fuelGauge; private int fuelGauge;
//电池剩余电量 //电池剩余电量 0.01%,
@Order(15) @Order(15)
@OffsetDef(value = 1f)
private int soc; private int soc;
//电池温度 //电池温度 [0..200],单位:摄氏度(℃),
//数据偏移量 100,表示-100℃~100℃ ,0xFF 表示缺省
@Order(16) @Order(16)
private short temperature; private short temperature;
//预计续航里程 //预计续航里程 单位:千米(km),
@Order(17) @Order(17)
private float endurance; private long endurance;
//车辆故障状态 //车辆故障状态
@Order(18) @Order(18)
...@@ -80,11 +85,11 @@ public class VehicleStatusInfo { ...@@ -80,11 +85,11 @@ public class VehicleStatusInfo {
//电机转矩 //电机转矩
@Order(20) @Order(20)
private long motortorque; private long motortorque;
//运行模式 //运行模式 车辆运行模式,1:纯电驱动模式;2:混合驱动 模式;3:行车充电模式;4:能量回收模式;5:停车充电模式;6: 能量混合回充模式;
@Order(21) @Order(21)
private short vehMode; private short vehMode;
//充电状态 //充电状态 1:未充电;2:充电准备;3:正在充电;4:充电故障;5:充电结束; 0xFF 表示缺省
@Order(22) @Order(22)
private short chargeState; private short chargeState;
//动力电池实时电压 //动力电池实时电压
...@@ -101,7 +106,8 @@ public class VehicleStatusInfo { ...@@ -101,7 +106,8 @@ public class VehicleStatusInfo {
@Order(26) @Order(26)
@NumFlag @NumFlag
private short wheelNum; private short wheelNum;
//轮速 //轮速 表示车轮线速度,单位:0.01 m/s,
//数据偏移量 200,表示-200.00 m/s~200.00 m/s,
@Order(27) @Order(27)
@RefNumFlag(value="wheelNum") @RefNumFlag(value="wheelNum")
private int[] wheelVelocity; private int[] wheelVelocity;
...@@ -109,7 +115,7 @@ public class VehicleStatusInfo { ...@@ -109,7 +115,7 @@ public class VehicleStatusInfo {
@Order(28) @Order(28)
@RefNumFlag(value="wheelNum") @RefNumFlag(value="wheelNum")
private int[] tirePressure; private int[] tirePressure;
//车灯状态 //车灯状态 BIT2 = 左转灯 BIT3 = 右转灯
@Order(30) @Order(30)
private int lights; private int lights;
//车门状态 //车门状态
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment