From 51a91d94e55c701c3b32e32596a029f6f3bf2559 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Sat, 24 Oct 2020 15:16:10 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BD=BF=E9=9F=B3=E9=A2=91=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E5=85=B3=E9=97=AD=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/gb28181/devicePlayer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/gb28181/devicePlayer.vue index 97fb7620..a86455c2 100644 --- a/web_src/src/components/gb28181/devicePlayer.vue +++ b/web_src/src/components/gb28181/devicePlayer.vue @@ -127,7 +127,7 @@ export default { realHasAudio = true; } } - this.hasaudio = realHasAudio; //&& this.hasaudio; + this.hasaudio = realHasAudio && this.hasaudio; } this.ssrc = streamInfo.ssrc; this.deviceId = deviceId; From 2c70065e36062f56b40530000057e5de9d363bd3 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Sat, 24 Oct 2020 15:18:48 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=85=B7=E6=9C=89=E5=AD=90=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=9A=84=E9=80=9A=E9=81=93=E4=BF=9D=E7=95=99=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E6=8C=89=E9=92=AE=EF=BC=8C=E9=81=BF=E5=85=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86NVR=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/channelList.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index c478e6e3..4bcbe31c 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -54,7 +54,8 @@