fcr-ui-scene 3.7.1 → 3.7.3

package/lib/modules/layout/store.js

@@ -80,8 +80,9 @@ var _type6 = require("../../type");
 var _view = require("./view");
 var _logger = require("../../utilities/logger");
 var _env = require("agora-foundation/lib/utilities/env");
+var _type7 = require("../secondary-window/type");
 var _LayoutStore;
-var _initProto, _participantDecs, _init_participant, _chatDecs, _init_chat, _chatActionDecs, _init_chatAction, _stateBarDecs, _init_stateBar, _actionBarDecs, _init_actionBar, _layersDecs, _init_layers, _whiteboardDecs, _init_whiteboard, _annotationDecs, _init_annotation, _screenShareControlDecs, _init_screenShareControl, _init_collapsed, _init_aside, _init_barHovering, _init_barLocked, _init_barHidden, _init_asideWidth, _init_userVolumeMap, _init_chatRoomState, _init_whiteboardActive, _init_ownerUser, _addPinMessageDecs, _cancelPinMessageDecs, _setWhiteboardActiveDecs, _setAsideWidthDecs, _updateSlotsDecs, _toggleLayoutDecs, _toggleCollapsedDecs, _toggleAsideDecs, _asideWidthChangedDecs, _toggleLayoutBarLockDecs, _toggleLayoutBarHiddenDecs, _resetLockTimerDecs, _setHoveringHandlerDecs, _setHoveringLeaveHandlerDecs, _setScreenShareSpeakerViewSizeDecs, _handleLiveLayoutChangeDecs, _onUserInfoUpdatedDecs, _handleLayoutUpdatedDecs, _init__handleLayoutUpdated, _handleFoldListChangedDecs, _handleMainListLengthChangedDecs, _handleMainListChangedDecs, _setBarHoveringDecs, _handleConnectionUpdatedDecs, _onAudioVolumeUpdatedDecs, _ref;
+var _initProto, _participantDecs, _init_participant, _chatDecs, _init_chat, _chatActionDecs, _init_chatAction, _stateBarDecs, _init_stateBar, _actionBarDecs, _init_actionBar, _layersDecs, _init_layers, _whiteboardDecs, _init_whiteboard, _annotationDecs, _init_annotation, _screenShareControlDecs, _init_screenShareControl, _init_collapsed, _init_aside, _init_barHovering, _init_barLocked, _init_barHidden, _init_asideWidth, _init_userVolumeMap, _init_chatRoomState, _init_whiteboardActive, _init_ownerUser, _addPinMessageDecs, _cancelPinMessageDecs, _setWhiteboardActiveDecs, _setAsideWidthDecs, _updateSlotsDecs, _toggleLayoutDecs, _toggleCollapsedDecs, _toggleAsideDecs, _asideWidthChangedDecs, _toggleLayoutBarLockDecs, _toggleLayoutBarHiddenDecs, _resetLockTimerDecs, _setHoveringHandlerDecs, _setHoveringLeaveHandlerDecs, _setScreenShareSpeakerViewSizeDecs, _handleLiveLayoutChangeDecs, _onUserInfoUpdatedDecs, _handleLayoutUpdatedDecs, _init__handleLayoutUpdated, _handleFoldListChangedDecs, _handleMainListLengthChangedDecs, _handleMainListChangedDecs, _setBarHoveringDecs, _handleConnectionUpdatedDecs, _findVideoWindowByUserIdDecs, _onRemoteUsersLeftDecs, _onAudioVolumeUpdatedDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -111,7 +112,7 @@ var _P = /*#__PURE__*/new WeakMap();
 var _Q = /*#__PURE__*/new WeakMap();
 var _R = /*#__PURE__*/new WeakMap();
 var _S = /*#__PURE__*/new WeakMap();
-_ref = (_participantDecs = [_mobx.observable, _mobx.observable.ref], _chatDecs = [_mobx.observable, _mobx.observable.ref], _chatActionDecs = [_mobx.observable, _mobx.observable.ref], _stateBarDecs = [_mobx.observable, _mobx.observable.ref], _actionBarDecs = [_mobx.observable, _mobx.observable.ref], _layersDecs = [_mobx.observable, _mobx.observable.ref], _whiteboardDecs = [_mobx.observable, _mobx.observable.ref], _annotationDecs = [_mobx.observable, _mobx.observable.ref], _screenShareControlDecs = [_mobx.observable, _mobx.observable.ref], _addPinMessageDecs = [_mobx.action, _mobx.action.bound], _cancelPinMessageDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardActiveDecs = [_mobx.action, _mobx.action.bound], _setAsideWidthDecs = [_mobx.action, _mobx.action.bound], _updateSlotsDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutDecs = [_mobx.action, _mobx.action.bound], _toggleCollapsedDecs = [_mobx.action, _mobx.action.bound], _toggleAsideDecs = [_mobx.action, _mobx.action.bound], _asideWidthChangedDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutBarLockDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutBarHiddenDecs = [_mobx.action, _mobx.action.bound], _resetLockTimerDecs = [_mobx.action, _mobx.action.bound], _setHoveringHandlerDecs = [_mobx.action, _mobx.action.bound], _setHoveringLeaveHandlerDecs = [_mobx.action, _mobx.action.bound], _setScreenShareSpeakerViewSizeDecs = [(0, _decorator.debounced)(400), _decorator.bound], _handleLiveLayoutChangeDecs = [_mobx.action, _mobx.action.bound], _onUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleLayoutUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleFoldListChangedDecs = [_mobx.action, _mobx.action.bound], _handleMainListLengthChangedDecs = [_mobx.action, _mobx.action.bound], _handleMainListChangedDecs = [_mobx.action, _mobx.action.bound], _setBarHoveringDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_mobx.action, _mobx.action.bound], _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_participantDecs = [_mobx.observable, _mobx.observable.ref], _chatDecs = [_mobx.observable, _mobx.observable.ref], _chatActionDecs = [_mobx.observable, _mobx.observable.ref], _stateBarDecs = [_mobx.observable, _mobx.observable.ref], _actionBarDecs = [_mobx.observable, _mobx.observable.ref], _layersDecs = [_mobx.observable, _mobx.observable.ref], _whiteboardDecs = [_mobx.observable, _mobx.observable.ref], _annotationDecs = [_mobx.observable, _mobx.observable.ref], _screenShareControlDecs = [_mobx.observable, _mobx.observable.ref], _addPinMessageDecs = [_mobx.action, _mobx.action.bound], _cancelPinMessageDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardActiveDecs = [_mobx.action, _mobx.action.bound], _setAsideWidthDecs = [_mobx.action, _mobx.action.bound], _updateSlotsDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutDecs = [_mobx.action, _mobx.action.bound], _toggleCollapsedDecs = [_mobx.action, _mobx.action.bound], _toggleAsideDecs = [_mobx.action, _mobx.action.bound], _asideWidthChangedDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutBarLockDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutBarHiddenDecs = [_mobx.action, _mobx.action.bound], _resetLockTimerDecs = [_mobx.action, _mobx.action.bound], _setHoveringHandlerDecs = [_mobx.action, _mobx.action.bound], _setHoveringLeaveHandlerDecs = [_mobx.action, _mobx.action.bound], _setScreenShareSpeakerViewSizeDecs = [(0, _decorator.debounced)(400), _decorator.bound], _handleLiveLayoutChangeDecs = [_mobx.action, _mobx.action.bound], _onUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleLayoutUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleFoldListChangedDecs = [_mobx.action, _mobx.action.bound], _handleMainListLengthChangedDecs = [_mobx.action, _mobx.action.bound], _handleMainListChangedDecs = [_mobx.action, _mobx.action.bound], _setBarHoveringDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_mobx.action, _mobx.action.bound], _findVideoWindowByUserIdDecs = [_mobx.action, _mobx.action.bound], _onRemoteUsersLeftDecs = [_mobx.action, _mobx.action.bound], _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var LayoutStore = exports["default"] = /*#__PURE__*/function () {
   function LayoutStore(params) {
     var _this = this;
@@ -177,22 +178,26 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     this._chatProvider = chatProvider;
     this._videoWindowDataSource = params.sharedVideoWindowDataSource;
     this._sharedMemberDataSource = params.sharedMemberDataSource;
-    this._screenShareProvider = params.screenShareProvider;
     this._pinDataSource = params.sharedPinDataSource;
     this.chatRoomState = this._chatRoomControl.getConnectionState();
-    this._annotationProvider = params.annotationProvider;
     this._sharedScreenShareDataSource = params.sharedScreenShareDataSource;
-    this._interpreterProvider = params.interpreterProvider;
     this._sharedAnnotationDataSource = params.sharedAnnotationDataSource;
+    this._multiDisplayProvider = params.multiDisplayProvider;
     this._addListeners();
-    //@ts-ignore
-    window.layoutStore = this;
     this._initStream();
     this._handleFoldListChanged();
     this._handleMainListChanged();
     this._handleMainListLengthChanged();
     this._handleLayoutUpdated(this._videoWindowDataSource.layoutType);
     this.setWhiteboardActive(this._whiteBoardControl.getActivity());
+
+    // 进入房间后，如果双屏模式处于激活状态，则需要设置主窗口为窗口最大化
+    if (this._multiDisplayProvider.isActive) {
+      this._multiDisplayProvider.setMainWindowMaximize();
+    }
+
+    // @ts-ignore
+    window._layoutStore = this;
   }
   return (0, _createClass2["default"])(LayoutStore, [{
     key: "participant",
@@ -409,6 +414,37 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "sourceList",
     get: function get() {
+      var mainList = this._videoWindowDataSource.mainList;
+      if (this.isMultiDisplayActive) {
+        switch (this.secondaryWindowContentType) {
+          case _type7.FcrUIDisplayDistributionContentType.LOCAL_CAMERA:
+            if (mainList.length === 1) {
+              return mainList;
+            } else {
+              return mainList.filter(function (item) {
+                return !item.isMySelf;
+              });
+            }
+          case _type7.FcrUIDisplayDistributionContentType.SHARING_SCREEN:
+          case _type7.FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION:
+            return mainList.filter(function (item) {
+              return item.videoSourceType !== _fcrCore.FcrVideoSourceType.SCREEN;
+            });
+          case _type7.FcrUIDisplayDistributionContentType.SHARING_WHITEBOARD:
+            return mainList.filter(function (item) {
+              return item.type !== _type2.FcrUIWindowType.BOARD;
+            });
+          case _type7.FcrUIDisplayDistributionContentType.HIDDEN:
+            var sharingType = this._multiDisplayProvider.displayState.sharingType;
+
+            // 当自己进行屏幕共享时，会隐藏副窗口，主窗口中不需要显示屏幕共享流
+            if (sharingType === _type7.FcrUIDisplayDistributionContentType.SHARING_SCREEN || sharingType === _type7.FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION) {
+              return mainList.filter(function (item) {
+                return item.videoSourceType !== _fcrCore.FcrVideoSourceType.SCREEN;
+              });
+            }
+        }
+      }
       var isMyselfCurrentScreenSharing = this._videoWindowDataSource.mainList.some(function (i) {
         return i.hasScreenSharing && i.isMySelf;
       });
@@ -531,6 +567,17 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
         return item.videoStreamId === _this3.spotlightStreamId || item.audioStreamId === _this3.spotlightStreamId;
       }) : null;
     }
+  }, {
+    key: "isWhoISpeakingActive",
+    get: function get() {
+      var _this$findSpotlightUs;
+      var spotlightUserName = (_this$findSpotlightUs = this.findSpotlightUser) === null || _this$findSpotlightUs === void 0 ? void 0 : _this$findSpotlightUs.userName;
+      var isSpeakerLayout = this.layout === _type2.FcrUIVideoWindowLayoutType.Speaker;
+      var speakerWindowData = this.galleryList[0];
+      var isSpeakerIsSharing = (speakerWindowData === null || speakerWindowData === void 0 ? void 0 : speakerWindowData.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN || (speakerWindowData === null || speakerWindowData === void 0 ? void 0 : speakerWindowData.type) === _type2.FcrUIWindowType.BOARD;
+      var active = spotlightUserName && isSpeakerLayout && this.collapsed && !isSpeakerIsSharing;
+      return active;
+    }
   }, {
     key: "microphoneEnabled",
     get: function get() {
@@ -602,6 +649,21 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedInterpreterDataSource.isInterpreterEnabled;
     }
+  }, {
+    key: "secondaryWindowContentType",
+    get: function get() {
+      return this._multiDisplayProvider.secondaryWindowContentType;
+    }
+  }, {
+    key: "isMultiDisplayActive",
+    get: function get() {
+      return this._multiDisplayProvider.isActive;
+    }
+  }, {
+    key: "isLocalCameraInSecondaryWindow",
+    get: function get() {
+      return this._multiDisplayProvider.isLocalCameraInSecondaryWindow;
+    }
   }, {
     key: "participantCount",
     get: function get() {
@@ -613,6 +675,11 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       var isSharingScreen = !!this._sharedScreenShareDataSource.isSharingScreen;
       var shareScreenOwner = this._sharedScreenShareDataSource.screenSharingOwner;
       var isSharingScreenBySelf = this.localUserId === (shareScreenOwner === null || shareScreenOwner === void 0 ? void 0 : shareScreenOwner.userId);
+
+      // 多屏模式开启时， 不需要显示悬浮窗
+      if (this.isMultiDisplayActive) {
+        return false;
+      }
       if ((0, _env.isElectron)() && isSharingScreen && isSharingScreenBySelf) {
         return true;
       }
@@ -993,7 +1060,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
         onStreamVolumeIndicationUpdated: this._onAudioVolumeUpdated
       };
       var userObserver = {
-        onUserInfoUpdated: this.onUserInfoUpdated
+        onUserInfoUpdated: this.onUserInfoUpdated,
+        onRemoteUsersLeft: this._onRemoteUsersLeft
       };
       var videoWindowObserver = {
         onLayoutUpdated: this._handleLayoutUpdated,
@@ -1039,21 +1107,58 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
           }
         }
         _this5._handleMainListLengthChanged();
+      }), (0, _mobx.reaction)(function () {
+        return _this5._multiDisplayProvider.isActive;
+      }, function (isActive) {
+        var _this5$_multiDisplayP = _this5._multiDisplayProvider.displayState,
+          sharingBySelf = _this5$_multiDisplayP.sharingBySelf,
+          isSharingScreen = _this5$_multiDisplayP.isSharingScreen;
+        if (isActive) {
+          // 多屏模式激活时，需要设置主窗口为窗口最大化
+          // 如果自己正在共享屏幕，则关闭 vidoe window 悬浮窗、显示主窗口
+          if (sharingBySelf && isSharingScreen) {
+            var _this5$_eventProvider;
+            (_this5$_eventProvider = _this5._eventProvider) === null || _this5$_eventProvider === void 0 || _this5$_eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_TOP_VIDEO_WINDOW);
+            _this5._multiDisplayProvider.showMainWindowInIndexLeastDisplay({
+              maximize: true
+            });
+          } else {
+            _this5._multiDisplayProvider.setMainWindowMaximize();
+          }
+          return;
+        }
+
+        // 多屏模式从激活状态转变为非激活状态时，
+        // 如果当前是自己在共享屏幕，则隐藏主窗口，打开 vidoe window 悬浮窗
+        // 如果不是自己在共享，则切换布局到演讲者模式
+        // 没屏幕共享时，不做操作
+        if (sharingBySelf && isSharingScreen) {
+          var _this5$_eventProvider2;
+          window.runtime.browserWindow.hide();
+          (_this5$_eventProvider2 = _this5._eventProvider) === null || _this5$_eventProvider2 === void 0 || _this5$_eventProvider2.sendEvent(_constant.FcrUIAction.OPEN_TOP_VIDEO_WINDOW);
+        } else if (isSharingScreen) {
+          _this5.toggleLayout(_type2.FcrUIVideoWindowLayoutType.Speaker);
+        }
       }), (0, _mobx.reaction)(function () {
         return _this5.whiteboardActive;
-      }, function (opened) {
-        if (opened) {
-          var isActive = _this5._whiteBoardControl.getActivity();
+      }, function (isBoardActive) {
+        if (isBoardActive) {
           var ownerUserId = _this5._whiteBoardControl.getOwnerId();
-          if (isActive) {
-            var ownerUser = _this5._userControl.getUser(ownerUserId);
-            _this5._videoWindowDataSource.addBoard(ownerUser, ownerUserId === _this5.localUserId);
+          var ownerUser = _this5._userControl.getUser(ownerUserId);
+          _this5._videoWindowDataSource.addBoard(ownerUser, ownerUserId === _this5.localUserId);
+          if (_this5.secondaryWindowContentType === _type7.FcrUIDisplayDistributionContentType.SHARING_WHITEBOARD) {
+            // 在副屏窗口模式显示白板时，不切换布局
+            return;
           }
           if (_this5.layout === _type2.FcrUIVideoWindowLayoutType.Gallery) {
             _this5.toggleLayout(_type2.FcrUIVideoWindowLayoutType.Speaker);
           }
         } else {
           _this5._videoWindowDataSource.removeBoard();
+          if (_this5.secondaryWindowContentType === _type7.FcrUIDisplayDistributionContentType.SHARING_WHITEBOARD) {
+            // 在副屏窗口模式显示白板时，不切换布局
+            return;
+          }
           if (_this5.manualLayout) {
             _this5.toggleLayout(_this5.manualLayout);
           } else {
@@ -1108,14 +1213,11 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
         });
       }), (0, _mobx.reaction)(function () {
         return {
-          count: _this5.participantCount,
           enableSpotlight: _this5.enableSpotlight
         };
       }, function (_ref7) {
-        var count = _ref7.count,
-          enableSpotlight = _ref7.enableSpotlight;
-        var enableSetSpotlight = _this5._isSetSpotlightEnable(count, enableSpotlight);
-        _this5._videoWindowDataSource.setSpotlightEnabled(enableSetSpotlight);
+        var enableSpotlight = _ref7.enableSpotlight;
+        _this5._videoWindowDataSource.setSpotlightEnabled(enableSpotlight);
       }),
       // 录制的特殊逻辑：
       // 因为录制机器人不发流，且当前切换布局的逻辑是有多个人的视频窗口才切换到 speaker layout
@@ -1207,18 +1309,34 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
         this.toggleLayout(_type2.FcrUIVideoWindowLayoutType.Speaker);
       }
     }
