From 2136bd3c0f58abbecf33551c76a2c5a41c35613c Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Thu, 11 Jul 2024 16:12:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?message=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rts-sim-testing-message | 2 +- src/protos/device_state.ts | 56 ++++++++++++++--------------- src/protos/stationLayoutGraphics.ts | 46 ++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 29 deletions(-) diff --git a/rts-sim-testing-message b/rts-sim-testing-message index 0844608..ed84266 160000 --- a/rts-sim-testing-message +++ b/rts-sim-testing-message @@ -1 +1 @@ -Subproject commit 0844608c8674ec2988c06ba61e73e7b6afe7d660 +Subproject commit ed8426685101b9c8e6ba72d15ca3b6d035110375 diff --git a/src/protos/device_state.ts b/src/protos/device_state.ts index 39aebdc..e6db747 100644 --- a/src/protos/device_state.ts +++ b/src/protos/device_state.ts @@ -2959,8 +2959,8 @@ export namespace state { obstacleCheckBtn?: boolean; driverActiveReportBtn?: boolean; brakeHeavyFault?: boolean; - leftDoorStateBtn?: boolean; - rightDoorStateBtn?: boolean; + leftDoorState?: boolean; + rightDoorState?: boolean; wakeUpBtn?: boolean; overhaulBtn?: boolean; undervoltageBtn?: boolean; @@ -3112,11 +3112,11 @@ export namespace state { if ("brakeHeavyFault" in data && data.brakeHeavyFault != undefined) { this.brakeHeavyFault = data.brakeHeavyFault; } - if ("leftDoorStateBtn" in data && data.leftDoorStateBtn != undefined) { - this.leftDoorStateBtn = data.leftDoorStateBtn; + if ("leftDoorState" in data && data.leftDoorState != undefined) { + this.leftDoorState = data.leftDoorState; } - if ("rightDoorStateBtn" in data && data.rightDoorStateBtn != undefined) { - this.rightDoorStateBtn = data.rightDoorStateBtn; + if ("rightDoorState" in data && data.rightDoorState != undefined) { + this.rightDoorState = data.rightDoorState; } if ("wakeUpBtn" in data && data.wakeUpBtn != undefined) { this.wakeUpBtn = data.wakeUpBtn; @@ -3450,16 +3450,16 @@ export namespace state { set brakeHeavyFault(value: boolean) { pb_1.Message.setField(this, 37, value); } - get leftDoorStateBtn() { + get leftDoorState() { return pb_1.Message.getFieldWithDefault(this, 38, false) as boolean; } - set leftDoorStateBtn(value: boolean) { + set leftDoorState(value: boolean) { pb_1.Message.setField(this, 38, value); } - get rightDoorStateBtn() { + get rightDoorState() { return pb_1.Message.getFieldWithDefault(this, 39, false) as boolean; } - set rightDoorStateBtn(value: boolean) { + set rightDoorState(value: boolean) { pb_1.Message.setField(this, 39, value); } get wakeUpBtn() { @@ -3716,8 +3716,8 @@ export namespace state { obstacleCheckBtn?: boolean; driverActiveReportBtn?: boolean; brakeHeavyFault?: boolean; - leftDoorStateBtn?: boolean; - rightDoorStateBtn?: boolean; + leftDoorState?: boolean; + rightDoorState?: boolean; wakeUpBtn?: boolean; overhaulBtn?: boolean; undervoltageBtn?: boolean; @@ -3867,11 +3867,11 @@ export namespace state { if (data.brakeHeavyFault != null) { message.brakeHeavyFault = data.brakeHeavyFault; } - if (data.leftDoorStateBtn != null) { - message.leftDoorStateBtn = data.leftDoorStateBtn; + if (data.leftDoorState != null) { + message.leftDoorState = data.leftDoorState; } - if (data.rightDoorStateBtn != null) { - message.rightDoorStateBtn = data.rightDoorStateBtn; + if (data.rightDoorState != null) { + message.rightDoorState = data.rightDoorState; } if (data.wakeUpBtn != null) { message.wakeUpBtn = data.wakeUpBtn; @@ -4022,8 +4022,8 @@ export namespace state { obstacleCheckBtn?: boolean; driverActiveReportBtn?: boolean; brakeHeavyFault?: boolean; - leftDoorStateBtn?: boolean; - rightDoorStateBtn?: boolean; + leftDoorState?: boolean; + rightDoorState?: boolean; wakeUpBtn?: boolean; overhaulBtn?: boolean; undervoltageBtn?: boolean; @@ -4172,11 +4172,11 @@ export namespace state { if (this.brakeHeavyFault != null) { data.brakeHeavyFault = this.brakeHeavyFault; } - if (this.leftDoorStateBtn != null) { - data.leftDoorStateBtn = this.leftDoorStateBtn; + if (this.leftDoorState != null) { + data.leftDoorState = this.leftDoorState; } - if (this.rightDoorStateBtn != null) { - data.rightDoorStateBtn = this.rightDoorStateBtn; + if (this.rightDoorState != null) { + data.rightDoorState = this.rightDoorState; } if (this.wakeUpBtn != null) { data.wakeUpBtn = this.wakeUpBtn; @@ -4366,10 +4366,10 @@ export namespace state { writer.writeBool(36, this.driverActiveReportBtn); if (this.brakeHeavyFault != false) writer.writeBool(37, this.brakeHeavyFault); - if (this.leftDoorStateBtn != false) - writer.writeBool(38, this.leftDoorStateBtn); - if (this.rightDoorStateBtn != false) - writer.writeBool(39, this.rightDoorStateBtn); + if (this.leftDoorState != false) + writer.writeBool(38, this.leftDoorState); + if (this.rightDoorState != false) + writer.writeBool(39, this.rightDoorState); if (this.wakeUpBtn != false) writer.writeBool(40, this.wakeUpBtn); if (this.overhaulBtn != false) @@ -4563,10 +4563,10 @@ export namespace state { message.brakeHeavyFault = reader.readBool(); break; case 38: - message.leftDoorStateBtn = reader.readBool(); + message.leftDoorState = reader.readBool(); break; case 39: - message.rightDoorStateBtn = reader.readBool(); + message.rightDoorState = reader.readBool(); break; case 40: message.wakeUpBtn = reader.readBool(); diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts index cfbd549..ac7ab40 100644 --- a/src/protos/stationLayoutGraphics.ts +++ b/src/protos/stationLayoutGraphics.ts @@ -4937,6 +4937,8 @@ export namespace graphicData { fixedTelegram?: string; fixedUserTelegram?: string; originalCode?: string; + leuIndex?: number; + leuInsideIndex?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [10], this.#one_of_decls); @@ -4968,6 +4970,12 @@ export namespace graphicData { if ("originalCode" in data && data.originalCode != undefined) { this.originalCode = data.originalCode; } + if ("leuIndex" in data && data.leuIndex != undefined) { + this.leuIndex = data.leuIndex; + } + if ("leuInsideIndex" in data && data.leuInsideIndex != undefined) { + this.leuInsideIndex = data.leuInsideIndex; + } } } get common() { @@ -5033,6 +5041,18 @@ export namespace graphicData { set originalCode(value: string) { pb_1.Message.setField(this, 13, value); } + get leuIndex() { + return pb_1.Message.getFieldWithDefault(this, 14, 0) as number; + } + set leuIndex(value: number) { + pb_1.Message.setField(this, 14, value); + } + get leuInsideIndex() { + return pb_1.Message.getFieldWithDefault(this, 15, 0) as number; + } + set leuInsideIndex(value: number) { + pb_1.Message.setField(this, 15, value); + } static fromObject(data: { common?: ReturnType; code?: string; @@ -5043,6 +5063,8 @@ export namespace graphicData { fixedTelegram?: string; fixedUserTelegram?: string; originalCode?: string; + leuIndex?: number; + leuInsideIndex?: number; }): Transponder { const message = new Transponder({}); if (data.common != null) { @@ -5072,6 +5094,12 @@ export namespace graphicData { if (data.originalCode != null) { message.originalCode = data.originalCode; } + if (data.leuIndex != null) { + message.leuIndex = data.leuIndex; + } + if (data.leuInsideIndex != null) { + message.leuInsideIndex = data.leuInsideIndex; + } return message; } toObject() { @@ -5085,6 +5113,8 @@ export namespace graphicData { fixedTelegram?: string; fixedUserTelegram?: string; originalCode?: string; + leuIndex?: number; + leuInsideIndex?: number; } = {}; if (this.common != null) { data.common = this.common.toObject(); @@ -5113,6 +5143,12 @@ export namespace graphicData { if (this.originalCode != null) { data.originalCode = this.originalCode; } + if (this.leuIndex != null) { + data.leuIndex = this.leuIndex; + } + if (this.leuInsideIndex != null) { + data.leuInsideIndex = this.leuInsideIndex; + } return data; } serialize(): Uint8Array; @@ -5137,6 +5173,10 @@ export namespace graphicData { writer.writeString(12, this.fixedUserTelegram); if (this.originalCode.length) writer.writeString(13, this.originalCode); + if (this.leuIndex != 0) + writer.writeUint32(14, this.leuIndex); + if (this.leuInsideIndex != 0) + writer.writeUint32(15, this.leuInsideIndex); if (!w) return writer.getResultBuffer(); } @@ -5173,6 +5213,12 @@ export namespace graphicData { case 13: message.originalCode = reader.readString(); break; + case 14: + message.leuIndex = reader.readUint32(); + break; + case 15: + message.leuInsideIndex = reader.readUint32(); + break; default: reader.skipField(); } } From 9112a3c73affdfbd75ffe3a11166e905ad108a16 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Thu, 11 Jul 2024 16:29:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=94=E7=AD=94=E5=99=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0LEU=E7=B4=A2=E5=BC=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../draw-app/properties/TransponderProperty.vue | 14 ++++++++++++++ src/drawApp/graphics/TransponderInteraction.ts | 12 ++++++++++++ src/graphics/transponder/Transponder.ts | 4 ++++ 3 files changed, 30 insertions(+) diff --git a/src/components/draw-app/properties/TransponderProperty.vue b/src/components/draw-app/properties/TransponderProperty.vue index 3f5d145..090c502 100644 --- a/src/components/draw-app/properties/TransponderProperty.vue +++ b/src/components/draw-app/properties/TransponderProperty.vue @@ -47,6 +47,20 @@ @blur="onUpdate" label="原编号" /> + +