fcr-ui-scene 3.6.4-rc.1 → 3.7.0

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

@@ -42,10 +42,12 @@ 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.iterator.js");
+require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.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");
+require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.iterator.js");
@@ -55,6 +57,7 @@ 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.map.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");
@@ -66,21 +69,23 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _fcrCore = require("fcr-core");
+var _type = require("fcr-core/lib/type");
 var _env = require("agora-foundation/lib/utilities/env");
-var _type = require("agora-rte-sdk/lib/core/rtc/type");
+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 _type2 = require("agora-ui-foundation/lib/components/icon/type");
+var _type3 = 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");
 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, _hasLoopbackDeviceDecs, _setShareAudioProcessingChannelDecs, _openRelaunchTipsDialogDecs, _startRenderSharePreviewDecs, _stopRenderSharePreviewDecs, _handleStopShareDecs, _handleStartShareDecs, _openShareScreenSelectionDecs, _closeShareScreenSelectionDecs, _setControlBarWindowIdDecs, _openVideoWindowDialogDecs, _closeControlBarDecs, _closeVideoWindowDialogDecs, _handleReplaceScreenDecs, _initControlbarDecs, _ref;
+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;
 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; }
@@ -92,7 +97,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var _A = /*#__PURE__*/new WeakMap();
-_ref = (_handleChooseScreenDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _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], _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], "logger");
+_ref = (_handleChooseScreenDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _zoomInDecs = [_mobx.action, _mobx.action.bound], _zoomOutDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound], _hasLoopbackDeviceDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _openRelaunchTipsDialogDecs = [_mobx.action, _mobx.action.bound], _startRenderSharePreviewDecs = [_mobx.action, _mobx.action.bound], _stopRenderSharePreviewDecs = [_mobx.action, _mobx.action.bound], _handleStopShareDecs = [_mobx.action, _mobx.action.bound], _handleStopShareByExitRoomDecs = [_mobx.action, _mobx.action.bound], _handleStartShareDecs = [_mobx.action, _mobx.action.bound], _openShareScreenSelectionDecs = [_mobx.action, _mobx.action.bound], _closeShareScreenSelectionDecs = [_mobx.action, _mobx.action.bound], _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");
 var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   function ShareScreenStore(_ref2) {
     var _this = this;
@@ -108,16 +113,17 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       screenShareProvider = _ref2.screenShareProvider,
       annotationProvider = _ref2.annotationProvider,
       sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource,
-      connectionProvider = _ref2.connectionProvider,
-      abilityProvider = _ref2.abilityProvider;
+      abilityProvider = _ref2.abilityProvider,
+      sharedAnnotationDataSource = _ref2.sharedAnnotationDataSource;
     (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, "_removeScreenStreamFailed", false);
     (0, _defineProperty2["default"])(this, "_isOnline", true);
+    (0, _defineProperty2["default"])(this, "_windowList", []);
+    (0, _defineProperty2["default"])(this, "_displayList", []);
     (0, _defineProperty2["default"])(this, "_cardChooseBounds", {
       x: 0,
       y: 0,
@@ -125,8 +131,12 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       height: 0
     });
     (0, _defineProperty2["default"])(this, "_roomObserver", {
+      // 房间关闭时，需要停止共享屏幕
       onRoomClosed: this.handleStopShare,
-      onLeaveMainRoom: this.handleStopShare
+      // 被移出主房间房间时，需要停止共享屏幕
+      onLeaveMainRoom: this.handleStopShare,
+      // 离开房间时，需要停止共享屏幕
+      onExitRoom: this.handleStopShareByExitRoom
     });
     (0, _defineProperty2["default"])(this, "_uiEventObserver", {
       onEvent: this._onUiEvent.bind(this)
@@ -134,7 +144,8 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_screenCaptureStateObserver", {
       onScreenCaptureStopped: this._handleOnScreenCaptureStopped.bind(this),
       onScreenShareReplaceBegin: this._handleOnScreenShareReplaceBegin.bind(this),
-      onScreenCaptureStarted: this._handleOnScreenCaptureStarted.bind(this)
+      onScreenCaptureStarted: this._handleOnScreenCaptureStarted.bind(this),
+      onScreenShareSeize: this._handleOnScreenShareSeize.bind(this)
     });
     (0, _defineProperty2["default"])(this, "_boardObserver", {
       onActive: function onActive(ownerId) {
@@ -152,7 +163,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] : _type.AgoraRtcScreenCaptureType.WINDOW;
+      var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _type2.AgoraRtcScreenCaptureType.WINDOW;
       _this._sharedScreenShareSharedDataSource.setCurrentSelection(id, type);
     }));
     this._deviceProvider = deviceProvider;
@@ -165,10 +176,12 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     this._screenShareProvider = screenShareProvider;
     this._annotationProvider = annotationProvider;
     this._sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
-    this._connectionProvider = connectionProvider;
     this._abilityProvider = abilityProvider;
+    this._sharedAnnotationDataSource = sharedAnnotationDataSource;
+    roomControl.getStreamControl();
     this._userControl = roomControl.getUserControl();
     this._boardControl = roomControl.getSharingControl().getBoardControl();
+    this._streamControl = roomControl.getStreamControl();
     this._roomProvider.addObserver(this._roomObserver);
     this._eventProvider.addObserver(this._uiEventObserver);
     this._boardControl.addObserver(this._boardObserver);
@@ -176,7 +189,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), _type.AgoraRtcScreenCaptureType.SCREEN, false, _shareAudio.AudioProcessingChannel.MONO, display.bounds);
+      this.handleStartShare(String(display.id), _type2.AgoraRtcScreenCaptureType.SCREEN, false, _shareAudio.AudioProcessingChannel.MONO, display.bounds);
     }
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this._securityStore.hasStartScreenSharePermission();
@@ -231,6 +244,11 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedScreenShareSharedDataSource.currentShareType;
     }
+  }, {
+    key: "isCurrentOriginal",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isCurrentOriginal;
+    }
   }, {
     key: "localUser",
     get: function get() {
@@ -267,9 +285,9 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       return this._sharedScreenShareSharedDataSource.connectionState;
     }
   }, {
-    key: "screenSharingState",
+    key: "localUserScreenSharingState",
     get: function get() {
-      return this._sharedScreenShareSharedDataSource.screenSharingState;
+      return this._sharedScreenShareSharedDataSource.localUserScreenSharingState;
     }
   }, {
     key: "applicationCaptureSources",
@@ -316,11 +334,46 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedScreenShareSharedDataSource.currentShareId;
     }
