From 15378bc73d0afabbf7373540437eb6b654c1ee8e Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Sat, 14 Sep 2024 17:10:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E7=9A=84=E7=9F=A9=E5=BD=A2=E7=BB=98=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cctv_graphic_data.proto       |  1 +
 src/fire_alarm_graphic_data.proto |  1 +
 src/iscs_graphic_data.proto       | 18 +++++++++++-------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/cctv_graphic_data.proto b/src/cctv_graphic_data.proto
index 3f99058..293e63d 100644
--- a/src/cctv_graphic_data.proto
+++ b/src/cctv_graphic_data.proto
@@ -8,6 +8,7 @@ message CCTVGraphicStorage {
   repeated CCTVButton cctvButtons = 2;
   repeated iscsGraphicData.Arrow arrows = 3;
   repeated iscsGraphicData.IscsText iscsTexts = 4;
+  repeated iscsGraphicData.Rect rects = 5;
 }
 
 
diff --git a/src/fire_alarm_graphic_data.proto b/src/fire_alarm_graphic_data.proto
index 28ff4c2..53ce2e7 100644
--- a/src/fire_alarm_graphic_data.proto
+++ b/src/fire_alarm_graphic_data.proto
@@ -7,4 +7,5 @@ message FireAlarmGraphicStorage {
   iscsGraphicData.Canvas canvas = 1;
   repeated iscsGraphicData.Arrow arrows = 2;
   repeated iscsGraphicData.IscsText iscsTexts = 3;
+  repeated iscsGraphicData.Rect rects = 4;
 }
diff --git a/src/iscs_graphic_data.proto b/src/iscs_graphic_data.proto
index a140a5f..e2df557 100644
--- a/src/iscs_graphic_data.proto
+++ b/src/iscs_graphic_data.proto
@@ -1,13 +1,6 @@
 syntax = "proto3";
 package iscsGraphicData;
 
-message IscsGraphicStorage {
-  Canvas canvas = 1;
-  UniqueIdOfStationLayout UniqueIdPrefix = 2;//地图唯一信息
-  repeated Arrow arrows = 3;
-  repeated IscsText iscsTexts = 4;
-}
-
 message Canvas {
   // 画布宽
   int32 width = 1;
@@ -83,3 +76,14 @@ message IscsText {
   string color = 4;
   int32 fontSize = 5;
 }
+
+message Rect {
+  CommonInfo common = 1;
+  string code = 2;
+  int32 lineWidth = 3;  // 线宽
+  string lineColor = 4; // 线色
+  float width = 5;      //宽度
+  float height = 6;     //高度
+  int32 radius = 7;     //圆角半径
+  Point point = 8;      // 画第一个点的坐标
+}

From 4029b6c96f132115bba08c87bfd3470f3e2d872b Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 18 Sep 2024 09:20:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fas=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fas_graphic_data.proto        | 41 +++++++++++++++++++++++++++++++
 src/fire_alarm_graphic_data.proto | 11 ---------
 2 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 src/fas_graphic_data.proto
 delete mode 100644 src/fire_alarm_graphic_data.proto

diff --git a/src/fas_graphic_data.proto b/src/fas_graphic_data.proto
new file mode 100644
index 0000000..49fda19
--- /dev/null
+++ b/src/fas_graphic_data.proto
@@ -0,0 +1,41 @@
+syntax = "proto3";
+import "iscs_graphic_data.proto";
+
+package FASGraphicData;
+
+message FASGraphicStorage {
+  iscsGraphicData.Canvas canvas = 1;
+  repeated iscsGraphicData.Arrow arrows = 2;
+  repeated iscsGraphicData.IscsText iscsTexts = 3;
+  repeated iscsGraphicData.Rect rects = 4;
+  repeated ManualAlarmButton manualAlarmButtons = 5;
+  repeated HydrantAlarmButton hydrantAlarmButtons = 6;
+  repeated GasExtinguishing gasExtinguishings = 7;
+}
+
+
+message ManualAlarmButton { //手动报警按钮
+  iscsGraphicData.CommonInfo common = 1;
+  string code = 2;
+}
+
+message HydrantAlarmButton { //消防栓报警按钮
+  iscsGraphicData.CommonInfo common = 1;
+  string code = 2;
+}
+
+message GasExtinguishing { //气体灭火
+  iscsGraphicData.CommonInfo common = 1;
+  string code = 2;
+}
+
+message SmokeDetector { //烟雾探测器
+  iscsGraphicData.CommonInfo common = 1;
+  string code = 2;
+}
+
+message TemperatureDetector { //温度探测器
+  iscsGraphicData.CommonInfo common = 1;
+  string code = 2;
+
+}
diff --git a/src/fire_alarm_graphic_data.proto b/src/fire_alarm_graphic_data.proto
deleted file mode 100644
index 53ce2e7..0000000
--- a/src/fire_alarm_graphic_data.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-import "iscs_graphic_data.proto";
-
-package FireAlarmGraphicData;
-
-message FireAlarmGraphicStorage {
-  iscsGraphicData.Canvas canvas = 1;
-  repeated iscsGraphicData.Arrow arrows = 2;
-  repeated iscsGraphicData.IscsText iscsTexts = 3;
-  repeated iscsGraphicData.Rect rects = 4;
-}