diff --git a/bj-rtss-message b/bj-rtss-message index bb62bff..269cba2 160000 --- a/bj-rtss-message +++ b/bj-rtss-message @@ -1 +1 @@ -Subproject commit bb62bff23f88dbb3c903323c0b4916a3423683e8 +Subproject commit 269cba242ab05d5c664386075386eb6a624bc861 diff --git a/src/protos/device_state.ts b/src/protos/device_state.ts index 1cf2ed5..cb47050 100644 --- a/src/protos/device_state.ts +++ b/src/protos/device_state.ts @@ -555,6 +555,9 @@ export namespace state { tailRadarSpeed?: number; trainLength?: number; show?: boolean; + headDeviceId?: string; + headOffset?: number; + devicePort?: string; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [7], this.#one_of_decls); @@ -631,6 +634,15 @@ export namespace state { if ("show" in data && data.show != undefined) { this.show = data.show; } + if ("headDeviceId" in data && data.headDeviceId != undefined) { + this.headDeviceId = data.headDeviceId; + } + if ("headOffset" in data && data.headOffset != undefined) { + this.headOffset = data.headOffset; + } + if ("devicePort" in data && data.devicePort != undefined) { + this.devicePort = data.devicePort; + } } } get id() { @@ -777,6 +789,24 @@ export namespace state { set show(value: boolean) { pb_1.Message.setField(this, 24, value); } + get headDeviceId() { + return pb_1.Message.getFieldWithDefault(this, 25, "") as string; + } + set headDeviceId(value: string) { + pb_1.Message.setField(this, 25, value); + } + get headOffset() { + return pb_1.Message.getFieldWithDefault(this, 26, 0) as number; + } + set headOffset(value: number) { + pb_1.Message.setField(this, 26, value); + } + get devicePort() { + return pb_1.Message.getFieldWithDefault(this, 27, "") as string; + } + set devicePort(value: string) { + pb_1.Message.setField(this, 27, value); + } static fromObject(data: { id?: string; up?: boolean; @@ -802,6 +832,9 @@ export namespace state { tailRadarSpeed?: number; trainLength?: number; show?: boolean; + headDeviceId?: string; + headOffset?: number; + devicePort?: string; }): TrainState { const message = new TrainState({}); if (data.id != null) { @@ -876,6 +909,15 @@ export namespace state { if (data.show != null) { message.show = data.show; } + if (data.headDeviceId != null) { + message.headDeviceId = data.headDeviceId; + } + if (data.headOffset != null) { + message.headOffset = data.headOffset; + } + if (data.devicePort != null) { + message.devicePort = data.devicePort; + } return message; } toObject() { @@ -904,6 +946,9 @@ export namespace state { tailRadarSpeed?: number; trainLength?: number; show?: boolean; + headDeviceId?: string; + headOffset?: number; + devicePort?: string; } = {}; if (this.id != null) { data.id = this.id; @@ -977,6 +1022,15 @@ export namespace state { if (this.show != null) { data.show = this.show; } + if (this.headDeviceId != null) { + data.headDeviceId = this.headDeviceId; + } + if (this.headOffset != null) { + data.headOffset = this.headOffset; + } + if (this.devicePort != null) { + data.devicePort = this.devicePort; + } return data; } serialize(): Uint8Array; @@ -1031,6 +1085,12 @@ export namespace state { writer.writeInt64(23, this.trainLength); if (this.show != false) writer.writeBool(24, this.show); + if (this.headDeviceId.length) + writer.writeString(25, this.headDeviceId); + if (this.headOffset != 0) + writer.writeInt64(26, this.headOffset); + if (this.devicePort.length) + writer.writeString(27, this.devicePort); if (!w) return writer.getResultBuffer(); } @@ -1112,6 +1172,15 @@ export namespace state { case 24: message.show = reader.readBool(); break; + case 25: + message.headDeviceId = reader.readString(); + break; + case 26: + message.headOffset = reader.readInt64(); + break; + case 27: + message.devicePort = reader.readString(); + break; default: reader.skipField(); } } diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts index ecdb4c0..5c36358 100644 --- a/src/protos/stationLayoutGraphics.ts +++ b/src/protos/stationLayoutGraphics.ts @@ -5376,6 +5376,7 @@ export namespace graphicData { constructor(data?: any[] | { offset?: number; deviceId?: string; + deviceType?: string; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -5386,6 +5387,9 @@ export namespace graphicData { if ("deviceId" in data && data.deviceId != undefined) { this.deviceId = data.deviceId; } + if ("deviceType" in data && data.deviceType != undefined) { + this.deviceType = data.deviceType; + } } } get offset() { @@ -5400,9 +5404,16 @@ export namespace graphicData { set deviceId(value: string) { pb_1.Message.setField(this, 2, value); } + get deviceType() { + return pb_1.Message.getFieldWithDefault(this, 3, "") as string; + } + set deviceType(value: string) { + pb_1.Message.setField(this, 3, value); + } static fromObject(data: { offset?: number; deviceId?: string; + deviceType?: string; }): DevicePosition { const message = new DevicePosition({}); if (data.offset != null) { @@ -5411,12 +5422,16 @@ export namespace graphicData { if (data.deviceId != null) { message.deviceId = data.deviceId; } + if (data.deviceType != null) { + message.deviceType = data.deviceType; + } return message; } toObject() { const data: { offset?: number; deviceId?: string; + deviceType?: string; } = {}; if (this.offset != null) { data.offset = this.offset; @@ -5424,6 +5439,9 @@ export namespace graphicData { if (this.deviceId != null) { data.deviceId = this.deviceId; } + if (this.deviceType != null) { + data.deviceType = this.deviceType; + } return data; } serialize(): Uint8Array; @@ -5434,6 +5452,8 @@ export namespace graphicData { writer.writeInt32(1, this.offset); if (this.deviceId.length) writer.writeString(2, this.deviceId); + if (this.deviceType.length) + writer.writeString(3, this.deviceType); if (!w) return writer.getResultBuffer(); } @@ -5449,6 +5469,9 @@ export namespace graphicData { case 2: message.deviceId = reader.readString(); break; + case 3: + message.deviceType = reader.readString(); + break; default: reader.skipField(); } }