From 39efda779fcd5d613870e9024cda69da28e571b2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 16 五月 2022 11:47:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 30 ------------------------------
1 files changed, 0 insertions(+), 30 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 778608e..a095f51 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
@@ -100,11 +100,6 @@
private String mediaServerId;
/**
- * 棣栨娉ㄥ唽
- */
- private boolean firsRegister;
-
- /**
* 瀛楃闆�, 鏀寔 UTF-8 涓� GB2312
*/
private String charset ;
@@ -133,16 +128,6 @@
* 鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�
*/
private boolean ssrcCheck;
-
- /**
- * 璁惧鐢ㄤ簬鎺ユ敹璇煶娑堟伅鐨勯�氶亾
- */
- private String audioChannelForReceive;
-
- /**
- * 璁惧鐢ㄤ簬鍙戦�佽闊虫秷鎭殑閫氶亾
- */
- private String audioChannelForSend;
public String getDeviceId() {
@@ -289,14 +274,6 @@
this.mediaServerId = mediaServerId;
}
- public boolean isFirsRegister() {
- return firsRegister;
- }
-
- public void setFirsRegister(boolean firsRegister) {
- this.firsRegister = firsRegister;
- }
-
public String getCharset() {
return charset;
}
@@ -345,11 +322,4 @@
this.ssrcCheck = ssrcCheck;
}
- public String getAudioChannelForReceive() {
- return audioChannelForReceive;
- }
-
- public void setAudioChannelForReceive(String audioChannelForReceive) {
- this.audioChannelForReceive = audioChannelForReceive;
- }
}
--
Gitblit v1.8.0