merge

protos/device_state.proto

@@ -55,6 +55,28 @@ message SignalState{
   //信号机索引
   string  id = 1;
 }
+//信号机显示枚举定义
+message Signal {
+	enum Aspect {
+		//物理灭灯
+		OFF = 0;
+		//物理亮灯
+		ON = 1;
+		//绿灯亮
+		L = 2;
+		//红灯亮
+		H = 3;
+		//黄灯亮
+		U = 4;
+		//红灯且黄灯亮
+		HU= 5;
+		//白灯亮
+		B=6;
+		//蓝灯亮
+		A=7;
+	}
+}
+
 //站台状态
 message PlatformState{
   //站台索引

protos/ibpGraphics.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
 import "stationLayoutGraphics.proto";
-
+import "relayCabinetLayoutGraphics.proto";
 package ibpGraphicData;
+option go_package = "./ats/verify/protos/graphicData";
 
 message IBPGraphicStorage {
   graphicData.Canvas canvas = 1;
@@ -10,8 +11,12 @@ message IBPGraphicStorage {
   repeated IbpKey ibpKeys = 4;
   repeated IbpArrow ibpArrows = 5;
   repeated IBPText IBPTexts = 6;
+<<<<<<< HEAD
   // UniqueIdType UniqueIdPrefix = 7;
   repeated IbpRelatedDevice ibpRelatedDevices = 8;
+=======
+  relayCabinetGraphicData.UniqueIdType UniqueIdPrefix = 7;
+>>>>>>> b33cc6eee0d88f566a6370e12633da50883b4d34
 }
 
 message IBPButton {
@@ -48,17 +53,10 @@ message IbpKey {
   string code = 2;
 }
 
-message Point {
-  // x坐标
-  float x = 1;
-  // y坐标
-  float y = 2;
-}
-
 message IbpArrow {
   graphicData.CommonInfo common = 1;
   string code = 2;
-  repeated Point points = 3;
+  repeated graphicData.Point points = 3;
 }
 
 // message UniqueIdType {

protos/pslGraphics.proto

@@ -55,10 +55,6 @@ message PslText {
 /* 门控箱关联的设备列表 */
 message GatedRelateDevice {
   string code = 1;//设备编号
-  repeated Combinationtype combinationtypes = 2; //组合类型
+  repeated graphicData.DeviceCombinationtype combinationtypes = 2; //组合类型
   graphicData.RelatedRef.DeviceType deviceType = 3;//设备类型
 }
-message Combinationtype {
-  string code = 1;
-  repeated string refDevices = 2;//门控箱关联的设备
-}

protos/stationLayoutGraphics.proto

@@ -149,6 +149,7 @@ message Station {
   // string kilometerCode = 5;       //公里标
   KilometerSystem kilometerSystem = 6; //公里标
   int32 index = 7;
+  string refIbpMapCode = 8; // 关联IBP地图Code
 }
 
 message TrainWindow {
@@ -408,6 +409,7 @@ message GatedBox {
   bool flip = 3;   // 是否翻转（前端显示）
   int32 index = 4; //索引
   string refScreenDoor = 5; // 关联屏蔽门
+  string refGatedBoxMapCode = 6; // 关联门控箱地图Code
 }
 
 /** 坡度公里标 */
@@ -469,10 +471,10 @@ message KilometerConvert {
 /* 车站关联的设备列表 */
 message StationRelateDevice {
   string code = 1;//设备编号
-  repeated Combinationtype combinationtypes = 2; //组合类型
+  repeated DeviceCombinationtype combinationtypes = 2; //组合类型
   RelatedRef.DeviceType deviceType = 3;//设备类型
 }
-message Combinationtype {
+message DeviceCombinationtype {
   string code = 1;
-  repeated string refDevices = 2;//门控箱关联的设备
+  repeated string refDevices = 2;//车站关联的设备
 }