fcr-ui-scene 3.4.0 → 3.4.2

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

@@ -41,9 +41,9 @@ require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.includes.js");
-require("core-js/modules/es.array.index-of.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.array.some.js");
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.json.stringify.js");
@@ -56,10 +56,12 @@ require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.some.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.for-each.js");
@@ -79,9 +81,7 @@ var _type3 = require("agora-rte-sdk/lib/core/scene/type");
 var _type4 = require("agora-rte-sdk/lib/type");
 var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
 var _mobx = require("mobx");
-var _constant = require("../../utilities/constant");
 var _rendererEvent = require("../../utilities/renderer-event");
-var _platform = require("../../utilities/platform");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _decorator = require("agora-foundation/lib/decorator");
 var _tools = require("../../utilities/tools");
@@ -90,8 +90,9 @@ var _type5 = require("agora-ui-foundation/lib/components/icon/type");
 var _types = require("fcr-core/lib/room-control/whiteboard-control/types");
 var _renderer = require("../../utilities/renderer");
 var _screenCapturePermission = require("../../utilities/screen-capture-permission");
+var _constant = require("../../utilities/constant");
 var _ShareScreenStore;
-var _initProto, _init__shareSelectionDialogId, _init__controlBarDialogId, _init__videoWindowDialogId, _init__isHost, _init__shareLocked, _init__screenTrack, _init__shareAudioTrack, _init_screenSharingState, _init_applicationCaptureSources, _init_screenCaptureSources, _init_hasScreenCapturePermission, _init_withAudio, _init_currentShareAudioProcessingChannel, _init_currentShareId, _init_sharerId, _init_currentShareType, _init_currentSelection, _init_currentSelectionType, _init_shareWithAudio, _init_boardOwnerUser, _init_localUser, _init_localUserRole, _handleChooseScreenDecs, _init_handleChooseScreen, _setShareWithAudioStateDecs, _hasLoopbackDeviceDecs, _setShareAudioProcessingChannelDecs, _handleShareStartWithAudioDecs, _handleShareStopWithAudioDecs, _startPreviewDecs, _openDialogDecs, _openShareScreenSelectionDecs, _closeShareScreenSelectionDecs, _setControlBarWindowIdDecs, _openVideoWindowDialogDecs, _closeControlBarDecs, _closeVideoWindowDialogDecs, _openRelaunchTipsDialogDecs, _setShareWithAudioDecs, _setWithAudioStateDecs, _handleStartShareDecs, _handleReplaceScreenDecs, _handleStopShareDecs, _handleScreenCaptureStateUpdatedDecs, _setShareLockDecs, _handleStreamUpdateDecs, _initControlbarDecs, _ref;
+var _initProto, _init__shareSelectionDialogId, _init__controlBarDialogId, _init__videoWindowDialogId, _init__isHost, _init__shareLocked, _init__screenTrack, _init__shareAudioTrack, _init_screenSharingState, _init_applicationCaptureSources, _init_screenCaptureSources, _init_hasScreenCapturePermission, _init_currentShareAudioProcessingChannel, _init_currentShareId, _init_sharerId, _init_currentShareType, _init_currentSelection, _init_currentSelectionType, _init_currentSelectionBounds, _init_shareWithAudio, _init_boardOwnerUser, _init_localUser, _init_localUserRole, _handleChooseScreenDecs, _init_handleChooseScreen, _setShareWithAudioStateDecs, _hasLoopbackDeviceDecs, _setShareAudioProcessingChannelDecs, _handleShareStartWithAudioDecs, _handleShareStopWithAudioDecs, _startPreviewDecs, _openDialogDecs, _openShareScreenSelectionDecs, _closeShareScreenSelectionDecs, _setControlBarWindowIdDecs, _openVideoWindowDialogDecs, _closeControlBarDecs, _closeVideoWindowDialogDecs, _openRelaunchTipsDialogDecs, _startLoopbackDecs, _setWithAudioStateDecs, _handleStartShareDecs, _handleReplaceScreenDecs, _handleStopShareDecs, _handleScreenCaptureStateUpdatedDecs, _setShareLockDecs, _handleStreamUpdateDecs, _initControlbarDecs, _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; }
@@ -124,15 +125,16 @@ var _S = /*#__PURE__*/new WeakMap();
 var _T = /*#__PURE__*/new WeakMap();
 var _U = /*#__PURE__*/new WeakMap();
 var _V = /*#__PURE__*/new WeakMap();
-_ref = (_handleChooseScreenDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _hasLoopbackDeviceDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _handleShareStartWithAudioDecs = [_mobx.action, _mobx.action.bound], _handleShareStopWithAudioDecs = [_mobx.action, _mobx.action.bound], _startPreviewDecs = [_mobx.action, _mobx.action.bound], _openDialogDecs = [_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], _openRelaunchTipsDialogDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioDecs = [_mobx.action, _mobx.action.bound], _setWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _handleStartShareDecs = [_mobx.action, _mobx.action.bound], _handleReplaceScreenDecs = [_mobx.action, _mobx.action.bound], _handleStopShareDecs = [_mobx.action, _mobx.action.bound], _handleScreenCaptureStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _setShareLockDecs = [_mobx.action, _mobx.action.bound], _handleStreamUpdateDecs = [_mobx.action, _mobx.action.bound], _initControlbarDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_handleChooseScreenDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _hasLoopbackDeviceDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _handleShareStartWithAudioDecs = [_mobx.action, _mobx.action.bound], _handleShareStopWithAudioDecs = [_mobx.action, _mobx.action.bound], _startPreviewDecs = [_mobx.action, _mobx.action.bound], _openDialogDecs = [_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], _openRelaunchTipsDialogDecs = [_mobx.action, _mobx.action.bound], _startLoopbackDecs = [_mobx.action, _mobx.action.bound], _setWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _handleStartShareDecs = [_mobx.action, _mobx.action.bound], _handleReplaceScreenDecs = [_mobx.action, _mobx.action.bound], _handleStopShareDecs = [_mobx.action, _mobx.action.bound], _handleScreenCaptureStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _setShareLockDecs = [_mobx.action, _mobx.action.bound], _handleStreamUpdateDecs = [_mobx.action, _mobx.action.bound], _initControlbarDecs = [_mobx.action, _mobx.action.bound], "logger");
 var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   function ShareScreenStore(_ref2) {
-    var _this = this,
-      _this$localUser;
+    var _this = this;
     var roomControl = _ref2.roomControl,
-      mediaControl = _ref2.mediaControl,
-      securityStore = _ref2.securityStore,
-      uiEventStore = _ref2.uiEventStore;
+      deviceProvider = _ref2.deviceProvider,
+      privilegeProvider = _ref2.privilegeProvider,
+      messageProvider = _ref2.messageProvider,
+      dialogProvider = _ref2.dialogProvider,
+      eventProvider = _ref2.eventProvider;
     (0, _classCallCheck2["default"])(this, ShareScreenStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
     (0, _defineProperty2["default"])(this, "_disposers", []);
@@ -148,9 +150,26 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       onEvent: this._onUiEvent.bind(this)
     });
     (0, _defineProperty2["default"])(this, "_streamObserver", {
-      onStreamsAdded: this._handleStreamUpdate.bind(this),
-      onStreamsRemoved: this._handleStreamUpdate.bind(this),
-      onStreamsUpdated: this._handleStreamUpdate.bind(this)
+      onStreamsAdded: function onStreamsAdded(_, events) {
+        return _this._handleStreamUpdate('add', events);
+      },
+      onStreamsRemoved: function onStreamsRemoved(_, events) {
+        return _this._handleStreamUpdate('remove', events);
+      },
+      onStreamsUpdated: function onStreamsUpdated(_, events) {
+        return _this._handleStreamUpdate('update', events);
+      }
+    });
+    (0, _defineProperty2["default"])(this, "_boardObserver", {
+      onActive: function onActive(ownerId) {
+        _this.handleStopShare();
+        (0, _env.isElectron)() && _this._closeCapture();
+        _this.closeShareScreenSelection();
+        _this.boardOwnerUser = _this._userControl.getUser(ownerId);
+      },
+      onInactive: function onInactive(reason) {
+        _this.boardOwnerUser = undefined;
+      }
     });
     _classPrivateFieldInitSpec(this, _A, _init__shareSelectionDialogId(this, ''));
     _classPrivateFieldInitSpec(this, _B, _init__controlBarDialogId(this, ''));
