joylink/rts-sim-testing-client
6
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m40s
Details

Browse Source
This commit is contained in:
joylink_fanyuhong 2024-07-11 16:30:12 +08:00
commit e23f1ee474
6 changed files with 105 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rts-sim-testing-message

@ -1 +1 @@
Subproject commit 0844608c8674ec2988c06ba61e73e7b6afe7d660
Subproject commit ed8426685101b9c8e6ba72d15ca3b6d035110375

14
src/components/draw-app/properties/TransponderProperty.vue
View File

@ -47,6 +47,20 @@
@blur="onUpdate"
label="原编号"
/>
<q-input
outlined
class="q-mt-md"
v-model="transponderModel.leuIndex"
@blur="onUpdate"
label="LEU索引"
/>
<q-input
outlined
class="q-mt-md"
v-model="transponderModel.leuInsideIndex"
@blur="onUpdate"
label="LEU内部索引"
/>
<q-select
outlined
class="q-mt-md"

12
src/drawApp/graphics/TransponderInteraction.ts
View File

@ -99,6 +99,18 @@ export class TransponderData
set originalCode(v: string) {
this.data.originalCode = v;
}
get leuIndex(): number {
return this.data.leuIndex;
}
set leuIndex(v: number) {
this.data.leuIndex = v;
}
get leuInsideIndex(): number {
return this.data.leuInsideIndex;
}
set leuInsideIndex(v: number) {
this.data.leuInsideIndex = v;
}
clone(): TransponderData {
return new TransponderData(this.data.cloneMessage());
}

4
src/graphics/transponder/Transponder.ts
View File

@ -39,6 +39,10 @@ export interface ITransponderData extends GraphicData {
set type(v: TransponderTypeEnum);
get originalCode(): string; //原编号
set originalCode(v: string);
get leuIndex(): number; //LEU索引
set leuIndex(v: number);
get leuInsideIndex(): number; //LEU内部索引
set leuInsideIndex(v: number);
clone(): ITransponderData;
copyFrom(data: ITransponderData): void;
eq(other: ITransponderData): boolean;

56
src/protos/device_state.ts
View File

@ -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();

46
src/protos/stationLayoutGraphics.ts
View File

@ -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<typeof CommonInfo.prototype.toObject>;
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();
}
}