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

This commit is contained in:
Yuan 2023-10-12 16:21:18 +08:00
commit 5604ad84ed
2 changed files with 45 additions and 4 deletions

View File

@ -10,6 +10,7 @@ message PslGraphicStorage {
repeated PslButton pslButtons = 3;
repeated PslKey pslKeys = 4;
repeated PslText pslTexts = 5;
repeated GatedRelateDevice gatedRelateDeviceList = 6;
}
@ -50,3 +51,14 @@ message PslText {
string color = 4;
int32 fontSize = 5;
}
/* 门控箱关联的设备列表 */
message GatedRelateDevice {
string code = 1;//
repeated Combinationtype combinationtypes = 2; //
graphicData.RelatedRef.DeviceType deviceType = 3;//
}
message Combinationtype {
string code = 1;
repeated string refDevices = 2;//
}

View File

@ -38,6 +38,8 @@ message RtssGraphicStorage {
//UniqueIdType UniqueIdPrefix = 30;//--
UniqueIdOfStationLayout UniqueIdPrefix = 31;//--
repeated KilometerConvert kilometerConvertList = 32;//
repeated ScreenDoor screenDoors = 33;
repeated StationRelateDevice stationRelateDeviceList = 34; //
}
message Canvas {
@ -117,13 +119,26 @@ message CommonInfo {
message Platform {
CommonInfo common = 1;
string code = 2;
bool hasdoor = 3; //
string direction = 4; // --
//bool hasdoor = 3; //
//string direction = 4; //
int32 index = 5; //
//int32 refStationIndex = 6; //
// repeated string centralizedStations = 7; //
string refStation = 8; //
int32 sonDoorAmount = 9; //
repeated RelatedRef platformRef = 8; //
}
message ScreenDoor {
CommonInfo common = 1;
string code = 2;
int32 sonDoorAmount = 3; //
string refPlatform = 4; //
repeated ScreenDoorGroup screenDoorGroupList = 5;//
}
message ScreenDoorGroup {
int32 trainGroupAmount = 1; //
int32 startSmallDoor = 2; //
int32 endSmallDoor = 3; //
}
message Station {
@ -248,6 +263,8 @@ message RelatedRef {
AxleCounting = 3;
SectionLink = 4;
signal = 5;
station = 6;
ScreenDoor = 7;
}
enum DevicePort {
@ -390,6 +407,7 @@ message GatedBox {
string code = 2;
bool flip = 3; //
int32 index = 4; //
string refScreenDoor = 5; //
}
/** 坡度公里标 */
@ -447,3 +465,14 @@ message KilometerConvert {
KilometerSystem kmB = 2;
bool sameTrend = 3; //
}
/* 车站关联的设备列表 */
message StationRelateDevice {
string code = 1;//
repeated Combinationtype combinationtypes = 2; //
RelatedRef.DeviceType deviceType = 3;//
}
message Combinationtype {
string code = 1;
repeated string refDevices = 2;//
}