fcr-ui-scene 3.7.2 → 3.7.3

package/lib/modules/share-screen/store.js

@@ -85,7 +85,7 @@ var _logger = require("../../utilities/logger");
 var _parameters = require("../../utilities/parameters");
 var _imports = require("fcr-core/lib/imports");
 var _ShareScreenStore;
-var _initProto, _init_boardOwnerUser, _handleChooseScreenDecs, _init_handleChooseScreen, _setShareWithAudioStateDecs, _zoomInDecs, _zoomOutDecs, _fullContainerDecs, _setOriginScalcDecs, _hasLoopbackDeviceDecs, _setShareAudioProcessingChannelDecs, _openRelaunchTipsDialogDecs, _startRenderSharePreviewDecs, _stopRenderSharePreviewDecs, _handleStopShareDecs, _handleStopShareByExitRoomDecs, _handleStartShareDecs, _openShareScreenSelectionDecs, _closeShareScreenSelectionDecs, _setControlBarWindowIdDecs, _openVideoWindowDialogDecs, _closeControlBarDecs, _closeVideoWindowDialogDecs, _handleReplaceScreenDecs, _initControlbarDecs, _toggleShareWithScenarioTypeDecs, _ref;
+var _initProto, _init_boardOwnerUser, _handleChooseScreenDecs, _init_handleChooseScreen, _setShareWithAudioStateDecs, _zoomInDecs, _zoomOutDecs, _fullContainerDecs, _setOriginScalcDecs, _hasLoopbackDeviceDecs, _setShareAudioProcessingChannelDecs, _openRelaunchTipsDialogDecs, _startRenderSharePreviewDecs, _stopRenderSharePreviewDecs, _handleStopShareDecs, _handleStopShareByExitRoomDecs, _handleStartShareDecs, _openShareScreenSelectionDecs, _closeShareScreenSelectionDecs, _openVideoWindowDialogDecs, _closeControlBarDecs, _closeVideoWindowDialogDecs, _handleReplaceScreenDecs, _initControlbarDecs, _toggleShareWithScenarioTypeDecs, _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; }
@@ -97,7 +97,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var _A = /*#__PURE__*/new WeakMap();
-_ref = (_handleChooseScreenDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _zoomInDecs = [_mobx.action, _mobx.action.bound], _zoomOutDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound], _hasLoopbackDeviceDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _openRelaunchTipsDialogDecs = [_mobx.action, _mobx.action.bound], _startRenderSharePreviewDecs = [_mobx.action, _mobx.action.bound], _stopRenderSharePreviewDecs = [_mobx.action, _mobx.action.bound], _handleStopShareDecs = [_mobx.action, _mobx.action.bound], _handleStopShareByExitRoomDecs = [_mobx.action, _mobx.action.bound], _handleStartShareDecs = [_mobx.action, _mobx.action.bound], _openShareScreenSelectionDecs = [_mobx.action, _mobx.action.bound], _closeShareScreenSelectionDecs = [_mobx.action, _mobx.action.bound], _setControlBarWindowIdDecs = [_mobx.action, _mobx.action.bound], _openVideoWindowDialogDecs = [_mobx.action, _mobx.action.bound], _closeControlBarDecs = [_mobx.action, _mobx.action.bound], _closeVideoWindowDialogDecs = [_mobx.action, _mobx.action.bound], _handleReplaceScreenDecs = [_mobx.action, _mobx.action.bound], _initControlbarDecs = [_mobx.action, _mobx.action.bound], _toggleShareWithScenarioTypeDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_handleChooseScreenDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _zoomInDecs = [_mobx.action, _mobx.action.bound], _zoomOutDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound], _hasLoopbackDeviceDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _openRelaunchTipsDialogDecs = [_mobx.action, _mobx.action.bound], _startRenderSharePreviewDecs = [_mobx.action, _mobx.action.bound], _stopRenderSharePreviewDecs = [_mobx.action, _mobx.action.bound], _handleStopShareDecs = [_mobx.action, _mobx.action.bound], _handleStopShareByExitRoomDecs = [_mobx.action, _mobx.action.bound], _handleStartShareDecs = [_mobx.action, _mobx.action.bound], _openShareScreenSelectionDecs = [_mobx.action, _mobx.action.bound], _closeShareScreenSelectionDecs = [_mobx.action, _mobx.action.bound], _openVideoWindowDialogDecs = [_mobx.action, _mobx.action.bound], _closeControlBarDecs = [_mobx.action, _mobx.action.bound], _closeVideoWindowDialogDecs = [_mobx.action, _mobx.action.bound], _handleReplaceScreenDecs = [_mobx.action, _mobx.action.bound], _initControlbarDecs = [_mobx.action, _mobx.action.bound], _toggleShareWithScenarioTypeDecs = [_mobx.action, _mobx.action.bound], "logger");
 var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   function ShareScreenStore(_ref2) {
     var _this = this;
@@ -114,13 +114,13 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       annotationProvider = _ref2.annotationProvider,
       sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource,
       abilityProvider = _ref2.abilityProvider,
-      sharedAnnotationDataSource = _ref2.sharedAnnotationDataSource;
+      sharedAnnotationDataSource = _ref2.sharedAnnotationDataSource,
+      multiDisplayProvider = _ref2.multiDisplayProvider;
     (0, _classCallCheck2["default"])(this, ShareScreenStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ShareScreenStore'
     })));
     (0, _defineProperty2["default"])(this, "_disposers", []);
