From 519db50c870afc7fd177dfffb66c5901380787ee Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 18 Aug 2023 13:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- graphic-pixi | 2 +- src/jl-graphic/utils/GraphicUtils.ts | 36 ++++ src/protos/alertConst.ts | 10 +- src/protos/device_status.ts | 276 +++++++++++++++++++++++++++ xian-ncc-da-message | 2 +- 5 files changed, 323 insertions(+), 3 deletions(-) diff --git a/graphic-pixi b/graphic-pixi index 495daf7..1e09b4c 160000 --- a/graphic-pixi +++ b/graphic-pixi @@ -1 +1 @@ -Subproject commit 495daf7fad12f889a782663e18453a19c5585518 +Subproject commit 1e09b4c3c44f87bbf79e9cf325dc1eb10d0b5f06 diff --git a/src/jl-graphic/utils/GraphicUtils.ts b/src/jl-graphic/utils/GraphicUtils.ts index ededb4f..f73549a 100644 --- a/src/jl-graphic/utils/GraphicUtils.ts +++ b/src/jl-graphic/utils/GraphicUtils.ts @@ -695,6 +695,42 @@ export function splitLineEvenly( }); } +export function splitPolyline(points: IPointData[], count: number) { + if (points.length !== 2) { + let totalLen = 0; + const lengths: number[] = []; + for (let i = 1; i < points.length; i++) { + const { x: x1, y: y1 } = points[i - 1], + { x: x2, y: y2 } = points[i]; + const len = new Vector2([x2 - x1, y2 - y1]).length(); + totalLen += len; + lengths.push(len); + } + const counts = lengths.map((length) => + Math.round((count * length) / totalLen) + ); + if (counts.reduce((p, c) => p + c, 0) !== count) { + const intersection = counts.reduce((p, c) => p + c, 0) - count; + let maxCountIndex = 0, + maxCount = 0; + counts.forEach((c, i) => { + if (c > maxCount) { + maxCount = c; + maxCountIndex = i; + } + }); + counts[maxCountIndex] + intersection; + } + return counts + .map((count, i) => { + return splitLineEvenly(points[i], points[i + 1], count); + }) + .flat(); + } else { + return splitLineEvenly(points[0], points[points.length - 1], count); + } +} + export function getParallelOfPolyline( points: IPointData[], offset: number, diff --git a/src/protos/alertConst.ts b/src/protos/alertConst.ts index f71f0c8..e9725c8 100644 --- a/src/protos/alertConst.ts +++ b/src/protos/alertConst.ts @@ -20,6 +20,14 @@ export namespace alert { TRAIN_DELAY_10 = 3, PLATFORM_DOOR_WITHOUT_LOCKED_SIGNAL = 4, PLATFORM_DOOR_CANNOT_OPEN = 5, - PLATFORM_DOOR_CANNOT_CLOSE = 6 + PLATFORM_DOOR_CANNOT_CLOSE = 6, + SWITCH_LOST = 7, + SWITCH_All_LOST = 8, + SWITCH_DW_LOST = 9, + SWITCH_FW_LOST = 10, + AXLE_LED_RED = 13, + AXLE_LED_RED_MOST = 14, + AXLE_LED_ORANGE = 15, + AXLE_LED_ORANGE_MOST = 16 } } diff --git a/src/protos/device_status.ts b/src/protos/device_status.ts index 5c0ade9..71aa840 100644 --- a/src/protos/device_status.ts +++ b/src/protos/device_status.ts @@ -30,6 +30,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -55,6 +56,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get ipRtuStusDown() { @@ -99,6 +103,12 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 7, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 8, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 8, value); + } static fromObject(data: { ipRtuStusDown?: boolean; ipRtuStusInLocalCtrl?: boolean; @@ -107,6 +117,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }): Rtu { const message = new Rtu({}); if (data.ipRtuStusDown != null) { @@ -130,6 +141,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -141,6 +155,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.ipRtuStusDown != null) { data.ipRtuStusDown = this.ipRtuStusDown; @@ -163,6 +178,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -183,6 +201,8 @@ export namespace state { writer.writeInt32(6, this.rtuId); if (this.timestamp != 0) writer.writeInt64(7, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(8, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -213,6 +233,9 @@ export namespace state { case 7: message.timestamp = reader.readInt64(); break; + case 8: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -255,6 +278,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -340,6 +364,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get ipStaStusTermMode1() { @@ -504,6 +531,12 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 27, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 28, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 28, value); + } static fromObject(data: { ipStaStusTermMode1?: boolean; ipStaStusTermMode2?: boolean; @@ -532,6 +565,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }): Station { const message = new Station({}); if (data.ipStaStusTermMode1 != null) { @@ -615,6 +649,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -646,6 +683,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.ipStaStusTermMode1 != null) { data.ipStaStusTermMode1 = this.ipStaStusTermMode1; @@ -728,6 +766,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -788,6 +829,8 @@ export namespace state { writer.writeInt32(26, this.rtuId); if (this.timestamp != 0) writer.writeInt64(27, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(28, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -878,6 +921,9 @@ export namespace state { case 27: message.timestamp = reader.readInt64(); break; + case 28: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -919,6 +965,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -1001,6 +1048,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get redOpen() { @@ -1159,6 +1209,12 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 26, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 27, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 27, value); + } static fromObject(data: { redOpen?: boolean; redFlash?: boolean; @@ -1186,6 +1242,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }): Signal { const message = new Signal({}); if (data.redOpen != null) { @@ -1266,6 +1323,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -1296,6 +1356,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.redOpen != null) { data.redOpen = this.redOpen; @@ -1375,6 +1436,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -1433,6 +1497,8 @@ export namespace state { writer.writeInt32(25, this.rtuId); if (this.timestamp != 0) writer.writeInt64(26, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(27, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -1520,6 +1586,9 @@ export namespace state { case 26: message.timestamp = reader.readInt64(); break; + case 27: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -1541,6 +1610,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -1563,6 +1633,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get dirLeft() { @@ -1601,6 +1674,12 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 6, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 7, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 7, value); + } static fromObject(data: { dirLeft?: boolean; dirRight?: boolean; @@ -1608,6 +1687,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }): Entry { const message = new Entry({}); if (data.dirLeft != null) { @@ -1628,6 +1708,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -1638,6 +1721,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.dirLeft != null) { data.dirLeft = this.dirLeft; @@ -1657,6 +1741,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -1675,6 +1762,8 @@ export namespace state { writer.writeInt32(5, this.rtuId); if (this.timestamp != 0) writer.writeInt64(6, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(7, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -1702,6 +1791,9 @@ export namespace state { case 6: message.timestamp = reader.readInt64(); break; + case 7: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -1748,6 +1840,7 @@ export namespace state { speedLimit?: number; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -1845,6 +1938,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get ipSingleSwitchStusCiOccupied() { @@ -2033,6 +2129,12 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 31, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 32, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 32, value); + } static fromObject(data: { ipSingleSwitchStusCiOccupied?: boolean; ipSingleSwitchStusCbtcOccupied?: boolean; @@ -2065,6 +2167,7 @@ export namespace state { speedLimit?: number; rtuId?: number; timestamp?: number; + lineId?: number; }): Switch { const message = new Switch({}); if (data.ipSingleSwitchStusCiOccupied != null) { @@ -2160,6 +2263,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -2195,6 +2301,7 @@ export namespace state { speedLimit?: number; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.ipSingleSwitchStusCiOccupied != null) { data.ipSingleSwitchStusCiOccupied = this.ipSingleSwitchStusCiOccupied; @@ -2289,6 +2396,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -2357,6 +2467,8 @@ export namespace state { writer.writeInt32(30, this.rtuId); if (this.timestamp != 0) writer.writeInt64(31, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(32, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -2459,6 +2571,9 @@ export namespace state { case 31: message.timestamp = reader.readInt64(); break; + case 32: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -2490,6 +2605,7 @@ export namespace state { limitType?: Track.LimitType; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -2542,6 +2658,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get ciOccupied() { @@ -2640,6 +2759,12 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 16, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 17, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 17, value); + } static fromObject(data: { ciOccupied?: boolean; cbtcOccupied?: boolean; @@ -2657,6 +2782,7 @@ export namespace state { limitType?: Track.LimitType; rtuId?: number; timestamp?: number; + lineId?: number; }): Track { const message = new Track({}); if (data.ciOccupied != null) { @@ -2707,6 +2833,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -2727,6 +2856,7 @@ export namespace state { limitType?: Track.LimitType; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.ciOccupied != null) { data.ciOccupied = this.ciOccupied; @@ -2776,6 +2906,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -2814,6 +2947,8 @@ export namespace state { writer.writeInt32(15, this.rtuId); if (this.timestamp != 0) writer.writeInt64(16, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(17, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -2871,6 +3006,9 @@ export namespace state { case 16: message.timestamp = reader.readInt64(); break; + case 17: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -2913,6 +3051,7 @@ export namespace state { stopTime?: number; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -2974,6 +3113,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get emergstop() { @@ -3090,6 +3232,12 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 19, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 20, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 20, value); + } static fromObject(data: { emergstop?: boolean; trainberth?: boolean; @@ -3110,6 +3258,7 @@ export namespace state { stopTime?: number; rtuId?: number; timestamp?: number; + lineId?: number; }): Platform { const message = new Platform({}); if (data.emergstop != null) { @@ -3169,6 +3318,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -3192,6 +3344,7 @@ export namespace state { stopTime?: number; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.emergstop != null) { data.emergstop = this.emergstop; @@ -3250,6 +3403,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -3294,6 +3450,8 @@ export namespace state { writer.writeInt32(18, this.rtuId); if (this.timestamp != 0) writer.writeInt64(19, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(20, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -3360,6 +3518,9 @@ export namespace state { case 19: message.timestamp = reader.readInt64(); break; + case 20: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -3381,6 +3542,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -3403,6 +3565,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get scadaOn() { @@ -3441,6 +3606,12 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 6, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 7, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 7, value); + } static fromObject(data: { scadaOn?: boolean; scadaSinglePower?: boolean; @@ -3448,6 +3619,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }): Scada { const message = new Scada({}); if (data.scadaOn != null) { @@ -3468,6 +3640,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -3478,6 +3653,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.scadaOn != null) { data.scadaOn = this.scadaOn; @@ -3497,6 +3673,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -3515,6 +3694,8 @@ export namespace state { writer.writeInt32(5, this.rtuId); if (this.timestamp != 0) writer.writeInt64(6, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(7, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -3542,6 +3723,9 @@ export namespace state { case 6: message.timestamp = reader.readInt64(); break; + case 7: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -3565,6 +3749,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -3593,6 +3778,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get doorClosed() { @@ -3643,6 +3831,12 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 8, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 9, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 9, value); + } static fromObject(data: { doorClosed?: boolean; doorExpectClose?: boolean; @@ -3652,6 +3846,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }): WaterProofDoor { const message = new WaterProofDoor({}); if (data.doorClosed != null) { @@ -3678,6 +3873,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -3690,6 +3888,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.doorClosed != null) { data.doorClosed = this.doorClosed; @@ -3715,6 +3914,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -3737,6 +3939,8 @@ export namespace state { writer.writeInt32(7, this.rtuId); if (this.timestamp != 0) writer.writeInt64(8, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(9, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -3770,6 +3974,9 @@ export namespace state { case 8: message.timestamp = reader.readInt64(); break; + case 9: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -3789,6 +3996,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -3805,6 +4013,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get ipStusWorkAreaEnable() { @@ -3831,11 +4042,18 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 4, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 5, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 5, value); + } static fromObject(data: { ipStusWorkAreaEnable?: boolean; id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }): WorkArea { const message = new WorkArea({}); if (data.ipStusWorkAreaEnable != null) { @@ -3850,6 +4068,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -3858,6 +4079,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.ipStusWorkAreaEnable != null) { data.ipStusWorkAreaEnable = this.ipStusWorkAreaEnable; @@ -3871,6 +4093,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -3885,6 +4110,8 @@ export namespace state { writer.writeInt32(3, this.rtuId); if (this.timestamp != 0) writer.writeInt64(4, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(5, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -3906,6 +4133,9 @@ export namespace state { case 4: message.timestamp = reader.readInt64(); break; + case 5: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -3925,6 +4155,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -3941,6 +4172,9 @@ export namespace state { if ("timestamp" in data && data.timestamp != undefined) { this.timestamp = data.timestamp; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get ipStusGamaDisable() { @@ -3967,11 +4201,18 @@ export namespace state { set timestamp(value: number) { pb_1.Message.setField(this, 4, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 5, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 5, value); + } static fromObject(data: { ipStusGamaDisable?: boolean; id?: string; rtuId?: number; timestamp?: number; + lineId?: number; }): Gama { const message = new Gama({}); if (data.ipStusGamaDisable != null) { @@ -3986,6 +4227,9 @@ export namespace state { if (data.timestamp != null) { message.timestamp = data.timestamp; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { @@ -3994,6 +4238,7 @@ export namespace state { id?: string; rtuId?: number; timestamp?: number; + lineId?: number; } = {}; if (this.ipStusGamaDisable != null) { data.ipStusGamaDisable = this.ipStusGamaDisable; @@ -4007,6 +4252,9 @@ export namespace state { if (this.timestamp != null) { data.timestamp = this.timestamp; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -4021,6 +4269,8 @@ export namespace state { writer.writeInt32(3, this.rtuId); if (this.timestamp != 0) writer.writeInt64(4, this.timestamp); + if (this.lineId != 0) + writer.writeInt32(5, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -4042,6 +4292,9 @@ export namespace state { case 4: message.timestamp = reader.readInt64(); break; + case 5: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } @@ -4908,6 +5161,7 @@ export namespace state { constructor(data?: any[] | { id?: string; active?: boolean; + lineId?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -4918,6 +5172,9 @@ export namespace state { if ("active" in data && data.active != undefined) { this.active = data.active; } + if ("lineId" in data && data.lineId != undefined) { + this.lineId = data.lineId; + } } } get id() { @@ -4932,9 +5189,16 @@ export namespace state { set active(value: boolean) { pb_1.Message.setField(this, 2, value); } + get lineId() { + return pb_1.Message.getFieldWithDefault(this, 3, 0) as number; + } + set lineId(value: number) { + pb_1.Message.setField(this, 3, value); + } static fromObject(data: { id?: string; active?: boolean; + lineId?: number; }): OccNccFepNetwork { const message = new OccNccFepNetwork({}); if (data.id != null) { @@ -4943,12 +5207,16 @@ export namespace state { if (data.active != null) { message.active = data.active; } + if (data.lineId != null) { + message.lineId = data.lineId; + } return message; } toObject() { const data: { id?: string; active?: boolean; + lineId?: number; } = {}; if (this.id != null) { data.id = this.id; @@ -4956,6 +5224,9 @@ export namespace state { if (this.active != null) { data.active = this.active; } + if (this.lineId != null) { + data.lineId = this.lineId; + } return data; } serialize(): Uint8Array; @@ -4966,6 +5237,8 @@ export namespace state { writer.writeString(1, this.id); if (this.active != false) writer.writeBool(2, this.active); + if (this.lineId != 0) + writer.writeInt32(3, this.lineId); if (!w) return writer.getResultBuffer(); } @@ -4981,6 +5254,9 @@ export namespace state { case 2: message.active = reader.readBool(); break; + case 3: + message.lineId = reader.readInt32(); + break; default: reader.skipField(); } } diff --git a/xian-ncc-da-message b/xian-ncc-da-message index 444643d..3830367 160000 --- a/xian-ncc-da-message +++ b/xian-ncc-da-message @@ -1 +1 @@ -Subproject commit 444643def119d639d49c6ce9be7836dea1a6eaf3 +Subproject commit 38303671b52db6ba37302425fd88af07a8b78854