From 35fe3df3fba97b305dd8605fab15bbe36383aa60 Mon Sep 17 00:00:00 2001 From: cxc Date: Wed, 8 Jun 2022 17:30:38 +0800 Subject: [PATCH] changed padding, fixed media check issue --- src/components/mediaCheck.vue | 163 +++++++++ src/views/host_new.vue | 592 ------------------------------- src/views/host_old.vue | 562 ----------------------------- src/views/meeting.vue | 186 ++-------- src/views/meeting_old.vue | 643 ---------------------------------- 5 files changed, 189 insertions(+), 1957 deletions(-) create mode 100644 src/components/mediaCheck.vue delete mode 100644 src/views/host_new.vue delete mode 100644 src/views/host_old.vue delete mode 100644 src/views/meeting_old.vue diff --git a/src/components/mediaCheck.vue b/src/components/mediaCheck.vue new file mode 100644 index 0000000..0f5f260 --- /dev/null +++ b/src/components/mediaCheck.vue @@ -0,0 +1,163 @@ + + + diff --git a/src/views/host_new.vue b/src/views/host_new.vue deleted file mode 100644 index 0a7f642..0000000 --- a/src/views/host_new.vue +++ /dev/null @@ -1,592 +0,0 @@ - - - diff --git a/src/views/host_old.vue b/src/views/host_old.vue deleted file mode 100644 index 39b47dd..0000000 --- a/src/views/host_old.vue +++ /dev/null @@ -1,562 +0,0 @@ - - - diff --git a/src/views/meeting.vue b/src/views/meeting.vue index 0ff90ef..2204609 100644 --- a/src/views/meeting.vue +++ b/src/views/meeting.vue @@ -80,62 +80,7 @@ - - - 检测中。 - 摄像头工作正常,麦克风工作正常。 - 摄像头工作正常,麦克风无法正常工作。 - 摄像头无法正常工作,麦克风工作正常。 - 摄像头无法正常工作,麦克风无法正常工作。 - -
- - - - - - -
- - -
+ { }; const setSize = () => { - meetingWidth.value = meetingContainerRef.value.offsetWidth * 0.9; + meetingWidth.value = meetingContainerRef.value.offsetWidth * 0.96; meetingHeight.value = (meetingWidth.value * 9) / 16; // videoElementRef.value.style.width = `${meetingWidth.value}px`; @@ -328,41 +274,6 @@ const setSize = () => { window.client = meetingConfig.client; window.startMeeting = startMeeting; -const checkMediaVideoRef = ref(null); -const checkMediaWrapRef = ref(null); -const showCheckMediaVideo = ref(true); -const isVideoAvailable = ref(undefined); -const isAudioAvailable = ref(undefined); -// TODO:可能有摄像头占用问题。 -onMounted(() => { - nextTick(() => { - const videoWidth = checkMediaWrapRef.value.offsetWidth; - const videoHeight = checkMediaWrapRef.value.offsetHeight; - console.log(checkMediaVideoRef.value); - navigator.mediaDevices - .getUserMedia({ video: { width: videoWidth, height: videoHeight } }) - .then((stream) => { - checkMediaVideoRef.value.srcObject = stream; - checkMediaVideoRef.value.play(); - isVideoAvailable.value = true; - }) - .catch((err) => { - console.log(err); - isVideoAvailable.value = false; - }); - }); - navigator.mediaDevices - .getUserMedia({ audio: true }) - .then((stream) => { - console.log(stream); - isAudioAvailable.value = true; - }) - .catch((err) => { - console.log(err); - isAudioAvailable.value = false; - }); -}); - // 设置文本标签 const setTextLabel = () => { document.querySelectorAll(".text-tag").forEach((el) => { @@ -544,7 +455,7 @@ const setFullScreen = async () => { isFullScreen.value = true; nextTick(() => { - meetingWidth.value = meetingContainerRef.value.offsetWidth * 0.9; + meetingWidth.value = meetingContainerRef.value.offsetWidth * 0.96; meetingHeight.value = (meetingWidth.value * 9) / 16; // 当手机竖屏时 if (window.orientation === 0) { @@ -747,7 +658,7 @@ const getStageQuestionnaireAnswer = (val) => { const isFullScreen = ref(false); onMounted(() => { meetingContainerRef.value.style.background = ` url(${store.getters.templateBackgroundPic}) 0% 0% / cover no-repeat`; - meetingWidth.value = meetingContainerRef.value.offsetWidth * 0.9; + meetingWidth.value = meetingContainerRef.value.offsetWidth * 0.96; meetingHeight.value = (meetingWidth.value * 9) / 16; videoElementRef.value.style.height = `${meetingHeight.value + 42}px`; @@ -759,7 +670,7 @@ onMounted(() => { isFullScreen.value = false; isVerticalFullScreen.value = false; nextTick(() => { - meetingWidth.value = meetingContainerRef.value.offsetWidth * 0.9; + meetingWidth.value = meetingContainerRef.value.offsetWidth * 0.96; meetingHeight.value = (meetingWidth.value * 9) / 16; // videoElementRef.value.style.width = `${meetingWidth.value}px`; videoElementRef.value.style.height = `${meetingHeight.value + 42}px`; @@ -790,7 +701,7 @@ onMounted(() => { // 当修改窗口尺寸时 window.addEventListener("resize", (e) => { console.log(e); - meetingWidth.value = meetingContainerRef.value.offsetWidth * 0.9; + meetingWidth.value = meetingContainerRef.value.offsetWidth * 0.96; meetingHeight.value = (meetingWidth.value * 9) / 16; if (!document.fullscreenElement) { videoElementRef.value.style.height = `${meetingHeight.value + 42}px`; @@ -832,7 +743,7 @@ onUnmounted(() => {