@@ -163,43 +182,45 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _I, _init_applicationCaptureSources(this, []));
     _classPrivateFieldInitSpec(this, _J, _init_screenCaptureSources(this, []));
     _classPrivateFieldInitSpec(this, _K, _init_hasScreenCapturePermission(this, true));
-    _classPrivateFieldInitSpec(this, _L, _init_withAudio(this, false));
-    _classPrivateFieldInitSpec(this, _M, _init_currentShareAudioProcessingChannel(this, _shareAudio.AudioProcessingChannel.MONO));
-    _classPrivateFieldInitSpec(this, _N, _init_currentShareId(this, ''));
-    _classPrivateFieldInitSpec(this, _O, _init_sharerId(this, ''));
-    _classPrivateFieldInitSpec(this, _P, _init_currentShareType(this, _type2.AgoraRtcScreenCaptureType.SCREEN));
-    _classPrivateFieldInitSpec(this, _Q, _init_currentSelection(this, ''));
-    _classPrivateFieldInitSpec(this, _R, _init_currentSelectionType(this, _type2.AgoraRtcScreenCaptureType.WINDOW));
-    _classPrivateFieldInitSpec(this, _S, _init_shareWithAudio(this, false));
+    _classPrivateFieldInitSpec(this, _L, _init_currentShareAudioProcessingChannel(this, _shareAudio.AudioProcessingChannel.MONO));
+    _classPrivateFieldInitSpec(this, _M, _init_currentShareId(this, ''));
+    _classPrivateFieldInitSpec(this, _N, _init_sharerId(this, ''));
+    _classPrivateFieldInitSpec(this, _O, _init_currentShareType(this, _type2.AgoraRtcScreenCaptureType.SCREEN));
+    _classPrivateFieldInitSpec(this, _P, _init_currentSelection(this));
+    _classPrivateFieldInitSpec(this, _Q, _init_currentSelectionType(this, _type2.AgoraRtcScreenCaptureType.WINDOW));
+    _classPrivateFieldInitSpec(this, _R, _init_currentSelectionBounds(this, {
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0
+    }));
+    _classPrivateFieldInitSpec(this, _S, _init_shareWithAudio(this));
     _classPrivateFieldInitSpec(this, _T, _init_boardOwnerUser(this, undefined));
-    _classPrivateFieldInitSpec(this, _U, _init_localUser(this, null));
+    _classPrivateFieldInitSpec(this, _U, _init_localUser(this));
     _classPrivateFieldInitSpec(this, _V, _init_localUserRole(this, _type.FcrUserRole.PARTICIPANT));
     (0, _defineProperty2["default"])(this, "handleChooseScreen", _init_handleChooseScreen(this, function (id) {
       var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _type2.AgoraRtcScreenCaptureType.WINDOW;
+      var bounds = arguments.length > 2 ? arguments[2] : undefined;
       _this.currentSelection = id;
       _this.currentSelectionType = type;
+      _this.currentSelectionBounds = bounds;
     }));
     this._roomControl = roomControl;
-    this._mediaControl = mediaControl;
+    this._deviceProvider = deviceProvider;
+    this._messageProvider = messageProvider;
+    this._dialogProvider = dialogProvider;
+    this._eventProvider = eventProvider;
     this._streamControl = roomControl.getStreamControl();
     this._userControl = roomControl.getUserControl();
-    this._securityStore = securityStore;
-    this._uiEventStore = uiEventStore;
+    this._securityStore = privilegeProvider;
     this.localUser = this._userControl.getLocalUser();
-    this.localUserRole = (_this$localUser = this.localUser) === null || _this$localUser === void 0 ? void 0 : _this$localUser.userRole;
-    this._uiEventStore.addObserver(this._uiEventObserver);
+    this.localUserRole = this.localUser.userRole;
+    this.shareWithAudio = (0, _env.isElectron)() ? false : true; // electron 默认 false，web 默认 true
+    this._loopbackAudioSourceId = (0, _env.getPlatform)() === _env.FcrApplicationPlatform.MACOS && (0, _env.isElectron)() ? 'AgoraALD' : (0, _env.isElectron)() ? '' : 'default';
+    this.currentSelection = (0, _env.isElectron)() ? '' : 'default';
+    this._eventProvider.addObserver(this._uiEventObserver);
     this._streamControl.addObserver(this._streamObserver);
-    this._roomControl.getBoardControl().addObserver({
-      onActive: function onActive(ownerId) {
-        _this.handleStopShare();
-        (0, _env.isElectron)() && _this._closeCapture();
-        _this.closeShareScreenSelection();
-        _this.boardOwnerUser = _this._userControl.getUser(ownerId);
-      },
-      onInactive: function onInactive(reason) {
-        _this.boardOwnerUser = undefined;
-      }
-    });
+    this._roomControl.getBoardControl().addObserver(this._boardObserver);
     this._isHost = [_type.FcrUserRole.HOST, _type.FcrUserRole.COHOST].includes(this.localUserRole);
     this._addEventListeners();
     this._syncShareStreamState();
@@ -207,22 +228,14 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       return _this._securityStore.hasStartScreenSharePermission();
     }, function (screenSharePremission) {
       if (!screenSharePremission) {
-        if (_this.screenSharingState === _fcrCore.FcrMediaSourceState.OPEN) _this.handleStopShare();
         if (_this._isHost) return;
-        _this._uiEventStore.showToast({
+        _this._messageProvider.showToast({
           type: 'error',
           message: (0, _i18n.transI18n)('fmt_screenshare_tips_hostprohibitssharing'),
           duration: 3000
         });
       }
     }));
-    this._disposers.push((0, _mobx.reaction)(function () {
-      return _this.screenSharingState;
-    }, function (state) {
-      _this._uiEventStore.sendEvent(_constant.UIAction.UPDATE_SHARE_STATE, {
-        isOpen: state === _fcrCore.FcrMediaSourceState.OPEN
-      });
-    }));
   }
   return (0, _createClass2["default"])(ShareScreenStore, [{
     key: "_shareSelectionDialogId",
@@ -313,7 +326,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "withAudio",
+    key: "currentShareAudioProcessingChannel",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
@@ -321,7 +334,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "currentShareAudioProcessingChannel",
+    key: "currentShareId",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
@@ -329,7 +342,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "currentShareId",
+    key: "sharerId",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
@@ -337,7 +350,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "sharerId",
+    key: "currentShareType",
     get: function get() {
       return _classPrivateFieldGet(_O, this);
     },
@@ -345,7 +358,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_O, this, v);
     }
   }, {
-    key: "currentShareType",
+    key: "currentSelection",
     get: function get() {
       return _classPrivateFieldGet(_P, this);
     },
@@ -353,7 +366,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_P, this, v);
     }
   }, {
-    key: "currentSelection",
+    key: "currentSelectionType",
     get: function get() {
       return _classPrivateFieldGet(_Q, this);
     },
@@ -361,7 +374,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_Q, this, v);
     }
   }, {
-    key: "currentSelectionType",
+    key: "currentSelectionBounds",
     get: function get() {
       return _classPrivateFieldGet(_R, this);
     },
@@ -400,6 +413,21 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_V, this, v);
     }