+  }, {
+    key: "annotationHasStart",
+    get: function get() {
+      return this._sharedAnnotationDataSource.annotationHasStart;
+    }
+  }, {
+    key: "allowAnnotationWrite",
+    get: function get() {
+      return this._annotationProvider.allowAnnotationWrite;
+    }
+  }, {
+    key: "screenShareWindowData",
+    get: function get() {
+      return this._annotationProvider.screenShareWindowData;
+    }
+  }, {
+    key: "isZoomMaxmum",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isZoomMaxmum;
+    }
+  }, {
+    key: "isZoomMinimum",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isZoomMinimum;
+    }
+  }, {
+    key: "isAspectRatioPreserved",
+    get: function get() {
+      return this._screenShareProvider.isAspectRatioPreserved;
+    }
+  }, {
+    key: "isCurrentScreenShareInSmoothType",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isCurrentScreenShareInSmoothType;
+    }
   }, {
     key: "_screenShareInfoForLog",
     get: function get() {
       return "Screen Share Info : ".concat(JSON.stringify({
-        isSharingScreen: this.screenSharingState,
+        isSharingScreen: this.localUserScreenSharingState,
         currentShareId: this.currentShareId,
         currentShareType: this.currentShareType,
         currentShareBounds: this.currentSelectionBounds
@@ -345,11 +398,48 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       }
       return true;
     }
+  }, {
+    key: "allowAnnotationSelfWriteState",
+    get: function get() {
+      return this._annotationProvider.allowAnnotationSelfWrite;
+    }
+  }, {
+    key: "isShowToolbar",
+    get: function get() {
+      return this._annotationProvider.isShowToolbar;
+    }
+  }, {
+    key: "toggleIsShowToolbar",
+    value: function toggleIsShowToolbar() {
+      if (this.allowAnnotationSelfWriteState) {
+        this._annotationProvider.setIsShowToolbar(!this.isShowToolbar);
+      }
+    }
   }, {
     key: "setShareWithAudioState",
     value: function setShareWithAudioState(withAudio) {
       this._sharedScreenShareSharedDataSource.setShareWithAudio(withAudio);
     }
+  }, {
+    key: "zoomIn",
+    value: function zoomIn() {
+      this._screenShareProvider.zoomIn();
+    }
+  }, {
+    key: "zoomOut",
+    value: function zoomOut() {
+      this._screenShareProvider.zoomOut();
+    }
+  }, {
+    key: "fullContainer",
+    value: function fullContainer() {
+      this._screenShareProvider.fullContainer();
+    }
+  }, {
+    key: "setOriginScalc",
+    value: function setOriginScalc() {
+      this._screenShareProvider.setOriginScalc();
+    }
   }, {
     key: "hasLoopbackDevice",
     value: function () {
@@ -443,17 +533,48 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       this._closeShareScreenComps();
       this._screenShareProvider.stopShareScreen();
     }
+  }, {
+    key: "handleStopShareByExitRoom",
+    value: function handleStopShareByExitRoom() {
+      this._closeShareScreenComps();
+      this._screenShareProvider.stopShareScreenByExitRoom();
+    }
+  }, {
+    key: "participantShareCanWeAnnotation",
+    value: function participantShareCanWeAnnotation() {
+      var streams = this._streamControl.getStreams();
+      var _notSupportPlatform = [_type.FcrPlatform.WEB_DESKTOP, _type.FcrPlatform.WEB_MOBILE, _type.FcrPlatform.IOS];
+      var streamLists = Object.keys(streams).map(function (key) {
+        return streams[key];
+      });
+      var screenShareStreams = streamLists.map(function (streamList) {
+        return streamList.find(function (streamInfo) {
+          return streamInfo.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN;
+        });
+      }).filter(Boolean);
+      if (screenShareStreams.length > 0) {
+        var screenShareOwnerInfo = screenShareStreams[0];
+        var _participantPlatform = screenShareOwnerInfo === null || screenShareOwnerInfo === void 0 ? void 0 : screenShareOwnerInfo.owner.platform;
+        this.logger.info("[Annotation] current share participant platform: ".concat(_participantPlatform));
+        if (typeof _participantPlatform !== 'undefined' && !_notSupportPlatform.includes(_participantPlatform)) {
+          return true;
+        } else {
+          return false;
+        }
+      }
+      return false;
+    }
   }, {
     key: "prepareShareScreen",
     value: function () {
-      var _prepareShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var _prepareShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
         var _this3 = this;
         var dialogId;
-        return _regenerator["default"].wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regenerator["default"].wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if ((0, _screenCapturePermission.hasScreenCapturePermission)()) {
-                _context2.next = 1;
+                _context3.next = 1;
                 break;
               }
               dialogId = this._dialogProvider.openConfirmDialog({
@@ -464,21 +585,41 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 onCancel: function onCancel() {
                   _this3._dialogProvider.closeConfirm(dialogId);
                 },
-                onOk: function onOk() {
-                  window.runtime.checkMediaPermission('sharing');
-                  _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) {
+                        case 0:
+                          // 检查权限
+                          //  corner case： 拒绝过权限后，将应用从系统中移除，打开设置后无法找到app，需要重新检查
+                          // 所以无论是否拒绝过权限，直接checkMediaPermission一次
+                          window.runtime.checkMediaPermission('sharing');
+                          if ((0, _screenCapturePermission.hasDeniedScreenCapturePermission)()) {
+                            window.runtime.openSystemPreferences('sharing');
+                          }
+                          _this3._dialogProvider.closeConfirm(dialogId);
+                        case 1:
+                        case "end":
+                          return _context2.stop();
+                      }
+                    }, _callee2);
+                  }));
+                  function onOk() {
+                    return _onOk.apply(this, arguments);
+                  }
+                  return onOk;
+                }(),
                 closable: false
               });
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
             case 1:
               this.supportEnumScreen && this._openShareScreenSelection();
