fcr-ui-scene 3.7.2 → 3.7.4-rc.1

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

@@ -71,13 +71,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _fcrCore = require("fcr-core");
 var _type = require("fcr-core/lib/type");
 var _env = require("agora-foundation/lib/utilities/env");
-var _type2 = require("agora-rte-sdk/lib/core/rtc/type");
 var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
 var _mobx = require("mobx");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _decorator = require("agora-foundation/lib/decorator");
 var _react = require("react");
-var _type3 = require("agora-ui-foundation/lib/components/icon/type");
+var _type2 = require("agora-ui-foundation/lib/components/icon/type");
 var _renderer = require("../../utilities/renderer");
 var _screenCapturePermission = require("../../utilities/screen-capture-permission");
 var _constant = require("../../utilities/constant");
@@ -85,7 +84,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, _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 +96,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], _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 +113,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", []);
@@ -163,7 +162,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_videoWindowDialogId", '');
     _classPrivateFieldInitSpec(this, _A, _init_boardOwnerUser(this, undefined));
     (0, _defineProperty2["default"])(this, "handleChooseScreen", _init_handleChooseScreen(this, function (id) {
-      var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _type2.AgoraRtcScreenCaptureType.WINDOW;
+      var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _type.FcrScreenCaptureType.WINDOW;
       _this._sharedScreenShareSharedDataSource.setCurrentSelection(id, type);
     }));
     this._deviceProvider = deviceProvider;