+  }, {
+    key: "supportEnumScreen",
+    get: function get() {
+      return this._deviceProvider.isCapabilitySupported(_fcrCore.FcrCapability.SCREEN_ENUMERATE);
+    }
+  }, {
+    key: "appWindowList",
+    get: function get() {
+      return this._deviceProvider.getWindowList();
+    }
+  }, {
+    key: "displayList",
+    get: function get() {
+      return this._deviceProvider.getDisplayList();
+    }
   }, {
     key: "setShareWithAudioState",
     value: function setShareWithAudioState(withAudio) {
@@ -414,7 +442,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return this._mediaControl.checkLoopbackDevice();
+              return this._deviceProvider.checkLoopbackDevice();
             case 2:
               res = _context.sent;
               return _context.abrupt("return", res === 0);
@@ -437,25 +465,28 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "handlerBoardShareStop",
     value: function handlerBoardShareStop() {
-      this._uiEventStore.sendEvent(_constant.UIAction.CLOSE_WHITEBOARD);
+      this._eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_WHITEBOARD);
     }
   }, {
     key: "release",
     value: function release() {
+      var _this$_screenTrack;
       this._disposers.forEach(function (disposer) {
         return disposer();
       });
       this._disposers = [];
       this._closeCapture();
       this._removeEventListeners();
-      this._uiEventStore.removeObserver(this._uiEventObserver);
+      this._eventProvider.removeObserver(this._uiEventObserver);
+      this._streamControl.removeObserver(this._streamObserver);
+      (_this$_screenTrack = this._screenTrack) === null || _this$_screenTrack === void 0 || _this$_screenTrack.removeObserver(this._observer);
+      this._roomControl.getBoardControl().removeObserver(this._boardObserver);
     }
   }, {
     key: "handleShareStartWithAudio",
     value: function handleShareStartWithAudio() {
-      var isMac = navigator.userAgent.indexOf('Mac') > -1;
-      this._shareAudioTrack = this._mediaControl.getLoopbackTrack(isMac && (0, _env.isElectron)() ? 'AgoraALD' : (0, _env.isElectron)() ? '' : 'default');
-      if (this._mediaControl.isCapabilitySupported(_fcrCore.FcrCapability.LOOPBACK_CAPTURE)) {
+      this._shareAudioTrack = this._deviceProvider.getLoopbackTrack(this._loopbackAudioSourceId);
+      if (this._deviceProvider.isCapabilitySupported(_fcrCore.FcrCapability.LOOPBACK_CAPTURE)) {
         this._shareAudioTrack.start();
       }
     }
@@ -465,7 +496,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       if (!this._shareAudioTrack) {
         return;
       }
-      if (this._mediaControl.isCapabilitySupported(_fcrCore.FcrCapability.LOOPBACK_CAPTURE)) {
+      if (this._deviceProvider.isCapabilitySupported(_fcrCore.FcrCapability.LOOPBACK_CAPTURE)) {
         this._shareAudioTrack.stop();
       }
     }
@@ -474,65 +505,48 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     value: function startPreview(dom) {
       this._previewDom = dom;
       if (dom) {
-        var _this$_screenTrack;
-        (_this$_screenTrack = this._screenTrack) === null || _this$_screenTrack === void 0 || _this$_screenTrack.startPreview({
+        var _this$_screenTrack2;
+        (_this$_screenTrack2 = this._screenTrack) === null || _this$_screenTrack2 === void 0 || _this$_screenTrack2.startPreview({
           renderMode: 1,
           isMirror: false
         }, dom);
       } else {
-        var _this$_screenTrack2;
-        (_this$_screenTrack2 = this._screenTrack) === null || _this$_screenTrack2 === void 0 || _this$_screenTrack2.stopPreview(dom);
+        var _this$_screenTrack3;
+        (_this$_screenTrack3 = this._screenTrack) === null || _this$_screenTrack3 === void 0 || _this$_screenTrack3.stopPreview(dom);
         this._previewDom = null;
       }
     }
   }, {
     key: "openDialog",
     value: function openDialog(item) {
-      this._uiEventStore.openDialog(item, '', {
+      this._dialogProvider.openDialog(item, '', {
         controlBarWindowId: this._controlBarWindowId
       });
     }
   }, {
     key: "closeDialog",
     value: function closeDialog(item) {
-      this._uiEventStore.closeDialog("".concat(item, "_").concat(item));
+      this._dialogProvider.closeDialog("".concat(item, "_").concat(item));
     }
   }, {
     key: "openShareScreenSelection",
     value: function () {
       var _openShareScreenSelection = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this2 = this;
-        var NORMAL_HEIGHT, WINDOWS_HEIGHT, NORMAL_WIDTH, shareSelectionHeight, _window$runtime$brows, mainWidowX, mainWindowY, mainWidth, mainHeight, offsetForToast, windowList, displayList;
+        var windowList, displayList;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              NORMAL_HEIGHT = 550;
-              WINDOWS_HEIGHT = 24;
-              NORMAL_WIDTH = 790;
-              shareSelectionHeight = !(0, _platform.isWindows)() ? NORMAL_HEIGHT : NORMAL_HEIGHT + WINDOWS_HEIGHT;
-              _window$runtime$brows = window.runtime.browserWindow.getBounds(), mainWidowX = _window$runtime$brows.x, mainWindowY = _window$runtime$brows.y, mainWidth = _window$runtime$brows.width, mainHeight = _window$runtime$brows.height;
-              offsetForToast = 50;
-              this._shareSelectionDialogId = this._uiEventStore.openDialog(_constant.DialogKey.SHARE_SCREEN, 'screen-selection', {
-                frame: false,
-                titleBarStyle: 'hidden',
-                width: NORMAL_WIDTH,
-                fullscreen: false,
-                maximizable: false,
-                height: shareSelectionHeight,
-                x: mainWidowX + Math.floor(mainWidth / 2) - Math.floor(NORMAL_WIDTH / 2),
-                y: mainWindowY + Math.floor(mainHeight / 2) - Math.floor(shareSelectionHeight / 2) + offsetForToast,
-                controlBarDialogId: this._controlBarDialogId,
-                transparent: true
-              });
-              _context2.next = 9;
-              return this._mediaControl.getWindowList();
-            case 9:
+              this._shareSelectionDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SHARE_SCREEN, 'screen-selection');
+              _context2.next = 3;
+              return this.appWindowList;
+            case 3:
               windowList = _context2.sent.filter(function (item) {
                 return !['AgoraHighLighter', 'Toast', 'Confirm'].includes(item.title) || item.isCurrent;
               });
-              _context2.next = 12;
-              return this._mediaControl.getDisplayList();
-            case 12:
+              _context2.next = 6;
+              return this.displayList;
+            case 6:
               displayList = _context2.sent;
               (0, _mobx.runInAction)(function () {
                 _this2.applicationCaptureSources = windowList.filter(function (item) {
@@ -544,7 +558,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                   image: _type5.FcrIconType.FCR_WHITEBOARD2
                 }].concat((0, _toConsumableArray2["default"])(displayList));
               });
-            case 14:
+            case 8:
             case "end":
               return _context2.stop();
           }
@@ -558,7 +572,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "closeShareScreenSelection",
     value: function closeShareScreenSelection() {
-      this._uiEventStore.closeDialog(this._shareSelectionDialogId);
+      this._dialogProvider.closeDialog(this._shareSelectionDialogId);
       this._shareSelectionDialogId = '';
     }
   }, {
@@ -569,35 +583,35 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "openVideoWindowDialog",
     value: function openVideoWindowDialog() {
-      this._videoWindowDialogId = this._uiEventStore.openDialog(_constant.DialogKey.VIDEO_WINDOW);
+      this._videoWindowDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
     }
   }, {
     key: "closeControlBar",
     value: function closeControlBar() {
       if (!this._controlBarDialogId) return;
       this.setControlBarWindowId(-1);
-      this._uiEventStore.closeDialog(this._controlBarDialogId);
+      this._dialogProvider.closeDialog(this._controlBarDialogId);
       this._controlBarDialogId = '';
     }
   }, {
     key: "closeVideoWindowDialog",
     value: function closeVideoWindowDialog() {
-      this._uiEventStore.closeDialog(this._videoWindowDialogId);
+      this._dialogProvider.closeDialog(this._videoWindowDialogId);
       this._videoWindowDialogId = '';
-      this._uiEventStore.sendEvent(_constant.UIAction.CLOSE_VIDEO_WINDOW);
+      this._eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_VIDEO_WINDOW);
     }
   }, {
     key: "openRelaunchTipsDialog",
     value: function openRelaunchTipsDialog() {
       var _this3 = this;
-      var dialogId = this._uiEventStore.openConfirmDialog({
+      var dialogId = this._dialogProvider.openConfirmDialog({
         content: (0, _i18n.transI18n)('fmt_driver_installation_v_sound_card'),
         onOk: function onOk() {
-          dialogId && _this3._uiEventStore.closeConfirm(dialogId);
+          dialogId && _this3._dialogProvider.closeConfirm(dialogId);
           (0, _renderer.restartApp)();
         },
         onCancel: function onCancel() {
-          dialogId && _this3._uiEventStore.closeConfirm(dialogId);
+          dialogId && _this3._dialogProvider.closeConfirm(dialogId);
         },
         okText: (0, _i18n.transI18n)('fmt_premeeting_setting_mobile_popup_button_restart'),
         cancelText: (0, _i18n.transI18n)('fmt_waitingroom_attendie_popup_button_gotit'),
@@ -605,51 +619,39 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       });
     }
   }, {
-    key: "setShareWithAudio",
+    key: "startLoopback",
     value: function () {
-      var _setShareWithAudio = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(withAudio) {
-        var isMac, hideTip;
+      var _startLoopback = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(withAudio) {
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              isMac = (0, _env.getPlatform)() === _env.FcrApplicationPlatform.MACOS;
-              if (!(withAudio && isMac)) {
-                _context3.next = 6;
-                break;
-              }
-              _context3.next = 4;
-              return this.hasLoopbackDevice();
-            case 4:
-              hideTip = _context3.sent;
-              if (!hideTip) {
-                this.openRelaunchTipsDialog();
-              }
-            case 6:
               this._setWithAudioState(withAudio);
               if (withAudio) {
                 this.handleShareStartWithAudio();
               } else {
                 this.handleShareStopWithAudio();
               }
-            case 8:
+            case 2:
             case "end":
               return _context3.stop();
           }
         }, _callee3, this);
       }));
-      function setShareWithAudio(_x) {
-        return _setShareWithAudio.apply(this, arguments);
+      function startLoopback(_x) {
+        return _startLoopback.apply(this, arguments);
       }
-      return setShareWithAudio;
+      return startLoopback;
     }()
   }, {
     key: "_setWithAudioState",
     value: function _setWithAudioState(withAudio) {
-      this.withAudio = withAudio;
-      this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, this._currentShareStreamId, {
-        audioPrivilege: withAudio ? _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE : _fcrCore.FcrStreamPrivilegeOperation.NOPRIVILEGE,
-        videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION
-      }));
+      this.setShareWithAudioState(withAudio);
+      if (this._currentShareStreamId) {
+        this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, this._currentShareStreamId, {
+          audioPrivilege: withAudio ? _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE : _fcrCore.FcrStreamPrivilegeOperation.NOPRIVILEGE,
+          videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION
+        }));
+      }
     }
   }, {
     key: "prepareShareScreen",
@@ -665,28 +667,25 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 _context4.next = 4;
                 break;
               }