-              !(0, _env.isElectron)() && this.handleStartShare(this.currentSelectionId, _type.AgoraRtcScreenCaptureType.SCREEN, true, _shareAudio.AudioProcessingChannel.MONO, this.currentSelectionBounds);
+              !(0, _env.isElectron)() && this.handleStartShare(this.currentSelectionId, _type2.AgoraRtcScreenCaptureType.SCREEN, true, _shareAudio.AudioProcessingChannel.MONO, this.currentSelectionBounds);
             case 2:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function prepareShareScreen() {
         return _prepareShareScreen.apply(this, arguments);
@@ -488,37 +629,38 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "handleStartShare",
     value: function () {
-      var _handleStartShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(id, type, withAudio) {
+      var _handleStartShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(id, type, withAudio) {
         var audioProcessingChannel,
           bounds,
           electronBounds,
-          hasValidShare,
-          _args3 = arguments;
-        return _regenerator["default"].wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+          needToReplaceMyself,
+          validShareStart,
+          _args4 = arguments;
+        return _regenerator["default"].wrap(function (_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              audioProcessingChannel = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : _shareAudio.AudioProcessingChannel.MONO;
-              bounds = _args3.length > 4 ? _args3[4] : undefined;
+              audioProcessingChannel = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : _shareAudio.AudioProcessingChannel.MONO;
+              bounds = _args4.length > 4 ? _args4[4] : undefined;
               if (!(this.connectionState !== _fcrCore.FcrConnectionState.CONNECTED || !this._isOnline)) {
-                _context3.next = 1;
+                _context4.next = 1;
                 break;
               }
               this._showToast((0, _i18n.transI18n)('fmt_screenshare_toast_network_error_unable_start_screen_share'), 'error');
-              return _context3.abrupt("return", Promise.reject(false));
+              return _context4.abrupt("return", Promise.reject(false));
             case 1:
               if ((0, _env.isElectron)()) this._closeShareScreenSelection();
               if (!id.startsWith('whiteboard-')) {
-                _context3.next = 3;
+                _context4.next = 3;
                 break;
               }
               if (!(!this._securityStore.hasStartBoardPermission() && !this.isHost)) {
-                _context3.next = 2;
+                _context4.next = 2;
                 break;
               }
-              return _context3.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_hostprohibits'), 'error'));
+              return _context4.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_hostprohibits'), 'error'));
             case 2:
               this._eventProvider.sendEvent(_constant.FcrUIAction.OPEN_WHITEBOARD);
-              return _context3.abrupt("return");
+              return _context4.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);
@@ -537,37 +679,42 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 type: type,
                 bounds: bounds
               });
-              if (!(this.screenSharingState === _fcrCore.FcrMediaSourceState.OPEN)) {
-                _context3.next = 4;
+              needToReplaceMyself = this.localUserScreenSharingState === _fcrCore.FcrMediaSourceState.OPEN;
+              this.logger.info("[screen-share][handleStartShare]: needToReplaceMyself - ".concat(needToReplaceMyself));
+              if (!needToReplaceMyself) {
+                _context4.next = 4;
                 break;
               }
               this._handleReplaceScreen(id, type, withAudio, audioProcessingChannel, bounds);
-              return _context3.abrupt("return");
+              return _context4.abrupt("return");
             case 4:
-              _context3.next = 5;
+              _context4.next = 5;
               return this._validateShareStart(id, type);
             case 5:
-              hasValidShare = _context3.sent;
-              if (!(!this._hasScreenSharePermission() || !hasValidShare)) {
-                _context3.next = 6;
+              validShareStart = _context4.sent;
+              this.logger.info("[screen-share][handleStartShare]: validShareStart: ".concat(validShareStart));
+              if (!(!this._hasScreenSharePermission() || !validShareStart)) {
+                _context4.next = 6;
                 break;
               }
-              return _context3.abrupt("return");
+              return _context4.abrupt("return");
             case 6:
               if (!this.shareLock) {
-                _context3.next = 7;
+                _context4.next = 7;
                 break;
               }
-              return _context3.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_enablecollection'), 'error'));
+              return _context4.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_enablecollection'), 'error'));
             case 7:
               this._sharedScreenShareSharedDataSource.setCurrentShareIdInfos(id, type, bounds);
-              this._screenShareProvider.startShareScreen(id, type, withAudio, false);
-              this._initControlbar();
+              _context4.next = 8;
+              return this._screenShareProvider.startShareScreen(id, type, withAudio, false);
             case 8:
+              this._initControlbar();
+            case 9:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
       function handleStartShare(_x, _x2, _x3) {
         return _handleStartShare.apply(this, arguments);
@@ -582,23 +729,25 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_openShareScreenSelection",
     value: function () {
-      var _openShareScreenSelection2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+      var _openShareScreenSelection2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
         var _this4 = this;
         var windowList, displayList;
-        return _regenerator["default"].wrap(function (_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regenerator["default"].wrap(function (_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               this._shareSelectionDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SHARE_SCREEN, 'screen-selection');
-              _context4.next = 1;
+              _context5.next = 1;
               return this.appWindowList;
             case 1:
-              windowList = _context4.sent.filter(function (item) {
+              windowList = _context5.sent.filter(function (item) {
                 return !['AgoraHighLighter', 'Toast', 'Confirm', 'Annotation tool bar', 'Annotation', 'Video Window', 'Control Bar'].includes(item.title) || item.isCurrent;
               });
-              _context4.next = 2;
+              _context5.next = 2;
               return this.displayList;
             case 2:
-              displayList = _context4.sent;
+              displayList = _context5.sent;
+              this._windowList = windowList;
+              this._displayList = displayList;
               (0, _mobx.runInAction)(function () {
                 _this4._sharedScreenShareSharedDataSource.setApplicationCaptureSources(windowList.filter(function (item) {
                   return !item.isCurrent;
@@ -606,14 +755,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: _type2.FcrIconType.FCR_WHITEBOARD2
+                  image: _type3.FcrIconType.FCR_WHITEBOARD2
                 }].concat((0, _toConsumableArray2["default"])(displayList)));
               });
             case 3:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function _openShareScreenSelection() {
         return _openShareScreenSelection2.apply(this, arguments);
@@ -672,17 +821,13 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       var bounds = arguments.length > 4 ? arguments[4] : undefined;
       this._screenShareProvider.replaceScreenShare(id, type, withAudio, bounds);
     }
-  }, {
-    key: "_setShareLock",
-    value: function _setShareLock(lock) {
-      this._screenShareProvider.setShareLock(lock);
-    }
   }, {
     key: "_closeShareScreenComps",
     value: function _closeShareScreenComps() {
       if ((0, _env.isElectron)()) {
         this._closeControlBar();
         this._closeVideoWindowDialog();
+        this._annotationProvider.closeAnnotationWindow();
         window.runtime.browserWindow.show();
       }
     }
@@ -712,46 +857,13 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "_onUiEvent",
-    value: function () {
-      var _onUiEvent2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(event, params) {
-        var _t;
-        return _regenerator["default"].wrap(function (_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
-            case 0:
-              _t = event;
-              _context5.next = _t === _constant.FcrUIAction.START_SHARE_SCREEN ? 1 : _t === _constant.FcrUIAction.STOP_SCREEN_CAPTURE ? 2 : _t === _constant.FcrUIAction.ENGINE_RECONNECTED ? 3 : _t === _constant.FcrUIAction.STOP_SHARE_SCREEN ? 4 : _t === _constant.FcrUIAction.SET_SHARE_WITH_AUDIO ? 5 : _t === _constant.FcrUIAction.OPEN_TOP_VIDEO_WINDOW ? 6 : 7;
-              break;
-            case 1:
-              this.prepareShareScreen();
-              return _context5.abrupt("continue", 7);
-            case 2:
-              this.handleStopShare();
-              return _context5.abrupt("continue", 7);
-            case 3:
-              if (this._removeScreenStreamFailed) {
-                this._removeScreenStreamFailed = !this._screenShareProvider.removeScreenStream();
-              }
-              return _context5.abrupt("continue", 7);
-            case 4:
-              this.handleStopShare();
-              return _context5.abrupt("continue", 7);
-            case 5:
-              this._screenShareProvider.toggleScreenshareWithAudio(params.withAudio);
-              return _context5.abrupt("continue", 7);
-            case 6:
-              this._openVideoWindowDialog();
-              return _context5.abrupt("continue", 7);
-            case 7:
-            case "end":
-              return _context5.stop();
-          }
-        }, _callee5, this);
-      }));
-      function _onUiEvent(_x4, _x5) {
-        return _onUiEvent2.apply(this, arguments);
+    value: function _onUiEvent(event, params) {
+      switch (event) {
+        case _constant.FcrUIAction.OPEN_TOP_VIDEO_WINDOW:
+          this._openVideoWindowDialog();
+          break;
       }
-      return _onUiEvent;
-    }()
+    }
   }, {
     key: "_showToast",
     value: function _showToast(message, type) {
@@ -764,104 +876,61 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "_validateWindow",
-    value: function () {
-      var _validateWindow2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
-        var windows, window;
-        return _regenerator["default"].wrap(function (_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              _context6.next = 1;
-              return this.appWindowList;
-            case 1:
-              windows = _context6.sent;
-              window = windows.filter(function (item) {
-                return item.title !== 'AgoraHighLighter' && item.title !== 'Development HTML';
-              }).find(function (item) {
-                return item.id === id;
-              });
-              if (window) {
-                _context6.next = 2;
-                break;
-              }
-              this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_faild_reselect'), 'error');
-              return _context6.abrupt("return", false);
-            case 2:
-              return _context6.abrupt("return", true);
-            case 3:
-            case "end":
-              return _context6.stop();
-          }
-        }, _callee6, this);
-      }));
-      function _validateWindow(_x6) {
-        return _validateWindow2.apply(this, arguments);
+    value: function _validateWindow(id) {
+      var window = this._windowList.filter(function (item) {
+        return item.title !== 'AgoraHighLighter' && item.title !== 'Development HTML';
+      }).find(function (item) {
+        return item.id === id;
+      });
+      if (!window) {
+        this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_faild_reselect'), 'error');
+        return false;
       }
-      return _validateWindow;
-    }()
+      return true;
+    }
   }, {
     key: "_validateDisplay",
-    value: function () {
-      var _validateDisplay2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
-        var displayList;
-        return _regenerator["default"].wrap(function (_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
-            case 0:
-              _context7.next = 1;
-              return this.displayList;
-            case 1:
-              displayList = _context7.sent.find(function (item) {
-                return item.id === id;
-              });
-              if (displayList) {
-                _context7.next = 2;
-                break;
-              }
-              this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_faild_screenselect'), 'error');
-              return _context7.abrupt("return", false);
-            case 2:
-              return _context7.abrupt("return", true);
-            case 3:
-            case "end":
-              return _context7.stop();
-          }
-        }, _callee7, this);
-      }));
-      function _validateDisplay(_x7) {
-        return _validateDisplay2.apply(this, arguments);
+    value: function _validateDisplay(id) {
+      var displayList = this._displayList.find(function (item) {
+        return item.id === id;
+      });
+      if (!displayList) {
+        this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_faild_screenselect'), 'error');
+        return false;
       }
-      return _validateDisplay;
-    }()
+      return true;
+    }
   }, {
     key: "_validateShareStart",
     value: function () {
-      var _validateShareStart2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(id, type) {
-        return _regenerator["default"].wrap(function (_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      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) {
             case 0:
               if (!this.supportEnumScreen) {
-                _context8.next = 2;
+                _context6.next = 2;
                 break;
               }
-              if (!(type === _type.AgoraRtcScreenCaptureType.WINDOW && !this._validateWindow(id))) {
-                _context8.next = 1;
+              if (!(type === _type2.AgoraRtcScreenCaptureType.WINDOW && !this._validateWindow(id))) {
+                _context6.next = 1;
                 break;
               }
-              return _context8.abrupt("return", false);
+              return _context6.abrupt("return", false);
             case 1:
-              if (!(type === _type.AgoraRtcScreenCaptureType.SCREEN && !this._validateDisplay(id))) {
-                _context8.next = 2;
+              if (!(type === _type2.AgoraRtcScreenCaptureType.SCREEN && !this._validateDisplay(id))) {
+                _context6.next = 2;
                 break;
               }
-              return _context8.abrupt("return", false);
+              return _context6.abrupt("return", false);
             case 2:
-              return _context8.abrupt("return", true);
+              return _context6.abrupt("return", true);
             case 3:
             case "end":
-              return _context8.stop();
+              return _context6.stop();
           }
-        }, _callee8, this);
+        }, _callee6, this);
       }));
-      function _validateShareStart(_x8, _x9) {
+      function _validateShareStart(_x4, _x5) {
         return _validateShareStart2.apply(this, arguments);
       }
       return _validateShareStart;
@@ -869,10 +938,10 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_initControlbar",
     value: function () {
-      var _initControlbar2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9() {
+      var _initControlbar2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7() {
         var mainWindow;
-        return _regenerator["default"].wrap(function (_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        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);
@@ -885,9 +954,9 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
               }
             case 1:
             case "end":
-              return _context9.stop();
+              return _context7.stop();
           }
-        }, _callee9, this);
+        }, _callee7, this);
       }));
       function _initControlbar() {
         return _initControlbar2.apply(this, arguments);
@@ -904,15 +973,27 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     value: function _hendleBrowserHide() {
       this.logger.info("[screen-share]: browser window hide, current sharing info: ".concat(this._screenShareInfoForLog));
     }
+  }, {
+    key: "_handleOnScreenShareSeize",
+    value: function _handleOnScreenShareSeize() {
+      // 统一在此处理我被抢占的后续逻辑
+      this._annotationProvider.closeAnnotationWindow();
+    }
   }, {
     key: "handleToggleScreenShareWithAudio",
     value: function handleToggleScreenShareWithAudio(withAudio) {
-      this._screenShareProvider.toggleScreenshareWithAudio(withAudio);
+      this._sharedScreenShareSharedDataSource.setShareWithAudio(withAudio);
+    }
+  }, {
+    key: "toggleShareWithScenarioType",
+    value: function toggleShareWithScenarioType(isCurrentSmoothType) {
+      var targetType = isCurrentSmoothType ? _imports.FcrScreenScenarioType.SMOOTH : _imports.FcrScreenScenarioType.CLEARITY;
+      this._sharedScreenShareSharedDataSource.setScreenShareScenarioType(targetType);
     }
   }]);
 }();
 _ShareScreenStore = ShareScreenStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "boardOwnerUser"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_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"], [_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, "handleToggleScreenShareWithAudio"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 3);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "boardOwnerUser"], [_decorator.bound, 2, "toggleIsShowToolbar"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_zoomInDecs, 18, "zoomIn"], [_zoomOutDecs, 18, "zoomOut"], [_fullContainerDecs, 18, "fullContainer"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_hasLoopbackDeviceDecs, 18, "hasLoopbackDevice"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_decorator.bound, 2, "setCardChooseBounds"], [_decorator.bound, 2, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_startRenderSharePreviewDecs, 18, "startRenderSharePreview"], [_stopRenderSharePreviewDecs, 18, "stopRenderSharePreview"], [_handleStopShareDecs, 18, "handleStopShare"], [_handleStopShareByExitRoomDecs, 18, "handleStopShareByExitRoom"], [_decorator.bound, 2, "participantShareCanWeAnnotation"], [_handleStartShareDecs, 18, "handleStartShare"], [_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);
 _init_boardOwnerUser = _applyDecs$e[0];
 _init_handleChooseScreen = _applyDecs$e[1];
 _initProto = _applyDecs$e[2];