-    (0, _defineProperty2["default"])(this, "_controlBarWindowId", -1);
     (0, _defineProperty2["default"])(this, "_isOnline", true);
     (0, _defineProperty2["default"])(this, "_windowList", []);
     (0, _defineProperty2["default"])(this, "_displayList", []);
@@ -217,6 +217,25 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     }
   }
   return (0, _createClass2["default"])(ShareScreenStore, [{
+    key: "_handleOnScreenCaptureStopped",
+    value: function _handleOnScreenCaptureStopped() {
+      this.handleStopShare();
+    }
+  }, {
+    key: "_handleOnScreenCaptureStarted",
+    value: function _handleOnScreenCaptureStarted() {
+      this.prepareShareScreen();
+    }
+  }, {
+    key: "_hasScreenSharePermission",
+    value: function _hasScreenSharePermission() {
+      if (!this._securityStore.hasStartScreenSharePermission()) {
+        this._showToast((0, _i18n.transI18n)('fmt_screenshare_cohost_can_not_share_remind'), 'error');
+        return false;
+      }
+      return true;
+    }
+  }, {
     key: "boardOwnerUser",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
@@ -379,25 +398,6 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
         currentShareBounds: this.currentSelectionBounds
       }));
     }
-  }, {
-    key: "_handleOnScreenCaptureStopped",
-    value: function _handleOnScreenCaptureStopped() {
-      this.handleStopShare();
-    }
-  }, {
-    key: "_handleOnScreenCaptureStarted",
-    value: function _handleOnScreenCaptureStarted() {
-      this.prepareShareScreen();
-    }
-  }, {
-    key: "_hasScreenSharePermission",
-    value: function _hasScreenSharePermission() {
-      if (!this._securityStore.hasStartScreenSharePermission()) {
-        this._showToast((0, _i18n.transI18n)('fmt_screenshare_cohost_can_not_share_remind'), 'error');
-        return false;
-      }
-      return true;
-    }
   }, {
     key: "allowAnnotationSelfWriteState",
     get: function get() {
@@ -408,6 +408,11 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._annotationProvider.isShowToolbar;
     }
+  }, {
+    key: "isAnnotationSupported",
+    get: function get() {
+      return this._abilityProvider.isAnnotationSupported();
+    }
   }, {
     key: "toggleIsShowToolbar",
     value: function toggleIsShowToolbar() {
@@ -705,12 +710,12 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
               }
               return _context4.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_enablecollection'), 'error'));
             case 7:
+              // 初始化 controlbar 并隐藏, controlbar 不能在 startShareScreen 之后初始化，否则获取不到窗口信息，在屏幕共享时无法排除
+              this._initControlbar();
               this._sharedScreenShareSharedDataSource.setCurrentShareIdInfos(id, type, bounds);
               _context4.next = 8;
               return this._screenShareProvider.startShareScreen(id, type, withAudio, false);
             case 8:
-              this._initControlbar();
-            case 9:
             case "end":
               return _context4.stop();
           }
@@ -721,11 +726,6 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       }
       return handleStartShare;
     }()
