mdm-client 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdm-client",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "private": false,
   "main": "index.js",
   "author": {

package/src/App.vue

@@ -66,7 +66,7 @@ export default {
       baseUrl: "https://10.2.12.103:8443",
       roomServerUrl: "wss://10.2.12.103:8443",
       token:
-        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJMb2dpbkluZm8iOnsibG9naW5Db2RlIjoibGl1amluYm8iLCJ1c2VyTmFtZSI6IuWImOmUpuazoiIsInRlbmFudElEIjo3OTA2MDE5OTgyNTAxMDAwLCJkZXB0VHJlZSI6Ijc5MDYwNzA4NTA5MDEwMDAvNzkwNzk1MzkyNjcwMTAwMCIsInVzZXJJRCI6NzkwNjI1NzUyOTgwMTAwMCwicm9sZUlEIjo3OTA2MDc0MzkyMDAxMDAwLCJ2ZXJzaW9uSUQiOjc5MDc5NDk3NjQyMDEwMDB9LCJwbGF0Zm9ybUlEIjowLCJwaG9uZSI6IiIsImV4cCI6MTc2MzIxNjUyNSwiaWF0IjoxNzYyNDk2NTI1fQ.FEGXEUhOfOC0nqKr9oaARnbzrqhGW8iE7WixaapiXXE",
+        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJMb2dpbkluZm8iOnsibG9naW5Db2RlIjoibGl1amluYm8iLCJ1c2VyTmFtZSI6IuWImOmUpuazoiIsInRlbmFudElEIjo3OTA2MDE5OTgyNTAxMDAwLCJkZXB0VHJlZSI6Ijc5MDYwNzA4NTA5MDEwMDAvNzkwNzk1MzkyNjcwMTAwMCIsInVzZXJJRCI6NzkwNjI1NzUyOTgwMTAwMCwicm9sZUlEIjo3OTA2MDc0MzkyMDAxMDAwLCJ2ZXJzaW9uSUQiOjc5MDc5NDk3NjQyMDEwMDB9LCJwbGF0Zm9ybUlEIjowLCJwaG9uZSI6IiIsImV4cCI6MTc2NDA5MzM3MCwiaWF0IjoxNzYzMzczMzcwfQ.sWfU8eZPDc05YIgstuI40C-lDvXZq3G30b-j9qAxWGg",
       liveClient: null,
       showMessage: null,
     };

package/src/components/LiveMultipleMeeting/LiveMultipleMeeting.vue

@@ -792,6 +792,33 @@ export default {
         });
       },
     },
