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

protos/ibpGraphics.proto

@@ -13,6 +13,7 @@ message IBPGraphicStorage {
   // UniqueIdType UniqueIdPrefix = 7;
   repeated IbpRelatedDevice ibpRelatedDevices = 8;
   repeated IbpLight ibpLights = 9;
+  repeated IbpStationText ibpStationTexts = 10;
 }
 
 message IBPButton {
@@ -73,3 +74,21 @@ message IbpRelatedDevice {
   repeated graphicData.DeviceCombinationtype combinationtypes = 2; //组合类型
   // graphicData.RelatedRef.DeviceType deviceType = 3; //设备类型
 }
+
+message IbpStationText {
+  enum IbpStationTextType {
+    CURRENT = 0;
+    UP = 1;
+    DOWN = 2;
+  }
+  enum IbpStationTextAlign {
+    LEFT = 0;
+    RIGHT = 1;
+    CENTER = 2;
+  }
+  graphicData.CommonInfo common = 1;
+  IbpStationTextType type = 2;
+  string color = 4;
+  int32 fontSize = 5;
+  IbpStationTextAlign align = 6;
+}

protos/picture.proto

@@ -11,4 +11,6 @@ enum PictureType {
   RelayCabinetLayout = 2;
   /** IBP盘 */
   IBP = 3;
+  /** 列车数据 */
+  TrainData = 4;
 }

protos/stationLayoutGraphics.proto

@@ -12,7 +12,7 @@ message RtssGraphicStorage {
   repeated Platform Platforms = 4;
   repeated Station stations = 5;
   // repeated Rect rects = 6;
-  // repeated Train train = 7;
+  repeated Train train = 7;
   repeated Signal signals = 8;
   repeated Turnout turnouts = 9;
   repeated Section section = 10;
@@ -166,6 +166,7 @@ message Station {
   string stationName = 9; //车站名
   string stationNameAcronym = 10; //  车站名缩写
   bool depots = 11; //是否车辆段
+  repeated string manageStations = 12; // 如果是集中站——管理的车站-id
 }
 
 message TrainWindow {
@@ -341,6 +342,7 @@ message Transponder { // 应答器
   KilometerSystem kilometerSystem = 5; //公里标
   RelatedRef TransponderRef = 6;       //关联关系
   repeated string centralizedStations = 7; // 集中站列表
+  string fixedTelegram = 8;//无源应答器固定报文
 }
 
 message SimpleRef {