From bfb3b4ea13dcfd360c313375d03658dfc82e19ef Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 16 May 2022 17:49:44 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=92=AD=E6=94=BE=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=89=80=E6=9C=89=E6=B5=81=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web_src/src/components/channelList.vue | 2 +
.../src/components/dialog/devicePlayer.vue | 122 ++++++++++++++++--
2 files changed, 114 insertions(+), 10 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 9c7ab8ef..21223ce1 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -237,6 +237,8 @@ export default {
that.initData();
}, 1000)
+ }else{
+ that.$message.error(res.data.msg);
}
}).catch(function (e) {
that.isLoging = false;
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 921e4136..43a929c5 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -33,10 +33,100 @@
资源地址：
-
-
-
+
+
+
+ 更多地址
+
+
+
+ FLV:
+ {{ streamInfo.flv }}
+
+
+ FLV(https):
+ {{ streamInfo.https_flv }}
+
+
+ FLV(ws):
+ {{ streamInfo.ws_flv }}
+
+
+ FLV(wss):
+ {{ streamInfo.wss_flv }}
+
+
+ FMP4:
+ {{ streamInfo.fmp4 }}
+
+
+ FMP4(https):
+ {{ streamInfo.https_fmp4 }}
+
+
+ FMP4(ws):
+ {{ streamInfo.ws_fmp4 }}
+
+
+ FMP4(wss):
+ {{ streamInfo.wss_fmp4 }}
+
+
+ HLS:
+ {{ streamInfo.hls }}
+
+
+ HLS(https):
+ {{ streamInfo.https_hls }}
+
+
+ HLS(ws):
+ {{ streamInfo.ws_hls }}
+
+
+ HLS(wss):
+ {{ streamInfo.wss_hls }}
+
+
+ TS:
+ {{ streamInfo.ts }}
+
+
+ TS(https):
+ {{ streamInfo.https_ts }}
+
+
+ TS(ws):
+ {{ streamInfo.ws_ts }}
+
+
+ TS(wss):
+ {{ streamInfo.wss_ts }}
+
+
+ RTC:
+ {{ streamInfo.rtc }}
+
+
+ RTMP:
+ {{ streamInfo.rtmp }}
+
+
+ RTMPS:
+ {{ streamInfo.rtmps }}
+
+
+ RTSP:
+ {{ streamInfo.rtsp }}
+
+
+ RTSPS:
+ {{ streamInfo.rtsps }}
+
+
+
+
@@ -117,27 +207,27 @@
- 预置位编号
+ 预置位编号
设置
调用
删除
- 巡航速度
+ 巡航速度
设置
- 停留时间
+ 停留时间
设置
- 巡航组编号
+ 巡航组编号
添加点
删除点
删除组
巡航
- 扫描速度
+ 扫描速度
设置
- 扫描组编号
+ 扫描组编号
左边界
右边界
@@ -174,6 +264,7 @@
+
@@ -244,6 +335,7 @@ export default {
seekTime: 0,
recordStartTime: 0,
showTimeText: "00:00:00",
+ streamInfo: null,
};
},
methods: {
@@ -306,6 +398,7 @@ export default {
console.log(val)
},
play: function (streamInfo, hasAudio) {
+ this.streamInfo = streamInfo;
this.hasAudio = hasAudio;
this.isLoging = false;
// this.videoUrl = streamInfo.rtc;
@@ -646,6 +739,14 @@ export default {
console.log(resultArray)
return resultArray;
},
+ copyUrl: function (dropdownItem){
+ console.log(dropdownItem)
+ this.$copyText(dropdownItem).then((e)=> {
+ this.$message.success("成功拷贝到粘贴板");
+ }, (e)=> {
+
+ })
+ },
gbPlay(){
console.log('前端控制：播放');
this.$axios({
@@ -686,7 +787,8 @@ export default {
this.$refs.videoPlayer.play(this.videoUrl)
}, 600)
});
- }
+ },
+
}
};
From debfb2222fe99f38ee6476ee6437f99d3616eaa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=A2=E7=BF=BC?= <659240788@qq.com>
Date: Tue, 17 May 2022 08:18:38 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=97=A0=E8=AE=A4=E8=AF=81=E5=AF=86?=
=?UTF-8?q?=E7=A0=81=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=A0=A1=E9=AA=8C=E6=98=AF?=
=?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E6=8E=88=E6=9D=83=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../transmit/event/request/impl/RegisterRequestProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
index 1c054401..47a4e008 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
@@ -94,7 +94,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
String deviceId = uri.getUser();
AuthorizationHeader authHead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
- if (authHead == null) {
+ if (authHead == null && !StringUtils.isEmpty(sipConfig.getPassword())) {
logger.info("[注册请求] 未携带授权头 回复401: {}", requestAddress);
response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
From 3051fc82ee1c265b509397579439a1e5806e278e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 18 May 2022 09:49:25 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=B4=E6=8E=A5?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=87=E6=8D=A2=E5=A4=9A=E7=A7=8D=E5=BC=80?=
=?UTF-8?q?=E6=BA=90=E6=92=AD=E6=94=BE=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/dialog/devicePlayer.vue | 79 +++---
web_src/static/js/ZLMRTCClient.js | 228 +++++++++++++++---
web_src/static/js/ZLMRTCClient.js.map | 1 +
3 files changed, 246 insertions(+), 62 deletions(-)
create mode 100644 web_src/static/js/ZLMRTCClient.js.map
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 43a929c5..652a599c 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -4,10 +4,22 @@
-
+
+
+
+
+
+
+
+ h265web敬请期待
+ wsPlayer 敬请期待
+
+
+
+
-
+
@@ -273,16 +285,16 @@