From 07b35b5360c41b2abebdf3423e48d13074694683 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu, 17 Oct 2024 14:50:52 +0800
Subject: [PATCH] =?UTF-8?q?cctv=E5=8A=A0=E5=88=86=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rtss-proto-msg                  |  2 +-
 src/drawApp/iscsApp.ts          | 19 +++++++++++--------
 src/protos/iscs_graphic_data.ts | 30 ++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/rtss-proto-msg b/rtss-proto-msg
index 587a787..cf2e52a 160000
--- a/rtss-proto-msg
+++ b/rtss-proto-msg
@@ -1 +1 @@
-Subproject commit 587a787812fa16a17d02fd3ab70e3731fc94e36f
+Subproject commit cf2e52a1e02d3f8c001c05ba6480fc201b016bef
diff --git a/src/drawApp/iscsApp.ts b/src/drawApp/iscsApp.ts
index 7b003f0..cb7b5d7 100644
--- a/src/drawApp/iscsApp.ts
+++ b/src/drawApp/iscsApp.ts
@@ -298,14 +298,17 @@ export function saveDrawDatas(app: IDrawApp) {
     );
   }
   if (!storage?.cctvOfEquipmentLayoutStorages.length) {
-    stationOption.forEach((station) =>
-      storage?.cctvOfEquipmentLayoutStorages.push(
-        new iscsGraphicData.CCTVOfEquipmentLayoutStorage({
-          stationName: station,
-          commonGraphicStorage: new iscsGraphicData.CommonGraphicStorage(),
-        })
-      )
-    );
+    stationOption.forEach((station) => {
+      for (let layer = 0; layer < 3; layer++) {
+        storage?.cctvOfEquipmentLayoutStorages.push(
+          new iscsGraphicData.CCTVOfEquipmentLayoutStorage({
+            stationName: station,
+            commonGraphicStorage: new iscsGraphicData.CommonGraphicStorage(),
+            layer,
+          })
+        );
+      }
+    });
   }
   const graphics = app.queryStore.getAllGraphics();
   switch (drawStore.selectSubmenuAndStation.submenu) {
diff --git a/src/protos/iscs_graphic_data.ts b/src/protos/iscs_graphic_data.ts
index 4af205f..b7df49c 100644
--- a/src/protos/iscs_graphic_data.ts
+++ b/src/protos/iscs_graphic_data.ts
@@ -2170,6 +2170,7 @@ export namespace iscsGraphicData {
             stationName?: string;
             canvas?: dependency_1.common.Canvas;
             commonGraphicStorage?: CommonGraphicStorage;
+            layer?: CCTVOfEquipmentLayoutStorage.LayerType;
         }) {
             super();
             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) {
                     this.commonGraphicStorage = data.commonGraphicStorage;
                 }
+                if ("layer" in data && data.layer != undefined) {
+                    this.layer = data.layer;
+                }
             }
         }
         get stationName() {
@@ -2209,10 +2213,17 @@ export namespace iscsGraphicData {
         get has_commonGraphicStorage() {
             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: {
             stationName?: string;
             canvas?: ReturnType<typeof dependency_1.common.Canvas.prototype.toObject>;
             commonGraphicStorage?: ReturnType<typeof CommonGraphicStorage.prototype.toObject>;
+            layer?: CCTVOfEquipmentLayoutStorage.LayerType;
         }): CCTVOfEquipmentLayoutStorage {
             const message = new CCTVOfEquipmentLayoutStorage({});
             if (data.stationName != null) {
@@ -2224,6 +2235,9 @@ export namespace iscsGraphicData {
             if (data.commonGraphicStorage != null) {
                 message.commonGraphicStorage = CommonGraphicStorage.fromObject(data.commonGraphicStorage);
             }
+            if (data.layer != null) {
+                message.layer = data.layer;
+            }
             return message;
         }
         toObject() {
@@ -2231,6 +2245,7 @@ export namespace iscsGraphicData {
                 stationName?: string;
                 canvas?: ReturnType<typeof dependency_1.common.Canvas.prototype.toObject>;
                 commonGraphicStorage?: ReturnType<typeof CommonGraphicStorage.prototype.toObject>;
+                layer?: CCTVOfEquipmentLayoutStorage.LayerType;
             } = {};
             if (this.stationName != null) {
                 data.stationName = this.stationName;
@@ -2241,6 +2256,9 @@ export namespace iscsGraphicData {
             if (this.commonGraphicStorage != null) {
                 data.commonGraphicStorage = this.commonGraphicStorage.toObject();
             }
+            if (this.layer != null) {
+                data.layer = this.layer;
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -2253,6 +2271,8 @@ export namespace iscsGraphicData {
                 writer.writeMessage(2, this.canvas, () => this.canvas.serialize(writer));
             if (this.has_commonGraphicStorage)
                 writer.writeMessage(3, this.commonGraphicStorage, () => this.commonGraphicStorage.serialize(writer));
+            if (this.layer != CCTVOfEquipmentLayoutStorage.LayerType.StationHall)
+                writer.writeEnum(4, this.layer);
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -2271,6 +2291,9 @@ export namespace iscsGraphicData {
                     case 3:
                         reader.readMessage(message.commonGraphicStorage, () => message.commonGraphicStorage = CommonGraphicStorage.deserialize(reader));
                         break;
+                    case 4:
+                        message.layer = reader.readEnum();
+                        break;
                     default: reader.skipField();
                 }
             }
@@ -2283,6 +2306,13 @@ export namespace iscsGraphicData {
             return CCTVOfEquipmentLayoutStorage.deserialize(bytes);
         }
     }
+    export namespace CCTVOfEquipmentLayoutStorage {
+        export enum LayerType {
+            StationHall = 0,
+            platform = 1,
+            PTZ = 2
+        }
+    }
     export class FASOfPlatformAlarmStorage extends pb_1.Message {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {