@tencentcloud/roomkit-electron-vue3 2.4.2 → 2.5.0

package/lib/components/ManageMember/useIndexHooks.js

@@ -10,6 +10,8 @@ const TUIRoomEngine = require("@tencentcloud/tuiroom-engine-electron");
 const Message = require("../common/base/Message/Message.js");
 const message = require("../../constants/message.js");
 const environment = require("../../utils/environment.js");
+const AllMembersShareScreenIcon = require("../common/icons/AllMembersShareScreenIcon.vue.js");
+const HostShareScreenIcon = require("../common/icons/HostShareScreenIcon.vue.js");
 function useIndex() {
   const roomEngine = useRoomEngine.default();
   const { t } = index.useI18n();
@@ -19,10 +21,18 @@ function useIndex() {
     userList,
     anchorUserList,
     applyToAnchorList,
-    isOnStateTabActive
+    isOnStateTabActive,
+    generalUserScreenStreamList
   } = pinia.storeToRefs(roomStore);
+  let ManageControlType;
+  ((ManageControlType2) => {
+    ManageControlType2["AUDIO"] = "audio";
+    ManageControlType2["VIDEO"] = "video";
+    ManageControlType2["SCREEN"] = "screen";
+  })(ManageControlType || (ManageControlType = {}));
   const audienceUserList = Vue.computed(() => userList.value.filter((user) => !anchorUserList.value.includes(user)));
   const searchText = Vue.ref("");
+  const showMoreControl = Vue.ref(false);
   function handleToggleStaged() {
     isOnStateTabActive.value = !isOnStateTabActive.value;
     roomStore.setOnStageTabStatus(isOnStateTabActive.value);
@@ -38,8 +48,8 @@ function useIndex() {
       return list;
     }
     return list.filter((item) => {
-      var _a;
-      return ((_a = item.userName) == null ? void 0 : _a.includes(searchText.value)) || item.userId.includes(searchText.value);
+      var _a, _b;
+      return ((_a = item.nameCard) == null ? void 0 : _a.includes(searchText.value)) || ((_b = item.userName) == null ? void 0 : _b.includes(searchText.value)) || item.userId.includes(searchText.value);
     });
   });
   const alreadyStaged = Vue.computed(() => `${t("Already on stage")} (${anchorUserList.value.length})`);
@@ -49,26 +59,31 @@ function useIndex() {
   }
   const audioManageInfo = Vue.computed(() => roomStore.isMicrophoneDisableForAllUser ? t("Lift all mute") : t("All mute"));
   const videoManageInfo = Vue.computed(() => roomStore.isCameraDisableForAllUser ? t("Lift stop all video") : t("All stop video"));
+  const moreControlList = Vue.computed(() => [
+    {
+      title: roomStore.isScreenShareDisableForAllUser ? t("All members can share screen") : t("Screen sharing for host/admin only"),
+      icon: roomStore.isScreenShareDisableForAllUser ? AllMembersShareScreenIcon.default : HostShareScreenIcon.default,
+      func: toggleManageAllMember,
+      type: "screen"
+      /* SCREEN */
+    }
+  ]);
   const showManageAllUserDialog = Vue.ref(false);
   const dialogContent = Vue.ref("");
   const dialogTitle = Vue.ref("");
   const dialogActionInfo = Vue.ref("");
   let stateForAllAudio = false;
   let stateForAllVideo = false;
