From ea8b911846b63f649a254250ba81c7a804da332a Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu, 10 Oct 2024 14:36:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9protoc=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iscs_graphic_data.proto | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/iscs_graphic_data.proto b/src/iscs_graphic_data.proto
index 622fab0..152280d 100644
--- a/src/iscs_graphic_data.proto
+++ b/src/iscs_graphic_data.proto
@@ -5,7 +5,7 @@ package iscsGraphicData;
 
 message IscsGraphicStorage {
   repeated CCTVOfStationControlStorage cctvOfStationControlStorages = 1;
-  repeated FASPlatformAlarmStorage fasPlatformAlarmStorages = 2;
+  repeated FASOfPlatformAlarmStorage fasOfPlatformAlarmStorages = 2;
 }
 
 message UniqueIdOfStationLayout {
@@ -14,14 +14,20 @@ message UniqueIdOfStationLayout {
   string mainCoordinateSystem = 3;//地图的公里标主坐标系
 }
 
+message CommonGraphicStorage {
+  repeated Arrow arrows = 1;
+  repeated Text texts = 2;
+  repeated Rect rects = 3;
+  repeated Line lines = 4;
+}
+
 message Arrow {
   common.CommonInfo common = 1;
   string code = 2;
   repeated common.Point points = 3;
 }
 
-//Iscs文字
-message IscsText {
+message Text {
   common.CommonInfo common = 1;
   string code = 2;
   string content = 3;
@@ -38,6 +44,8 @@ message Rect {
   float height = 6;     //高度
   int32 radius = 7;     //圆角半径
   common.Point point = 8;      // 画第一个点的坐标
+  string fillColor = 9; // 填充色
+  float alpha = 10;  // 透明度
 }
 
 message Line {
@@ -96,18 +104,12 @@ message TemperatureDetector {
 message CCTVOfStationControlStorage {
   string stationName = 1;
   common.Canvas canvas = 2;
-  repeated Arrow arrows = 3;
-  repeated IscsText iscsTexts = 4;
-  repeated Rect rects = 5;
-  repeated CCTVButton cctvButtons = 6;
-  repeated Line lines = 7;
+  CommonGraphicStorage commonGraphicStorage = 3;
+  repeated CCTVButton cctvButtons = 4;
 }
 
-message FASPlatformAlarmStorage {
+message FASOfPlatformAlarmStorage {
   string stationName = 1;
   common.Canvas canvas = 2;
-  repeated Arrow arrows = 3;
-  repeated IscsText iscsTexts = 4;
-  repeated Rect rects = 5;
-  repeated Line lines = 6;
+  CommonGraphicStorage commonGraphicStorage = 3;
 }