From 652489b47ef582b3f492039ab7fd58c558c1ba36 Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:10:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 db8463a..a294ab1 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
@@ -78,7 +78,7 @@
* 鍦ㄧ嚎
*/
@Schema(description = "鏄惁鍦ㄧ嚎锛宼rue涓哄湪绾匡紝false涓虹绾�")
- private boolean online;
+ private boolean onLine;
/**
@@ -195,6 +195,8 @@
private SipTransactionInfo sipTransactionInfo;
+
+
public String getDeviceId() {
return deviceId;
}
@@ -286,12 +288,12 @@
this.hostAddress = hostAddress;
}
- public boolean isOnline() {
- return online;
+ public boolean isOnLine() {
+ return onLine;
}
- public void setOnline(boolean online) {
- this.online = online;
+ public void setOnLine(boolean onLine) {
+ this.onLine = onLine;
}
public int getChannelCount() {
@@ -461,4 +463,20 @@
public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
this.sipTransactionInfo = sipTransactionInfo;
}
+
+ /*======================璁惧涓诲瓙鐮佹祦閫昏緫START=========================*/
+ @Schema(description = "寮�鍚富瀛愮爜娴佸垏鎹㈢殑寮�鍏筹紙false-涓嶅紑鍚紝true-寮�鍚級")
+ private boolean switchPrimarySubStream;
+
+ public boolean isSwitchPrimarySubStream() {
+ return switchPrimarySubStream;
+ }
+
+ public void setSwitchPrimarySubStream(boolean switchPrimarySubStream) {
+ this.switchPrimarySubStream = switchPrimarySubStream;
+ }
+
+ /*======================璁惧涓诲瓙鐮佹祦閫昏緫END=========================*/
+
+
}
--
Gitblit v1.8.0