-  let ManageControlType;
-  ((ManageControlType2) => {
-    ManageControlType2["AUDIO"] = "audio";
-    ManageControlType2["VIDEO"] = "video";
-  })(ManageControlType || (ManageControlType = {}));
+  let stateForScreenShare = false;
   const currentControlType = Vue.ref(
     "audio"
     /* AUDIO */
   );
   async function toggleManageAllMember(type) {
-    showManageAllUserDialog.value = true;
     currentControlType.value = type;
     switch (type) {
       case "audio":
+        showManageAllUserDialog.value = true;
         dialogTitle.value = roomStore.isMicrophoneDisableForAllUser ? t("Enable all audios") : t("All current and new members will be muted");
         dialogContent.value = roomStore.isMicrophoneDisableForAllUser ? t("After unlocking, users can freely turn on the microphone") : t("Members will not be able to open the microphone");
         stateForAllAudio = !roomStore.isMicrophoneDisableForAllUser;
@@ -76,15 +91,27 @@ function useIndex() {
         dialogActionInfo.value = audioManageInfo.value;
         break;
       case "video":
+        showManageAllUserDialog.value = true;
         dialogTitle.value = roomStore.isCameraDisableForAllUser ? t("Enable all videos") : t("All and new members will be banned from the camera");
         dialogContent.value = roomStore.isCameraDisableForAllUser ? t("After unlocking, users can freely turn on the camera") : t("Members will not be able to open the camera");
         stateForAllVideo = !roomStore.isCameraDisableForAllUser;
         await Vue.nextTick();
         dialogActionInfo.value = videoManageInfo.value;
         break;
+      case "screen":
+        stateForScreenShare = !roomStore.isScreenShareDisableForAllUser;
+        if (generalUserScreenStreamList.value.length === 0) {
+          toggleAllScreenShare();
+          break;
+        }
+        showManageAllUserDialog.value = true;
+        dialogTitle.value = t("Is it turned on that only the host/admin can share the screen?");
+        dialogContent.value = t("Other member is sharing the screen is now, the member's sharing will be terminated after you turning on");
+        break;
     }
   }
   async function doToggleManageAllMember() {
+    var _a;
     switch (currentControlType.value) {
       case "audio":
         toggleAllAudio();
@@ -92,9 +119,25 @@ function useIndex() {
       case "video":
         toggleAllVideo();
         break;
+      case "screen":
+        await ((_a = roomEngine.instance) == null ? void 0 : _a.closeRemoteDeviceByAdmin({
+          userId: generalUserScreenStreamList.value[0].userId,
+          device: TUIRoomEngine.TUIMediaDevice.kScreen
+        }));
+        toggleAllScreenShare();
+        break;
     }
     showManageAllUserDialog.value = false;
   }
+  async function toggleAllScreenShare() {
+    var _a;
+    await ((_a = roomEngine.instance) == null ? void 0 : _a.disableDeviceForAllUserByAdmin({
+      isDisable: stateForScreenShare,
+      device: TUIRoomEngine.TUIMediaDevice.kScreen
+    }));
+    roomStore.setDisableScreenShareForAllUserByAdmin(stateForScreenShare);
+    showMoreControl.value = false;
+  }
   function showApplyUserList() {
     if (environment.isMobile) {
       basicStore.setSidebarOpenStatus(true);
@@ -118,7 +161,7 @@ function useIndex() {
       isDisable: stateForAllAudio,
       device: TUIRoomEngine.TUIMediaDevice.kMicrophone
     }));
-    roomStore.setMicrophoneDisableState(stateForAllAudio);
+    roomStore.setDisableMicrophoneForAllUserByAdmin(stateForAllAudio);
   }
   async function toggleAllVideo() {
     var _a;
@@ -135,17 +178,20 @@ function useIndex() {
       isDisable: stateForAllVideo,
       device: TUIRoomEngine.TUIMediaDevice.kCamera
     }));
-    roomStore.setCameraDisableState(stateForAllVideo);
+    roomStore.setDisableCameraForAllUserByAdmin(stateForAllVideo);
   }
   const applyToAnchorUserContent = Vue.computed(() => {
-    var _a, _b;
+    var _a, _b, _c;
     const lastIndex = applyToAnchorList.value.length - 1;
-    const userName = ((_a = applyToAnchorList.value[lastIndex]) == null ? void 0 : _a.userName) || ((_b = applyToAnchorList.value[lastIndex]) == null ? void 0 : _b.userId);
+    const userName = ((_a = applyToAnchorList.value[lastIndex]) == null ? void 0 : _a.nameCard) || ((_b = applyToAnchorList.value[lastIndex]) == null ? void 0 : _b.userName) || ((_c = applyToAnchorList.value[lastIndex]) == null ? void 0 : _c.userId);
     if (applyToAnchorList.value.length === 1) {
       return `${userName} ${t("Applying for the stage")}`;
     }
     return `${userName} ${t("and so on number people applying to stage", { number: applyToAnchorList.value.length })}`;
   });
