Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message

protos/alertConst.proto

@@ -60,4 +60,26 @@ enum AlertType {
   TRAIN_EB_ATP = 18;
   //全线蓝显
   ALL_LINE_BLUE_DISPLAY = 19;
+  //联锁区红光带
+  AXLE_LED_RED_INTERLOCK_AREA = 20;
+  //联锁区橙光带
+  AXLE_LED_ORANGE_INTERLOCK_AREA = 21;
+  //联锁区失表
+  SWITCH_LOST_INTERLOCK_AREA = 22;
+  //一级联锁
+  INTERLOCK_LEVEL_ONE = 23;
+
+
 }
+enum TipTimeConfig{
+  //假期早高峰
+  HOLIDAYS_MORN_PEAK = 0;
+  //假期晚高峰
+  HOLIDAYS_EVENING_PEAK = 1;
+  //早高峰
+  MORN_PEAK = 2;
+  //晚高峰
+  EVENING_PEARK = 3;
+  //低峰
+  NORMAL_UNPEARK = 4;
+}

protos/stationLayoutGraphics.proto

@@ -121,10 +121,15 @@ message Station {
 }
 
 message StationLine {
+   enum stationColor {
+    orange = 0;
+    gray = 1;
+  }
   CommonInfo common = 1;
   string code = 2;
   bool hasTransfer = 3; // 是否有换乘图标
   bool hideName = 4;
+  stationColor codeColor = 5;
 }
 
 message TrainWindow {

protos/trainShedule.proto

@@ -0,0 +1,25 @@
+syntax = "proto3";
+
+package alert;
+
+
+//模型的可变的状态数据
+//import "LineNetTrainOffsetDiagram.proto";
+option java_package = "club.joylink.xiannccda.dto.protos";
+option java_outer_classname = "TrainShedule";
+message Plan{
+  int32 lineId = 1;
+  int64 date = 2;
+  int32 actionId = 3;
+  string trainId = 4;
+  string globalId = 5;
+  int32 stationId = 6;
+  int32 platformId = 7;
+  int64 aTime = 8;
+  int64 dTime = 9;
+  bool upWay = 10;
+  int64 timestamp = 11;
+  //接受时间
+  int64 receiveTime = 12;
+  int32 flag = 13;
+}