-  }, {
-    key: "isAnnotationSupported",
-    value: function isAnnotationSupported() {
-      return this._abilityProvider.isAnnotationSupported();
-    }
   }, {
     key: "_openShareScreenSelection",
     value: function () {
@@ -740,7 +740,8 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
               return this.appWindowList;
             case 1:
               windowList = _context5.sent.filter(function (item) {
-                return !['AgoraHighLighter', 'Toast', 'Confirm', 'Annotation tool bar', 'Annotation', 'Video Window', 'Control Bar'].includes(item.title) || item.isCurrent;
+                return !['AgoraHighLighter', 'Toast', 'Confirm', 'Annotation tool bar', 'Annotation', 'Video Window', 'Control Bar', window.runtime.browserWindow.getTitle() // 主窗口和副窗口 title 一致，副窗口也需要排除在可选择列表中
+                ].includes(item.title) || item.isCurrent;
               });
               _context5.next = 2;
               return this.displayList;
@@ -775,11 +776,6 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       this._dialogProvider.closeDialog(this._shareSelectionDialogId);
       this._shareSelectionDialogId = '';
     }
-  }, {
-    key: "_setControlBarWindowId",
-    value: function _setControlBarWindowId(id) {
-      this._controlBarWindowId = id;
-    }
   }, {
     key: "_openVideoWindowDialog",
     value: function _openVideoWindowDialog() {
@@ -789,7 +785,6 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     key: "_closeControlBar",
     value: function _closeControlBar() {
       if (!this._controlBarDialogId) return;
-      this._setControlBarWindowId(-1);
       this._dialogProvider.closeDialog(this._controlBarDialogId);
       this._controlBarDialogId = '';
     }
@@ -862,6 +857,9 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
         case _constant.FcrUIAction.OPEN_TOP_VIDEO_WINDOW:
           this._openVideoWindowDialog();
           break;
+        case _constant.FcrUIAction.CLOSE_TOP_VIDEO_WINDOW:
+          this._closeVideoWindowDialog();
+          break;
       }
     }
   }, {
@@ -937,32 +935,9 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     }()
   }, {
     key: "_initControlbar",
-    value: function () {
-      var _initControlbar2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7() {
-        var mainWindow;
-        return _regenerator["default"].wrap(function (_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
-            case 0:
-              if ((0, _env.isElectron)()) {
-                this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR);
-                mainWindow = window.runtime.browserWindow;
-                if (mainWindow) {
-                  mainWindow.hide();
-                }
-              } else {
-                this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR);
-              }
-            case 1:
-            case "end":
-              return _context7.stop();
-          }
-        }, _callee7, this);
-      }));
-      function _initControlbar() {
-        return _initControlbar2.apply(this, arguments);
-      }
-      return _initControlbar;
-    }()
+    value: function _initControlbar() {
+      this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR);
+    }
   }, {
     key: "_handleBrowserShow",
     value: function _handleBrowserShow() {
@@ -993,7 +968,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ShareScreenStore = ShareScreenStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "boardOwnerUser"], [_decorator.bound, 2, "toggleIsShowToolbar"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_zoomInDecs, 18, "zoomIn"], [_zoomOutDecs, 18, "zoomOut"], [_fullContainerDecs, 18, "fullContainer"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_hasLoopbackDeviceDecs, 18, "hasLoopbackDevice"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_decorator.bound, 2, "setCardChooseBounds"], [_decorator.bound, 2, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_startRenderSharePreviewDecs, 18, "startRenderSharePreview"], [_stopRenderSharePreviewDecs, 18, "stopRenderSharePreview"], [_handleStopShareDecs, 18, "handleStopShare"], [_handleStopShareByExitRoomDecs, 18, "handleStopShareByExitRoom"], [_decorator.bound, 2, "participantShareCanWeAnnotation"], [_handleStartShareDecs, 18, "handleStartShare"], [_decorator.bound, 2, "isAnnotationSupported"], [_openShareScreenSelectionDecs, 18, "_openShareScreenSelection"], [_closeShareScreenSelectionDecs, 18, "_closeShareScreenSelection"], [_setControlBarWindowIdDecs, 18, "_setControlBarWindowId"], [_openVideoWindowDialogDecs, 18, "_openVideoWindowDialog"], [_closeControlBarDecs, 18, "_closeControlBar"], [_closeVideoWindowDialogDecs, 18, "_closeVideoWindowDialog"], [_handleReplaceScreenDecs, 18, "_handleReplaceScreen"], [_decorator.bound, 2, "_handleOnline"], [_decorator.bound, 2, "_handleOffline"], [_initControlbarDecs, 18, "_initControlbar"], [_decorator.bound, 2, "_handleBrowserShow"], [_decorator.bound, 2, "_hendleBrowserHide"], [_decorator.bound, 2, "_handleOnScreenShareSeize"], [_decorator.bound, 2, "handleToggleScreenShareWithAudio"], [_toggleShareWithScenarioTypeDecs, 18, "toggleShareWithScenarioType"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 3);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "boardOwnerUser"], [_decorator.bound, 2, "toggleIsShowToolbar"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_zoomInDecs, 18, "zoomIn"], [_zoomOutDecs, 18, "zoomOut"], [_fullContainerDecs, 18, "fullContainer"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_hasLoopbackDeviceDecs, 18, "hasLoopbackDevice"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_decorator.bound, 2, "setCardChooseBounds"], [_decorator.bound, 2, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_startRenderSharePreviewDecs, 18, "startRenderSharePreview"], [_stopRenderSharePreviewDecs, 18, "stopRenderSharePreview"], [_handleStopShareDecs, 18, "handleStopShare"], [_handleStopShareByExitRoomDecs, 18, "handleStopShareByExitRoom"], [_decorator.bound, 2, "participantShareCanWeAnnotation"], [_handleStartShareDecs, 18, "handleStartShare"], [_openShareScreenSelectionDecs, 18, "_openShareScreenSelection"], [_closeShareScreenSelectionDecs, 18, "_closeShareScreenSelection"], [_openVideoWindowDialogDecs, 18, "_openVideoWindowDialog"], [_closeControlBarDecs, 18, "_closeControlBar"], [_closeVideoWindowDialogDecs, 18, "_closeVideoWindowDialog"], [_handleReplaceScreenDecs, 18, "_handleReplaceScreen"], [_decorator.bound, 2, "_handleOnline"], [_decorator.bound, 2, "_handleOffline"], [_initControlbarDecs, 18, "_initControlbar"], [_decorator.bound, 2, "_handleBrowserShow"], [_decorator.bound, 2, "_hendleBrowserHide"], [_decorator.bound, 2, "_handleOnScreenShareSeize"], [_decorator.bound, 2, "handleToggleScreenShareWithAudio"], [_toggleShareWithScenarioTypeDecs, 18, "toggleShareWithScenarioType"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 3);
 _init_boardOwnerUser = _applyDecs$e[0];
 _init_handleChooseScreen = _applyDecs$e[1];
 _initProto = _applyDecs$e[2];

