From 6e4fc1e79b7b4b91d6eb36f6b5638fa902665a50 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期六, 23 四月 2022 23:34:36 +0800
Subject: [PATCH] 1.修正了播放地址无法正常播放视频的问题，包含两个错误： 1.1修正播放器界面路由（此页面不需要layout边框，之前已经修复但在地图代码合并时又被错误覆盖） 1.2修正播放器id属性，此属性现在不需要父级组件传入（这是之前导致独立播放页面失效的主要原因） 2.调整滚动条美化样式到app.vue中，使其真正全局生效
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 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 aff1671..81b9666 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
@@ -4,11 +4,6 @@
public class Device {
/**
- * Id
- */
- private int id;
-
- /**
* 璁惧Id
*/
private String deviceId;
@@ -110,22 +105,35 @@
private boolean firsRegister;
/**
- * 瀛楃闆�, 鏀寔 utf-8 涓� gb2312
+ * 瀛楃闆�, 鏀寔 UTF-8 涓� GB2312
*/
private String charset ;
/**
* 鐩綍璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄
*/
- private int subscribeCycleForCatalog ;
+ private int subscribeCycleForCatalog;
- public int getId() {
- return id;
- }
+ /**
+ * 绉诲姩璁惧浣嶇疆璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄
+ */
+ private int subscribeCycleForMobilePosition;
- public void setId(int id) {
- this.id = id;
- }
+ /**
+ * 绉诲姩璁惧浣嶇疆淇℃伅涓婃姤鏃堕棿闂撮殧,鍗曚綅:绉�,榛樿鍊�5
+ */
+ private int mobilePositionSubmissionInterval = 5;
+
+ /**
+ * 鎶ヨ璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄
+ */
+ private int subscribeCycleForAlarm;
+
+ /**
+ * 鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�
+ */
+ private boolean ssrcCheck;
+
public String getDeviceId() {
return deviceId;
@@ -295,5 +303,35 @@
this.subscribeCycleForCatalog = subscribeCycleForCatalog;
}
+ public int getSubscribeCycleForMobilePosition() {
+ return subscribeCycleForMobilePosition;
+ }
+ public void setSubscribeCycleForMobilePosition(int subscribeCycleForMobilePosition) {
+ this.subscribeCycleForMobilePosition = subscribeCycleForMobilePosition;
+ }
+
+ public int getMobilePositionSubmissionInterval() {
+ return mobilePositionSubmissionInterval;
+ }
+
+ public void setMobilePositionSubmissionInterval(int mobilePositionSubmissionInterval) {
+ this.mobilePositionSubmissionInterval = mobilePositionSubmissionInterval;
+ }
+
+ public int getSubscribeCycleForAlarm() {
+ return subscribeCycleForAlarm;
+ }
+
+ public void setSubscribeCycleForAlarm(int subscribeCycleForAlarm) {
+ this.subscribeCycleForAlarm = subscribeCycleForAlarm;
+ }
+
+ public boolean isSsrcCheck() {
+ return ssrcCheck;
+ }
+
+ public void setSsrcCheck(boolean ssrcCheck) {
+ this.ssrcCheck = ssrcCheck;
+ }
}
--
Gitblit v1.8.0