From 3ec3b88456cf9ac455d93baba40f339bb284dd77 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 14 十月 2020 14:39:10 +0800
Subject: [PATCH] 修复点播判断错误导致的15s超长延时 增加默认不关闭推流, 无人观看超时或点击停止按钮关闭流 修复点播其他bug
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 74f86a2..8a88497 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
@@ -49,7 +49,9 @@
/**
* 閫氶亾鍒楄〃
*/
- private Map<String,DeviceChannel> channelMap;
+// private Map<String,DeviceChannel> channelMap;
+
+ private int channelCount;
public String getDeviceId() {
@@ -84,13 +86,13 @@
this.host = host;
}
- public Map<String, DeviceChannel> getChannelMap() {
- return channelMap;
- }
-
- public void setChannelMap(Map<String, DeviceChannel> channelMap) {
- this.channelMap = channelMap;
- }
+// public Map<String, DeviceChannel> getChannelMap() {
+// return channelMap;
+// }
+//
+// public void setChannelMap(Map<String, DeviceChannel> channelMap) {
+// this.channelMap = channelMap;
+// }
public String getManufacturer() {
return manufacturer;
@@ -123,4 +125,12 @@
public void setOnline(int online) {
this.online = online;
}
+
+ public int getChannelCount() {
+ return channelCount;
+ }
+
+ public void setChannelCount(int channelCount) {
+ this.channelCount = channelCount;
+ }
}
--
Gitblit v1.8.0