From b2fa4608a2e0abb3d744f4f91bd423380e45f9c4 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 16 十二月 2020 12:43:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 68 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index 8a88497..de52ac6 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -1,7 +1,8 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import java.util.Map;
+import java.util.List;
+import java.util.Map;
public class Device {
@@ -37,6 +38,14 @@
private String transport;
/**
+ * 鏁版嵁娴佷紶杈撴ā寮�
+ * UDP:udp浼犺緭
+ * TCP-ACTIVE锛歵cp涓诲姩妯″紡
+ * TCP-PASSIVE锛歵cp琚姩妯″紡
+ */
+ private String streamMode;
+
+ /**
* wan鍦板潃
*/
private Host host;
@@ -53,6 +62,7 @@
private int channelCount;
+ private List<String> channelList;
public String getDeviceId() {
return deviceId;
@@ -69,30 +79,6 @@
public void setName(String name) {
this.name = name;
}
-
- public String getTransport() {
- return transport;
- }
-
- public void setTransport(String transport) {
- this.transport = transport;
- }
-
- public Host getHost() {
- return host;
- }
-
- public void setHost(Host host) {
- this.host = host;
- }
-
-// public Map<String, DeviceChannel> getChannelMap() {
-// return channelMap;
-// }
-//
-// public void setChannelMap(Map<String, DeviceChannel> channelMap) {
-// this.channelMap = channelMap;
-// }
public String getManufacturer() {
return manufacturer;
@@ -118,6 +104,30 @@
this.firmware = firmware;
}
+ public String getTransport() {
+ return transport;
+ }
+
+ public void setTransport(String transport) {
+ this.transport = transport;
+ }
+
+ public String getStreamMode() {
+ return streamMode;
+ }
+
+ public void setStreamMode(String streamMode) {
+ this.streamMode = streamMode;
+ }
+
+ public Host getHost() {
+ return host;
+ }
+
+ public void setHost(Host host) {
+ this.host = host;
+ }
+
public int getOnline() {
return online;
}
@@ -133,4 +143,12 @@
public void setChannelCount(int channelCount) {
this.channelCount = channelCount;
}
+
+ public List<String> getChannelList() {
+ return channelList;
+ }
+
+ public void setChannelList(List<String> channelList) {
+ this.channelList = channelList;
+ }
}
--
Gitblit v1.8.0