-              dialogId = this._uiEventStore.openConfirmDialog({
+              dialogId = this._dialogProvider.openConfirmDialog({
                 title: (0, _i18n.transI18n)('fmt_screenshare_options_allowshare'),
                 content: (0, _i18n.transI18n)('fmt_screenshare_tips_notavailable'),
                 okText: (0, _i18n.transI18n)('fmt_group_popup_creat_next_sidpop_label_setting'),
                 cancelText: (0, _i18n.transI18n)('fmt_group_popup_creat_next_sidpop_button_help_ignore'),
                 onCancel: function onCancel() {
-                  _this4._uiEventStore.closeConfirm(dialogId);
+                  _this4._dialogProvider.closeConfirm(dialogId);
                 },
                 onOk: function onOk() {
-                  window.runtime.openSystemPreferences('sharing');
-                  _this4._uiEventStore.closeConfirm(dialogId);
+                  window.runtime.checkMediaPermission('sharing');
+                  _this4._dialogProvider.closeConfirm(dialogId);
                 },
                 closable: false
               });
               return _context4.abrupt("return");
             case 4:
-              if (this._mediaControl.isCapabilitySupported(_fcrCore.FcrCapability.SCREEN_ENUMERATE)) {
-                this.openShareScreenSelection();
-              } else {
-                this.handleStartShare();
-              }
-            case 5:
+              this.supportEnumScreen && this.openShareScreenSelection();
+              !(0, _env.isElectron)() && this.handleStartShare(this.currentSelection, _type2.AgoraRtcScreenCaptureType.SCREEN, true, _shareAudio.AudioProcessingChannel.MONO, this.currentSelectionBounds); // web 直接开始分享
+            case 6:
             case "end":
               return _context4.stop();
           }
@@ -700,101 +699,95 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "handleStartShare",
     value: function () {
-      var _handleStartShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
-        var id,
-          type,
-          withAudio,
-          audioProcessingChannel,
+      var _handleStartShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(id, type, withAudio) {
+        var audioProcessingChannel,
+          bounds,
           excludeWindows,
-          _this$localUser2,
-          _this$localUser3,
           screenTrack,
           _args5 = arguments;
         return _regenerator["default"].wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              id = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : 'default';
-              type = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : _type2.AgoraRtcScreenCaptureType.SCREEN;
-              withAudio = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : false;
               audioProcessingChannel = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : _shareAudio.AudioProcessingChannel.MONO;
-              console.log('window id:', id, type);
+              bounds = _args5.length > 4 ? _args5[4] : undefined;
               excludeWindows = [];
-              withAudio = (0, _env.isElectron)() ? withAudio : true; // electron 取 withAudio，web 默认为 true
               if ((0, _env.isElectron)()) this.closeShareScreenSelection();
               if (!(id.split('-')[0] === 'whiteboard')) {
-                _context5.next = 13;
+                _context5.next = 9;
                 break;
               }
-              if (!(!this._securityStore.hasStartBoardPermission() && !(((_this$localUser2 = this.localUser) === null || _this$localUser2 === void 0 ? void 0 : _this$localUser2.userRole) === _type.FcrUserRole.HOST) && !(((_this$localUser3 = this.localUser) === null || _this$localUser3 === void 0 ? void 0 : _this$localUser3.userRole) === _type.FcrUserRole.COHOST))) {
-                _context5.next = 11;
+              if (!(!this._securityStore.hasStartBoardPermission() && !(this.localUser.userRole === _type.FcrUserRole.HOST) && !(this.localUser.userRole === _type.FcrUserRole.COHOST))) {
+                _context5.next = 7;
                 break;
               }
               return _context5.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_hostprohibits'), 'error'));
-            case 11:
-              this._uiEventStore.sendEvent(_constant.UIAction.OPEN_WHITEBOARD);
+            case 7:
+              this._eventProvider.sendEvent(_constant.FcrUIAction.OPEN_WHITEBOARD);
               return _context5.abrupt("return");
-            case 13:
+            case 9:
               if (!(this.screenSharingState === _fcrCore.FcrMediaSourceState.OPEN)) {
-                _context5.next = 17;
+                _context5.next = 13;
                 break;
               }
-              this.handleReplaceScreen(id, type, withAudio, audioProcessingChannel);
+              this.handleReplaceScreen(id, type, withAudio, audioProcessingChannel, bounds);
               this._setShareLock(false);
               return _context5.abrupt("return");
-            case 17:
-              this._uiEventStore.sendEvent(_constant.UIAction.SET_CURRENT_SHARE_SCREEN, {
+            case 13:
+              this._eventProvider.sendEvent(_constant.FcrUIAction.SET_CURRENT_SHARE_SCREEN, {
                 id: id,
-                type: type
+                type: type,
+                bounds: bounds
               });
-              _context5.t0 = this._mediaControl.isCapabilitySupported(_fcrCore.FcrCapability.SCREEN_ENUMERATE);
+              _context5.t0 = this.supportEnumScreen;
               if (!_context5.t0) {
-                _context5.next = 23;
+                _context5.next = 19;
                 break;
               }
-              _context5.next = 22;
+              _context5.next = 18;
               return this._validateShareStart(id, type);
-            case 22:
+            case 18:
               _context5.t0 = !_context5.sent;
-            case 23:
+            case 19:
               if (!_context5.t0) {
-                _context5.next = 25;
+                _context5.next = 21;
                 break;
               }
               return _context5.abrupt("return");
-            case 25:
+            case 21:
               if (!this._shareLocked) {
-                _context5.next = 27;
+                _context5.next = 23;
                 break;
               }
               return _context5.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_enablecollection'), 'error'));
-            case 27:
+            case 23:
               this._setShareLock(true);
+              this.setShareWithAudioState(withAudio);
               this.currentShareId = id;
               this.currentShareType = type;
-              this.withAudio = withAudio;
+              this.currentSelectionBounds = bounds;
               if (withAudio) this.handleShareStartWithAudio();
               if (this._hasScreenSharePermission()) {
-                _context5.next = 35;
+                _context5.next = 32;
                 break;
               }
               this._setShareLock(false);
               return _context5.abrupt("return");
-            case 35:
+            case 32:
+              this._initControlbar(); // 初始化控制栏，web 和 electron 都需要执行
               if (!(0, _env.isElectron)()) {
-                _context5.next = 43;
+                _context5.next = 40;
                 break;
               }
-              _context5.next = 38;
+              _context5.next = 36;
               return this._createScreenStream(id);
-            case 38:
-              this._initControlbar();
+            case 36:
               this.openVideoWindowDialog();
-              _context5.next = 42;
+              _context5.next = 39;
               return this._getExcludeWindows();
-            case 42:
+            case 39:
               excludeWindows = _context5.sent;
-            case 43:
-              screenTrack = this._mediaControl.getScreenTrack(id);
+            case 40:
+              screenTrack = this._deviceProvider.getScreenTrack(id);
               this._screenTrack = screenTrack;
               screenTrack.addObserver(this._observer);
               screenTrack.start(type, {
@@ -802,30 +795,28 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 withAudio: withAudio,
                 excludeWindows: excludeWindows
               });
-            case 47:
+            case 44:
             case "end":
               return _context5.stop();
           }
         }, _callee5, this);
       }));
-      function handleStartShare() {
+      function handleStartShare(_x2, _x3, _x4) {
         return _handleStartShare.apply(this, arguments);
       }
       return handleStartShare;
     }()
   }, {
     key: "handleReplaceScreen",
-    value: function handleReplaceScreen() {
+    value: function handleReplaceScreen(id, type, withAudio) {
       var _this5 = this;
-      var id = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'default';
-      var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _type2.AgoraRtcScreenCaptureType.WINDOW;
-      var withAudio = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var audioProcessingChannel = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _shareAudio.AudioProcessingChannel.MONO;
+      var bounds = arguments.length > 4 ? arguments[4] : undefined;
       withAudio = (0, _env.isElectron)() ? withAudio : true; // electron 取 withAudio，web 默认为 true
-      if (this.withAudio && !withAudio) {
+      if (this.shareWithAudio && !withAudio) {
         this.handleShareStopWithAudio();
       }
-      this.withAudio = withAudio;
+      this.setShareWithAudioState(withAudio);
       var screenTrack = this._screenTrack;
       this._isReplaceScreen = true;
       if (screenTrack) {
@@ -837,19 +828,20 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 while (1) switch (_context6.prev = _context6.next) {
                   case 0:
                     if (!(state === _fcrCore.FcrMediaSourceState.CLOSE)) {
-                      _context6.next = 18;
+                      _context6.next = 19;
                       break;
                     }
                     if ((0, _env.isElectron)()) {
                       _this5._initControlbar();
                     }
-                    _this5._uiEventStore.sendEvent(_constant.UIAction.SET_CURRENT_SHARE_SCREEN, {
+                    _this5._eventProvider.sendEvent(_constant.FcrUIAction.SET_CURRENT_SHARE_SCREEN, {
                       id: id,
-                      type: type
+                      type: type,
+                      bounds: bounds
                     });
                     screenTrack.removeObserver(_this5._observer);
                     screenTrack.removeObserver(observer);
-                    newScreenTrack = _this5._mediaControl.getScreenTrack(id);
+                    newScreenTrack = _this5._deviceProvider.getScreenTrack(id);
                     if (withAudio) {
                       _this5.handleShareStartWithAudio();
                     }
@@ -873,19 +865,20 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                     if (_this5._currentShareStreamId) {
                       _this5._streamControl.bindLocalStreams([{
                         streamId: _this5._currentShareStreamId,
-                        audioSourceId: 'default',
+                        audioSourceId: _this5._loopbackAudioSourceId,
                         videoSourceId: id
                       }]);
                     }
                     _this5.currentShareId = id;
                     _this5.currentShareType = type;
-                  case 18:
+                    _this5.currentSelectionBounds = bounds;
+                  case 19:
                   case "end":
                     return _context6.stop();
                 }
               }, _callee6);
             }));
-            function onScreenCaptureStateUpdated(_x2, _x3) {
+            function onScreenCaptureStateUpdated(_x5, _x6) {
               return _onScreenCaptureStateUpdated.apply(this, arguments);
             }
             return onScreenCaptureStateUpdated;
@@ -899,11 +892,11 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "handleStopShare",
     value: function handleStopShare() {
-      var _this$_screenTrack3, _this$_screenTrack4;
+      var _this$_screenTrack4, _this$_screenTrack5;
       this._closeCapture();
       this._removeScreenStream();
-      this._previewDom && ((_this$_screenTrack3 = this._screenTrack) === null || _this$_screenTrack3 === void 0 ? void 0 : _this$_screenTrack3.stopPreview(this._previewDom));
-      (_this$_screenTrack4 = this._screenTrack) === null || _this$_screenTrack4 === void 0 || _this$_screenTrack4.stop();
+      this._previewDom && ((_this$_screenTrack4 = this._screenTrack) === null || _this$_screenTrack4 === void 0 ? void 0 : _this$_screenTrack4.stopPreview(this._previewDom));
+      (_this$_screenTrack5 = this._screenTrack) === null || _this$_screenTrack5 === void 0 || _this$_screenTrack5.stop();
       this.currentShareId = '';
     }
   }, {
@@ -911,14 +904,14 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     value: function () {
       var _createScreenStream2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(videoSourceId) {
         var _this6 = this;
-        var streamType, streamId;
+        var audioSourceId, streamId;
         return _regenerator["default"].wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              streamType = this.withAudio ? _type3.AgoraRteMediaStreamType.BOTH : _type3.AgoraRteMediaStreamType.VIDEO;
+              audioSourceId = this._loopbackAudioSourceId;
               _context7.next = 3;
               return this._streamControl.addLocalScreenStream({
-                streamType: streamType
+                streamType: _type3.AgoraRteMediaStreamType.BOTH
               })["finally"](function () {
                 _this6._setShareLock(false);
               });
@@ -926,7 +919,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
               streamId = _context7.sent;
               this._streamControl.bindLocalStreams([{
                 streamId: streamId,
-                audioSourceId: 'default',
+                audioSourceId: audioSourceId,
                 videoSourceId: videoSourceId
               }]);
               this._currentShareStreamId = streamId;
@@ -936,7 +929,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           }
         }, _callee7, this);
       }));