+    meetingNum: {
+      handler(newVal) {
+        if (!newVal) return
+        try {
+          const key = `lk:ss_prefs:${newVal}`
+          const raw = sessionStorage.getItem(key)
+          if (!raw) return
+          const saved = JSON.parse(raw)
+          if (saved && typeof saved === 'object') {
+            if (saved.systemAudio === 'include' || saved.systemAudio === 'exclude') {
+              this.screenShareCaptureOption.systemAudio = saved.systemAudio
+            }
+            if (saved.resolution && typeof saved.resolution === 'object') {
+              const { width, height, frameRate } = saved.resolution
+              this.screenShareCaptureOption.resolution = {
+                width: width ?? 1920,
+                height: height ?? 1080,
+                frameRate: typeof frameRate === 'number' ? frameRate : 60,
+              }
+            }
+          }
+        } catch (err) {
+          // 忽略解析异常
+        }
+      },
+      immediate: true,
+    }
   },
   created() {
     this.showMessage = new ShowMessage();
@@ -2921,7 +2948,7 @@ export default {
           videoDiv.appendChild(signalElm);
 
           // 构建码率显示元素
-          let bitrateElm = document.getElementById(`bitrate-${identity}`)
+          let bitrateElm = document.getElementById(`bitrate-${videoItem.identity}`)
           if (!bitrateElm) {
             bitrateElm = document.createElement('div')
             bitrateElm.id = `bitrate-${videoItem.identity}`
@@ -3074,6 +3101,11 @@ export default {
         if (videoItem?.audioTrack) {
           videoItem.audioTrack.detach();
         }
+        if (videoItem?.screenShareAudioTrack) {
+          try {
+            videoItem.screenShareAudioTrack.detach()
+          } catch (e) {}
+        }
         return;
       }
       // 与会者屏幕共享布局切换
@@ -3136,6 +3168,32 @@ export default {
         if (videoItem?.audioTrack) {
           videoItem.audioTrack.attach(videoElm);
         }
+        // 屏幕共享系统音频：使用独立的隐藏 audio 元素，避免某些浏览器在多音轨时替换 video 的音频源
+        if (videoItem?.isScreenShareEnabled && videoItem?.screenShareAudioTrack) {
+          const audioHolderId = `screenshare-audio-${videoItem.identity}`
+          let audioHolder = document.getElementById(audioHolderId)
+          if (!audioHolder) {
+            audioHolder = document.createElement('audio')
+            audioHolder.id = audioHolderId
+            audioHolder.style.display = 'none'
+            audioHolder.setAttribute('playsinline', '')
+            audioHolder.autoplay = true
+            // 将隐藏audio元素插入到与会者容器，便于随与会者一起清理
+            videoDiv && videoDiv.appendChild(audioHolder)
+          }
+          try {
+            videoItem.screenShareAudioTrack.attach(audioHolder)
+          } catch (e) {
+            console.warn('屏幕共享系统音频附加失败', videoItem.identity, e)
+          }
+        } else {
+          // 如果当前不再共享屏幕，清理残留的隐藏 audio 元素
+          const orphanAudio = document.getElementById(`screenshare-audio-${videoItem.identity}`)
+          if (orphanAudio) {
+            try { videoItem.screenShareAudioTrack?.detach(orphanAudio) } catch (_) {}
+            orphanAudio.remove()
+          }
+        }
       }
       // 更新与会者名称
       let nameDom = document.getElementById(videoItem.identity);
@@ -4132,8 +4190,6 @@ export default {
       }
     },
     async chooseVideoDevice(e) {
-      this.dispatchLocalTrack('video')
-      await this.sleep(100)
       await this.changeActiveDevice("videoinput", e);
       this.videoSelectShow = false;
     },
@@ -4157,7 +4213,50 @@ export default {
       await this.liveClient.changeScreenShareStatus(this.screenShareCaptureOption);
     },
     screenShareOptionChange(e) {
-      console.log("屏幕共享设置变更", e);
+      if (!e) return
+      const { isFluencyPriority, systemAudioInclude } = e
+
+      // 1) 生效到当前响应式配置（将于下一次开始共享时使用；不对正在共享做自动重启）
+      this.screenShareCaptureOption.systemAudio = systemAudioInclude ? 'include' : 'exclude'
+      const targetFrameRate = isFluencyPriority ? 60 : 30
+      if (
+        !this.screenShareCaptureOption.resolution ||
+        typeof this.screenShareCaptureOption.resolution !== 'object'
+      ) {
+        this.screenShareCaptureOption.resolution = { width: 1920, height: 1080, frameRate: targetFrameRate }
+      } else {
+        this.screenShareCaptureOption.resolution.frameRate = targetFrameRate
+      }
+
+      // 2) 正在共享时尽量实时生效：
+      //    - 帧率：对现有轨道调用 applyConstraints(frameRate)
+      //    - 系统音频：单独发布/取消发布 ScreenShareAudio 轨道，避免影响视频轨道
+      // if (isScreenShareEnabled?.value) {
+      //   try {
+      //     const fr = screenShareCaptureOption?.resolution?.frameRate
+      //     if (typeof fr === 'number') {
+      //       await liveClient.updateScreenShareFrameRate(fr)
+      //     }
+      //   } catch (_) {}
+      //   try {
+      //     await liveClient.setScreenShareSystemAudio(systemAudioInclude)
+      //   } catch (_) {}
+      // }
+
+      // 3) 按会议号持久化（当前会话内保留，退出会议后不跨会保留）
+      const roomId = this.meetingNum
+      if (roomId) {
+        try {
+          const key = `lk:ss_prefs:${roomId}`
+          const toSave = {
+            systemAudio: this.screenShareCaptureOption.systemAudio,
+            resolution: { ...this.screenShareCaptureOption.resolution },
+          }
+          sessionStorage.setItem(key, JSON.stringify(toSave))
+        } catch (err) {
+          // 忽略持久化异常
+        }
+      }
     },
     stopScreenShare() {
       this.changeScreenShareStatus(this.screenShareCaptureOption);
@@ -5515,7 +5614,7 @@ export default {
         align-items: center;
         justify-content: space-between;
         position: absolute;
-        z-index: 2100;
+        z-index: 4100;
         bottom: -66px;
         left: 0;
         transition: all 0.2s ease;

package/src/components/LivePoint/LivePoint.vue

@@ -23,6 +23,7 @@
     <teleport to="body">
       <LivePointMeeting
         v-if="isMeetingDialogShow"
+        ref="livePointMeetingRef"
         :joinType="pointMeetingData.joinType"
         :meetingNum="pointMeetingData.meetingNum"
         :meetingType="pointMeetingData.meetingType"
@@ -36,9 +37,18 @@
         @miniLinkSend="miniLinkSend"
         @meetingStarted="isInMeeting = true"
         @meetingEnded="isInMeeting = false"
+        @pointMeetingMinum="openMiniVideoDialog"
       >
       </LivePointMeeting>
     </teleport>
+    <teleport to="body">
+      <minium-video-dialog
+        v-if="isMiniVideoDialogShow"
+        :trackData="trackData"
+        @resetMultiDialog="resetPointDialog"
+        @miniVideoDialogClose="closeMiniVideoDialog"
+      ></minium-video-dialog>
+    </teleport>
   </div>
 </template>
 
@@ -48,6 +58,7 @@ import { mittBus, ShowMessage } from "../../utils/index.js";
 import LiveCallBoard from "../LiveCallBoard/LiveCallBoard.vue";
 import LivePointMeeting from "../LivePointMeeting/LivePointMeeting.vue";
 import LiveInviteReceive from "../LiveInviteReceive/LiveInviteReceive.vue";
+import MiniumVideoDialog from "../MiniumVideoDialog/MiniumVideoDialog.vue";
 import Teleport from 'vue2-teleport'
 
 export default {
@@ -56,6 +67,7 @@ export default {
     LiveCallBoard,
     LivePointMeeting,
     LiveInviteReceive,
+    MiniumVideoDialog,
     Teleport
   },
   props: {
@@ -92,6 +104,8 @@ export default {
       isInMeeting: false,
       liveClient: null,
       showMessage: null,
+      isMiniVideoDialogShow: false,
+      trackData: {}
     };
   },
   computed: {
@@ -198,6 +212,17 @@ export default {
     meetingDialogClose() {
       this.isMeetingDialogShow = false;
     },
+    openMiniVideoDialog(e) {
+      this.trackData = e ?? {}
+      this.isMiniVideoDialogShow = true
+    },
+    resetPointDialog() {
+      this.isMiniVideoDialogShow = false
+      this.$refs.livePointMeetingRef && this.$refs.livePointMeetingRef.resetDialog()
+    },
+    closeMiniVideoDialog() {
+      this.isMiniVideoDialogShow = false
+    },
     handleLiveClientInitSuccess() {
       this.liveClient = window["liveClient"];
     }

package/src/components/LivePointMeeting/LivePointMeeting.vue

@@ -6,7 +6,9 @@
         <span>{{ meetingDuration }}</span>
       </div>
       <div class="top-group">
+        <div class="minimize-btn" @click="minumDialog"></div>
         <div class="full-screen-btn" @click="switchComponentFullScreen"></div>
+        <div class="close-btn" @click="confirmClose"></div>
       </div>
     </div>
     <div class="point-meeting-wrapper">
@@ -78,6 +80,7 @@
 
 <script>
 import { calculateTime, ShowMessage } from "../../utils/index.js";
+import { MessageBox } from "element-ui";
 
 export default {
   name: "LivePointMeeting",
@@ -591,13 +594,63 @@ export default {
     closeMeetingDialog() {
       this.$emit("meetingDialogClose");
     },
+    // 最小化窗口: 复用 multi 会议的最小化逻辑，向父组件抛出 pointMeetingMinum 事件
+    minumDialog() {
+      if (!this.isInMeeting) {
+        this.showMessage.message('error', '请先进入会议')
+        return
+      }
+      if (!this.localIdentity) {
+        this.showMessage.message('error', '获取本地与会者信息失败')
+        return
+      }
+      // 查找本地与会者渲染数据（视频或音频）
+      let localVideoTrack = null
+      if (this.liveClient?.roomMode === 'auto') {
+        const idx = this.participants.findIndex(item => item.identity === this.localIdentity)
+        if (idx > -1) {
+          localVideoTrack = this.participants[idx]?.videoTrack || null
+        }
+      }
+      // 通知父组件打开最小化窗口
+      this.$emit('pointMeetingMinum', {
+        identity: this.localIdentity,
+        name: this.localName,
+        videoTrack: this.liveClient?.roomMode === 'auto' ? localVideoTrack : null,
+      })
+      // 隐藏当前窗口（保持状态以便恢复）
+      this.$refs.rootElm && (this.$refs.rootElm.style.visibility = 'hidden')
+    },
+    // 还原窗口（供父组件调用）
+    resetDialog() {
+      this.$refs.rootElm && (this.$refs.rootElm.style.visibility = 'visible') 
+    },
     async leaveRoom() {
+      if (!this.isInMeeting) {
+        this.closeMeetingDialog();
+        return
+      }
       if (this.liveClient) {
         await this.liveClient.leaveRoom();
       }
       // 重置房间连接处理标志
       this.isRoomConnectedHandled = false;
     },
+    confirmClose() {
+      if(!this.isInMeeting) {
+        this.closeMeetingDialog();
+        return;
+      }
+      MessageBox.confirm('点击确定后会议将被解散，您确定要这么做么？', '警告', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+      }).then(() => {
+        this.leaveRoom();
+      }).catch(() => {
+        // 取消操作
+      });
+    },
     // 切换组件全屏状态
     async switchComponentFullScreen(e) {
       if (
@@ -1151,6 +1204,13 @@ export default {
       display: flex;
       align-items: center;
 
+      .minimize-btn {
+        cursor: pointer;
+        width: 16px;
+        height: 16px;
+        margin-right: 12px;
+        background: url('../../assets/image/screenBlue/meeting_slide_small_icon.png') no-repeat center / 100% 100%;
+      }
       .duration-icon {
         width: 15px;
         height: 15px;
@@ -1171,8 +1231,9 @@ export default {
 
       .close-btn {
         cursor: pointer;
-        width: 20px;
-        height: 20px;
+        width: 16px;
+        height: 16px;
+        margin-left: 12px;
         background: var(--close-icon) no-repeat center / 100% 100%;
       }
     }