修复视频童话BUG

gmingchen · Jul 1, 2024 · 887bd8d · 887bd8d
1 parent 6574950
commit 887bd8d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/src/components/empty/index.vue b/src/components/empty/index.vue
@@ -1,11 +1,5 @@
 <template>
   <el-empty class="empty height-full width-full" :class="absolute ? 'position-center' : ''" :image="Logo">
-    <template v-if="icon">
-      <el-image :src="Logo"></el-image>
-      <el-icon class="cursor-pointer" size="160">
-        <component :is="component"></component>
-      </el-icon>
-    </template>
     <template #description>
       <div class="margin_t-20" v-if="text">{{ text }}</div>
     </template>
@@ -18,10 +12,6 @@ import { VideoCamera } from '@element-plus/icons-vue'
 import Logo from '@/assets/images/logo.png'
 
 const props = defineProps({
-  icon: {
-    type: String,
-    default: () => ''
-  },
   text: {
     type: String,
     default: () => ''
@@ -31,14 +21,6 @@ const props = defineProps({
     default: () => false
   }
 })
-
-const component = computed(() => {
-  if (props.icon === 'VideoCamera') {
-    return VideoCamera
-  }
-  return null
-})
-
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/stores/modules/media.js b/src/stores/modules/media.js
@@ -35,8 +35,10 @@ const candidateHandler = (connection) => {
     if (connection.localDescription) {
       return resolve(connection.localDescription)
     }
+    let localDescription = null
     connection.onicecandidate = ({ candidate }) => {
-      if (!candidate) {
+      if (!localDescription) {
+        localDescription = connection.localDescription
         resolve(connection.localDescription)
       }
     }
@@ -70,6 +72,7 @@ export const useMediaStore = defineStore('media', {
     // ontrack 事件
     ontrack: (event) => {
       const video = document.getElementById('video')
+      console.log(video);
       video.srcObject = event.streams[0];
       video.play()
       console.log('ontrack', event);
@@ -198,6 +201,8 @@ export const useMediaStore = defineStore('media', {
         channelHandler(this)
       }
 
+      console.log(1233);
+
       this.connection.setRemoteDescription(description)
 
       const answer = await this.connection.createAnswer()

diff --git a/src/views/conversation/components/conversation-card/index.vue b/src/views/conversation/components/conversation-card/index.vue
@@ -10,7 +10,7 @@
       <template #content>
         <div class="flex_a_i-center">
           <div class="flex-item_f-1 ellipse">{{ message }}</div>
-          <MessageSendStatus :message="conversation.message"></MessageSendStatus>
+          <MessageSendStatus :message="conversation.message" v-if="conversation.message"></MessageSendStatus>
         </div>
       </template>
     </Card>

diff --git a/src/views/layout/components/media-dialog/index.vue b/src/views/layout/components/media-dialog/index.vue
@@ -12,9 +12,9 @@
       <UserBox v-if="!showVideo" :avatar="active.avatar" :name="active.name"></UserBox>
       <Status v-if="!showVideo" :active="active"></Status>
       <Operation class="opreation margin_b-10" :active="active"></Operation>
-      <video id="video"></video>
+      <video id="video" v-show="showVideo"></video>
       <div v-if="showVideo" class="video-empty">
-        <Empty icon="VideoCamera"></Empty>
+        <Empty></Empty>
       </div>
     </div>
   </el-dialog>
@@ -70,6 +70,9 @@ onMounted(async () => {
     #video {
       z-index: 1;
     }
+    .video-empty {
+      bottom: 10%;
+    }
   }
 }
 </style>