+  function toggleClickMoreBtn() {
+    showMoreControl.value = !showMoreControl.value;
+  }
   return {
     showApplyUserList,
     searchText,
@@ -165,7 +211,10 @@ function useIndex() {
     filteredUserList,
     isOnStateTabActive,
     handleToggleStaged,
-    applyToAnchorUserContent
+    applyToAnchorUserContent,
+    toggleClickMoreBtn,
+    showMoreControl,
+    moreControlList
   };
 }
 exports.default = useIndex;

package/lib/components/RoomContent/StreamContainer/index.vue.js

@@ -3,5 +3,5 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const index_vue_vue_type_script_setup_true_lang = require("./index.vue2.js");
 require("./index.vue3.js");
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
-const StreamContainer = /* @__PURE__ */ _pluginVue_exportHelper.default(index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-d8433998"]]);
+const StreamContainer = /* @__PURE__ */ _pluginVue_exportHelper.default(index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-06523284"]]);
 exports.default = StreamContainer;

package/lib/components/RoomContent/StreamContainer/index.vue2.js

@@ -7,9 +7,10 @@ const basic = require("../../../stores/basic.js");
 const render = require("../../../constants/render.js");
 const index = require("../StreamRegion/index.vue.js");
 const Message = require("../../common/base/Message/Message.js");
+const index$1 = require("../../common/base/MessageBox/index.js");
 const message = require("../../../constants/message.js");
 const utils = require("../../../utils/utils.js");
-const index$1 = require("../../../utils/common/logger/index.js");
+const index$2 = require("../../../utils/common/logger/index.js");
 const ArrowStroke = require("../../common/ArrowStroke.vue.js");
 const SvgIcon = require("../../common/base/SvgIcon.vue.js");
 const ArrowStrokeTurnPageIcon = require("../../common/icons/ArrowStrokeTurnPageIcon.vue.js");
@@ -348,10 +349,10 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
           roomStore.setCanControlSelfVideo(!roomStore.isCameraDisableForAllUser);
         }
         if (streamType === TUIRoomEngine.TUIVideoStreamType.kScreenStream) {
-          Message.default({
-            type: "warning",
-            message: t("The host has turned off your screen sharing"),
-            duration: message.MESSAGE_DURATION.NORMAL
+          index$1.default({
+            title: t("Your screen sharing has been stopped"),
+            message: t("Your screen sharing has been stopped, Now only the host/admin can share the screen"),
+            confirmButtonText: t("I got it")
           });
         }
       }
@@ -371,7 +372,7 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
           if (userId !== basicStore.userId) {
             roomStore.setHasOtherScreenShare(false);
           }
-          index$1.default.debug(`${logPrefix} onUserVideoStateChanged: stop`, userId, streamType);
+          index$2.default.debug(`${logPrefix} onUserVideoStateChanged: stop`, userId, streamType);
           (_b = roomEngine.instance) == null ? void 0 : _b.stopPlayRemoteVideo({
             userId,
             streamType
@@ -405,8 +406,8 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
       }
     };
     const handleStreamContainerScroll = async () => {
-      const childDom = streamListRef.value.children[0];
       await Vue.nextTick();
+      const childDom = streamListRef.value.children[0];
       let index2 = 0;
       let finalIndex = 0;
       let number = 0;
@@ -502,8 +503,8 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
                 "enlarge-dom-id": enlargeDomId.value,
                 class: "single-stream",
                 style: Vue.normalizeStyle(streamStyle.value),
-                onRoom_dblclick: ($event) => handleEnlargeStreamRegion(stream)
-              }, null, 8, ["stream", "enlarge-dom-id", "style", "onRoom_dblclick"])), [
+                onRoomDblclick: ($event) => handleEnlargeStreamRegion(stream)
+              }, null, 8, ["stream", "enlarge-dom-id", "style", "onRoomDblclick"])), [
                 [Vue.vShow, showStreamList.value.indexOf(stream) > -1]
               ]);
             }), 128))

package/lib/components/RoomContent/StreamContainer/useStreamContainerHooks.d.ts