-      function _createScreenStream(_x4) {
+      function _createScreenStream(_x7) {
         return _createScreenStream2.apply(this, arguments);
       }
       return _createScreenStream;
@@ -945,6 +938,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     key: "_handleWebScreenCaptureStateUpdated",
     value: function () {
       var _handleWebScreenCaptureStateUpdated2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(sourceId, state) {
+        var _this$_screenTrack6;
         return _regenerator["default"].wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -952,12 +946,10 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
               if (state === _fcrCore.FcrMediaSourceState.OPEN) {
                 this._setShareLock(true);
                 this._createScreenStream(this.currentShareId);
-                this._isReplaceScreen = false;
               }
               if (state === _fcrCore.FcrMediaSourceState.CLOSE) {
                 this._setShareLock(false);
-                !this._isReplaceScreen && this.handleStopShare();
-                this._isReplaceScreen = false;
+                this._isReplaceScreen ? (_this$_screenTrack6 = this._screenTrack) === null || _this$_screenTrack6 === void 0 ? void 0 : _this$_screenTrack6.stop() : this.handleStopShare();
               }
               if (state === _fcrCore.FcrMediaSourceState.ERROR) {
                 this._setShareLock(false);
@@ -969,7 +961,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           }
         }, _callee8, this);
       }));
-      function _handleWebScreenCaptureStateUpdated(_x5, _x6) {
+      function _handleWebScreenCaptureStateUpdated(_x8, _x9) {
         return _handleWebScreenCaptureStateUpdated2.apply(this, arguments);
       }
       return _handleWebScreenCaptureStateUpdated;
@@ -978,31 +970,33 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     key: "_handleScreenCaptureStateUpdated",
     value: function () {
       var _handleScreenCaptureStateUpdated2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(sourceId, state) {
-        var _this$_screenTrack5, _this$_screenTrack6, _this$_screenTrack7;
+        var _this$_screenTrack7, _this$_screenTrack8, _this$_screenTrack9;
         return _regenerator["default"].wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (state === _fcrCore.FcrMediaSourceState.CLOSE) {
-                this._previewDom && ((_this$_screenTrack5 = this._screenTrack) === null || _this$_screenTrack5 === void 0 ? void 0 : _this$_screenTrack5.stopPreview(this._previewDom));
-                (_this$_screenTrack6 = this._screenTrack) === null || _this$_screenTrack6 === void 0 || _this$_screenTrack6.removeObserver(this._observer);
-                (_this$_screenTrack7 = this._screenTrack) === null || _this$_screenTrack7 === void 0 || _this$_screenTrack7.stop();
+                this._previewDom && ((_this$_screenTrack7 = this._screenTrack) === null || _this$_screenTrack7 === void 0 ? void 0 : _this$_screenTrack7.stopPreview(this._previewDom));
+                (_this$_screenTrack8 = this._screenTrack) === null || _this$_screenTrack8 === void 0 || _this$_screenTrack8.removeObserver(this._observer);
+                this._isReplaceScreen ? (_this$_screenTrack9 = this._screenTrack) === null || _this$_screenTrack9 === void 0 ? void 0 : _this$_screenTrack9.stop() : this.handleStopShare();
+                this._isReplaceScreen = false;
               }
               if (!(state === _fcrCore.FcrMediaSourceState.ERROR)) {
-                _context9.next = 5;
+                _context9.next = 6;
                 break;
               }
               this.handleStopShare();
               this.screenSharingState = _fcrCore.FcrMediaSourceState.CLOSE;
+              this._isReplaceScreen = false;
               return _context9.abrupt("return");
-            case 5:
-              this.screenSharingState = state;
             case 6:
+              this.screenSharingState = state;
+            case 7:
             case "end":
               return _context9.stop();
           }
         }, _callee9, this);
       }));
