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/DeviceChannel.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 73fafc1..1350341 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -103,9 +103,14 @@
private String password;
/**
- * 浜戝彴鎺у埗
+ * 浜戝彴绫诲瀷
*/
private int PTZType;
+
+ /**
+ * 浜戝彴绫诲瀷鎻忚堪瀛楃涓�
+ */
+ private String PTZTypeText;
/**
* 鍦ㄧ嚎/绂荤嚎
@@ -137,6 +142,16 @@
* 娴佸敮涓�缂栧彿锛屽瓨鍦ㄨ〃绀烘鍦ㄧ洿鎾�
*/
private String ssrc;
+
+ /**
+ * 鏄惁鍚湁闊抽
+ */
+ private boolean hasAudio;
+
+ /**
+ * 鏄惁姝ｅ湪鎾斁
+ */
+ private boolean play;
public String getChannelId() {
return channelId;
@@ -328,6 +343,27 @@
public void setPTZType(int PTZType) {
this.PTZType = PTZType;
+ switch (PTZType) {
+ case 0:
+ this.PTZTypeText = "鏈煡";
+ break;
+ case 1:
+ this.PTZTypeText = "鐞冩満";
+ break;
+ case 2:
+ this.PTZTypeText = "鍗婄悆";
+ break;
+ case 3:
+ this.PTZTypeText = "鍥哄畾鏋満";
+ break;
+ case 4:
+ this.PTZTypeText = "閬ユ帶鏋満";
+ break;
+ }
+ }
+
+ public String getPTZTypeText() {
+ return PTZTypeText;
}
public String getSsrc() {
@@ -345,4 +381,24 @@
public void setSubCount(int subCount) {
this.subCount = subCount;
}
+
+ public void setPTZTypeText(String PTZTypeText) {
+ this.PTZTypeText = PTZTypeText;
+ }
+
+ public boolean isHasAudio() {
+ return hasAudio;
+ }
+
+ public void setHasAudio(boolean hasAudio) {
+ this.hasAudio = hasAudio;
+ }
+
+ public boolean isPlay() {
+ return play;
+ }
+
+ public void setPlay(boolean play) {
+ this.play = play;
+ }
}
--
Gitblit v1.8.0