From 9978d30aa1533c50bfaa48e44a1b0de4c157d10b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 11 四月 2024 09:36:48 +0800
Subject: [PATCH] Merge branch '2.7.0'
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEvent.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEvent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEvent.java
old mode 100644
new mode 100755
index e343fec..5c064f7
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEvent.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEvent.java
@@ -11,16 +11,43 @@
super(source);
}
- public static final String ON = "ON"; // 涓婄嚎
- public static final String OFF = "OFF"; // 绂荤嚎
- public static final String VLOST = "VLOST"; // 瑙嗛涓㈠け
- public static final String DEFECT = "DEFECT"; // 鏁呴殰
- public static final String ADD = "ADD"; // 澧炲姞
- public static final String DEL = "DEL"; // 鍒犻櫎
- public static final String UPDATE = "UPDATE"; // 鏇存柊
+ /**
+ * 涓婄嚎
+ */
+ public static final String ON = "ON";
+
+ /**
+ * 绂荤嚎
+ */
+ public static final String OFF = "OFF";
+
+ /**
+ * 瑙嗛涓㈠け
+ */
+ public static final String VLOST = "VLOST";
+
+ /**
+ * 鏁呴殰
+ */
+ public static final String DEFECT = "DEFECT";
+
+ /**
+ * 澧炲姞
+ */
+ public static final String ADD = "ADD";
+
+ /**
+ * 鍒犻櫎
+ */
+ public static final String DEL = "DEL";
+
+ /**
+ * 鏇存柊
+ */
+ public static final String UPDATE = "UPDATE";
private List<DeviceChannel> deviceChannels;
- private GbStream[] gbStreams;
+ private List<GbStream> gbStreams;
private String type;
private String platformId;
@@ -48,11 +75,11 @@
this.platformId = platformId;
}
- public GbStream[] getGbStreams() {
+ public List<GbStream> getGbStreams() {
return gbStreams;
}
- public void setGbStreams(GbStream[] gbStreams) {
+ public void setGbStreams(List<GbStream> gbStreams) {
this.gbStreams = gbStreams;
}
}
--
Gitblit v1.8.0