【将列车状态合并成一个大对象】

protos/device_state.proto

@@ -268,7 +268,7 @@ message TrainMapState{
 	//列车初始link运行方向
 	bool up = 2;
 	// 列车初始速度
-	float speed = 3;
+	float initialSpeed = 3;
 	//列车长度,1=1mm
 	int64 trainLength = 4;
 	//列车是否显示
@@ -291,113 +291,103 @@ message TrainMapState{
 	int64 controlDelayTime = 13;
 	// 列车轮径
 	int32 wheelDiameter = 14;
-}
-
-// 动力学列车状态
-message TrainMapDynamicState {
-	//列车索引
-	string id = 1;
+	// 动力学信息
 	// 生命信号	每个周期+1
-	int32 heartbeat = 2;
+	int32 dynamicHeartbeat = 15;
 	//车头所在link的索引
-	string headLinkId = 3;
+	string headLinkId = 16;
 	//车头所在link内的偏移量，单位为mm
-	int64 headLinkOffset = 4;
+	int64 headLinkOffset = 17;
 	//车尾所在link的索引
-	string tailLinkId = 5;
+	string tailLinkId = 18;
 	//车尾所在link内的偏移量，单位为mm
-	int64 tailLinkOffset = 6;
+	int64 tailLinkOffset = 19;
 	//列车所占用的link的索引的列表
 	//顺序为从车头到车尾
-	repeated string occupiedLinkIndex = 7;
+	repeated string occupiedLinkIndex = 20;
 	//列车所在位置坡度值,1=1‰
-	int32 slope = 8;
+	int32 slope = 21;
 	//列车所在位置坡度走势,1=上坡true，0=下坡false
-	bool upslope = 9;
+	bool upslope = 22;
 	//列车当前运行方向,1 =上行true 0 =下行false
-	bool runningUp = 10;
+	bool runningUp = 23;
 	//实际运行阻力（总）（N）totalResistance,1=1KN 
-	float runningResistanceSum = 11;
+	float runningResistanceSum = 24;
 	//阻力1（空气阻力）（N）airResistance,1=1KN 
-	float airResistance = 12;
+	float airResistance = 25;
 	//阻力2（坡道阻力）（N）slopeResistance,1=1KN
-	float rampResistance  = 13;
+	float rampResistance  = 26;
 	//阻力3（曲线阻力）（N）curveResistance,1=1KN
-	float curveResistance = 14;
+	float curveResistance = 27;
 	//列车运行速度（m/s）speed,1=1km/h
-	int32 speed = 15;
+	int32 speed = 28;
 	//头车速传1速度值（m/s）headSpeed1,1=1km/h
-	int32 headSensorSpeed1 = 16;
+	int32 headSensorSpeed1 = 29;
 	//头车速度2速度值（m/s）headSpeed2,1=1km/h
-	int32 headSensorSpeed2 = 17;
+	int32 headSensorSpeed2 = 30;
 	//尾车速传1速度值（m/s）tailSpeed1,1=1km/h
-	int32 tailSensorSpeed1 = 18;
+	int32 tailSensorSpeed1 = 31;
 	//尾车速度2速度值（m/s）tailSpeed2,1=1km/h
-	int32 tailSensorSpeed2 = 19;
+	int32 tailSensorSpeed2 = 32;
 	//头车雷达速度值（m/s）headRadarSpeed,1=1km/h
-	int32 headRadarSpeed = 20;
+	int32 headRadarSpeed = 33;
 	//尾车雷达速度值（m/s）tailRadarSpeed,1=1km/h
-	int32 tailRadarSpeed = 21;
+	int32 tailRadarSpeed = 34;
 	// 通讯中断
-	bool udpInterruption = 22;
+	bool dynamicInterruption = 35;
 	// 加速
-	float acceleration = 23;
-}
-
-// vobc发过来的列车信息
-message TrainMapVobcState {
-	//列车索引
-	string id = 1;
+	float acceleration = 36;
+	// 半实物信息
 	// 生命信号	每个周期+1
-	int32 lifeSignal = 2;
+	int32 lifeSignal = 37;
 	// TC1激活状态	1=激活
-	bool tc1Active = 3;
+	bool tc1Active = 38;
 	// TC2激活状态	1=激活
-	bool tc2Active = 4;
+	bool tc2Active = 39;
 	// 列车方向向前	1=方向向前
-	bool directionForward = 5;
+	bool directionForward = 40;
 	// 列车方向向后	1=方向向后
-	bool directionBackward = 6;
+	bool directionBackward = 41;
 	// 列车牵引状态	1=牵引
-	bool tractionStatus = 7;
+	bool tractionStatus = 42;
 	// 列车制动状态	1=制动
-	bool brakingStatus = 8;
+	bool brakingStatus = 43;
 	// 列车紧急制动状态	1=紧急制动
-	bool emergencyBrakingStatus = 9;
+	bool emergencyBrakingStatus = 44;
 	// 列车折返状态（AR）	1=折返
-	bool turnbackStatus = 10;
+	bool turnbackStatus = 45;
 	// 跳跃状态	1=跳跃
-	bool jumpStatus = 11;
+	bool jumpStatus = 46;
 	// ATO模式	1=ATO模式
-	bool ato = 12;
+	bool ato = 47;
 	// FAM模式	1=FAM模式
-	bool fam = 13;
+	bool fam = 48;
 	// CAM模式	1=CAM模式
-	bool cam = 14;
+	bool cam = 49;
 	// 牵引安全回路	1=牵引安全切除
-	bool tractionSafetyCircuit = 15;
+	bool tractionSafetyCircuit = 50;
 	// 停放制动状态	1=停放施加
-	bool parkingBrakeStatus = 16;
+	bool parkingBrakeStatus = 51;
 	// 保持制动状态	1=保持制动施加
-	bool maintainBrakeStatus = 17;
+	bool maintainBrakeStatus = 52;
 	// 列车牵引力	100=1KN
-	int64 tractionForce = 18;
+	int64 tractionForce = 53;
 	// 列车制动力	100=1KN
-	int64 brakeForce = 19;
+	int64 brakeForce = 54;
 	//【列车载荷	100=1ton
-	int64 trainLoad = 20;
+	int64 trainLoad = 55;
 	// 列车开左门指令	1=开门
-	bool leftDoorOpenCommand = 21;
+	bool leftDoorOpenCommand = 56;
 	// 列车开右门指令	1=开门
-	bool rightDoorOpenCommand = 22;
+	bool rightDoorOpenCommand = 57;
 	// 列车关左门指令	1=关门
-	bool leftDoorCloseCommand = 23;
+	bool leftDoorCloseCommand = 58;
 	// 列车关右门指令	1=关门
-	bool rightDoorCloseCommand = 24;
+	bool rightDoorCloseCommand = 59;
 	// 整列车门关好	1=门关好
-	bool allDoorClose = 25;
+	bool allDoorClose = 60;
 	// 通讯中断
-	bool udpInterruption = 26;
+	bool vobcInterruption = 61;
 }
 
 // 继电器状态
@@ -496,10 +486,6 @@ message AllDevicesStatus{
 	repeated KeyState KeyState = 10;
 	// 站场图站台状态
 	repeated PlatformState platformState = 11;
-	// 所有列车的动力学状态
-	repeated TrainMapDynamicState trainDynamicState = 12;
-	// 所有列车的半实物状态
-	repeated TrainMapVobcState trainVobcState = 13;
 }
 
 //服务器端向前端推送的设备状态信息