fix: remote screen

ruxailab · Jun 14, 2024 · ba92e8f · ba92e8f
1 parent b3de53a
commit ba92e8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 49 deletions.
diff --git a/src/components/molecules/FeedbackView.vue b/src/components/molecules/FeedbackView.vue
@@ -1,10 +1,8 @@
 <template>
   <v-row>
     <v-col class="mt-8" cols="12">
-      <video ref="remoteCamera" class="video" autoplay playsinline />
-      <video ref="localCamera" class="video" muted autoplay playsinline />
-      <video ref="remoteScreen" class="video" muted autoplay playsinline />
-      <video ref="localScreen" class="video" muted autoplay playsinline />
+      <video ref="remoteMedia" class="video" autoplay playsinline />
+      <video ref="localMedia" class="video" muted autoplay playsinline />
     </v-col>
     <v-col cols="12">
       <v-row justify="center">
@@ -23,6 +21,9 @@
             mdi-microphone-off
           </v-icon>
         </v-btn>
+        <v-btn @click="toggleCameraScreen()" color="blue" block depressed
+          >TOGGLE CAMERA/SCREEN</v-btn
+        >
       </v-row>
     </v-col>
     <VideoCall ref="VideoCall" />
@@ -58,12 +59,6 @@ export default {
     remoteCameraStream() {
       return this.$store.getters.remoteCameraStream
     },
-    localScreenStream() {
-      return this.$store.getters.localScreenStream
-    },
-    remoteScreenStream() {
-      return this.$store.getters.remoteScreenStream
-    },
     roomTestId() {
       return this.$store.getters.test.id
     },
@@ -78,19 +73,11 @@ export default {
     remoteCameraStream(newVal) {
       this.setupStreams()
     },
-    localScreenStream(newVal) {
-      this.setupStreams()
-    },
-    remoteScreenStream(newVal) {
-      this.setupStreams()
-    },
   },
   methods: {
     setupStreams() {
-      this.$refs.localCamera.srcObject = this.localCameraStream
-      this.$refs.remoteCamera.srcObject = this.remoteCameraStream
-      this.$refs.localScreen.srcObject = this.localScreenStream
-      this.$refs.remoteScreen.srcObject = this.remoteScreenStream
+      this.$refs.localMedia.srcObject = this.localCameraStream
+      this.$refs.remoteMedia.srcObject = this.remoteCameraStream
     },
     toggleMicrophone() {
       if (

diff --git a/src/components/molecules/VideoCall.vue b/src/components/molecules/VideoCall.vue
@@ -12,14 +12,6 @@
           depressed
           >CONNECT</v-btn
         >
-        <v-btn
-          v-if="index === 1"
-          @click="toggleCameraScreen"
-          color="blue"
-          block
-          depressed
-          >TOGGLE CAMERA/SCREEN</v-btn
-        >
       </v-col>
     </v-row>
   </v-container>
@@ -98,7 +90,7 @@ export default {
       return this.$store.getters.currentUserTestAnswer
     },
   },
-  created() {
+  mounted() {
     if (!this.isAdmin) {
       setInterval(this.toggleCameraScreen, 50000) // Remove parentheses from toggleCameraScreen
     }

diff --git a/src/store/modules/Test.js b/src/store/modules/Test.js
@@ -30,8 +30,6 @@ export default {
     finalMessage: '',
     remoteCameraStream: null,
     localCameraStream: null,
-    remoteScreenStream: null,
-    localScreenStream: null,
   },
   getters: {
     tests(state) {
@@ -76,12 +74,6 @@ export default {
     localCameraStream(state) {
       return state.localCameraStream
     },
-    remoteScreenStream(state) {
-      return state.remoteScreenStream
-    },
-    localScreenStream(state) {
-      return state.localScreenStream
-    },
   },
   mutations: {
     SET_TEST(state, payload) {
@@ -130,12 +122,6 @@ export default {
     SET_LOCAL_STREAM(state, stream) {
       state.localCameraStream = stream
     },
-    SET_LOCAL_SCREEN_STREAM(state, stream) {
-      state.localScreenStream = stream
-    },
-    SET_REMOTE_SCREEN_STREAM(state, stream) {
-      state.remoteScreenStream = stream
-    },
     updateCurrentImageUrl(state, url) {
       state.currentImageUrl = url // Update currentImageUrl with the new URL
     },
@@ -431,12 +417,6 @@ export default {
     setlocalCameraStream({ commit }, stream) {
       commit('SET_LOCAL_STREAM', stream)
     },
-    setRemoteScreenStream({ commit }, stream) {
-      commit('SET_REMOTE_SCREEN_STREAM', stream)
-    },
-    setLocalScreenStream({ commit }, stream) {
-      commit('SET_LOCAL_SCREEN_STREAM', stream)
-    },
     cleanTest({ commit }) {
       try {
         commit('CLEAN_TEST')