package/lib/modules/state-bar/index.d.ts

@@ -13,6 +13,7 @@ import { FcrUIMeetingTimeSharedDataSource } from '../../shared-data-source/meeti
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
+import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
 export declare class StateBarUIModule extends UIModule {
     private _store?;
     currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
@@ -31,6 +32,7 @@ export declare class StateBarUIModule extends UIModule {
     annotationProvider: FcrUIAnnotationProvider;
     dialogProvider?: FcrUIDialogProvider;
     sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
+    multiDisplayProvider?: FcrUIMultiDisplayProvider;
     onNodeWillActive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
     onNodeWillInactive(): void;

package/lib/modules/state-bar/index.js

@@ -58,7 +58,8 @@ var StateBarUIModule = exports.StateBarUIModule = /*#__PURE__*/function (_UIModu
         sharedMeetingTimeDataSource: this.sharedMeetingTimeDataSource,
         annotationProvider: this.annotationProvider,
         dialogProvider: this.dialogProvider,
-        sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource
+        sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource,
+        multiDisplayProvider: this.multiDisplayProvider
       });
     }
   }, {

package/lib/modules/state-bar/live-streaming-state.js

@@ -48,7 +48,6 @@ var LiveStreamingState = exports.LiveStreamingState = (0, _mobxReact.observer)(f
     var MIN_WIDTH = 84;
     var textWidth = (_textRef$current = textRef.current) === null || _textRef$current === void 0 ? void 0 : _textRef$current.offsetWidth;
     var parentWidth = (_textRef$current2 = textRef.current) === null || _textRef$current2 === void 0 || (_textRef$current2 = _textRef$current2.parentNode) === null || _textRef$current2 === void 0 ? void 0 : _textRef$current2.offsetWidth;
-    console.log(textWidth, parentWidth);
     if (textWidth > parentWidth || parentWidth < MIN_WIDTH || galleryWidth < _store.GALLERY_MIN_SIZE) {
       setHideLiveStreamingInfoOnOverflow(true);
     } else {

package/lib/modules/state-bar/store.d.ts

@@ -16,6 +16,7 @@ import { FcrUIMeetingTimeSharedDataSource } from '../../shared-data-source/meeti
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
+import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
 export type NetworkStatus = 'excellent' | 'average' | 'poor' | 'unknown';
 export declare const GALLERY_MIN_SIZE = 825;
 export default class StateBarStore {
@@ -32,6 +33,7 @@ export default class StateBarStore {
     private _messageProvider;
     private _sharedMemberDataSource;
     private _localStorageProvider;
+    private _multiDisplayProvider;
     private _roomObserver;
     private _abilityProvider;
     private _annotationProvider;
@@ -65,12 +67,13 @@ export default class StateBarStore {
     get meetingTime(): string;
     get password(): string | undefined;
     get isSharingScreen(): boolean;
+    get isLayoutSwitchDisabled(): boolean;
     get layoutSize(): number;
     get layoutView(): import("../../type").FcrUIVideoWindowLayoutType;
     get asideLayout(): import("../../type").FcrUIUpdateAsideParams;
     get isRoomDetailSupported(): boolean;
     get roomDetailCopyText(): string;
-    constructor({ roomControl, uiEventStore, securityStore, parameters, sharedLayoutDataSource, roomProvider, sharedVideoWindowDataSource, messageProvider, sharedMemberDataSource, localStorageProvider, abilityProvider, sharedMeetingTimeDataSource, annotationProvider, dialogProvider, sharedScreenShareSharedDataSource, }: {
+    constructor({ roomControl, uiEventStore, securityStore, parameters, sharedLayoutDataSource, roomProvider, sharedVideoWindowDataSource, messageProvider, sharedMemberDataSource, localStorageProvider, abilityProvider, sharedMeetingTimeDataSource, annotationProvider, dialogProvider, sharedScreenShareSharedDataSource, multiDisplayProvider, }: {
         roomControl: FcrMainRoomControl | FcrWaitingRoomControl;
         uiEventStore: FcrUIEventProvider;
         securityStore: FcrUIPrivilegeProvider;
@@ -86,6 +89,7 @@ export default class StateBarStore {
         annotationProvider: FcrUIAnnotationProvider;
         dialogProvider: FcrUIDialogProvider;
         sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
+        multiDisplayProvider: FcrUIMultiDisplayProvider;
     });
     get roomId(): string | undefined;
     get meetingId(): string | undefined;
@@ -95,7 +99,6 @@ export default class StateBarStore {
     setRoomInfo(roomInfo: FcrRoomInfo | undefined): void;
     toggleLayout(layout: FcrUIVideoWindowLayoutType): void;
     toggleLayoutBarLock(state: boolean): void;
-    openVideoWindowDialog(): void;
     release(): void;
     openDeviceSettingDialog(arg?: Partial<DeviceSettingDialogConfig>): void;
     stopLiveStreamingDialog(): void;

package/lib/modules/state-bar/store.js

@@ -131,7 +131,8 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
       sharedMeetingTimeDataSource = _ref2.sharedMeetingTimeDataSource,
       annotationProvider = _ref2.annotationProvider,
       dialogProvider = _ref2.dialogProvider,
-      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource;
+      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource,
+      multiDisplayProvider = _ref2.multiDisplayProvider;
     (0, _classCallCheck2["default"])(this, StateBarStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'StateBarStore'
@@ -180,13 +181,13 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     this._roomControl.addObserver(this._roomObserver);
     this._abilityProvider = abilityProvider;
     this._annotationProvider = annotationProvider;
+    this._multiDisplayProvider = multiDisplayProvider;
     this._uiEventStore.addObserver({
       onEvent: this._uiEvents.bind(this)
     });
     this._onNetworkQualityUpdated = this._onNetworkQualityUpdated.bind(this);
     this.toggleLayout = this.toggleLayout.bind(this);
     this.toggleLayoutBarLock = this.toggleLayoutBarLock.bind(this);
-    this.openVideoWindowDialog = this.openVideoWindowDialog.bind(this);
     this.cloudRecordingState = this._roomControl.getCloudRecordingState();
     this._initRoomInfo();
     var resizeHandler = this._setBrowserWidth();
@@ -368,6 +369,17 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedScreenShareSharedDataSource.isSharingScreen;
     }
+  }, {
+    key: "isLayoutSwitchDisabled",
+    get: function get() {
+      // 如果多屏幕功能开启，则始终不禁用布局切换
+      if (this.isMainRoom && this._multiDisplayProvider.isActive) {
+        return false;
+      }
+
+      // 如果正在共享屏幕，则切禁用布局切换
+      return this.isSharingScreen;
+    }
   }, {
     key: "layoutSize",
     get: function get() {
@@ -443,11 +455,6 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     value: function toggleLayoutBarLock(state) {
       this._uiEventStore.sendEvent(_constant.FcrUIAction.TOGGLE_LAYOUT_BAR_LOCK, state);
     }
-  }, {
-    key: "openVideoWindowDialog",
-    value: function openVideoWindowDialog() {
-      this._uiEventStore.openDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-    }
   }, {
     key: "release",
     value: function release() {

package/lib/modules/state-bar/view.js

@@ -68,7 +68,7 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     showNotification = _useContext.showNotification,
     closeNotification = _useContext.closeNotification,
     isRoomDetailSupported = _useContext.isRoomDetailSupported,
-    isSharingScreen = _useContext.isSharingScreen;
+    isLayoutSwitchDisabled = _useContext.isLayoutSwitchDisabled;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     isFullScreen = _useState2[0],
@@ -211,10 +211,10 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingTime.MeetingTime, {})
       }), attendeeCount > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: (0, _classnames["default"])(ns.e('layout'), {
-          'fcr-state-bar_layout_disable': isSharingScreen
+          'fcr-state-bar_layout_disable': isLayoutSwitchDisabled
         }),
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layoutConfig.LayoutConfig, {
-          disable: isSharingScreen
+          disable: isLayoutSwitchDisabled
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(MyFcrToolTip, {
         placement: "bottom",

package/lib/modules/video-window/components/members/index.js

@@ -20,8 +20,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _memberWindow = require("../../../components/member-window");
 var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
 require("./index.css");
-var _fcrCore = require("fcr-core");
-var _muteAction = require("../../../../utilities/mute-action");
 var _env = require("agora-foundation/lib/utilities/env");
 var _memberActions = require("../../../components/member-window/components/member-actions");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -46,7 +44,8 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
     interpreterUserList = _useContext.interpreterUserList,
     isInterpreterEnabled = _useContext.isInterpreterEnabled,
     openRenameDialog = _useContext.openRenameDialog,
-    userVolumeMap = _useContext.userVolumeMap;
+    userVolumeMap = _useContext.userVolumeMap,
+    deviceMicrophoneEnabled = _useContext.deviceMicrophoneEnabled;
   var ref = (0, _react.useRef)(null);
   var onScaleChange = (0, _react.useCallback)(function (scale) {}, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -56,12 +55,6 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
     }),
     ref: ref,
     children: [foldListRenderData.map(function (windowData, index) {
-      var muteAudioPermission = hasMutePermission(windowData.isMySelf ? _fcrCore.FcrPrivilegeUserRole.SELF : windowData.ownerRoleType);
-      var startAudioPermission = hasUnmutePermission(windowData.isMySelf ? _fcrCore.FcrPrivilegeUserRole.SELF : windowData.ownerRoleType);
-      var requestStartAudioPermission = hasRequestStartAudioPermission(windowData.ownerRoleType);
-      var _actionMute = (0, _muteAction.actionMute)(windowData.isMySelf, windowData.hasMicrophoneAudioStream, muteAudioPermission, startAudioPermission, requestStartAudioPermission),
-        isShowActionAudio = _actionMute.isShowActionAudio,
-        actionAudioTag = _actionMute.actionAudioTag;
       var isMySelf = windowData.isMySelf,
         videoStreamId = windowData.videoStreamId,
         audioStreamId = windowData.audioStreamId;
@@ -81,8 +74,6 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
             videoWindowCurrentWidth: videoWindowCurrentWidth,
             videoWindowCurrentHeight: videoWindowCurrentHeight,
             videoWindowPreviewType: videoWindowPreviewType,
-            isShowActionAudio: isShowActionAudio,
-            actionAudioTag: actionAudioTag,
             showActionBottomLabel: windowData.isSpeakerSpotlight || wrapperHovering,
             allowedOperations: getAllowedOperations(windowData.ownerRoleType, windowData.isMySelf),
             setVideoOrientation: setVideoOrientation,
@@ -98,7 +89,11 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
             handleRename: openRenameDialog,
             renderListLength: foldListRenderData.length,
             id: id,
-            volume: volume
+            volume: volume,
+            deviceMicrophoneEnabled: deviceMicrophoneEnabled,
+            hasMutePermission: hasMutePermission,
+            hasUnmutePermission: hasUnmutePermission,
+            hasRequestStartAudioPermission: hasRequestStartAudioPermission
           }),
           videoRenderMode: _type3.AgoraRtcRenderMode.FIT,
           videoStreamType: _type3.AgoraRtcVideoStreamType.LOW_STREAM,

package/lib/modules/video-window/store.d.ts

@@ -35,6 +35,7 @@ export default class VideoWindowStore {
     get filterFoldList(): FcrUIVideoWindowData[];
     get shouldHaveListView(): boolean;
     get localUserRole(): FcrUserRole;
+    get deviceMicrophoneEnabled(): boolean;
     constructor(params: VideoWindowStoreParams);
     setVideoOrientation(): void;
     release(): void;

package/lib/modules/video-window/store.js

@@ -262,6 +262,11 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedMemberDataSource.localUserRole;
     }
+  }, {
+    key: "deviceMicrophoneEnabled",
+    get: function get() {
+      return this._deviceStore.microphoneEnabled;
+    }
   }, {
     key: "setVideoOrientation",
     value: function setVideoOrientation() {

package/lib/modules/whiteboard/components/toolbar/store.d.ts

@@ -2,7 +2,7 @@ import { FcrBoardShape, WhiteboardThemeType } from '../../type';
 import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 import { FcrBoardMainWindow } from 'fcr-core/lib/room-control/whiteboard-control/types';
 import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
-import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 import { FcrUIAnnotationProvider } from '../../../../providers/annotation-provider';
 import { FcrUIEventProvider } from '../../../../providers/event-provider';
 import { FcrUISharedAnnotationSource } from '../../../../shared-data-source/annotation-data';
@@ -47,7 +47,7 @@ export declare class ToolbarStore {
     };
     get roomInfo(): import("fcr-core/lib/type").FcrRoomInfo | undefined;
     get boardMainWindow(): FcrBoardMainWindow | undefined;
-    constructor(_whiteboardControl: FcrWhiteboardControl, _roomControl: FcrBaseRoomControl, _annotationProvider: FcrUIAnnotationProvider, _eventProvider: FcrUIEventProvider, _sharedAnnotationDataSource: FcrUISharedAnnotationSource);
+    constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _roomControl: FcrBaseRoomControl, _annotationProvider: FcrUIAnnotationProvider, _eventProvider: FcrUIEventProvider, _sharedAnnotationDataSource: FcrUISharedAnnotationSource);
     private _onUiEvent;
     resetToolbarVars(): void;
     get annotationHasStart(): boolean;

package/lib/modules/whiteboard/index.d.ts

@@ -1,4 +1,4 @@
-import { FcrBoardRegion, WhiteboardBaseEvents, WhiteboardControlbarEvents } from './type';
+import { WhiteboardBaseEvents, WhiteboardControlbarEvents } from './type';
 import { FcrUIDialogKey, FcrUIAction } from '../../utilities/constant';
 import { UIModule } from '../../base';
 import { FcrUserInfo } from 'fcr-core/lib/type';
@@ -9,6 +9,7 @@ import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
 export declare class FcrWhiteboardUIModule extends UIModule {
+    protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
     private _uiEventStore?;
     private _userControl?;
@@ -27,18 +28,14 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     private _timer;
     private _isMyBoard;
     private _boardObserver;
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    protected _mounted: boolean;
-    protected _initialized: boolean;
-    protected _joined: boolean;
-    protected _boardDom?: HTMLDivElement | null;
-    protected _collectorDom?: HTMLDivElement | null;
-    protected _grantedUsers: Set<string>;
-    protected _outerDom?: Element;
-    protected _initArgs?: {
-        appId: string;
-        region: FcrBoardRegion;
-    };
+    private _mounted;
+    private _initialized;
+    private _joined;
+    private _boardDom?;
+    private _collectorDom?;
+    private _grantedUsers;
+    private _outerDom?;
+    private _initArgs?;
     currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
     eventProvider?: FcrUIEventProvider;
     privilegeProvider?: FcrUIPrivilegeProvider;

package/lib/modules/whiteboard/index.js

@@ -137,7 +137,7 @@ var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
-_ref = (_onPropertiesUpdateDecs = [_mobx.action, _mobx.action.bound], _mountDecs = [_mobx.action, _mobx.action.bound], _unmountDecs = [_mobx.action, _mobx.action.bound], _unloadDecs = [_mobx.action, _mobx.action.bound], _setBackgroundDecs = [_mobx.action, _mobx.action.bound], _boardUIEventsDecs = [_mobx.action, _mobx.action.bound], _repositionToolbarDecs = [_mobx.action, _mobx.action.bound], _setConnectionStateDecs = [_mobx.action, _mobx.action.bound], _openLonelyWindowDecs = [_mobx.action, _mobx.action.bound], _setJoinSuccessedDecs = [_mobx.action, _mobx.action.bound], "_disposers");
+_ref = (_onPropertiesUpdateDecs = [_mobx.action, _mobx.action.bound], _mountDecs = [_mobx.action, _mobx.action.bound], _unmountDecs = [_mobx.action, _mobx.action.bound], _unloadDecs = [_mobx.action, _mobx.action.bound], _setBackgroundDecs = [_mobx.action, _mobx.action.bound], _boardUIEventsDecs = [_mobx.action, _mobx.action.bound], _repositionToolbarDecs = [_mobx.action, _mobx.action.bound], _setConnectionStateDecs = [_mobx.action, _mobx.action.bound], _openLonelyWindowDecs = [_mobx.action, _mobx.action.bound], _setJoinSuccessedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/function (_UIModule) {
   function FcrWhiteboardUIModule() {
     var _this;
@@ -146,7 +146,10 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, FcrWhiteboardUIModule, [].concat(args));
-    (0, _defineProperty2["default"])(_this, _ref, (_initProto(_this), []));
+    (0, _defineProperty2["default"])(_this, _ref, (_initProto(_this), (0, _logger.createLogger)({
+      prefix: 'FcrWhiteboardUIModule'
+    })));
+    (0, _defineProperty2["default"])(_this, "_disposers", []);
     (0, _defineProperty2["default"])(_this, "_connectionState", _fcrCore.FcrConnectionState.DISCONNECTED);
     (0, _defineProperty2["default"])(_this, "_initWidth", 1920);
     (0, _defineProperty2["default"])(_this, "_initHeight", 1220);
@@ -161,12 +164,14 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         });
       },
       onInactive: function onInactive(reason, operatorUser) {
-        var _this$_localUser, _this$_ownerUser, _this$_ownerUser2;
+        var _this$_localUser, _this$_ownerUser;
+        _this._controlbarStore.controlEnabled = false;
         var currentUserId = (_this$_localUser = _this._localUser) === null || _this$_localUser === void 0 ? void 0 : _this$_localUser.userId;
         var isMeOperated = (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) === currentUserId;
         var isMeOwner = ((_this$_ownerUser = _this._ownerUser) === null || _this$_ownerUser === void 0 ? void 0 : _this$_ownerUser.userId) === currentUserId;
-        _this.logger.info("Fcr board has inactive effect, the reason is ".concat(reason, ", the operator is ").concat(operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userName, ", the owner is ").concat((_this$_ownerUser2 = _this._ownerUser) === null || _this$_ownerUser2 === void 0 ? void 0 : _this$_ownerUser2.userName));
-        !isMeOperated && isMeOwner && _this._alertWhenBeenStopByOthers(operatorUser);
+        if (!isMeOperated && isMeOwner) {
+          _this._alertWhenBeenStopByOthers(operatorUser);
+        }
         _this.onDestroy({
           operatorUser: operatorUser
         });
@@ -178,7 +183,6 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
           return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                _this.logger.info('Fcr board connection state changed to', state);
                 _this._setConnectionState(state);
                 if (state === _fcrCore.FcrConnectionState.DISCONNECTED) {
                   if (_this._joined) {
@@ -215,9 +219,6 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         return onConnectionStateUpdated;
       }()
     });
-    (0, _defineProperty2["default"])(_this, "logger", (0, _logger.createLogger)({
-      prefix: 'FcrWhiteboardUIModule'
-    }));
     (0, _defineProperty2["default"])(_this, "_mounted", false);
     (0, _defineProperty2["default"])(_this, "_initialized", false);
     (0, _defineProperty2["default"])(_this, "_joined", false);
@@ -504,10 +505,10 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
 
           var isActive = (_this$_whiteboardCont6 = this._whiteboardControl) === null || _this$_whiteboardCont6 === void 0 ? void 0 : _this$_whiteboardCont6.getActivity();
           if (isActive && this._whiteboardControl) {
-            var _this$_userControl2, _this$_ownerUser3, _this$_localUser3, _this$_boardStore2, _this$_boardStore3, _this$_uiEventStore3, _this$_toolbarStore;
+            var _this$_userControl2, _this$_ownerUser2, _this$_localUser3, _this$_boardStore2, _this$_boardStore3, _this$_uiEventStore3, _this$_toolbarStore;
             var ownerUserId = this._whiteboardControl.getOwnerId();
             this._ownerUser = (_this$_userControl2 = this._userControl) === null || _this$_userControl2 === void 0 ? void 0 : _this$_userControl2.getUser(ownerUserId);
-            this._isMyBoard = ((_this$_ownerUser3 = this._ownerUser) === null || _this$_ownerUser3 === void 0 ? void 0 : _this$_ownerUser3.userId) === ((_this$_localUser3 = this._localUser) === null || _this$_localUser3 === void 0 ? void 0 : _this$_localUser3.userId);
+            this._isMyBoard = ((_this$_ownerUser2 = this._ownerUser) === null || _this$_ownerUser2 === void 0 ? void 0 : _this$_ownerUser2.userId) === ((_this$_localUser3 = this._localUser) === null || _this$_localUser3 === void 0 ? void 0 : _this$_localUser3.userId);
             (_this$_boardStore2 = this._boardStore) === null || _this$_boardStore2 === void 0 || _this$_boardStore2.setPrivilege(this._isMyBoard || this._isHost);
             (_this$_boardStore3 = this._boardStore) === null || _this$_boardStore3 === void 0 || _this$_boardStore3.setWriteEnable(this._isMyBoard || this._isHost);
             (_this$_uiEventStore3 = this._uiEventStore) === null || _this$_uiEventStore3 === void 0 || _this$_uiEventStore3.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {

package/lib/providers/ability-provider.js

@@ -55,5 +55,7 @@ var FcrUIAbilityProviderImpl = exports.FcrUIAbilityProviderImpl = /*#__PURE__*/(
     return result;
   });
   this._abilityControl = _abilityControl;
+  // @ts-ignore
+  window._abilityProvider = this;
 });
 (0, _base.registerDependency)('abilityProvider');

package/lib/providers/device-provider.d.ts

@@ -284,6 +284,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     private _localVideoViewSet;
     private _videoRotation;
     private _playAudioTimer?;
+    private _released;
     private _isForceEnableBeauty;
     private _isForceEnableVirtualBackground;
     private _lastEnableVideoEffectType;
@@ -291,6 +292,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     private _mediaControlObserver;
     private _defaultMirror;
     private _volumeIndicationInterval;
+    private accessor _isDeviceListInited;
     private accessor _microphoneDevice;
     private accessor _microphone;
     private accessor _speakerDevice;
@@ -350,7 +352,8 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     getDisplayList(): Promise<AgoraRtcDisplayInfo[]>;
     get cameraTrack(): FcrCameraTrack;
     get microphoneTrack(): FcrMicrophoneTrack | null;
-    initDeviceList(): Promise<[void, void, void]>;
+    private _initDefaultDevice;
+    private _initDeviceList;
     addObserver(observer: FcrUIDeviceObserver): void;
     removeObserver(observer: FcrUIDeviceObserver): void;
     startPlayLocalVideo(view: HTMLElement, isMirror?: boolean): void;
@@ -385,8 +388,8 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     private _handleMicrophoneDeviceIdChanged;
     private _handleSpeakerDeviceIdChanged;
     private _handleSpeakerIdChanged;
-    setSpeakerId(speakerId: string): Promise<void>;
-    setMicrophoneId(microphoneId: string): Promise<void>;
+    setSpeakerId(speakerId: string): void;
+    setMicrophoneId(microphoneId: string): void;
     setSpeakerVolume(value: number): void;
     setMicrophoneVolume(value: number): void;
     startOrStopCamera(enable: boolean): void;