-      function _handleScreenCaptureStateUpdated(_x7, _x8) {
+      function _handleScreenCaptureStateUpdated(_x10, _x11) {
         return _handleScreenCaptureStateUpdated2.apply(this, arguments);
       }
       return _handleScreenCaptureStateUpdated;
@@ -1065,8 +1059,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       var _this$_streamControl$2,
         _this7 = this;
       var currentShareStreamId = this._currentShareStreamId || ((_this$_streamControl$2 = this._streamControl.getStreamList().find(function (stream) {
-        var _this7$localUser;
-        return stream.videoSourceType === _type4.AgoraRteVideoSourceType.SCREEN && stream.owner.userId === ((_this7$localUser = _this7.localUser) === null || _this7$localUser === void 0 ? void 0 : _this7$localUser.userId);
+        return stream.videoSourceType === _type4.AgoraRteVideoSourceType.SCREEN && stream.owner.userId === _this7.localUser.userId;
       })) === null || _this$_streamControl$2 === void 0 ? void 0 : _this$_streamControl$2.streamId);
       if (this.screenSharingState !== _fcrCore.FcrMediaSourceState.OPEN && currentShareStreamId) {
         this.handleStopShare();
@@ -1075,26 +1068,42 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_isStoppedFor",
     value: function _isStoppedFor(events, reason) {
+      var _this8 = this;
       return events && events.find(function (event) {
         var _event$cause;
-        return ((_event$cause = event.cause) === null || _event$cause === void 0 || (_event$cause = _event$cause.data) === null || _event$cause === void 0 ? void 0 : _event$cause.reason) === reason;
+        return ((_event$cause = event.cause) === null || _event$cause === void 0 || (_event$cause = _event$cause.data) === null || _event$cause === void 0 ? void 0 : _event$cause.reason) === reason && event.modifiedStream.owner.userId === _this8.localUser.userId;
       });
     }
   }, {
     key: "_handleStreamUpdate",
-    value: function _handleStreamUpdate(_, events) {
-      var _this$localUser4, _this$localUser5;
+    value: function _handleStreamUpdate(process, events) {
+      var _this$_screenTrack10,
+        _this9 = this;
       var isClosedByOther = this._isStoppedFor(events, _types.FcrBoardInactiveReason.CLOSE);
       var isSeizedByOther = this._isStoppedFor(events, _types.FcrBoardInactiveReason.SEIZE);
       var operatorUser = (isSeizedByOther === null || isSeizedByOther === void 0 ? void 0 : isSeizedByOther.operatorUser) || (isClosedByOther === null || isClosedByOther === void 0 ? void 0 : isClosedByOther.operatorUser);
       var ownerUser = (isSeizedByOther === null || isSeizedByOther === void 0 ? void 0 : isSeizedByOther.modifiedStream.owner) || (isClosedByOther === null || isClosedByOther === void 0 ? void 0 : isClosedByOther.modifiedStream.owner);
-      var selfOperated = (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) === ((_this$localUser4 = this.localUser) === null || _this$localUser4 === void 0 ? void 0 : _this$localUser4.userId);
-      var isMyOwnShare = ((_this$localUser5 = this.localUser) === null || _this$localUser5 === void 0 ? void 0 : _this$localUser5.userId) === (ownerUser === null || ownerUser === void 0 ? void 0 : ownerUser.userId);
-      (isSeizedByOther || isClosedByOther) && !selfOperated && this.handleStopShare();
-      isClosedByOther && !selfOperated && isMyOwnShare && this._uiEventStore.sendEvent(_constant.UIAction.SHOW_TOAST, {
+      var selfOperated = (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) === this.localUser.userId;
+      var isMyOwnShare = this.localUser.userId === (ownerUser === null || ownerUser === void 0 ? void 0 : ownerUser.userId);
+      (isSeizedByOther || isClosedByOther) && !selfOperated && ((_this$_screenTrack10 = this._screenTrack) === null || _this$_screenTrack10 === void 0 ? void 0 : _this$_screenTrack10.stop());
+      isClosedByOther && !selfOperated && isMyOwnShare && this._eventProvider.sendEvent(_constant.FcrUIAction.SHOW_TOAST, {
         type: 'info',
         message: (0, _i18n.transI18n)('fmt_share_tips_sharingdisabled')
       });
+      switch (process) {
+        case 'remove':
+          if (events.some(function (event) {
+            return event.modifiedStream.videoSourceType === _type4.AgoraRteVideoSourceType.SCREEN && event.modifiedStream.owner.userId === _this9.localUser.userId;
+          })) {
+            var _this$_screenTrack11;
+            if (!(0, _env.isElectron)() && this._isReplaceScreen) {
+              this._isReplaceScreen = false;
+              return;
+            } // web 下如果是替换的逻辑，不需要关闭分享
+            (_this$_screenTrack11 = this._screenTrack) === null || _this$_screenTrack11 === void 0 || _this$_screenTrack11.stop();
+          }
+          break;
+      }
     }
   }, {
     key: "_addEventListeners",
@@ -1114,35 +1123,34 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               _context11.t0 = event;
-              _context11.next = _context11.t0 === _constant.UIAction.START_SHARE_SCREEN ? 3 : _context11.t0 === _constant.UIAction.STOP_SCREEN_CAPTURE ? 5 : _context11.t0 === _constant.UIAction.ENGINE_RECONNECTED ? 7 : _context11.t0 === _constant.UIAction.STOP_SHARE_SCREEN ? 9 : _context11.t0 === _constant.UIAction.SET_SHARE_WITH_AUDIO ? 12 : 14;
+              _context11.next = _context11.t0 === _constant.FcrUIAction.START_SHARE_SCREEN ? 3 : _context11.t0 === _constant.FcrUIAction.STOP_SCREEN_CAPTURE ? 5 : _context11.t0 === _constant.FcrUIAction.ENGINE_RECONNECTED ? 7 : _context11.t0 === _constant.FcrUIAction.STOP_SHARE_SCREEN ? 9 : _context11.t0 === _constant.FcrUIAction.SET_SHARE_WITH_AUDIO ? 11 : 13;
               break;
             case 3:
               this.prepareShareScreen();
-              return _context11.abrupt("break", 14);
+              return _context11.abrupt("break", 13);
             case 5:
               this._closeCapture();
               // this.handleStopShare();
-              return _context11.abrupt("break", 14);
+              return _context11.abrupt("break", 13);
             case 7:
               if (this._removeScreenStreamFailed) {
                 this._removeScreenStream();
                 this._removeScreenStreamFailed = false;
               }
-              return _context11.abrupt("break", 14);
+              return _context11.abrupt("break", 13);
             case 9:
               this.handleStopShare();
-              this.closeDialog(_constant.DialogKey.PARTICIPANT);
-              return _context11.abrupt("break", 14);
-            case 12:
-              this.setShareWithAudio(params.withAudio);
-              return _context11.abrupt("break", 14);
-            case 14:
+              return _context11.abrupt("break", 13);
+            case 11:
+              this.startLoopback(params.withAudio);
+              return _context11.abrupt("break", 13);
+            case 13:
             case "end":
               return _context11.stop();
           }
         }, _callee11, this);
       }));
-      function _onUiEvent(_x9, _x10) {
+      function _onUiEvent(_x12, _x13) {
         return _onUiEvent2.apply(this, arguments);
       }
       return _onUiEvent;
@@ -1151,7 +1159,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     key: "_showToast",
     value: function _showToast(message, type) {
       var duration = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 3000;
-      this._uiEventStore.showToast({
+      this._messageProvider.showToast({
         type: type,
         message: message,
         duration: duration
@@ -1166,7 +1174,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
               _context12.next = 2;
-              return this._mediaControl.getWindowList();
+              return this.appWindowList;
             case 2:
               windows = _context12.sent;
               window = windows.filter(function (item) {
@@ -1188,7 +1196,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function _validateWindow(_x11) {
+      function _validateWindow(_x14) {
         return _validateWindow2.apply(this, arguments);
       }
       return _validateWindow;
@@ -1202,7 +1210,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
               _context13.next = 2;
-              return this._mediaControl.getDisplayList();
+              return this.displayList;
             case 2:
               displayList = _context13.sent.find(function (item) {
                 return item.id === id;
@@ -1221,7 +1229,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           }
         }, _callee13, this);
       }));
-      function _validateDisplay(_x12) {
+      function _validateDisplay(_x15) {
         return _validateDisplay2.apply(this, arguments);
       }
       return _validateDisplay;
@@ -1272,7 +1280,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           }
         }, _callee14, this);
       }));
