joylink/rtsa-client
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cctv加分层

Browse Source
This commit is contained in:
joylink_zhaoerwei 2024-10-17 14:50:52 +08:00
parent d03f30d4cc
commit 07b35b5360
3 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtss-proto-msg

@ -1 +1 @@
Subproject commit 587a787812fa16a17d02fd3ab70e3731fc94e36f Subproject commit cf2e52a1e02d3f8c001c05ba6480fc201b016bef

19
src/drawApp/iscsApp.ts
View File

@ -298,14 +298,17 @@ export function saveDrawDatas(app: IDrawApp) {
); );
} }
if (!storage?.cctvOfEquipmentLayoutStorages.length) { if (!storage?.cctvOfEquipmentLayoutStorages.length) {
stationOption.forEach((station) => stationOption.forEach((station) => {
storage?.cctvOfEquipmentLayoutStorages.push( for (let layer = 0; layer < 3; layer++) {
new iscsGraphicData.CCTVOfEquipmentLayoutStorage({ storage?.cctvOfEquipmentLayoutStorages.push(
stationName: station, new iscsGraphicData.CCTVOfEquipmentLayoutStorage({
commonGraphicStorage: new iscsGraphicData.CommonGraphicStorage(), stationName: station,
}) commonGraphicStorage: new iscsGraphicData.CommonGraphicStorage(),
) layer,
); })
);
}
});
} }
const graphics = app.queryStore.getAllGraphics(); const graphics = app.queryStore.getAllGraphics();
switch (drawStore.selectSubmenuAndStation.submenu) { switch (drawStore.selectSubmenuAndStation.submenu) {

30
src/protos/iscs_graphic_data.ts
View File

@ -2170,6 +2170,7 @@ export namespace iscsGraphicData {
stationName?: string; stationName?: string;
canvas?: dependency_1.common.Canvas; canvas?: dependency_1.common.Canvas;
commonGraphicStorage?: CommonGraphicStorage; commonGraphicStorage?: CommonGraphicStorage;
layer?: CCTVOfEquipmentLayoutStorage.LayerType;
}) { }) {
super(); super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@ -2183,6 +2184,9 @@ export namespace iscsGraphicData {
if ("commonGraphicStorage" in data && data.commonGraphicStorage != undefined) { if ("commonGraphicStorage" in data && data.commonGraphicStorage != undefined) {
this.commonGraphicStorage = data.commonGraphicStorage; this.commonGraphicStorage = data.commonGraphicStorage;
} }
if ("layer" in data && data.layer != undefined) {
this.layer = data.layer;
}
} }
} }
get stationName() { get stationName() {
@ -2209,10 +2213,17 @@ export namespace iscsGraphicData {
get has_commonGraphicStorage() { get has_commonGraphicStorage() {
return pb_1.Message.getField(this, 3) != null; return pb_1.Message.getField(this, 3) != null;
} }
get layer() {
return pb_1.Message.getFieldWithDefault(this, 4, CCTVOfEquipmentLayoutStorage.LayerType.StationHall) as CCTVOfEquipmentLayoutStorage.LayerType;
}
set layer(value: CCTVOfEquipmentLayoutStorage.LayerType) {
pb_1.Message.setField(this, 4, value);
}
static fromObject(data: { static fromObject(data: {
stationName?: string; stationName?: string;
canvas?: ReturnType<typeof dependency_1.common.Canvas.prototype.toObject>; canvas?: ReturnType<typeof dependency_1.common.Canvas.prototype.toObject>;
commonGraphicStorage?: ReturnType<typeof CommonGraphicStorage.prototype.toObject>; commonGraphicStorage?: ReturnType<typeof CommonGraphicStorage.prototype.toObject>;
layer?: CCTVOfEquipmentLayoutStorage.LayerType;
}): CCTVOfEquipmentLayoutStorage { }): CCTVOfEquipmentLayoutStorage {
const message = new CCTVOfEquipmentLayoutStorage({}); const message = new CCTVOfEquipmentLayoutStorage({});
if (data.stationName != null) { if (data.stationName != null) {
@ -2224,6 +2235,9 @@ export namespace iscsGraphicData {
if (data.commonGraphicStorage != null) { if (data.commonGraphicStorage != null) {
message.commonGraphicStorage = CommonGraphicStorage.fromObject(data.commonGraphicStorage); message.commonGraphicStorage = CommonGraphicStorage.fromObject(data.commonGraphicStorage);
} }
if (data.layer != null) {
message.layer = data.layer;
}
return message; return message;
} }
toObject() { toObject() {
@ -2231,6 +2245,7 @@ export namespace iscsGraphicData {
stationName?: string; stationName?: string;
canvas?: ReturnType<typeof dependency_1.common.Canvas.prototype.toObject>; canvas?: ReturnType<typeof dependency_1.common.Canvas.prototype.toObject>;
commonGraphicStorage?: ReturnType<typeof CommonGraphicStorage.prototype.toObject>; commonGraphicStorage?: ReturnType<typeof CommonGraphicStorage.prototype.toObject>;
layer?: CCTVOfEquipmentLayoutStorage.LayerType;
} = {}; } = {};
if (this.stationName != null) { if (this.stationName != null) {
data.stationName = this.stationName; data.stationName = this.stationName;
@ -2241,6 +2256,9 @@ export namespace iscsGraphicData {
if (this.commonGraphicStorage != null) { if (this.commonGraphicStorage != null) {
data.commonGraphicStorage = this.commonGraphicStorage.toObject(); data.commonGraphicStorage = this.commonGraphicStorage.toObject();
} }
if (this.layer != null) {
data.layer = this.layer;
}
return data; return data;
} }
serialize(): Uint8Array; serialize(): Uint8Array;
@ -2253,6 +2271,8 @@ export namespace iscsGraphicData {
writer.writeMessage(2, this.canvas, () => this.canvas.serialize(writer)); writer.writeMessage(2, this.canvas, () => this.canvas.serialize(writer));
if (this.has_commonGraphicStorage) if (this.has_commonGraphicStorage)
writer.writeMessage(3, this.commonGraphicStorage, () => this.commonGraphicStorage.serialize(writer)); writer.writeMessage(3, this.commonGraphicStorage, () => this.commonGraphicStorage.serialize(writer));
if (this.layer != CCTVOfEquipmentLayoutStorage.LayerType.StationHall)
writer.writeEnum(4, this.layer);
if (!w) if (!w)
return writer.getResultBuffer(); return writer.getResultBuffer();
} }
@ -2271,6 +2291,9 @@ export namespace iscsGraphicData {
case 3: case 3:
reader.readMessage(message.commonGraphicStorage, () => message.commonGraphicStorage = CommonGraphicStorage.deserialize(reader)); reader.readMessage(message.commonGraphicStorage, () => message.commonGraphicStorage = CommonGraphicStorage.deserialize(reader));
break; break;
case 4:
message.layer = reader.readEnum();
break;
default: reader.skipField(); default: reader.skipField();
} }
} }
@ -2283,6 +2306,13 @@ export namespace iscsGraphicData {
return CCTVOfEquipmentLayoutStorage.deserialize(bytes); return CCTVOfEquipmentLayoutStorage.deserialize(bytes);
} }
} }
export namespace CCTVOfEquipmentLayoutStorage {
export enum LayerType {
StationHall = 0,
platform = 1,
PTZ = 2
}
}
export class FASOfPlatformAlarmStorage extends pb_1.Message { export class FASOfPlatformAlarmStorage extends pb_1.Message {
#one_of_decls: number[][] = []; #one_of_decls: number[][] = [];
constructor(data?: any[] | { constructor(data?: any[] | {