Merge branch 'main' of https://gitea.joylink.club/joylink/rtss-proto-msg

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;
 }
 
 

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;
+
+}

src/fire_alarm_graphic_data.proto

@@ -1,10 +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;
-}

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;      // 画第一个点的坐标
+}