fcr-ui-scene 3.6.2 → 3.6.4

package/lib/modules/share-screen/store.d.ts

@@ -16,6 +16,7 @@ import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
 import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
+import { FcrUIAbilityProvider } from '../../providers/ability-provider';
 export default class ShareScreenStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
@@ -33,7 +34,9 @@ export default class ShareScreenStore {
     private _sharedMemberDataSource;
     private _sharedScreenShareSharedDataSource;
     private _connectionProvider;
+    private _abilityProvider;
     private _isOnline;
+    private _cardChooseBounds;
     private _roomObserver;
     private _uiEventObserver;
     private _screenCaptureStateObserver;
@@ -43,6 +46,7 @@ export default class ShareScreenStore {
     private _videoWindowDialogId;
     private _annotationProvider;
     accessor boardOwnerUser: FcrUserInfo | undefined;
+    get cardChooseBounds(): CurrentShareBounds;
     get currentShareStreamId(): string;
     get screenTrack(): FcrScreenTrack | null;
     get currentShareType(): AgoraRtcScreenCaptureType;
@@ -63,7 +67,8 @@ export default class ShareScreenStore {
     get currentSelectionBounds(): CurrentShareBounds;
     get shareLock(): boolean;
     get currentShareId(): string;
-    constructor({ roomControl, deviceProvider, privilegeProvider, messageProvider, dialogProvider, eventProvider, sharedMemberDataSource, roomProvider, sharedConfigDataSource, screenShareProvider, annotationProvider, sharedScreenShareSharedDataSource, connectionProvider, }: {
+    get _screenShareInfoForLog(): string;
+    constructor({ roomControl, deviceProvider, privilegeProvider, messageProvider, dialogProvider, eventProvider, sharedMemberDataSource, roomProvider, sharedConfigDataSource, screenShareProvider, annotationProvider, sharedScreenShareSharedDataSource, connectionProvider, abilityProvider, }: {
         roomControl: FcrMainRoomControl;
         deviceProvider: FcrUIDeviceProvider;
         privilegeProvider: FcrUIPrivilegeProvider;
@@ -77,14 +82,16 @@ export default class ShareScreenStore {
         annotationProvider: FcrUIAnnotationProvider;
         sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
         connectionProvider: FcrUIConnectionProvider;
+        abilityProvider: FcrUIAbilityProvider;
     });
     private _handleOnScreenCaptureStopped;
     private _handleOnScreenCaptureStarted;
     private _hasScreenSharePermission;
-    handleChooseScreen: (id: string, type: AgoraRtcScreenCaptureType | undefined, bounds: CurrentShareBounds) => void;
+    handleChooseScreen: (id: string, type?: AgoraRtcScreenCaptureType) => void;
     setShareWithAudioState(withAudio: boolean): void;
     hasLoopbackDevice(): Promise<boolean>;
     setShareAudioProcessingChannel(currentShareAudioProcessingChannel: AudioProcessingChannel): void;
+    setCardChooseBounds(bounds: CurrentShareBounds): void;
     handlerBoardShareStop(): void;
     release(): void;
     openRelaunchTipsDialog(): void;
@@ -93,6 +100,7 @@ export default class ShareScreenStore {
     handleStopShare(): void;
     prepareShareScreen(): Promise<void>;
     handleStartShare(id: string, type: AgoraRtcScreenCaptureType, withAudio: boolean, audioProcessingChannel: AudioProcessingChannel | undefined, bounds: CurrentShareBounds): Promise<void>;
+    isAnnotationSupported(): boolean;
     private _openShareScreenSelection;
     private _closeShareScreenSelection;
     private _setControlBarWindowId;
@@ -113,6 +121,8 @@ export default class ShareScreenStore {
     private _validateDisplay;
     private _validateShareStart;
     private _initControlbar;
+    private _handleBrowserShow;
+    private _hendleBrowserHide;
     handleToggleScreenShareWithAudio(withAudio: boolean): void;
 }
 export declare const StoreContext: import("react").Context<ShareScreenStore>;

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

@@ -43,15 +43,14 @@ 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.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.to-string.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.string.starts-with.js");
 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.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
@@ -109,7 +108,8 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       screenShareProvider = _ref2.screenShareProvider,
       annotationProvider = _ref2.annotationProvider,
       sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource,
-      connectionProvider = _ref2.connectionProvider;
+      connectionProvider = _ref2.connectionProvider,
+      abilityProvider = _ref2.abilityProvider;
     (0, _classCallCheck2["default"])(this, ShareScreenStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ShareScreenStore'
@@ -118,6 +118,12 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_controlBarWindowId", -1);
     (0, _defineProperty2["default"])(this, "_removeScreenStreamFailed", false);
     (0, _defineProperty2["default"])(this, "_isOnline", true);
+    (0, _defineProperty2["default"])(this, "_cardChooseBounds", {
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0
+    });
     (0, _defineProperty2["default"])(this, "_roomObserver", {
       onRoomClosed: this.handleStopShare,
       onLeaveMainRoom: this.handleStopShare
@@ -147,8 +153,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     _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 bounds = arguments.length > 2 ? arguments[2] : undefined;
-      _this._sharedScreenShareSharedDataSource.setCurrentSelection(id, type, bounds);
+      _this._sharedScreenShareSharedDataSource.setCurrentSelection(id, type);
     }));
     this._deviceProvider = deviceProvider;
     this._messageProvider = messageProvider;
@@ -161,6 +166,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     this._annotationProvider = annotationProvider;
     this._sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
     this._connectionProvider = connectionProvider;
+    this._abilityProvider = abilityProvider;
     this._userControl = roomControl.getUserControl();
     this._boardControl = roomControl.getSharingControl().getBoardControl();
     this._roomProvider.addObserver(this._roomObserver);
@@ -183,7 +189,19 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           duration: 3000
         });
       }
+    }), (0, _mobx.reaction)(function () {
+      return _this.connectionState;
+    }, function (val) {
+      var needCloseState = val === _fcrCore.FcrConnectionState.ABORTED || val === _fcrCore.FcrConnectionState.DISCONNECTED;
+      _this.logger.info("[screen-share]: connection state changed to ".concat(val, ", need close state: ").concat(needCloseState));
+      if (needCloseState) {
+        _this.handleStopShare();
+      }
     }));
+    if ((0, _env.isElectron)()) {
+      window.runtime.browserWindow.addListener('show', this._handleBrowserShow);
+      window.runtime.browserWindow.addListener('hide', this._hendleBrowserHide);
+    }
   }
   return (0, _createClass2["default"])(ShareScreenStore, [{
     key: "boardOwnerUser",
@@ -193,6 +211,11 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_A, this, v);
     }
+  }, {
+    key: "cardChooseBounds",
+    get: function get() {
+      return this._cardChooseBounds;
+    }
   }, {
     key: "currentShareStreamId",
     get: function get() {
@@ -293,6 +316,16 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedScreenShareSharedDataSource.currentShareId;
     }
+  }, {
+    key: "_screenShareInfoForLog",
+    get: function get() {
+      return "Screen Share Info : ".concat(JSON.stringify({
+        isSharingScreen: this.screenSharingState,
+        currentShareId: this.currentShareId,
+        currentShareType: this.currentShareType,
+        currentShareBounds: this.currentSelectionBounds
+      }));
+    }
   }, {
     key: "_handleOnScreenCaptureStopped",
     value: function _handleOnScreenCaptureStopped() {
@@ -322,15 +355,15 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     value: function () {
       var _hasLoopbackDevice = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var res;
-        return _regenerator["default"].wrap(function _callee$(_context) {
+        return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              _context.next = 1;
               return this._deviceProvider.checkLoopbackDevice();
-            case 2:
+            case 1:
               res = _context.sent;
               return _context.abrupt("return", res === 0);
-            case 4:
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -346,6 +379,11 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     value: function setShareAudioProcessingChannel(currentShareAudioProcessingChannel) {
       this._sharedScreenShareSharedDataSource.setCurrentShareAudioProcessingChannel(currentShareAudioProcessingChannel);
     }
+  }, {
+    key: "setCardChooseBounds",
+    value: function setCardChooseBounds(bounds) {
+      this._cardChooseBounds = bounds;
+    }
   }, {
     key: "handlerBoardShareStop",
     value: function handlerBoardShareStop() {
@@ -366,6 +404,10 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       this._boardControl.removeObserver(this._boardObserver);
       this._roomProvider.removeObserver(this._roomObserver);
       this._removeEventListeners();
+      if ((0, _env.isElectron)()) {
+        window.runtime.browserWindow.removeListener('show', this._handleBrowserShow);
+        window.runtime.browserWindow.removeListener('hide', this._hendleBrowserHide);
+      }
     }
   }, {
     key: "openRelaunchTipsDialog",
@@ -407,11 +449,11 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       var _prepareShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this3 = this;
         var dialogId;
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
+        return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if ((0, _screenCapturePermission.hasScreenCapturePermission)()) {
-                _context2.next = 3;
+                _context2.next = 1;
                 break;
               }
               dialogId = this._dialogProvider.openConfirmDialog({
@@ -429,10 +471,10 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 closable: false
               });
               return _context2.abrupt("return");
-            case 3:
+            case 1:
               this.supportEnumScreen && this._openShareScreenSelection();
               !(0, _env.isElectron)() && this.handleStartShare(this.currentSelectionId, _type.AgoraRtcScreenCaptureType.SCREEN, true, _shareAudio.AudioProcessingChannel.MONO, this.currentSelectionBounds);
-            case 5:
+            case 2:
             case "end":
               return _context2.stop();
           }
@@ -450,92 +492,78 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
         var audioProcessingChannel,
           bounds,
           electronBounds,
+          hasValidShare,
           _args3 = arguments;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
+        return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               audioProcessingChannel = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : _shareAudio.AudioProcessingChannel.MONO;
               bounds = _args3.length > 4 ? _args3[4] : undefined;
               if (!(this.connectionState !== _fcrCore.FcrConnectionState.CONNECTED || !this._isOnline)) {
-                _context3.next = 5;
+                _context3.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));
-            case 5:
+            case 1:
               if ((0, _env.isElectron)()) this._closeShareScreenSelection();
               if (!id.startsWith('whiteboard-')) {
-                _context3.next = 11;
+                _context3.next = 3;
                 break;
               }
               if (!(!this._securityStore.hasStartBoardPermission() && !this.isHost)) {
-                _context3.next = 9;
+                _context3.next = 2;
                 break;
               }
               return _context3.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_hostprohibits'), 'error'));
-            case 9:
+            case 2:
               this._eventProvider.sendEvent(_constant.FcrUIAction.OPEN_WHITEBOARD);
               return _context3.abrupt("return");
-            case 11:
+            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);
-              if (!(this.screenSharingState === _fcrCore.FcrMediaSourceState.OPEN)) {
-                _context3.next = 17;
-                break;
-              }
-              this._handleReplaceScreen(id, type, withAudio, audioProcessingChannel, bounds);
-              this._setShareLock(false);
-              return _context3.abrupt("return");
-            case 17:
-              this._annotationProvider.setCurrentShareInfo({
+              this.logger.info("[screen-share][handleStartShare]: currentShareInfo: ".concat(JSON.stringify({
                 id: id,
                 type: type,
                 bounds: bounds
-              });
-              this._annotationProvider.setBoundsToAnnotationWindow({
+              })));
+              this._annotationProvider.setCurrentShareInfo({
                 id: id,
                 type: type,
                 bounds: bounds
               });
-              this._eventProvider.sendEvent(_constant.FcrUIAction.SET_CURRENT_SHARE_SCREEN, {
+              this._annotationProvider.setBoundsToAnnotationWindow({
                 id: id,
                 type: type,
                 bounds: bounds
               });
-              _context3.t0 = this.supportEnumScreen;
-              if (!_context3.t0) {
-                _context3.next = 25;
+              if (!(this.screenSharingState === _fcrCore.FcrMediaSourceState.OPEN)) {
+                _context3.next = 4;
                 break;
               }
-              _context3.next = 24;
+              this._handleReplaceScreen(id, type, withAudio, audioProcessingChannel, bounds);
+              return _context3.abrupt("return");
+            case 4:
+              _context3.next = 5;
               return this._validateShareStart(id, type);
-            case 24:
-              _context3.t0 = !_context3.sent;
-            case 25:
-              if (!_context3.t0) {
-                _context3.next = 27;
+            case 5:
+              hasValidShare = _context3.sent;
+              if (!(!this._hasScreenSharePermission() || !hasValidShare)) {
+                _context3.next = 6;
                 break;
               }
               return _context3.abrupt("return");
-            case 27:
+            case 6:
               if (!this.shareLock) {
-                _context3.next = 29;
+                _context3.next = 7;
                 break;
               }
               return _context3.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_enablecollection'), 'error'));
-            case 29:
-              this._setShareLock(true);
+            case 7:
               this._sharedScreenShareSharedDataSource.setCurrentShareIdInfos(id, type, bounds);
-              if (this._hasScreenSharePermission()) {
-                _context3.next = 34;
-                break;
-              }
-              this._setShareLock(false);
-              return _context3.abrupt("return");
-            case 34:
-              this._initControlbar();
               this._screenShareProvider.startShareScreen(id, type, withAudio, false);
-            case 36:
+              this._initControlbar();
+            case 8:
             case "end":
               return _context3.stop();
           }
@@ -546,25 +574,30 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       }
       return handleStartShare;
     }()
+  }, {
+    key: "isAnnotationSupported",
+    value: function isAnnotationSupported() {
+      return this._abilityProvider.isAnnotationSupported();
+    }
   }, {
     key: "_openShareScreenSelection",
     value: function () {
       var _openShareScreenSelection2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
         var _this4 = this;
         var windowList, displayList;
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
+        return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               this._shareSelectionDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SHARE_SCREEN, 'screen-selection');
-              _context4.next = 3;
+              _context4.next = 1;
               return this.appWindowList;
-            case 3:
+            case 1:
               windowList = _context4.sent.filter(function (item) {
                 return !['AgoraHighLighter', 'Toast', 'Confirm', 'Annotation tool bar', 'Annotation', 'Video Window', 'Control Bar'].includes(item.title) || item.isCurrent;
               });
-              _context4.next = 6;
+              _context4.next = 2;
               return this.displayList;
-            case 6:
+            case 2:
               displayList = _context4.sent;
               (0, _mobx.runInAction)(function () {
                 _this4._sharedScreenShareSharedDataSource.setApplicationCaptureSources(windowList.filter(function (item) {
@@ -576,7 +609,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                   image: _type2.FcrIconType.FCR_WHITEBOARD2
                 }].concat((0, _toConsumableArray2["default"])(displayList)));
               });
-            case 8:
+            case 3:
             case "end":
               return _context4.stop();
           }
@@ -621,14 +654,6 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_handleOnScreenShareReplaceBegin",
     value: function _handleOnScreenShareReplaceBegin(id, type, bounds) {
-      if ((0, _env.isElectron)()) {
-        this._initControlbar();
-      }
-      this._eventProvider.sendEvent(_constant.FcrUIAction.SET_CURRENT_SHARE_SCREEN, {
-        id: id,
-        type: type,
-        bounds: bounds
-      });
       this._annotationProvider.setCurrentShareInfo({
         id: id,
         type: type,
@@ -689,33 +714,34 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     key: "_onUiEvent",
     value: function () {
       var _onUiEvent2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(event, params) {
-        return _regenerator["default"].wrap(function _callee5$(_context5) {
+        var _t;
+        return _regenerator["default"].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context5.t0 = event;
-              _context5.next = _context5.t0 === _constant.FcrUIAction.START_SHARE_SCREEN ? 3 : _context5.t0 === _constant.FcrUIAction.STOP_SCREEN_CAPTURE ? 5 : _context5.t0 === _constant.FcrUIAction.ENGINE_RECONNECTED ? 7 : _context5.t0 === _constant.FcrUIAction.STOP_SHARE_SCREEN ? 9 : _context5.t0 === _constant.FcrUIAction.SET_SHARE_WITH_AUDIO ? 11 : _context5.t0 === _constant.FcrUIAction.OPEN_TOP_VIDEO_WINDOW ? 13 : 15;
+              _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 3:
+            case 1:
               this.prepareShareScreen();
-              return _context5.abrupt("break", 15);
-            case 5:
+              return _context5.abrupt("continue", 7);
+            case 2:
               this.handleStopShare();
-              return _context5.abrupt("break", 15);
-            case 7:
+              return _context5.abrupt("continue", 7);
+            case 3:
               if (this._removeScreenStreamFailed) {
                 this._removeScreenStreamFailed = !this._screenShareProvider.removeScreenStream();
               }
-              return _context5.abrupt("break", 15);
-            case 9:
+              return _context5.abrupt("continue", 7);
+            case 4:
               this.handleStopShare();
-              return _context5.abrupt("break", 15);
-            case 11:
+              return _context5.abrupt("continue", 7);
+            case 5:
               this._screenShareProvider.toggleScreenshareWithAudio(params.withAudio);
-              return _context5.abrupt("break", 15);
-            case 13:
+              return _context5.abrupt("continue", 7);
+            case 6:
               this._openVideoWindowDialog();
-              return _context5.abrupt("break", 15);
-            case 15:
+              return _context5.abrupt("continue", 7);
+            case 7:
             case "end":
               return _context5.stop();
           }
@@ -741,12 +767,12 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     value: function () {
       var _validateWindow2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
         var windows, window;
-        return _regenerator["default"].wrap(function _callee6$(_context6) {
+        return _regenerator["default"].wrap(function (_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context6.next = 2;
+              _context6.next = 1;
               return this.appWindowList;
-            case 2:
+            case 1:
               windows = _context6.sent;
               window = windows.filter(function (item) {
                 return item.title !== 'AgoraHighLighter' && item.title !== 'Development HTML';
@@ -754,14 +780,14 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
                 return item.id === id;
               });
               if (window) {
-                _context6.next = 7;
+                _context6.next = 2;
                 break;
               }
               this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_faild_reselect'), 'error');
               return _context6.abrupt("return", false);
-            case 7:
+            case 2:
               return _context6.abrupt("return", true);
-            case 8:
+            case 3:
             case "end":
               return _context6.stop();
           }
@@ -777,24 +803,24 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     value: function () {
       var _validateDisplay2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
         var displayList;
-        return _regenerator["default"].wrap(function _callee7$(_context7) {
+        return _regenerator["default"].wrap(function (_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context7.next = 2;
+              _context7.next = 1;
               return this.displayList;
-            case 2:
+            case 1:
               displayList = _context7.sent.find(function (item) {
                 return item.id === id;
               });
               if (displayList) {
-                _context7.next = 6;
+                _context7.next = 2;
                 break;
               }
               this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_faild_screenselect'), 'error');
               return _context7.abrupt("return", false);
-            case 6:
+            case 2:
               return _context7.abrupt("return", true);
-            case 7:
+            case 3:
             case "end":
               return _context7.stop();
           }
@@ -809,43 +835,27 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     key: "_validateShareStart",
     value: function () {
       var _validateShareStart2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(id, type) {
-        return _regenerator["default"].wrap(function _callee8$(_context8) {
+        return _regenerator["default"].wrap(function (_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context8.t0 = type === _type.AgoraRtcScreenCaptureType.WINDOW;
-              if (!_context8.t0) {
-                _context8.next = 5;
+              if (!this.supportEnumScreen) {
+                _context8.next = 2;
                 break;
               }
-              _context8.next = 4;
-              return this._validateWindow(id);
-            case 4:
-              _context8.t0 = !_context8.sent;
-            case 5:
-              if (!_context8.t0) {
-                _context8.next = 7;
+              if (!(type === _type.AgoraRtcScreenCaptureType.WINDOW && !this._validateWindow(id))) {
+                _context8.next = 1;
                 break;
               }
               return _context8.abrupt("return", false);
-            case 7:
-              _context8.t1 = type === _type.AgoraRtcScreenCaptureType.SCREEN;
-              if (!_context8.t1) {
-                _context8.next = 12;
-                break;
-              }
-              _context8.next = 11;
-              return this._validateDisplay(id);
-            case 11:
-              _context8.t1 = !_context8.sent;
-            case 12:
-              if (!_context8.t1) {
-                _context8.next = 14;
+            case 1:
+              if (!(type === _type.AgoraRtcScreenCaptureType.SCREEN && !this._validateDisplay(id))) {
+                _context8.next = 2;
                 break;
               }
               return _context8.abrupt("return", false);
-            case 14:
+            case 2:
               return _context8.abrupt("return", true);
-            case 15:
+            case 3:
             case "end":
               return _context8.stop();
           }
@@ -860,27 +870,20 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
     key: "_initControlbar",
     value: function () {
       var _initControlbar2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9() {
-        var params, mainWindow;
-        return _regenerator["default"].wrap(function _callee9$(_context9) {
+        var mainWindow;
+        return _regenerator["default"].wrap(function (_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              params = {
-                currentShareAudioProcessingChannel: _shareAudio.AudioProcessingChannel.MONO,
-                currentShareId: this.currentShareId,
-                currentShareType: this.currentShareType,
-                shareWithAudio: this.shareWithAudio,
-                currentShareBounds: this.currentSelectionBounds
-              };
               if ((0, _env.isElectron)()) {
-                this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR, params);
+                this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR);
                 mainWindow = window.runtime.browserWindow;
                 if (mainWindow) {
                   mainWindow.hide();
                 }
               } else {
-                this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR, params);
+                this._controlBarDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.CONTROL_BAR);
               }
-            case 2:
+            case 1:
             case "end":
               return _context9.stop();
           }
@@ -891,6 +894,16 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
       }
       return _initControlbar;
     }()
+  }, {
+    key: "_handleBrowserShow",
+    value: function _handleBrowserShow() {
+      this.logger.info("[screen-share]: browser window show, current sharing info: ".concat(this._screenShareInfoForLog));
+    }
+  }, {
+    key: "_hendleBrowserHide",
+    value: function _hendleBrowserHide() {
+      this.logger.info("[screen-share]: browser window hide, current sharing info: ".concat(this._screenShareInfoForLog));
+    }
   }, {
     key: "handleToggleScreenShareWithAudio",
     value: function handleToggleScreenShareWithAudio(withAudio) {
@@ -899,7 +912,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _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, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_startRenderSharePreviewDecs, 18, "startRenderSharePreview"], [_stopRenderSharePreviewDecs, 18, "stopRenderSharePreview"], [_handleStopShareDecs, 18, "handleStopShare"], [_handleStartShareDecs, 18, "handleStartShare"], [_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, "handleToggleScreenShareWithAudio"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 3);
+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);
 _init_boardOwnerUser = _applyDecs$e[0];
 _init_handleChooseScreen = _applyDecs$e[1];
 _initProto = _applyDecs$e[2];