From 69300cf11d9e494e2ab1115608269fd80dea4fa9 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Tue, 16 Jan 2024 13:07:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E7=AB=99?= =?UTF-8?q?=E6=8B=BC=E9=9F=B3=E7=AE=80=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index f52f3b5..a34a0be 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -196,7 +196,7 @@ message Station { // int32 index = 7; string refIbpMapCode = 8; // 关联IBP地图Code string stationName = 9; //车站名 - //string stationNameAcronym = 10; // 车站名缩写 + string stationNameAcronym = 10; // 车站名拼音简写 bool depots = 11; //是否车辆段 repeated string oldmanageStations = 12; // 如果是集中站——管理的车站-id repeated uint32 manageStations = 13; // 如果是集中站——管理的车站-id From 411729dc6a357f8bab7df24d66ea93cb5ba77c0a Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Tue, 16 Jan 2024 13:44:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8E=E5=89=8D=E7=AB=AF=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E7=9A=84=E5=BA=94=E7=AD=94=E5=99=A8=E6=8A=A5=E6=96=87?= =?UTF-8?q?=E6=94=B9=E4=B8=BA16=E8=BF=9B=E5=88=B6=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index 0b1ac5f..4f61955 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -452,7 +452,7 @@ message MkxJState { message BaliseState { uint32 id = 1; graphicData.KilometerSystem km = 2; //当前公里标 - bytes telegram = 3; //当前报文 + string telegram = 3; //当前报文（16进制字符串） } //////////////////////////////////////////////////////////////////////////// From 659a26757fc777406b1691c062a8ae2358784177 Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 16 Jan 2024 15:46:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=94=E7=AD=94=E5=99=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 2da68d8..87284d3 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -411,9 +411,11 @@ message Transponder { // 应答器 KilometerSystem kilometerSystem = 5; //公里标 RelatedRef TransponderRef = 6; //关联关系 repeated string oldcentralizedStations = 7; // 集中站Id列表 - bytes fixedTelegram = 8;//无源应答器固定报文 + // bytes fixedTelegram = 8;//无源应答器固定报文 TransponderTypeEnum type = 9;//应答器类型 repeated uint32 centralizedStations = 10; // 集中站Id列表 + string fixedTelegram = 11; //应答器固定报文 + string userTelegram = 12; //应答器用户报文 } message SimpleRef {