Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD

# Conflicts:
#	protos/device_state.proto

protos/device_state.proto

@@ -54,9 +54,12 @@ message  SwitchState{
 message SignalState{
 	//信号机索引
 	string  id = 1;
+	//信号机的灯列表
+	repeated 	Signal.Light light = 2;
 }
-//信号机显示枚举定义
+//信号机显示定义
 message Signal {
+	//信号机显示枚举
 	enum Aspect {
 		//物理灭灯
 		OFF = 0;
@@ -64,17 +67,24 @@ message Signal {
 		ON = 1;
 		//绿灯亮
 		L = 2;
-		//红灯亮
+		//红
 		H = 3;
-		//黄灯亮
+		//黄
 		U = 4;
-		//红灯且黄灯亮
+		//红黄
 		HU= 5;
-		//白灯亮
+		//白
 		B=6;
-		//蓝灯亮
+		//蓝
 		A=7;
 	}
+	//信号机中的灯
+	message Light{
+		//灯颜色(单色)
+		Aspect color = 1;
+		//true-显示信号，false-不显示信号
+		bool  display = 2;
+	}
 }
 
 //站台状态
@@ -256,6 +266,8 @@ message AllDevicesStatus{
 	repeated SectionState sectionState = 3;
 	// 所有继电器状态
 	repeated ReplyState replyState = 4;
+	// 所有信号机状态
+	repeated SignalState signalState = 5;
 }
 
 //服务器端向前端推送的设备状态信息

protos/ibpGraphics.proto

@@ -12,6 +12,7 @@ message IBPGraphicStorage {
   repeated IBPText IBPTexts = 6;
   // UniqueIdType UniqueIdPrefix = 7;
   repeated IbpRelatedDevice ibpRelatedDevices = 8;
+  repeated IbpLight ibpLights = 9;
 }
 
 message IBPButton {
@@ -54,6 +55,18 @@ message IbpArrow {
   repeated graphicData.Point points = 3;
 }
 
+message IbpLight {
+  enum IbpLightColor {
+    white = 0;
+    red = 1;
+    green = 2;
+    blue = 3;
+  }
+  graphicData.CommonInfo common = 1;
+  IbpLightColor color = 2;
+  string code = 3;
+}
+
 // message UniqueIdType {
 //   string city = 1;           //城市
 //   string lineId = 2;         //线路号