From 343882e4c49c7c504fa9c33412819b7288c2bc38 Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期三, 10 三月 2021 14:38:31 +0800
Subject: [PATCH] 修正某些branch不符合GB之处
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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 19e9eda..ca6ef60 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
@@ -2,10 +2,17 @@
public class DeviceChannel {
+
+
/**
* 閫氶亾id
*/
private String channelId;
+
+ /**
+ * 璁惧id
+ */
+ private String deviceId;
/**
* 閫氶亾鍚�
@@ -146,13 +153,15 @@
/**
* 鏄惁鍚湁闊抽
*/
- private boolean hasAudio;
+ private boolean hasAudio;
- /**
- * 鏄惁姝ｅ湪鎾斁
- */
- private boolean play;
+ public String getDeviceId() {
+ return deviceId;
+ }
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
public void setPTZType(int PTZType) {
this.PTZType = PTZType;
@@ -385,14 +394,6 @@
public void setHasAudio(boolean hasAudio) {
this.hasAudio = hasAudio;
- }
-
- public boolean isPlay() {
- return play;
- }
-
- public void setPlay(boolean play) {
- this.play = play;
}
public String getStreamId() {
--
Gitblit v1.8.0