@@ -1,6 +1,10 @@
 import { TUIChangeReason, TUIUserInfo } from '@tencentcloud/tuiroom-engine-electron';
+import { StreamInfo } from '../../../stores/room';
+import { Ref } from 'vue';
 
 export default function useStreamContainer(): {
+    currentRemoteSpeakerUserId: Ref<string>;
+    currentSpeakerUserId: Ref<string>;
     onRemoteUserEnterRoom: (eventInfo: {
         userInfo: TUIUserInfo;
     }) => void;
@@ -17,5 +21,9 @@ export default function useStreamContainer(): {
         hasAudio: boolean;
         reason: TUIChangeReason;
     }) => void;
+    onUserVoiceVolumeChanged: (eventInfo: {
+        userVolumeList: any[];
+    }) => void;
+    isSameStream: (stream1: StreamInfo | null, stream2: StreamInfo | null) => boolean;
     t: any;
 };

package/lib/components/RoomContent/StreamContainer/useStreamContainerHooks.js

@@ -10,16 +10,20 @@ const basic = require("../../../stores/basic.js");
 const message = require("../../../constants/message.js");
 const pinia = require("pinia");
 const environment = require("../../../utils/environment.js");
-const index$1 = require("../../../utils/common/logger/index.js");
 const room$1 = require("../../../constants/room.js");
 const useDeviceManager = require("../../../hooks/useDeviceManager.js");
-const logPrefix = "[StreamContainer]";
+const utils = require("../../../utils/utils.js");
+const render = require("../../../constants/render.js");
 function useStreamContainer() {
   const roomEngine = useRoomEngine.default();
   const basicStore = basic.useBasicStore();
   const roomStore = room.useRoomStore();
+  const { layout } = pinia.storeToRefs(basicStore);
+  const { localStream } = pinia.storeToRefs(roomStore);
   const { t } = index.useI18n();
   const { deviceManager } = useDeviceManager.default();
+  const currentRemoteSpeakerUserId = Vue.ref("");
+  const currentSpeakerUserId = Vue.ref("");
   const onRemoteUserEnterRoom = (eventInfo) => {
     roomStore.addRemoteUser(eventInfo.userInfo);
   };
@@ -42,53 +46,88 @@ function useStreamContainer() {
       roomStore.setCanControlSelfAudio(!roomStore.isMicrophoneDisableForAllUser);
     }
   };
