From d58064587d02f3bb11b2b355c41aee6fc9931a6c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 21 十二月 2020 11:13:27 +0800
Subject: [PATCH] 修复兼容接口
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 109 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 26 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..19e9eda 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;
/**
* 鍦ㄧ嚎/绂荤嚎
@@ -136,7 +141,39 @@
/**
* 娴佸敮涓�缂栧彿锛屽瓨鍦ㄨ〃绀烘鍦ㄧ洿鎾�
*/
- private String ssrc;
+ private String streamId;
+
+ /**
+ * 鏄惁鍚湁闊抽
+ */
+ private boolean hasAudio;
+
+ /**
+ * 鏄惁姝ｅ湪鎾斁
+ */
+ private boolean play;
+
+
+ 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 getChannelId() {
return channelId;
@@ -152,14 +189,6 @@
public void setName(String name) {
this.name = name;
- }
-
- public int getStatus() {
- return status;
- }
-
- public void setStatus(int status) {
- this.status = status;
}
public String getManufacture() {
@@ -306,6 +335,26 @@
this.password = password;
}
+ public int getPTZType() {
+ return PTZType;
+ }
+
+ public String getPTZTypeText() {
+ return PTZTypeText;
+ }
+
+ public void setPTZTypeText(String PTZTypeText) {
+ this.PTZTypeText = PTZTypeText;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
public double getLongitude() {
return longitude;
}
@@ -322,22 +371,6 @@
this.latitude = latitude;
}
- public int getPTZType() {
- return PTZType;
- }
-
- public void setPTZType(int PTZType) {
- this.PTZType = PTZType;
- }
-
- public String getSsrc() {
- return ssrc;
- }
-
- public void setSsrc(String ssrc) {
- this.ssrc = ssrc;
- }
-
public int getSubCount() {
return subCount;
}
@@ -345,4 +378,28 @@
public void setSubCount(int subCount) {
this.subCount = subCount;
}
+
+ 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;
+ }
+
+ public String getStreamId() {
+ return streamId;
+ }
+
+ public void setStreamId(String streamId) {
+ this.streamId = streamId;
+ }
}
--
Gitblit v1.8.0