From eb0ad6e4305642b6619f5e97d1498ad5dc5a6d42 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Wed, 19 Jul 2023 11:19:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_status.proto | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/protos/device_status.proto b/protos/device_status.proto index 5e9a78b..99d71a9 100644 --- a/protos/device_status.proto +++ b/protos/device_status.proto @@ -101,14 +101,14 @@ message Switch { bool ipSingleSwitchStusReverse = 6; // 反位 bool ipSingleSwitchStusBlocked1 = 7; // 单锁 bool ipSingleSwitchStusJammed = 8; // 挤岔 - // bool ipSingleSwitchStusExpectLock = 9; // 期望锁闭 - // bool ipSingleSwitchStusExpectUnlock = 10; // 期望锁闭解除 - // bool ipSingleSwitchStusExpectNormal = 11; // 期望道岔定位 - // bool ipSingleSwitchStusExpectReverse = 12; // 期望道岔反位 - // bool ipSingleSwitchStusExpectBlock = 13; // 期望道岔单锁 - // bool ipSingleSwitchStusExpectUnblock = 14; // 期望道岔解除单锁 - // bool ipSingleSwitchStusInRoute = 15; // 是否在进路中锁闭 - // bool ipSingleSwitchStusManualMode = 16; // 道岔为手动操作模式 + bool ipSingleSwitchStusExpectLock = 9; // 期望锁闭 + bool ipSingleSwitchStusExpectUnlock = 10; // 期望锁闭解除 + bool ipSingleSwitchStusExpectNormal = 11; // 期望道岔定位 + bool ipSingleSwitchStusExpectReverse = 12; // 期望道岔反位 + bool ipSingleSwitchStusExpectBlock = 13; // 期望道岔单锁 + bool ipSingleSwitchStusExpectUnblock = 14; // 期望道岔解除单锁 + bool ipSingleSwitchStusInRoute = 15; // 是否在进路中锁闭 + bool ipSingleSwitchStusManualMode = 16; // 道岔为手动操作模式 bool ipSingleSwitchStusCut = 17; // 道岔切除 bool ipSingleSwitchStusAtcInvalid = 18; // 道岔区段被ATC报告失效 bool ipSingleSwitchStusOverlap = 19; // OVERLAP From e9804dd24b80e7f2423dc2559e70475215c62fd5 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Thu, 20 Jul 2023 11:10:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E7=AB=99=E5=90=8D=E5=AD=97--?= =?UTF-8?q?=E7=AB=99=E5=8F=B0=E4=B8=8A=E4=B8=8B=E8=A1=8C=E5=92=8C=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=BD=A6=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index a770aa4..a77af79 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -105,6 +105,8 @@ message Platform { string code = 2; bool hasdoor = 3; // 是否有屏蔽门 string direction = 4; // 行驶方向--屏蔽门上下 + string upAndDown =5; //上下行--upLink表示上行，downLink表示下行 + string refStation=6; //关联的车站 } message Station { @@ -112,8 +114,9 @@ message Station { string code = 2; bool hasControl = 3; // 是否有控制 bool concentrationStations = 4; //是否集中站 - // string kilometerCode = 5; //公里标 + // string kilometerCode = 5; //公里标 KilometerSystem kilometerSystem = 6; //公里标 + string name = 7; } message StationLine { From ed8634ea3e21136f693d361f5801e4b0f6802c60 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 20 Jul 2023 15:50:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=BA=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=99=9A=E7=BA=BF=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 6fce03d..24f47f6 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -189,6 +189,7 @@ message RunLine { repeated string containSta = 8; repeated string linkPathLines = 9; string lineId = 10; + repeated int32 dashPointIndexs = 11; // 虚线段点序号 } /** 物理区段 */