From f89fd688cc80c8eb0eeec2c5f608c2319cfdea0b Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 13 Sep 2024 09:55:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0iscs=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs_graphic_data.proto | 61 +++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/iscs_graphic_data.proto diff --git a/src/iscs_graphic_data.proto b/src/iscs_graphic_data.proto new file mode 100644 index 0000000..dc5e777 --- /dev/null +++ b/src/iscs_graphic_data.proto @@ -0,0 +1,61 @@ +syntax = "proto3"; +package iscsGraphicData; + +message IscsGraphicStorage { + Canvas canvas = 1; +} + +message Canvas { + // 画布宽 + int32 width = 1; + // 画布高 + int32 height = 2; + // 背景色 + string backgroundColor = 3; + // 视口变换 + Transform viewportTransform = 4; + //画布格子背景 + Grid gridBackground = 5; +} + +//格子背景 +message Grid { + bool hasGrid = 1; + string lineColor = 2; // 线色 + int32 space = 3; //间隔 +} + +message Point { + // x坐标 + float x = 1; + // y坐标 + float y = 2; +} + +//变换 +message Transform { + // 位移 + Point position = 1; + // 缩放 + Point scale = 2; + // 旋转弧度 + float rotation = 3; + // 歪斜 + Point skew = 4; +} + +//子元素变换 +message ChildTransform { + // 子元素名称 + string name = 1; + // 子元素变换 + Transform transform = 2; +} +// 公共属性 +message CommonInfo { +// string oldid = 1; + string graphicType = 2; + Transform transform = 3; + repeated ChildTransform childTransforms = 4; + uint32 id = 5; +} From d4a3340f7cee52ce5dc0c5ad4cdbe9cbe5a1d414 Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 13 Sep 2024 10:09:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs_graphic_data.proto | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/iscs_graphic_data.proto b/src/iscs_graphic_data.proto index dc5e777..6683475 100644 --- a/src/iscs_graphic_data.proto +++ b/src/iscs_graphic_data.proto @@ -3,6 +3,7 @@ package iscsGraphicData; message IscsGraphicStorage { Canvas canvas = 1; + UniqueIdOfStationLayout UniqueIdPrefix = 2;//地图唯一信息 } message Canvas { @@ -59,3 +60,9 @@ message CommonInfo { repeated ChildTransform childTransforms = 4; uint32 id = 5; } + +message UniqueIdOfStationLayout { + string city = 1;//城市 + string lineId = 2;//线路号 + string mainCoordinateSystem = 3;//地图的公里标主坐标系 +} From d5735a58f40f7e013e4a4789e47b46e6f3f99adc Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 13 Sep 2024 16:36:37 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=AD=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs_graphic_data.proto | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/iscs_graphic_data.proto b/src/iscs_graphic_data.proto index 6683475..5361dfe 100644 --- a/src/iscs_graphic_data.proto +++ b/src/iscs_graphic_data.proto @@ -4,6 +4,7 @@ package iscsGraphicData; message IscsGraphicStorage { Canvas canvas = 1; UniqueIdOfStationLayout UniqueIdPrefix = 2;//地图唯一信息 + repeated Arrow arrows = 3; } message Canvas { @@ -66,3 +67,9 @@ message UniqueIdOfStationLayout { string lineId = 2;//线路号 string mainCoordinateSystem = 3;//地图的公里标主坐标系 } + +message Arrow { + CommonInfo common = 1; + string code = 2; + repeated Point points = 3; +} From 6ac472d1f7d118761ae39435761a74fcd23f23c2 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 13 Sep 2024 19:01:18 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=85=AC=E5=85=B1=E7=9A=84=E6=96=87?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs_graphic_data.proto | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/iscs_graphic_data.proto b/src/iscs_graphic_data.proto index 5361dfe..a140a5f 100644 --- a/src/iscs_graphic_data.proto +++ b/src/iscs_graphic_data.proto @@ -5,6 +5,7 @@ message IscsGraphicStorage { Canvas canvas = 1; UniqueIdOfStationLayout UniqueIdPrefix = 2;//地图唯一信息 repeated Arrow arrows = 3; + repeated IscsText iscsTexts = 4; } message Canvas { @@ -73,3 +74,12 @@ message Arrow { string code = 2; repeated Point points = 3; } + +/** Iscs文字 */ +message IscsText { + CommonInfo common = 1; + string code = 2; + string content = 3; + string color = 4; + int32 fontSize = 5; +} From 9218ddcf90a543ca84c7240480a12dd08ceb2b1d Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Sat, 14 Sep 2024 11:58:30 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0CCTV=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 | 21 +++++++++++++++++++++ src/picture.proto | 24 ++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 src/cctv_graphic_data.proto create mode 100644 src/picture.proto diff --git a/src/cctv_graphic_data.proto b/src/cctv_graphic_data.proto new file mode 100644 index 0000000..8633fbc --- /dev/null +++ b/src/cctv_graphic_data.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; +import "iscs_graphic_data.proto"; + +package CCTVGraphicData; + +message CCTVGraphicStorage { + iscsGraphicData.Canvas canvas = 1; + repeated CCTVButton cctvButtons = 2; +} + + +/** CCTV按钮 */ +message CCTVButton { + enum ButtonType { + rect = 0; + monitor = 1; //监控样子的按钮 + } + iscsGraphicData.CommonInfo common = 1; + string code = 2; + ButtonType buttonType = 3; +} diff --git a/src/picture.proto b/src/picture.proto new file mode 100644 index 0000000..01180dd --- /dev/null +++ b/src/picture.proto @@ -0,0 +1,24 @@ +syntax = "proto3"; + +enum PictureType { + /** 火灾报警 */ + FireAlarm = 0; + /** 机电 */ + Electromechanical = 1; + /** 广播 */ + Broadcast = 2; + /** 乘客信息 */ + PassengerInformation = 3; + /** 闭路电视 */ + CCTV = 4; + /** 屏蔽门 */ + PSD = 5; + /** 售检票 */ + TicketSalesAndChecking = 6; + /** 门禁 */ + AccessControl = 7; + /** 防淹门 */ + FloodGate = 8; + /** 网络状态 */ + NetworkStatus = 9; +} From 5cb82e750f4f4e6d9523ab9a8a24a4148d12950a Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Sat, 14 Sep 2024 14:54:54 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9CCTV=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cctv_graphic_data.proto | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cctv_graphic_data.proto b/src/cctv_graphic_data.proto index 8633fbc..3f99058 100644 --- a/src/cctv_graphic_data.proto +++ b/src/cctv_graphic_data.proto @@ -6,6 +6,8 @@ package CCTVGraphicData; message CCTVGraphicStorage { iscsGraphicData.Canvas canvas = 1; repeated CCTVButton cctvButtons = 2; + repeated iscsGraphicData.Arrow arrows = 3; + repeated iscsGraphicData.IscsText iscsTexts = 4; } @@ -14,6 +16,7 @@ message CCTVButton { enum ButtonType { rect = 0; monitor = 1; //监控样子的按钮 + semicircle = 2; //半圆样子的按钮 } iscsGraphicData.CommonInfo common = 1; string code = 2; From 62dc244c9214c0f8095a54cd6e745cc1105b0c3c Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Sat, 14 Sep 2024 15:23:10 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=81=AB=E7=81=BE?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fire_alarm_graphic_data.proto | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/fire_alarm_graphic_data.proto diff --git a/src/fire_alarm_graphic_data.proto b/src/fire_alarm_graphic_data.proto new file mode 100644 index 0000000..249346e --- /dev/null +++ b/src/fire_alarm_graphic_data.proto @@ -0,0 +1,23 @@ +syntax = "proto3"; +import "iscs_graphic_data.proto"; + +package FireAlarmGraphicData; + +message CCTVGraphicStorage { + iscsGraphicData.Canvas canvas = 1; + repeated iscsGraphicData.Arrow arrows = 2; + repeated iscsGraphicData.IscsText iscsTexts = 3; +} + + +/** CCTV按钮 */ +message CCTVButton { + enum ButtonType { + rect = 0; + monitor = 1; //监控样子的按钮 + semicircle = 2; //半圆样子的按钮 + } + iscsGraphicData.CommonInfo common = 1; + string code = 2; + ButtonType buttonType = 3; +} From 2b9a6287fb04b6cd7a8c6018f2c12b7d87dfad28 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Sat, 14 Sep 2024 15:32:42 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9fire=5Falarm=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fire_alarm_graphic_data.proto | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/fire_alarm_graphic_data.proto b/src/fire_alarm_graphic_data.proto index 249346e..28ff4c2 100644 --- a/src/fire_alarm_graphic_data.proto +++ b/src/fire_alarm_graphic_data.proto @@ -3,21 +3,8 @@ import "iscs_graphic_data.proto"; package FireAlarmGraphicData; -message CCTVGraphicStorage { +message FireAlarmGraphicStorage { iscsGraphicData.Canvas canvas = 1; repeated iscsGraphicData.Arrow arrows = 2; repeated iscsGraphicData.IscsText iscsTexts = 3; } - - -/** CCTV按钮 */ -message CCTVButton { - enum ButtonType { - rect = 0; - monitor = 1; //监控样子的按钮 - semicircle = 2; //半圆样子的按钮 - } - iscsGraphicData.CommonInfo common = 1; - string code = 2; - ButtonType buttonType = 3; -}