-  }, {
-    key: "_isSetSpotlightEnable",
-    value: function _isSetSpotlightEnable(count, enableSpotlight) {
-      var setSpotlightEnable = count > LayoutStore.MIN_USERS_TO_ENABLE_SPOTLIGHT;
-      return setSpotlightEnable && enableSpotlight;
-    }
   }, {
     key: "_handleConnectionUpdated",
     value: function _handleConnectionUpdated(_, state) {
       this.logger.info('layout store handleConnectionUpdated', state);
       this.chatRoomState = state;
     }
+  }, {
+    key: "_findVideoWindowByUserId",
+    value: function _findVideoWindowByUserId(userId) {
+      return this.mainList.find(function (item) {
+        return item.userId === userId;
+      });
+    }
+  }, {
+    key: "_onRemoteUsersLeft",
+    value: function _onRemoteUsersLeft(roomId, events) {
+      var _this7 = this;
+      events.forEach(function (event) {
+        var userInfo = event.userInfo;
+        var videoWindowData = _this7._findVideoWindowByUserId(userInfo.userId);
+        if (videoWindowData) {
+          var stream = videoWindowData.getVideoStream();
+          if (stream) {
+            _this7._videoWindowDataSource["delete"](stream);
+          }
+        }
+      });
+    }
   }, {
     key: "_handleLiveStreamingStateUpdated",
     value: function _handleLiveStreamingStateUpdated(_, state, url, reason) {
@@ -1234,6 +1352,10 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     key: "_handleStreamAdded",
     value: function _handleStreamAdded(modifiedStream) {
       this._videoWindowDataSource.add(modifiedStream, modifiedStream.owner.userId === this.localUserId);
+      if (this.isMultiDisplayActive) {
+        // 在开启多屏模式下，屏幕共享流添加时，保持布局不变
+        return;
+      }
       if (modifiedStream.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN) {
         var isSharingScreenOwner = modifiedStream.owner.userId === this.localUserId;
         if (this.layout === _type2.FcrUIVideoWindowLayoutType.Gallery) {
@@ -1248,33 +1370,37 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_onStreamsAdded",
     value: function _onStreamsAdded(roomId, events) {
-      var _this7 = this;
+      var _this8 = this;
       events.forEach(function (_ref8) {
         var modifiedStream = _ref8.modifiedStream;
-        _this7._handleStreamAdded(modifiedStream);
+        _this8._handleStreamAdded(modifiedStream);
       });
     }
   }, {
     key: "_onStreamsUpdated",
     value: function _onStreamsUpdated(roomId, events) {
-      var _this8 = this;
+      var _this9 = this;
       events.forEach(function (_ref9) {
         var modifiedStream = _ref9.modifiedStream;
-        _this8._videoWindowDataSource.update(modifiedStream);
+        _this9._videoWindowDataSource.update(modifiedStream);
       });
     }
   }, {
     key: "_onStreamsRemoved",
     value: function _onStreamsRemoved(roomId, events) {
-      var _this9 = this;
+      var _this0 = this;
       events.forEach(function (_ref0) {
         var modifiedStream = _ref0.modifiedStream;
-        _this9._videoWindowDataSource["delete"](modifiedStream);
+        _this0._videoWindowDataSource["delete"](modifiedStream);
       });
       var hasScreenStream = events === null || events === void 0 ? void 0 : events.find(function (event) {
         var videoType = event.modifiedStream.videoSourceType;
         return videoType === _fcrCore.FcrVideoSourceType.SCREEN;
       });
+      if (this.isMultiDisplayActive) {
+        // 在开启多屏模式下，屏幕共享流被移除时，保持布局不变
+        return;
+      }
       if (hasScreenStream) {
         if (this.manualLayout) {
           this._videoWindowDataSource.setLayout(this.manualLayout);
@@ -1292,16 +1418,16 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_findSpotlightStream",
     value: function _findSpotlightStream() {
-      var _this0 = this;
+      var _this1 = this;
       //find the max volume stream
       var res = {
         streamId: '',
         volume: 0
       };
       this.userVolumeMap.forEach(function (volume, id) {
-        var _this0$interpreterUse;
-        var windowData = _this0.mainListMapByAudioStreamId.get(id);
-        if (id !== '0' && !res.streamId && volume > 45 && windowData !== null && windowData !== void 0 && windowData.hasMicrophoneAudioStream && windowData.videoSourceType !== _fcrCore.FcrVideoSourceType.SCREEN && !((_this0$interpreterUse = _this0.interpreterUserList) !== null && _this0$interpreterUse !== void 0 && _this0$interpreterUse.find(function (user) {
+        var _this1$interpreterUse;
+        var windowData = _this1.mainListMapByAudioStreamId.get(id);
+        if (id !== '0' && !res.streamId && volume > 45 && windowData !== null && windowData !== void 0 && windowData.hasMicrophoneAudioStream && windowData.videoSourceType !== _fcrCore.FcrVideoSourceType.SCREEN && !((_this1$interpreterUse = _this1.interpreterUserList) !== null && _this1$interpreterUse !== void 0 && _this1$interpreterUse.find(function (user) {
           return user.userId === windowData.userId;
         }))) {
           res = {
@@ -1315,7 +1441,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _LayoutStore = LayoutStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LayoutStore, [[_participantDecs, 17, "participant"], [_chatDecs, 17, "chat"], [_chatActionDecs, 17, "chatAction"], [_stateBarDecs, 17, "stateBar"], [_actionBarDecs, 17, "actionBar"], [_layersDecs, 17, "layers"], [_whiteboardDecs, 17, "whiteboard"], [_annotationDecs, 17, "annotation"], [_screenShareControlDecs, 17, "screenShareControl"], [_mobx.observable, 1, "collapsed"], [_mobx.observable, 1, "aside"], [_mobx.observable, 1, "barHovering"], [_mobx.observable, 1, "barLocked"], [_mobx.observable, 1, "barHidden"], [_mobx.observable, 1, "asideWidth"], [_mobx.observable, 1, "userVolumeMap"], [_mobx.observable, 1, "chatRoomState"], [_mobx.observable, 1, "whiteboardActive"], [_mobx.observable, 1, "ownerUser"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_mobx.computed, 3, "layout"], [_mobx.computed, 3, "manualLayout"], [_mobx.computed, 3, "scalcValue"], [_mobx.computed, 3, "sourceList"], [_mobx.computed, 3, "layoutMainList"], [_mobx.computed, 3, "mainList"], [_mobx.computed, 3, "mainListMapByAudioStreamId"], [_mobx.computed, 3, "spotlightStreamId"], [_mobx.computed, 3, "foldList"], [_mobx.computed, 3, "galleryList"], [_mobx.computed, 3, "isMainWindowInScreenSharing"], [_mobx.computed, 3, "isCurrentUserInBoardSharing"], [_mobx.computed, 3, "asideLayout"], [_mobx.computed, 3, "carouselList"], [_mobx.computed, 3, "hasPinnedStream"], [_mobx.computed, 3, "isRobot"], [_mobx.computed, 3, "findSpotlightUser"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "galleryMaxSize"], [_mobx.computed, 3, "isVideoSuspended"], [_mobx.computed, 3, "asideContent"], [_mobx.computed, 3, "participantsRenderAt"], [_mobx.computed, 3, "chatRenderAt"], [_decorator.bound, 2, "getWaterMarkContent"], [_decorator.bound, 2, "hasMutePermission"], [_decorator.bound, 2, "hasUnmutePermission"], [_decorator.bound, 2, "hasRequestStartAudioPermission"], [_decorator.bound, 2, "toggleMainStream"], [_addPinMessageDecs, 18, "addPinMessage"], [_cancelPinMessageDecs, 18, "cancelPinMessage"], [_decorator.bound, 2, "addPin"], [_decorator.bound, 2, "removePin"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "handleSetPinState"], [_setWhiteboardActiveDecs, 18, "setWhiteboardActive"], [_setAsideWidthDecs, 18, "setAsideWidth"], [_updateSlotsDecs, 18, "updateSlots"], [_decorator.bound, 2, "closeParticipantFromAside"], [_decorator.bound, 2, "moveParticipantFromAsideToDialog"], [_decorator.bound, 2, "closeChatFromAside"], [_decorator.bound, 2, "closeAsideChat"], [_decorator.bound, 2, "moveChatFromAsideToDialog"], [_decorator.bound, 2, "openPrivateChat"], [_decorator.bound, 2, "openRenameDialog"], [_toggleLayoutDecs, 18, "toggleLayout"], [_toggleCollapsedDecs, 18, "toggleCollapsed"], [_toggleAsideDecs, 18, "toggleAside"], [_asideWidthChangedDecs, 18, "asideWidthChanged"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_toggleLayoutBarHiddenDecs, 18, "toggleLayoutBarHidden"], [_resetLockTimerDecs, 18, "resetLockTimer"], [_setHoveringHandlerDecs, 18, "setHoveringHandler"], [_setHoveringLeaveHandlerDecs, 18, "setHoveringLeaveHandler"], [_setScreenShareSpeakerViewSizeDecs, 2, "setScreenShareSpeakerViewSize"], [_handleLiveLayoutChangeDecs, 18, "handleLiveLayoutChange"], [_onUserInfoUpdatedDecs, 18, "onUserInfoUpdated"], [_decorator.bound, 2, "stopLocalPreview"], [_decorator.bound, 2, "startLocalPreview"], [_decorator.bound, 2, "setAllowChatWithPayload"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "muteAudio"], [_decorator.bound, 2, "sendParticipantEvent"], [_decorator.bound, 2, "onEvent"], [_decorator.bound, 2, "_addListeners"], [_mobx.computed, 3, "_hasVideoStreamUser"], [_handleFoldListChangedDecs, 18, "_handleFoldListChanged"], [_handleMainListLengthChangedDecs, 18, "_handleMainListLengthChanged"], [_handleMainListChangedDecs, 18, "_handleMainListChanged"], [_mobx.action, 2, "_switchToSpeaker"], [_mobx.action, 2, "_switchToGallery"], [_setBarHoveringDecs, 18, "_setBarHovering"], [_decorator.bound, 2, "_initStream"], [_decorator.bound, 2, "_isSetSpotlightEnable"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_decorator.bound, 2, "_handleLiveStreamingStateUpdated"], [_decorator.bound, 2, "_handleStreamAdded"], [_decorator.bound, 2, "_onStreamsAdded"], [_decorator.bound, 2, "_onStreamsUpdated"], [_decorator.bound, 2, "_onStreamsRemoved"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_handleLayoutUpdatedDecs, 16, "_handleLayoutUpdated"]], []).e, 21);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LayoutStore, [[_participantDecs, 17, "participant"], [_chatDecs, 17, "chat"], [_chatActionDecs, 17, "chatAction"], [_stateBarDecs, 17, "stateBar"], [_actionBarDecs, 17, "actionBar"], [_layersDecs, 17, "layers"], [_whiteboardDecs, 17, "whiteboard"], [_annotationDecs, 17, "annotation"], [_screenShareControlDecs, 17, "screenShareControl"], [_mobx.observable, 1, "collapsed"], [_mobx.observable, 1, "aside"], [_mobx.observable, 1, "barHovering"], [_mobx.observable, 1, "barLocked"], [_mobx.observable, 1, "barHidden"], [_mobx.observable, 1, "asideWidth"], [_mobx.observable, 1, "userVolumeMap"], [_mobx.observable, 1, "chatRoomState"], [_mobx.observable, 1, "whiteboardActive"], [_mobx.observable, 1, "ownerUser"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_mobx.computed, 3, "layout"], [_mobx.computed, 3, "manualLayout"], [_mobx.computed, 3, "scalcValue"], [_mobx.computed, 3, "sourceList"], [_mobx.computed, 3, "layoutMainList"], [_mobx.computed, 3, "mainList"], [_mobx.computed, 3, "mainListMapByAudioStreamId"], [_mobx.computed, 3, "spotlightStreamId"], [_mobx.computed, 3, "foldList"], [_mobx.computed, 3, "galleryList"], [_mobx.computed, 3, "isMainWindowInScreenSharing"], [_mobx.computed, 3, "isCurrentUserInBoardSharing"], [_mobx.computed, 3, "asideLayout"], [_mobx.computed, 3, "carouselList"], [_mobx.computed, 3, "hasPinnedStream"], [_mobx.computed, 3, "isRobot"], [_mobx.computed, 3, "findSpotlightUser"], [_mobx.computed, 3, "isWhoISpeakingActive"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "galleryMaxSize"], [_mobx.computed, 3, "isVideoSuspended"], [_mobx.computed, 3, "asideContent"], [_mobx.computed, 3, "participantsRenderAt"], [_mobx.computed, 3, "chatRenderAt"], [_decorator.bound, 2, "getWaterMarkContent"], [_decorator.bound, 2, "hasMutePermission"], [_decorator.bound, 2, "hasUnmutePermission"], [_decorator.bound, 2, "hasRequestStartAudioPermission"], [_decorator.bound, 2, "toggleMainStream"], [_addPinMessageDecs, 18, "addPinMessage"], [_cancelPinMessageDecs, 18, "cancelPinMessage"], [_decorator.bound, 2, "addPin"], [_decorator.bound, 2, "removePin"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "handleSetPinState"], [_setWhiteboardActiveDecs, 18, "setWhiteboardActive"], [_setAsideWidthDecs, 18, "setAsideWidth"], [_updateSlotsDecs, 18, "updateSlots"], [_decorator.bound, 2, "closeParticipantFromAside"], [_decorator.bound, 2, "moveParticipantFromAsideToDialog"], [_decorator.bound, 2, "closeChatFromAside"], [_decorator.bound, 2, "closeAsideChat"], [_decorator.bound, 2, "moveChatFromAsideToDialog"], [_decorator.bound, 2, "openPrivateChat"], [_decorator.bound, 2, "openRenameDialog"], [_toggleLayoutDecs, 18, "toggleLayout"], [_toggleCollapsedDecs, 18, "toggleCollapsed"], [_toggleAsideDecs, 18, "toggleAside"], [_asideWidthChangedDecs, 18, "asideWidthChanged"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_toggleLayoutBarHiddenDecs, 18, "toggleLayoutBarHidden"], [_resetLockTimerDecs, 18, "resetLockTimer"], [_setHoveringHandlerDecs, 18, "setHoveringHandler"], [_setHoveringLeaveHandlerDecs, 18, "setHoveringLeaveHandler"], [_setScreenShareSpeakerViewSizeDecs, 2, "setScreenShareSpeakerViewSize"], [_handleLiveLayoutChangeDecs, 18, "handleLiveLayoutChange"], [_onUserInfoUpdatedDecs, 18, "onUserInfoUpdated"], [_decorator.bound, 2, "stopLocalPreview"], [_decorator.bound, 2, "startLocalPreview"], [_decorator.bound, 2, "setAllowChatWithPayload"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "muteAudio"], [_decorator.bound, 2, "sendParticipantEvent"], [_decorator.bound, 2, "onEvent"], [_decorator.bound, 2, "_addListeners"], [_mobx.computed, 3, "_hasVideoStreamUser"], [_handleFoldListChangedDecs, 18, "_handleFoldListChanged"], [_handleMainListLengthChangedDecs, 18, "_handleMainListLengthChanged"], [_handleMainListChangedDecs, 18, "_handleMainListChanged"], [_mobx.action, 2, "_switchToSpeaker"], [_mobx.action, 2, "_switchToGallery"], [_setBarHoveringDecs, 18, "_setBarHovering"], [_decorator.bound, 2, "_initStream"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_findVideoWindowByUserIdDecs, 18, "_findVideoWindowByUserId"], [_onRemoteUsersLeftDecs, 18, "_onRemoteUsersLeft"], [_decorator.bound, 2, "_handleLiveStreamingStateUpdated"], [_decorator.bound, 2, "_handleStreamAdded"], [_decorator.bound, 2, "_onStreamsAdded"], [_decorator.bound, 2, "_onStreamsUpdated"], [_decorator.bound, 2, "_onStreamsRemoved"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_handleLayoutUpdatedDecs, 16, "_handleLayoutUpdated"]], []).e, 21);
 _init_participant = _applyDecs$e[0];
 _init_chat = _applyDecs$e[1];
 _init_chatAction = _applyDecs$e[2];
@@ -1337,5 +1463,4 @@ _init_whiteboardActive = _applyDecs$e[17];
 _init_ownerUser = _applyDecs$e[18];
 _init__handleLayoutUpdated = _applyDecs$e[19];
 _initProto = _applyDecs$e[20];
-(0, _defineProperty2["default"])(LayoutStore, "MIN_USERS_TO_ENABLE_SPOTLIGHT", 2);
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/layout/type.d.ts

@@ -1,5 +1,24 @@
 import { FcrRoomConnectorType, FcrVideoSourceType } from 'fcr-core';
+import { FcrMainRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrUserRole } from 'fcr-core/lib/type';
+import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
+import { FcrUIChatProvider } from '../../providers/chat-provider';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUIInterpreterProvider } from '../../providers/interpreter-provider';
+import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
+import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
+import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
+import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
+import { FcrUISharedInterpreterDataSource } from '../../shared-data-source/interpreter';
+import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
+import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
+import { FcrUISharedPinDataSource } from '../../shared-data-source/pin-data';
+import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
+import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
+import { FcrUISharedSpeakerSpotlightDataSource } from '../../shared-data-source/speaker-spotlight';
+import { FcrUIVideoWindowDataSource } from '../../shared-data-source/video-window';
+import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
 export declare enum FcrUIVideoWindowLayoutType {
     /** Show a carousel on top and a big video on the rest of the screen. */
     Speaker = "speaker",
@@ -76,3 +95,39 @@ export declare enum FcrUILayoutType {
      */
     GALLERY = "gallery"
 }
+export interface FcrLayoutSlots {
+    participant: React.ReactNode;
+    chat: React.ReactNode;
+    chatAction: React.ReactNode;
+    stateBar: React.ReactNode;
+    actionBar: React.ReactNode;
+    layers: React.ReactNode;
+    whiteboard: React.ReactNode;
+    annotation: React.ReactNode;
+    screenShareControl: React.ReactNode;
+}
+export interface FcrUILayoutAsideContent {
+    participant: boolean;
+    chat: boolean;
+}
+export interface LayoutStoreParams {
+    eventProvider: FcrUIEventProvider;
+    deviceProvider: FcrUIDeviceProvider;
+    privilegeProvider: FcrUIPrivilegeProvider;
+    roomControl: FcrMainRoomControl;
+    sharedConfigDataSource: FcrUISharedConfigDataSource;
+    sharedSpeakerSpotlightDataSource: FcrUISharedSpeakerSpotlightDataSource;
+    sharedLayoutDataSource: FcrUISharedLayoutDataSource;
+    sharedInterpreterDataSource: FcrUISharedInterpreterDataSource;
+    sharedSettingDataSource: FcrUISharedSettingDataSource;
+    chatProvider: FcrUIChatProvider;
+    sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
+    sharedMemberDataSource: FcrUIMemberSharedDataSource;
+    screenShareProvider: FcrUIScreenShareProvider;
+    sharedPinDataSource: FcrUISharedPinDataSource;
+    annotationProvider: FcrUIAnnotationProvider;
+    sharedScreenShareDataSource: FcrUIScreenShareSharedDataSource;
+    interpreterProvider: FcrUIInterpreterProvider;
+    sharedAnnotationDataSource: FcrUISharedAnnotationSource;
+    multiDisplayProvider: FcrUIMultiDisplayProvider;
+}

package/lib/modules/participant/components/can-moveable/index.js

@@ -35,7 +35,6 @@ var Moveable = exports.Moveable = function Moveable(_ref) {
     setCurrentCoordinateY(y);
   };
   var handleResize = (0, _react.useCallback)(function () {
-    console.log('window.innerWidth < currentCoordinateX', window.innerWidth < currentCoordinateX, window.innerWidth, currentCoordinateX);
     if (window.innerWidth < currentCoordinateX - rndRef.current) {
       setCurrentCoordinateX(0);
     }

package/lib/modules/participant/components/participants/components/participants/components/attendee/index.js

@@ -43,7 +43,8 @@ var FcrParticipant = exports.FcrParticipant = function FcrParticipant(props) {
     _props$onParticipants = props.onParticipantsButtonClick,
     onParticipantsButtonClick = _props$onParticipants === void 0 ? function () {} : _props$onParticipants,
     _props$hideActions = props.hideActions,
-    hideActions = _props$hideActions === void 0 ? [] : _props$hideActions;
+    hideActions = _props$hideActions === void 0 ? [] : _props$hideActions,
+    isLocalCameraInSecondaryWindow = props.isLocalCameraInSecondaryWindow;
   var userId = user.userId,
     _user$userName = user.userName,
     userName = _user$userName === void 0 ? '' : _user$userName,
@@ -117,7 +118,8 @@ var FcrParticipant = exports.FcrParticipant = function FcrParticipant(props) {
             hideActions: hideActions,
             hasPinnedStream: hasPinnedStream,
             onParticipantsButtonClick: onParticipantsButtonClick,
-            user: user
+            user: user,
+            isLocalCameraInSecondaryWindow: isLocalCameraInSecondaryWindow
           })
         }),
         placement: "bottomRight",

package/lib/modules/participant/components/participants/components/participants/components/participants-more/index.js

@@ -51,7 +51,8 @@ var FcrParticipantsMoreActions = exports.FcrParticipantsMoreActions = function F
   var onParticipantsButtonClick = props.onParticipantsButtonClick,
     hasPinnedStream = props.hasPinnedStream,
     hideActions = props.hideActions,
-    user = props.user;
+    user = props.user,
+    isLocalCameraInSecondaryWindow = props.isLocalCameraInSecondaryWindow;
   var isMe = user.isMe,
     userId = user.userId,
     hasVideo = user.hasVideo,
@@ -62,6 +63,17 @@ var FcrParticipantsMoreActions = exports.FcrParticipantsMoreActions = function F
     allowedOperations = user.allowedOperations;
   var cameraStateType = !hasVideo ? 'primary' : 'danger';
 
+  /**
+   * 如果当前用户的类型是 'meeting-system' 且没有视频流，则不显示固定选项。
+   * 如果当前用户是自己且摄像头的视频流显示在副窗口中，也不显示固定选项。
+   */
+  var isShowPinOption = true;
+  if (userType === 'meeting-system' && !hasVideo) {
+    isShowPinOption = false;
+  } else if (isMe && isLocalCameraInSecondaryWindow) {
+    isShowPinOption = false;
+  }
+
   // 定义所有操作菜单
   var allOperationMenu = [{
     icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_cameraState.CameraState, {
@@ -115,7 +127,7 @@ var FcrParticipantsMoreActions = exports.FcrParticipantsMoreActions = function F
     }) : hasPinnedStream ? (0, _i18next.t)('fmt_attendies_options_replacefixed') : (0, _i18next.t)('fmt_attendies_options_fixfirst'),
     key: 'pin',
     type: isPin ? 'danger' : 'primary',
-    canOperation: userType === 'normal' || userType === 'phone' || userType === 'meeting-system' && hasVideo,
+    canOperation: isShowPinOption,
     onButtonClick: handleButtonClick(isPin ? _types.ParticipantActionType.REMOVE_PIN : _types.ParticipantActionType.ADD_PIN, userId, onParticipantsButtonClick),
     group: 'own_view'
   }, {

package/lib/modules/participant/components/participants/components/participants/components/user-row/index.d.ts

@@ -2,4 +2,4 @@ import { ListRowProps } from 'react-virtualized';
 import { CellMeasurerCache } from 'react-virtualized/dist/es/CellMeasurer';
 import { ParticipantActionType, User } from '../../../../types';
 export declare const cache: CellMeasurerCache;
-export declare const userRowRenderer: (userList: User[], userRenderer: ((user: User) => React.ReactNode) | undefined, hasPinnedStream: boolean, toggleParticipantAction: ((action: ParticipantActionType, userId: string) => void) | undefined) => (renderProps: ListRowProps) => import("react/jsx-runtime").JSX.Element;
+export declare const userRowRenderer: (userList: User[], userRenderer: ((user: User) => React.ReactNode) | undefined, hasPinnedStream: boolean, toggleParticipantAction: ((action: ParticipantActionType, userId: string) => void) | undefined, isLocalCameraInSecondaryWindow: boolean) => (renderProps: ListRowProps) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/participant/components/participants/components/participants/components/user-row/index.js

@@ -37,7 +37,7 @@ var cache = exports.cache = new _CellMeasurer.CellMeasurerCache({
   fixedWidth: true,
   defaultHeight: 52
 });
-var userRowRenderer = exports.userRowRenderer = function userRowRenderer(userList, userRenderer, hasPinnedStream, toggleParticipantAction) {
+var userRowRenderer = exports.userRowRenderer = function userRowRenderer(userList, userRenderer, hasPinnedStream, toggleParticipantAction, isLocalCameraInSecondaryWindow) {
   return function (renderProps) {
     var key = renderProps.key,
       parent = renderProps.parent,
@@ -58,7 +58,8 @@ var userRowRenderer = exports.userRowRenderer = function userRowRenderer(userLis
           children: userRenderer ? userRenderer(userList[index]) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_attendee.FcrParticipant, {
             hasPinnedStream: hasPinnedStream,
             user: userList[index],
-            onParticipantsButtonClick: toggleParticipantAction
+            onParticipantsButtonClick: toggleParticipantAction,
+            isLocalCameraInSecondaryWindow: isLocalCameraInSecondaryWindow
           })
         });
       }

package/lib/modules/participant/components/participants/components/participants/index.js

@@ -45,7 +45,8 @@ var FcrParticipants = exports.FcrParticipants = function FcrParticipants(props)
     toggleRoomControlAction = _props.toggleRoomControlAction,
     footer = _props.footer,
     header = _props.header,
-    hasInvite = _props.hasInvite;
+    hasInvite = _props.hasInvite,
+    isLocalCameraInSecondaryWindow = _props.isLocalCameraInSecondaryWindow;
 
   // 使用 useMemo 初始化 value 状态
   var _useState = (0, _react.useState)((0, _react.useMemo)(function () {
@@ -107,7 +108,7 @@ var FcrParticipants = exports.FcrParticipants = function FcrParticipants(props)
             height: height,
             rowCount: userList.length,
             rowHeight: _userRow.cache.rowHeight,
-            rowRenderer: (0, _userRow.userRowRenderer)(userList, userRenderer, hasPinnedStream, toggleParticipantAction)
+            rowRenderer: (0, _userRow.userRowRenderer)(userList, userRenderer, hasPinnedStream, toggleParticipantAction, isLocalCameraInSecondaryWindow)
           });
         }
       })]

package/lib/modules/participant/components/participants/components/render-user/components/user-action/components/move-actions-popover/index.d.ts

@@ -7,6 +7,7 @@ interface MoreActionsPopoverPropsType {
     user: User;
     waitingRoomParticipateActionsNeedHiden: string[];
     mainRoomParticipateActionsNeedHiden: string[];
+    isLocalCameraInSecondaryWindow: boolean;
 }
 export declare const MoreActionsPopover: (props: MoreActionsPopoverPropsType) => import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/modules/participant/components/participants/components/render-user/components/user-action/components/move-actions-popover/index.js

@@ -23,7 +23,8 @@ var MoreActionsPopover = exports.MoreActionsPopover = function MoreActionsPopove
     handleMoreActionsClick = props.handleMoreActionsClick,
     waitingRoomParticipateActionsNeedHiden = props.waitingRoomParticipateActionsNeedHiden,
     mainRoomParticipateActionsNeedHiden = props.mainRoomParticipateActionsNeedHiden,
-    user = props.user;
+    user = props.user,
+    isLocalCameraInSecondaryWindow = props.isLocalCameraInSecondaryWindow;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     activeTab = _useContext.activeTab,
     hasPinnedStream = _useContext.hasPinnedStream;
@@ -57,6 +58,7 @@ var MoreActionsPopover = exports.MoreActionsPopover = function MoreActionsPopove
         onParticipantsButtonClick: handleMoreActionsClick,
         user: user,
         hasPinnedStream: hasPinnedStream,
+        isLocalCameraInSecondaryWindow: isLocalCameraInSecondaryWindow,
         hideActions: activeTab === _type2.FcrUIRoomType.MAIN_ROOM ? mainRoomParticipateActionsNeedHiden : waitingRoomParticipateActionsNeedHiden
       })
     }),

package/lib/modules/participant/components/participants/components/render-user/components/user-action/index.js

@@ -20,7 +20,8 @@ var _type = require("../../../../../../../../type");
 var _jsxRuntime = require("react/jsx-runtime");
 var waitingRoomParticipateActionsNeedHiden = ['start_video', 'request_start_video', 'stop_video', 'pin', 'set_as_host', 'set_as_co_host', 'revoke_co_host', 'merge_video', 'put_into_waiting_room'];
 var UserActions = exports.UserActions = function UserActions(props) {
-  var user = props.user;
+  var user = props.user,
+    isLocalCameraInSecondaryWindow = props.isLocalCameraInSecondaryWindow;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     activeTab = _useContext.activeTab,
     hasMutePermission = _useContext.hasMutePermission,
@@ -69,7 +70,8 @@ var UserActions = exports.UserActions = function UserActions(props) {
         setIsShowDropMenu(false);
       },
       waitingRoomParticipateActionsNeedHiden: waitingRoomParticipateActionsNeedHiden,
-      mainRoomParticipateActionsNeedHiden: mainRoomParticipateActionsNeedHiden
+      mainRoomParticipateActionsNeedHiden: mainRoomParticipateActionsNeedHiden,
+      isLocalCameraInSecondaryWindow: isLocalCameraInSecondaryWindow
     })]
   });
 };

package/lib/modules/participant/components/participants/components/render-user/index.d.ts

@@ -1,5 +1,7 @@
 import { User } from '../../types';
-declare const RenderUser: ({ user }: {
+type RenderUserProps = {
     user: User;
-}) => import("react/jsx-runtime").JSX.Element;
+    isLocalCameraInSecondaryWindow: boolean;
+};
+declare const RenderUser: React.FC<RenderUserProps>;
 export default RenderUser;