-      function _validateShareStart(_x13, _x14) {
+      function _validateShareStart(_x16, _x17) {
         return _validateShareStart2.apply(this, arguments);
       }
       return _validateShareStart;
@@ -1340,12 +1348,15 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 currentShareAudioProcessingChannel: _shareAudio.AudioProcessingChannel.MONO,
                 currentShareId: this.currentShareId,
                 currentShareType: this.currentShareType,
-                shareWithAudio: this.withAudio
+                shareWithAudio: this.shareWithAudio,
+                currentShareBounds: this.currentSelectionBounds
               };
-              this._controlBarDialogId = this._uiEventStore.openDialog(_constant.DialogKey.CONTROL_BAR, _constant.DialogKey.CONTROL_BAR, params);
-              window.runtime.browserWindow.setFullScreen(false);
-              window.runtime.browserWindow.hide();
-            case 4:
+              this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR, params);
+              if ((0, _env.isElectron)()) {
+                window.runtime.browserWindow.setFullScreen(false);
+                window.runtime.browserWindow.hide();
+              }
+            case 3:
             case "end":
               return _context16.stop();
           }
@@ -1359,7 +1370,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ShareScreenStore = ShareScreenStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "_shareSelectionDialogId"], [_mobx.observable, 1, "_controlBarDialogId"], [_mobx.observable, 1, "_videoWindowDialogId"], [_mobx.observable, 1, "_isHost"], [_mobx.observable, 1, "_shareLocked"], [_mobx.observable, 1, "_screenTrack"], [_mobx.observable, 1, "_shareAudioTrack"], [_mobx.observable, 1, "screenSharingState"], [_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "hasScreenCapturePermission"], [_mobx.observable, 1, "withAudio"], [_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "currentShareId"], [_mobx.observable, 1, "sharerId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "currentSelection"], [_mobx.observable, 1, "currentSelectionType"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "localUser"], [_mobx.observable, 1, "localUserRole"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_hasLoopbackDeviceDecs, 18, "hasLoopbackDevice"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_decorator.bound, 2, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_handleShareStartWithAudioDecs, 18, "handleShareStartWithAudio"], [_handleShareStopWithAudioDecs, 18, "handleShareStopWithAudio"], [_startPreviewDecs, 18, "startPreview"], [_openDialogDecs, 18, "openDialog"], [_decorator.bound, 2, "closeDialog"], [_openShareScreenSelectionDecs, 18, "openShareScreenSelection"], [_closeShareScreenSelectionDecs, 18, "closeShareScreenSelection"], [_setControlBarWindowIdDecs, 18, "setControlBarWindowId"], [_openVideoWindowDialogDecs, 18, "openVideoWindowDialog"], [_closeControlBarDecs, 18, "closeControlBar"], [_closeVideoWindowDialogDecs, 18, "closeVideoWindowDialog"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_setShareWithAudioDecs, 18, "setShareWithAudio"], [_setWithAudioStateDecs, 18, "_setWithAudioState"], [_handleStartShareDecs, 18, "handleStartShare"], [_handleReplaceScreenDecs, 18, "handleReplaceScreen"], [_handleStopShareDecs, 18, "handleStopShare"], [_decorator.bound, 2, "_handleWebScreenCaptureStateUpdated"], [_handleScreenCaptureStateUpdatedDecs, 18, "_handleScreenCaptureStateUpdated"], [_setShareLockDecs, 18, "_setShareLock"], [_decorator.bound, 2, "_syncShareStreamState"], [_handleStreamUpdateDecs, 18, "_handleStreamUpdate"], [_initControlbarDecs, 18, "_initControlbar"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 24);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "_shareSelectionDialogId"], [_mobx.observable, 1, "_controlBarDialogId"], [_mobx.observable, 1, "_videoWindowDialogId"], [_mobx.observable, 1, "_isHost"], [_mobx.observable, 1, "_shareLocked"], [_mobx.observable, 1, "_screenTrack"], [_mobx.observable, 1, "_shareAudioTrack"], [_mobx.observable, 1, "screenSharingState"], [_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "hasScreenCapturePermission"], [_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "currentShareId"], [_mobx.observable, 1, "sharerId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "currentSelection"], [_mobx.observable, 1, "currentSelectionType"], [_mobx.observable, 1, "currentSelectionBounds"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "localUser"], [_mobx.observable, 1, "localUserRole"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_hasLoopbackDeviceDecs, 18, "hasLoopbackDevice"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_decorator.bound, 2, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_handleShareStartWithAudioDecs, 18, "handleShareStartWithAudio"], [_handleShareStopWithAudioDecs, 18, "handleShareStopWithAudio"], [_startPreviewDecs, 18, "startPreview"], [_openDialogDecs, 18, "openDialog"], [_decorator.bound, 2, "closeDialog"], [_openShareScreenSelectionDecs, 18, "openShareScreenSelection"], [_closeShareScreenSelectionDecs, 18, "closeShareScreenSelection"], [_setControlBarWindowIdDecs, 18, "setControlBarWindowId"], [_openVideoWindowDialogDecs, 18, "openVideoWindowDialog"], [_closeControlBarDecs, 18, "closeControlBar"], [_closeVideoWindowDialogDecs, 18, "closeVideoWindowDialog"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_startLoopbackDecs, 18, "startLoopback"], [_setWithAudioStateDecs, 18, "_setWithAudioState"], [_handleStartShareDecs, 18, "handleStartShare"], [_handleReplaceScreenDecs, 18, "handleReplaceScreen"], [_handleStopShareDecs, 18, "handleStopShare"], [_decorator.bound, 2, "_handleWebScreenCaptureStateUpdated"], [_handleScreenCaptureStateUpdatedDecs, 18, "_handleScreenCaptureStateUpdated"], [_setShareLockDecs, 18, "_setShareLock"], [_decorator.bound, 2, "_syncShareStreamState"], [_handleStreamUpdateDecs, 18, "_handleStreamUpdate"], [_initControlbarDecs, 18, "_initControlbar"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 24);
 _init__shareSelectionDialogId = _applyDecs$e[0];
 _init__controlBarDialogId = _applyDecs$e[1];
 _init__videoWindowDialogId = _applyDecs$e[2];
@@ -1371,13 +1382,13 @@ _init_screenSharingState = _applyDecs$e[7];
 _init_applicationCaptureSources = _applyDecs$e[8];
 _init_screenCaptureSources = _applyDecs$e[9];
 _init_hasScreenCapturePermission = _applyDecs$e[10];
-_init_withAudio = _applyDecs$e[11];
-_init_currentShareAudioProcessingChannel = _applyDecs$e[12];
-_init_currentShareId = _applyDecs$e[13];
-_init_sharerId = _applyDecs$e[14];
-_init_currentShareType = _applyDecs$e[15];
-_init_currentSelection = _applyDecs$e[16];
-_init_currentSelectionType = _applyDecs$e[17];
+_init_currentShareAudioProcessingChannel = _applyDecs$e[11];
+_init_currentShareId = _applyDecs$e[12];
+_init_sharerId = _applyDecs$e[13];
+_init_currentShareType = _applyDecs$e[14];
+_init_currentSelection = _applyDecs$e[15];
+_init_currentSelectionType = _applyDecs$e[16];
+_init_currentSelectionBounds = _applyDecs$e[17];
 _init_shareWithAudio = _applyDecs$e[18];
 _init_boardOwnerUser = _applyDecs$e[19];
 _init_localUser = _applyDecs$e[20];