@@ -189,7 +188,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     this._addEventListeners();
     if ((0, _parameters.getStartScreenSharing)(sharedConfigDataSource.creatorConfig.parameters)) {
       var display = window.runtime.screen.getAllDisplays()[0];
-      this.handleStartShare(String(display.id), _type2.AgoraRtcScreenCaptureType.SCREEN, false, _shareAudio.AudioProcessingChannel.MONO, display.bounds);
+      this.handleStartShare(String(display.id), _type.FcrScreenCaptureType.SCREEN, false, _shareAudio.AudioProcessingChannel.MONO, display.bounds);
     }
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this._securityStore.hasStartScreenSharePermission();
@@ -217,6 +216,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 +397,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 +407,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() {
@@ -440,30 +444,6 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     value: function setOriginScalc() {
       this._screenShareProvider.setOriginScalc();
     }
-  }, {
-    key: "hasLoopbackDevice",
-    value: function () {
-      var _hasLoopbackDevice = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var res;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 1;
-              return this._deviceProvider.checkLoopbackDevice();
-            case 1:
-              res = _context.sent;
-              return _context.abrupt("return", res === 0);
-            case 2:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function hasLoopbackDevice() {
-        return _hasLoopbackDevice.apply(this, arguments);
-      }
-      return hasLoopbackDevice;
-    }()
   }, {
     key: "setShareAudioProcessingChannel",
     value: function setShareAudioProcessingChannel(currentShareAudioProcessingChannel) {
@@ -567,14 +547,14 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "prepareShareScreen",
     value: function () {
-      var _prepareShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      var _prepareShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this3 = this;
         var dialogId;
-        return _regenerator["default"].wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if ((0, _screenCapturePermission.hasScreenCapturePermission)()) {
-                _context3.next = 1;
+                _context2.next = 1;
                 break;
               }
               dialogId = this._dialogProvider.openConfirmDialog({
@@ -586,9 +566,9 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                   _this3._dialogProvider.closeConfirm(dialogId);
                 },
                 onOk: function () {
-                  var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-                    return _regenerator["default"].wrap(function (_context2) {
-                      while (1) switch (_context2.prev = _context2.next) {
+                  var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+                    return _regenerator["default"].wrap(function (_context) {
+                      while (1) switch (_context.prev = _context.next) {
                         case 0:
                           // 检查权限
                           //  corner case： 拒绝过权限后，将应用从系统中移除，打开设置后无法找到app，需要重新检查
@@ -600,9 +580,9 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                           _this3._dialogProvider.closeConfirm(dialogId);
                         case 1:
                         case "end":
-                          return _context2.stop();
+                          return _context.stop();
                       }
-                    }, _callee2);
+                    }, _callee);
                   }));
                   function onOk() {
                     return _onOk.apply(this, arguments);
@@ -611,15 +591,15 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 }(),
                 closable: false
               });
-              return _context3.abrupt("return");
+              return _context2.abrupt("return");
             case 1:
               this.supportEnumScreen && this._openShareScreenSelection();
-              !(0, _env.isElectron)() && this.handleStartShare(this.currentSelectionId, _type2.AgoraRtcScreenCaptureType.SCREEN, true, _shareAudio.AudioProcessingChannel.MONO, this.currentSelectionBounds);
+              !(0, _env.isElectron)() && this.handleStartShare(this.currentSelectionId, _type.FcrScreenCaptureType.SCREEN, true, _shareAudio.AudioProcessingChannel.MONO, this.currentSelectionBounds);
             case 2:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
       function prepareShareScreen() {
         return _prepareShareScreen.apply(this, arguments);
@@ -629,38 +609,38 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "handleStartShare",
     value: function () {
-      var _handleStartShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(id, type, withAudio) {
+      var _handleStartShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(id, type, withAudio) {
         var audioProcessingChannel,
           bounds,
           electronBounds,
           needToReplaceMyself,
           validShareStart,
-          _args4 = arguments;
-        return _regenerator["default"].wrap(function (_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+          _args3 = arguments;
+        return _regenerator["default"].wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              audioProcessingChannel = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : _shareAudio.AudioProcessingChannel.MONO;
-              bounds = _args4.length > 4 ? _args4[4] : undefined;
+              audioProcessingChannel = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : _shareAudio.AudioProcessingChannel.MONO;
+              bounds = _args3.length > 4 ? _args3[4] : undefined;
               if (!(this.connectionState !== _fcrCore.FcrConnectionState.CONNECTED || !this._isOnline)) {
-                _context4.next = 1;
+                _context3.next = 1;
                 break;
               }
               this._showToast((0, _i18n.transI18n)('fmt_screenshare_toast_network_error_unable_start_screen_share'), 'error');
-              return _context4.abrupt("return", Promise.reject(false));
+              return _context3.abrupt("return", Promise.reject(false));
             case 1:
               if ((0, _env.isElectron)()) this._closeShareScreenSelection();
               if (!id.startsWith('whiteboard-')) {
-                _context4.next = 3;
+                _context3.next = 3;
                 break;
               }
               if (!(!this._securityStore.hasStartBoardPermission() && !this.isHost)) {
-                _context4.next = 2;
+                _context3.next = 2;
                 break;
               }
-              return _context4.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_hostprohibits'), 'error'));
+              return _context3.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_hostprohibits'), 'error'));
             case 2:
               this._eventProvider.sendEvent(_constant.FcrUIAction.OPEN_WHITEBOARD);
-              return _context4.abrupt("return");
+              return _context3.abrupt("return");
             case 3:
               electronBounds = (0, _env.isElectron)() ? window.runtime.screen.getDisplayNearestPoint(bounds) : null;
               this._sharedScreenShareSharedDataSource.setCurrentSelectionBounds((electronBounds === null || electronBounds === void 0 ? void 0 : electronBounds.bounds) || bounds);
@@ -682,70 +662,66 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
               needToReplaceMyself = this.localUserScreenSharingState === _fcrCore.FcrMediaSourceState.OPEN;
               this.logger.info("[screen-share][handleStartShare]: needToReplaceMyself - ".concat(needToReplaceMyself));
               if (!needToReplaceMyself) {
-                _context4.next = 4;
+                _context3.next = 4;
                 break;
               }
               this._handleReplaceScreen(id, type, withAudio, audioProcessingChannel, bounds);
-              return _context4.abrupt("return");
+              return _context3.abrupt("return");
             case 4:
-              _context4.next = 5;
+              _context3.next = 5;
               return this._validateShareStart(id, type);
             case 5:
-              validShareStart = _context4.sent;
+              validShareStart = _context3.sent;
               this.logger.info("[screen-share][handleStartShare]: validShareStart: ".concat(validShareStart));
               if (!(!this._hasScreenSharePermission() || !validShareStart)) {
-                _context4.next = 6;
+                _context3.next = 6;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context3.abrupt("return");
             case 6:
               if (!this.shareLock) {
-                _context4.next = 7;
+                _context3.next = 7;
                 break;
               }
-              return _context4.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_enablecollection'), 'error'));
+              return _context3.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;
+              _context3.next = 8;
               return this._screenShareProvider.startShareScreen(id, type, withAudio, false);
             case 8:
-              this._initControlbar();
-            case 9:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
       function handleStartShare(_x, _x2, _x3) {
         return _handleStartShare.apply(this, arguments);
       }
       return handleStartShare;
     }()
-  }, {
-    key: "isAnnotationSupported",
-    value: function isAnnotationSupported() {
-      return this._abilityProvider.isAnnotationSupported();
-    }
   }, {
     key: "_openShareScreenSelection",
     value: function () {
-      var _openShareScreenSelection2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+      var _openShareScreenSelection2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
         var _this4 = this;
         var windowList, displayList;
-        return _regenerator["default"].wrap(function (_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regenerator["default"].wrap(function (_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               this._shareSelectionDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SHARE_SCREEN, 'screen-selection');
-              _context5.next = 1;
+              _context4.next = 1;
               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;
+              windowList = _context4.sent.filter(function (item) {
+                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;
+              _context4.next = 2;
               return this.displayList;
             case 2:
-              displayList = _context5.sent;
+              displayList = _context4.sent;
               this._windowList = windowList;
               this._displayList = displayList;
               (0, _mobx.runInAction)(function () {
@@ -755,14 +731,14 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 _this4._sharedScreenShareSharedDataSource.setScreenCaptureSources([{
                   title: (0, _i18n.transI18n)('fmt_share_options_whiteboard'),
                   id: "whiteboard-".concat(displayList[0].id),
-                  image: _type3.FcrIconType.FCR_WHITEBOARD2
+                  image: _type2.FcrIconType.FCR_WHITEBOARD2
                 }].concat((0, _toConsumableArray2["default"])(displayList)));
               });
             case 3:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this);
+        }, _callee4, this);
       }));
       function _openShareScreenSelection() {
         return _openShareScreenSelection2.apply(this, arguments);
@@ -775,11 +751,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 +760,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 +832,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;
       }
     }
   }, {
@@ -903,32 +876,32 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_validateShareStart",
     value: function () {
-      var _validateShareStart2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(id, type) {
-        return _regenerator["default"].wrap(function (_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _validateShareStart2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(id, type) {
+        return _regenerator["default"].wrap(function (_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               if (!this.supportEnumScreen) {
-                _context6.next = 2;
+                _context5.next = 2;
                 break;
               }
-              if (!(type === _type2.AgoraRtcScreenCaptureType.WINDOW && !this._validateWindow(id))) {
-                _context6.next = 1;
+              if (!(type === _type.FcrScreenCaptureType.WINDOW && !this._validateWindow(id))) {
+                _context5.next = 1;
                 break;
               }
-              return _context6.abrupt("return", false);
+              return _context5.abrupt("return", false);
             case 1:
-              if (!(type === _type2.AgoraRtcScreenCaptureType.SCREEN && !this._validateDisplay(id))) {
-                _context6.next = 2;
+              if (!(type === _type.FcrScreenCaptureType.SCREEN && !this._validateDisplay(id))) {
+                _context5.next = 2;
                 break;
               }
-              return _context6.abrupt("return", false);
+              return _context5.abrupt("return", false);
             case 2:
-              return _context6.abrupt("return", true);
+              return _context5.abrupt("return", true);
             case 3:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
-        }, _callee6, this);
+        }, _callee5, this);
       }));
       function _validateShareStart(_x4, _x5) {
         return _validateShareStart2.apply(this, arguments);
@@ -937,32 +910,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 +943,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"], [_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/share-screen/types.d.ts

@@ -1,27 +1,26 @@
-import { AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
 import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
-import { AgoraRtcDisplayInfo, AgoraRtcWindowInfo } from 'fcr-core/lib/imports';
+import { FcrDisplayInfo, FcrWindowInfo, FcrScreenCaptureType } from 'fcr-core/lib/type';
 import { CurrentShareBounds } from '../control-bar/types';
-export type FcrUIWindowCaptureSource = AgoraRtcWindowInfo;
-export type FcrUIDisplayCaptureSource = Omit<AgoraRtcDisplayInfo, 'image'> & {
+export type FcrUIWindowCaptureSource = FcrWindowInfo;
+export type FcrUIDisplayCaptureSource = Omit<FcrDisplayInfo, 'image'> & {
     image: FcrIconType | Uint8Array;
 };
 export interface FcrUIShareSelectionWindowProps {
     currentShareType: string;
     onChangeShareType: (type: string) => void;
-    screens: AgoraRtcWindowInfo[];
-    applications: AgoraRtcDisplayInfo[];
+    screens: FcrWindowInfo[];
+    applications: FcrDisplayInfo[];
 }
 export interface FcrUIShareSelectionDisplayProps {
     currentShareAudioProcessingChannel: AudioProcessingChannel;
     currentShareId: string;
-    currentShareType: AgoraRtcScreenCaptureType;
+    currentShareType: FcrScreenCaptureType;
     currentShareBounds: CurrentShareBounds;
     shareWithAudio: boolean;
 }
 export type CurrentShareScreenTypes = {
     id: string;
-    type: AgoraRtcScreenCaptureType;
+    type: FcrScreenCaptureType;
     bounds: CurrentShareBounds;
 };

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;