+  function handleUserVoiceVolume(userVolumeList) {
+    const localUserVolume = {
+      userId: basicStore.userId,
+      volume: 0
+    };
+    const largestRemoteUserVolume = {
+      userId: "",
+      volume: 0
+    };
+    userVolumeList.forEach((item) => {
+      var _a;
+      if (item.userId === basicStore.userId && localStream.value.hasAudioStream) {
+        localUserVolume.volume = item.volume;
+      } else if (item.userId !== basicStore.userId && ((_a = roomStore.remoteUserObj[item.userId]) == null ? void 0 : _a.hasAudioStream)) {
+        const { userId, volume } = item;
+        if (volume > largestRemoteUserVolume.volume) {
+          largestRemoteUserVolume.userId = userId;
+          largestRemoteUserVolume.volume = volume;
+        }
+      }
+    });
+    const largestUserVolume = localUserVolume.volume > largestRemoteUserVolume.volume ? localUserVolume : largestRemoteUserVolume;
+    if (currentRemoteSpeakerUserId.value) {
+      const lastRemoteSpeakerUserVolumeInfo = userVolumeList.find((item) => item.userId === currentRemoteSpeakerUserId.value);
+      if (!lastRemoteSpeakerUserVolumeInfo || lastRemoteSpeakerUserVolumeInfo.volume === 0) {
+        if (largestRemoteUserVolume.volume > 0) {
+          currentRemoteSpeakerUserId.value = largestRemoteUserVolume.userId;
+        }
+      }
+    } else {
+      if (largestRemoteUserVolume.volume > 0) {
+        currentRemoteSpeakerUserId.value = largestRemoteUserVolume.userId;
+      }
+    }
+    if (currentSpeakerUserId.value) {
+      const lastSpeakerUserVolumeInfo = userVolumeList.find((item) => item.userId === currentSpeakerUserId.value);
+      if (!lastSpeakerUserVolumeInfo || lastSpeakerUserVolumeInfo.volume === 0) {
+        if (largestUserVolume.volume > 0) {
+          currentSpeakerUserId.value = largestUserVolume.userId;
+        }
+      }
+    } else {
+      if (largestUserVolume.volume > 0) {
+        currentSpeakerUserId.value = largestUserVolume.userId;
+      }
+    }
+  }
+  const handleUserVoiceVolumeThrottle = utils.throttle(handleUserVoiceVolume, 1e3);
+  const onUserVoiceVolumeChanged = (eventInfo) => {
+    const { userVolumeList } = eventInfo;
+    if (layout.value === render.LAYOUT.LARGE_SMALL_WINDOW) {
+      handleUserVoiceVolumeThrottle(userVolumeList);
+    }
+  };
   const {
     isDefaultOpenCamera,
     isDefaultOpenMicrophone
   } = pinia.storeToRefs(roomStore);
   Vue.watch(isDefaultOpenCamera, async (val) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f;
     if (val) {
       if (environment.isWeChat) {
-        await ((_a = roomEngine.instance) == null ? void 0 : _a.setLocalVideoView({
-          view: `${roomStore.localStream.userId}_${roomStore.localStream.streamType}`
-        }));
-        await ((_b = roomEngine.instance) == null ? void 0 : _b.openLocalCamera({ isFrontCamera: basicStore.isFrontCamera }));
+        await ((_a = roomEngine.instance) == null ? void 0 : _a.openLocalCamera({ isFrontCamera: basicStore.isFrontCamera }));
       } else if (environment.isMobile) {
-        const previewDom = document == null ? void 0 : document.getElementById(`${roomStore.localStream.userId}_${roomStore.localStream.streamType}`);
-        if (!previewDom) {
-          index$1.default.error(`${logPrefix}watch isDefaultOpenCamera:`, isDefaultOpenCamera, previewDom);
-          return;
-        }
-        await ((_c = roomEngine.instance) == null ? void 0 : _c.setLocalVideoView({
-          view: `${roomStore.localStream.userId}_${roomStore.localStream.streamType}`
-        }));
-        const trtcCloud = (_d = roomEngine.instance) == null ? void 0 : _d.getTRTCCloud();
+        const trtcCloud = (_b = roomEngine.instance) == null ? void 0 : _b.getTRTCCloud();
         trtcCloud == null ? void 0 : trtcCloud.enableSmallVideoStream(false, room$1.SMALL_VIDEO_ENC_PARAM);
-        await ((_e = roomEngine.instance) == null ? void 0 : _e.openLocalCamera({ isFrontCamera: basicStore.isFrontCamera }));
+        await ((_c = roomEngine.instance) == null ? void 0 : _c.openLocalCamera({ isFrontCamera: basicStore.isFrontCamera }));
         return;
       } else {
-        const previewDom = document == null ? void 0 : document.getElementById(`${roomStore.localStream.userId}_${roomStore.localStream.streamType}`);
-        if (!previewDom) {
-          index$1.default.error(`${logPrefix}watch isDefaultOpenCamera:`, isDefaultOpenCamera, previewDom);
-          return;
-        }
         if (!roomStore.currentCameraId) {
-          const cameraList = await ((_f = deviceManager.instance) == null ? void 0 : _f.getDevicesList({
+          const cameraList = await ((_d = deviceManager.instance) == null ? void 0 : _d.getDevicesList({
             type: TUIRoomEngine.TUIMediaDeviceType.kMediaDeviceTypeVideoCamera
           }));
           if (cameraList && cameraList.length > 0) {
             roomStore.setCurrentCameraId(cameraList[0].deviceId);
           }
         }
-        await ((_g = deviceManager.instance) == null ? void 0 : _g.setCurrentDevice({
+        await ((_e = deviceManager.instance) == null ? void 0 : _e.setCurrentDevice({
           type: TUIRoomEngine.TUIMediaDeviceType.kMediaDeviceTypeVideoCamera,
           deviceId: roomStore.currentCameraId
         }));
-        await ((_h = roomEngine.instance) == null ? void 0 : _h.setLocalVideoView({
-          view: `${roomStore.localStream.userId}_${roomStore.localStream.streamType}`
-        }));
-        await ((_i = roomEngine.instance) == null ? void 0 : _i.openLocalCamera());
+        await ((_f = roomEngine.instance) == null ? void 0 : _f.openLocalCamera());
       }
     }
   }, { immediate: true });
@@ -117,11 +156,16 @@ function useStreamContainer() {
       await ((_f = roomEngine.instance) == null ? void 0 : _f.muteLocalAudio());
     }
   }, { immediate: true });
+  const isSameStream = (stream1, stream2) => `${stream1 == null ? void 0 : stream1.userId}_${stream1 == null ? void 0 : stream1.streamType}` === `${stream2 == null ? void 0 : stream2.userId}_${stream2 == null ? void 0 : stream2.streamType}`;
   return {
+    currentRemoteSpeakerUserId,
+    currentSpeakerUserId,
     onRemoteUserEnterRoom,
     onRemoteUserLeaveRoom,
     onSeatListChanged,
     onUserAudioStateChanged,
+    onUserVoiceVolumeChanged,
+    isSameStream,
     t
   };
 }

package/lib/components/RoomContent/StreamRegion/index.vue.d.ts

@@ -5,7 +5,11 @@ interface Props {
     enlargeDomId?: string;
     changeLargeStream?: boolean;
 }
-declare const _default: import('vue').DefineComponent<__VLS_TypePropsToRuntimeProps<Props>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToRuntimeProps<Props>>>, {}, {}>;
+declare const _default: import('vue').DefineComponent<__VLS_TypePropsToRuntimeProps<Props>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    "room-dblclick": (...args: any[]) => void;
+}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToRuntimeProps<Props>>> & {
+    "onRoom-dblclick"?: ((...args: any[]) => any) | undefined;
+}, {}, {}>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToRuntimeProps<T> = {

package/lib/components/RoomContent/StreamRegion/index.vue.js

@@ -3,5 +3,5 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const index_vue_vue_type_script_setup_true_lang = require("./index.vue2.js");
 require("./index.vue3.js");
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
-const StreamRegion = /* @__PURE__ */ _pluginVue_exportHelper.default(index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-f3b29630"]]);
+const StreamRegion = /* @__PURE__ */ _pluginVue_exportHelper.default(index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-d119ad48"]]);
 exports.default = StreamRegion;

package/lib/components/RoomContent/StreamRegion/index.vue2.js

@@ -31,6 +31,7 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
     enlargeDomId: {},
     changeLargeStream: { type: Boolean }
   },
+  emits: ["room-dblclick"],
   setup(__props) {
     const roomEngine = useRoomEngine.default();
     const basicStore = basic.useBasicStore();
@@ -55,10 +56,33 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
     const isScreenStream = Vue.computed(() => props.stream.streamType === TUIRoomEngine.TUIVideoStreamType.kScreenStream);
     const userInfo = Vue.computed(() => {
       if (constants.isInnerScene) {
-        return `${props.stream.userName} | ${props.stream.userId}` || props.stream.userId;
+        return `${props.stream.nameCard || props.stream.userName} | ${props.stream.userId}`;
       }
-      return props.stream.userName || props.stream.userId;
+      return props.stream.nameCard || props.stream.userName || props.stream.userId;
     });
+    Vue.watch(
+      () => props.stream.hasVideoStream,
+      async (val) => {
+        var _a, _b;
+        if (props.stream.userId === basicStore.userId && props.stream.streamType === TUIRoomEngine.TUIVideoStreamType.kCameraStream) {
+          if (val) {
+            await Vue.nextTick();
+            const userIdEl = document == null ? void 0 : document.getElementById(`${playRegionDomId.value}`);
+            if (userIdEl) {
+              index$1.default.debug(`${logPrefix}watch isVideoStreamAvailable:`, props.stream.userId, userIdEl);
+              await ((_a = roomEngine.instance) == null ? void 0 : _a.setLocalVideoView({
+                view: `${playRegionDomId.value}`
+              }));
+            }
+          } else {
+            await ((_b = roomEngine.instance) == null ? void 0 : _b.setLocalVideoView({
+              view: null
+            }));
+          }
+        }
+      },
+      { immediate: true }
+    );
     const streamTypeToFetch = Vue.computed(() => {
       const { streamType, userId } = props.stream;
       const { kScreenStream, kCameraStream } = TUIRoomEngine.TUIVideoStreamType;
@@ -168,7 +192,7 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
         ref_key: "streamRegionRef",
         ref: streamRegionRef,
         class: "user-stream-container",
-        onDblclick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("room_dblclick"))
+        onDblclick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("room-dblclick"))
       }, [
         isLocalScreen.value ? (Vue.openBlock(), Vue.createBlock(index$2.default, {
           key: 0,

package/lib/components/RoomFooter/ApplyControl/MasterApplyControl/index.vue.js

@@ -3,5 +3,5 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const index_vue_vue_type_script_setup_true_lang = require("./index.vue2.js");
 require("./index.vue3.js");
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
-const MasterApplyControl = /* @__PURE__ */ _pluginVue_exportHelper.default(index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-5e2dbb41"]]);
+const MasterApplyControl = /* @__PURE__ */ _pluginVue_exportHelper.default(index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-1d9fb310"]]);
 exports.default = MasterApplyControl;

package/lib/components/RoomFooter/ApplyControl/MasterApplyControl/index.vue2.js

@@ -7,6 +7,12 @@ const Avatar = require("../../../common/Avatar.vue.js");
 const index = require("../../../common/base/Dialog/index.vue.js");
 const SvgIcon = require("../../../common/base/SvgIcon.vue.js");
 const Button = require("../../../common/base/Button.vue.js");
+require("../../../../services/main.js");
+const roomService = require("../../../../services/roomService.js");
+require("../../../../locales/index.js");
+require("@tencentcloud/tuiroom-engine-electron");
+require("mitt");
+require("../../../../services/manager/roomActionManager.js");
 const _hoisted_1 = {
   key: 0,
   class: "apply-list"
@@ -88,8 +94,8 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
                     }, null, 8, ["img-src"]),
                     Vue.createElementVNode("span", {
                       class: "user-name",
-                      title: item.userName || item.userId
-                    }, Vue.toDisplayString(item.userName || item.userId), 9, _hoisted_6)
+                      title: Vue.unref(roomService.roomService).getDisplayName(item)
+                    }, Vue.toDisplayString(Vue.unref(roomService.roomService).getDisplayName(item)), 9, _hoisted_6)
                   ]),
                   Vue.createElementVNode("div", _hoisted_7, [
                     Vue.createVNode(Button.default, {

package/lib/components/RoomFooter/EndControl/index.vue.js

@@ -3,5 +3,5 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const index_vue_vue_type_script_setup_true_lang = require("./index.vue2.js");
 require("./index.vue3.js");
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
-const EndControl = /* @__PURE__ */ _pluginVue_exportHelper.default(index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-8a854972"]]);
+const EndControl = /* @__PURE__ */ _pluginVue_exportHelper.default(index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-288c67ea"]]);
 exports.default = EndControl;

package/lib/components/RoomFooter/EndControl/index.vue2.js

@@ -191,7 +191,7 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
                       return Vue.openBlock(), Vue.createBlock(Option.default, {
                         key: user.userId,
                         value: user.userId,
-                        label: user.userName,
+                        label: user.nameCard || user.userName,
                         theme: "white"
                       }, null, 8, ["value", "label"]);
                     }), 128))

package/lib/components/RoomFooter/EndControl/useEndControlHooks.js

@@ -10,6 +10,10 @@ const useRoomEngine = require("../../../hooks/useRoomEngine.js");
 const TUIRoomEngine = require("@tencentcloud/tuiroom-engine-electron");
 const index$1 = require("../../../utils/common/logger/index.js");
 const Message = require("../../common/base/Message/Message.js");
+require("../../../services/main.js");
+const roomService = require("../../../services/roomService.js");
+require("mitt");
+require("../../../services/manager/roomActionManager.js");
 function useEndControl() {
   const { t } = index.useI18n();
   let DialogType;
@@ -37,8 +41,8 @@ function useEndControl() {
   const showTransfer = Vue.ref(false);
   const searchName = Vue.ref("");
   const filteredList = Vue.computed(() => remoteUserList.value.filter((searchUser) => {
-    var _a;
-    return searchUser.userId.includes(searchName.value) || ((_a = searchUser.userName) == null ? void 0 : _a.includes(searchName.value));
+    var _a, _b;
+    return ((_a = searchUser.nameCard) == null ? void 0 : _a.includes(searchName.value)) || searchUser.userId.includes(searchName.value) || ((_b = searchUser.userName) == null ? void 0 : _b.includes(searchName.value));
   }));
   const hasNoData = Vue.computed(() => filteredList.value.length === 0);
   const isMasterWithOneRemoteUser = Vue.computed(() => remoteUserList.value.length === 1);
@@ -162,9 +166,17 @@ function useEndControl() {
     var _a;
     (_a = roomEngine.instance) == null ? void 0 : _a.on(TUIRoomEngine.TUIRoomEvents.onUserRoleChanged, onUserRoleChanged);
   });
+  const handleMount = () => {
+    const { userRole } = roomService.roomService.roomStore.localUser;
+    if (userRole === TUIRoomEngine.TUIRole.kRoomOwner || userRole === TUIRoomEngine.TUIRole.kAdministrator) {
+      handleUpdateSeatApplicationList();
+    }
+  };
+  roomService.roomService.lifeCycleManager.on("mount", handleMount);
   Vue.onUnmounted(() => {
     var _a;
     (_a = roomEngine.instance) == null ? void 0 : _a.off(TUIRoomEngine.TUIRoomEvents.onUserRoleChanged, onUserRoleChanged);
+    roomService.roomService.lifeCycleManager.off("mount", handleMount);
   });
   return {
     t,

package/lib/components/RoomFooter/ScreenShareControl/Index.vue.js

@@ -3,5 +3,5 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const Index_vue_vue_type_script_setup_true_lang = require("./Index.vue2.js");
 require("./Index.vue3.js");
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
-const ScreenShareControl = /* @__PURE__ */ _pluginVue_exportHelper.default(Index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-2dd9ae04"]]);
+const ScreenShareControl = /* @__PURE__ */ _pluginVue_exportHelper.default(Index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-9e5b6506"]]);
 exports.default = ScreenShareControl;

package/lib/components/RoomFooter/ScreenShareControl/Index.vue2.js

@@ -23,7 +23,7 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
   setup(__props) {
     const { t } = index.useI18n();
     const roomStore = room.useRoomStore();
-    const { isAudience, hasOtherScreenShare } = pinia.storeToRefs(roomStore);
+    const { isAudience, hasOtherScreenShare, isGeneralUser, isScreenShareDisableForAllUser } = pinia.storeToRefs(roomStore);
     const roomEngine = useRoomEngine.default();
     const btnStopRef = Vue.ref();
     const isSharing = Vue.ref(false);
@@ -56,6 +56,14 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
         });
         return;
       }
+      if (isGeneralUser.value && isScreenShareDisableForAllUser.value) {
+        Message.default({
+          type: "warning",
+          message: t("Failed to initiate screen sharing, currently only host/admin can share screen."),
+          duration: message.MESSAGE_DURATION.LONG
+        });
+        return;
+      }
       if (!window.isHasScreen && process.platform === "darwin") {
         showPermissionVisible.value = true;
       }

package/lib/components/RoomFooter/VideoControl.vue.js

@@ -3,5 +3,5 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const VideoControl_vue_vue_type_script_setup_true_lang = require("./VideoControl.vue2.js");
 require("./VideoControl.vue3.js");
 const _pluginVue_exportHelper = require("../../_virtual/_plugin-vue_export-helper.js");
-const VideoControl = /* @__PURE__ */ _pluginVue_exportHelper.default(VideoControl_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-4da95364"]]);
+const VideoControl = /* @__PURE__ */ _pluginVue_exportHelper.default(VideoControl_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-5c3d6ed6"]]);
 exports.default = VideoControl;