fcr-ui-scene 3.7.8 → 3.7.9-alpha

package/installer/mac/entitlements.mac.plist

@@ -12,9 +12,5 @@
     <true/>
     <key>com.apple.security.device.camera</key>
     <true/>
-    <key>com.apple.security.network.server</key>
-    <true />
-    <key>com.apple.security.network.client</key>
-    <true />
   </dict>
-</plist>
+</plist>

package/lib/creator/index.js

@@ -183,17 +183,6 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
             type: _type.FcrUIGlobalNodeEventType.LAUNCH_SUCCESS,
             data: args
           });
-
-          // if (isElectron()) {
-          //   const windowProvider = this._objectManager.getObject<FcrUIWindowProvider>(
-          //     FcrUIObjectKeys.P_WINDOW_PROVIDER,
-          //   );
-
-          //   const mainWindow = windowProvider.getCurrentWindow();
-
-          //   focusWindow(mainWindow);
-          // }
-
           onSuccess.apply(void 0, args);
         },
         onLaunchFailure: function onLaunchFailure() {
@@ -325,12 +314,14 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     key: "release",
     value: function release() {
       this._precheckState();
+      if (this._scene) {
+        this.logger.info('exit existing scene before releasing creator');
+        this._scene.exit();
+      }
       this._globalNode.unmount();
       this._globalNode.nodeWillInactive();
       this._providerInitializer.onCreatorRelease();
-      // Release core engine last
       this._released = true;
-      this._resetScene();
     }
   }, {
     key: "_setMeetingState",
@@ -348,13 +339,16 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
   }, {
     key: "_resetScene",
     value: function _resetScene() {
-      if (this._sceneObserver) {
-        var _this$_scene;
-        (_this$_scene = this._scene) === null || _this$_scene === void 0 || _this$_scene.removeObserver(this._sceneObserver);
-        this._sceneObserver = null;
+      var scene = this._scene;
+      var sceneObserver = this._sceneObserver;
+      if (scene) {
+        if (sceneObserver) {
+          scene.removeObserver(sceneObserver);
+          this._sceneObserver = null;
+        }
+        this._setMeetingState(_renderer.MeetingState.NOT_IN_MEETING);
+        this._scene = null;
       }
-      this._setMeetingState(_renderer.MeetingState.NOT_IN_MEETING);
-      this._scene = null;
     }
   }, {
     key: "_precheckState",

package/lib/creator/provider-initializer.browser.js

@@ -97,8 +97,6 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE, sharedConfigDataSource);
       var monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(engine.getMonitorControl());
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MONITOR_PROVIDER, monitorProvider);
-      var sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE, sharedLayoutDataSource);
       var sharedWidgetDataSource = new _widgetData.FcrUISharedWidgetDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE, sharedWidgetDataSource);
     }
@@ -111,7 +109,6 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_USER_SETTING_STORAGE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_MONITOR_PROVIDER);
-      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_EVENT_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
@@ -136,6 +133,9 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       var sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
       var messageProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
       var dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
+      var sharedConfigDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE);
+      var sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource);
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE, sharedLayoutDataSource);
       var sharedScreenShareDataSource = new _screenShare.FcrUISharedScreenShareDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_SCREEN_SHARE_DATA_SOURCE, sharedScreenShareDataSource);
       var sharedWidgetDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE);
@@ -226,6 +226,7 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
     value: function onMainSceneRelease() {
       var objectManager = this._objectManager;
       // MainScene Providers/DataSources cleanup
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_PHONE_AUDIO_CONNECTOR_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_ABILITY_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PRIVILEGE_PROVIDER);

package/lib/electron/app.js

@@ -33,6 +33,7 @@ var logger = (0, _logger.getLogger)();
 var hookApp = exports.hookApp = function hookApp(app) {
   logger.info("hook app, main process id: ".concat(process.pid));
   app.commandLine.appendSwitch('ignore-certificate-errors');
+  app.commandLine.appendSwitch('--force_high_performance_gpu');
   // app.commandLine.appendSwitch('enable-logging');
   // app.commandLine.appendSwitch('log-level', '0');
   // app.commandLine.appendSwitch('v', '1');

package/lib/electron/bootstrap-sdk.js

@@ -53,6 +53,7 @@ var mainWindow;
 var mainWindowReady = false;
 var userMinimize = false;
 var mainWindowDisplayState = _struct.DisplayState.HIDE;
+var lastInitParams = '';
 (0, _main.initialize)();
 var port = (_process$argv$find = process.argv.find(function (arg) {
   return arg.startsWith('--port=');
@@ -101,7 +102,10 @@ ipcClient.addObserver({
         _eventManager.eventManager.startMeetingProcess(roomId);
         (0, _logger.getLogger)().info("CPP EVENT: LaunchMeeting: ".concat(JSON.stringify(message.data), ", has mainWindow ").concat(!!mainWindow, ", state changed to ").concat(_struct.FcrUISceneLaunchState[_eventManager.eventManager.launchState]));
         if (mainWindow) {
-          mainWindow.webContents.send(_type.IPCMessageCMD.LaunchMeeting, message.data);
+          mainWindow.webContents.send(_type.IPCMessageCMD.LaunchMeeting, {
+            data: message.data,
+            lastInitParams: lastInitParams
+          });
           mainWindow.show();
           mainWindow.focus();
           mainWindow.moveTop();
@@ -122,7 +126,8 @@ ipcClient.addObserver({
         }
         break;
       case _type.IPCMessageCMD.InitCreator:
-        (0, _logger.getLogger)().info("InitCreator: ".concat(JSON.stringify(message.data)));
+        (0, _logger.getLogger)().info("InitCreator, current message data: ".concat(JSON.stringify(message.data)));
+        lastInitParams = JSON.stringify(message.data);
 
         // 检查调用顺序：如果是 init -> launch 但 launch 在 PROCESSING 阶段，需要报错
         if (_eventManager.eventManager.launchState === _struct.FcrUISceneLaunchState.PROCESSING) {
@@ -142,7 +147,10 @@ ipcClient.addObserver({
           (0, _logger.getLogger)().error("InitCreator: ".concat(e));
         }
         if (mainWindow) {
+          (0, _logger.getLogger)().info("InitCreator: send InitCreator message to mainWindow");
           mainWindow.webContents.send(_type.IPCMessageCMD.InitCreator, message.data);
+        } else {
+          (0, _logger.getLogger)().error("InitCreator: mainWindow is not ready");
         }
         break;
       case _type.IPCMessageCMD.OpenSetting:
@@ -323,6 +331,15 @@ _electron.app.addListener('ready', function () {
     if (_eventManager.eventManager.launchState !== _struct.FcrUISceneLaunchState.PROCESSING) {
       return;
     }
+    try {
+      // 再会议启动过程中，窗口被其他窗口遮挡也会触发hide事件，实际窗口在后面运行，所以需要判断窗口是否可见
+      if (mainWindow.isVisible()) {
+        (0, _logger.getLogger)().info('windows_release main window hidden, but window is visible, ignore this event');
+        return;
+      }
+    } catch (error) {
+      (0, _logger.getLogger)().error("windows_release main window hide, get main window visible error");
+    }
     ipcClient.sendMessage({
       // TODO
       //  cmd: IPCMessageCMD.ExitUiSceneFromMainProcess,

package/lib/electron/sdk-helper.js

@@ -201,7 +201,8 @@ _renderer.ipcRenderer.on(_type.IPCMessageCMD.SetParameters, function (_event, va
 _renderer.ipcRenderer.on(_type.IPCMessageCMD.LaunchMeeting, function (_event, value) {
   console.log('LaunchMeeting in sdk-helper', value);
   if (cppSdkHelper.onLaunchMeeting) {
-    var data = value;
+    var data = value.data,
+      lastInitParams = value.lastInitParams;
     try {
       if (typeof value == 'string') {
         data = JSON.parse(value);
@@ -209,7 +210,10 @@ _renderer.ipcRenderer.on(_type.IPCMessageCMD.LaunchMeeting, function (_event, va
     } catch (e) {
       console.error("windows_release Failed to parse launch options:, ".concat(JSON.stringify(e), ", typeof value: ").concat((0, _typeof2["default"])(value), ", value: ").concat(value));
     }
-    cppSdkHelper.onLaunchMeeting(data);
+    cppSdkHelper.onLaunchMeeting({
+      data: data,
+      lastInitParams: lastInitParams
+    });
   }
 });
 _renderer.ipcRenderer.on(_type.IPCMessageCMD.RenewUserToken, function (_event, value) {

package/lib/electron/until.js

@@ -54,7 +54,10 @@ var DetailErrorCode = /*#__PURE__*/function (DetailErrorCode) {
 var generaErrorCode = exports.generaErrorCode = function generaErrorCode(serviceCode, uiSceneCode, detailCode) {
   return serviceCode * 1000000 + uiSceneCode * 1000 + detailCode;
 };
+
+// 800010082
 var windowHideErrorCode = exports.windowHideErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHidden);
+// // 800010083
 var closeWindowBeforeLaunchSuccessErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.closeWindowBeforeLaunchSuccess);
 var meetingLaunchProcessingErrorCode = exports.meetingLaunchProcessingErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.meetingLaunchProcessing);
 

package/lib/index.js

@@ -47,10 +47,17 @@ require("./plugins/electron-rtc-plugin");
 require("./plugins/multi-lang-plugin");
 require("./plugins/rtm-plugin");
 require("./plugins/web-rtc-plugin");
+var _logger = require("./utilities/logger");
+var _imports = require("fcr-core/lib/imports");
 // import { configure } from 'mobx';
 
 // configure({
 //   enforceActions: 'always',
 // });
 
-_dayjs["default"].extend(_duration["default"]);
+_dayjs["default"].extend(_duration["default"]);
+// @ts-ignore
+window.__AgoraLogger = (0, _logger.getLogger)();
+
+// @ts-ignore
+window.__AgoraMutex = new _imports.Mutex();

package/lib/modules/components/leave-meeting/store.base.d.ts

@@ -32,5 +32,6 @@ export declare abstract class LeaveMeetingStoreBase {
     setKeepConnect(value: boolean): void;
     end(): Promise<void>;
     release(): void;
+    private _checkIfQuitFullScreen;
 }
 export declare const LeaveMeetingStoreContext: import("react").Context<LeaveMeetingStoreBase>;

package/lib/modules/components/leave-meeting/store.base.js

@@ -59,6 +59,7 @@ var _react = require("react");
 var _constant = require("../../../utilities/constant");
 var _objectManager = require("../../../object-manager");
 var _env = require("agora-foundation/lib/utilities/env");
+var _imports = require("fcr-core/lib/imports");
 var _LeaveMeetingStoreBase;
 var _initProto, _init_keepConnect, _init_canAssign, _init_loading, _showEndConfirmDialogDecs, _assignHostDecs, _setIsSelfEndMeetingDecs, _leaveDecs, _keepPhoneAudioConnectionDecs, _setCanAssignDecs, _setKeepConnectDecs, _endDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -163,19 +164,22 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              _context.next = 1;
+              return this._checkIfQuitFullScreen();
+            case 1:
               this.loading = true;
               _t = this.keepConnect && this.isPstnUser;
               if (!_t) {
-                _context.next = 1;
+                _context.next = 2;
                 break;
               }
-              _context.next = 1;
+              _context.next = 2;
               return this.keepPhoneAudioConnection();
-            case 1:
+            case 2:
               this.loading = false;
               this._roomProvider.exitRoom();
               this.resetPreventClose();
-            case 2:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -237,10 +241,13 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              _context3.next = 1;
+              return this._checkIfQuitFullScreen();
+            case 1:
               this._roomControl.close();
               this._roomProvider.exitRoom();
               this.resetPreventClose();
-            case 1:
+            case 2:
             case "end":
               return _context3.stop();
           }
@@ -254,6 +261,40 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
   }, {
     key: "release",
     value: function release() {}
+  }, {
+    key: "_checkIfQuitFullScreen",
+    value: function () {
+      var _checkIfQuitFullScreen2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+        var windowProvider, mainWindow;
+        return _regenerator["default"].wrap(function (_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (!(0, _env.isElectron)()) {
+                _context4.next = 1;
+                break;
+              }
+              windowProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
+              mainWindow = windowProvider.getCurrentWindow();
+              if (!mainWindow.isFullScreen()) {
+                _context4.next = 1;
+                break;
+              }
+              mainWindow.setFullScreen(false);
+
+              // 需要等待窗口退出全屏完成
+              _context4.next = 1;
+              return (0, _imports.sleep)(500);
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function _checkIfQuitFullScreen() {
+        return _checkIfQuitFullScreen2.apply(this, arguments);
+      }
+      return _checkIfQuitFullScreen;
+    }()
   }]);
 }();
 _LeaveMeetingStoreBase = LeaveMeetingStoreBase;

package/lib/modules/dialog/dialogs/confirm-leave-meeting/index.d.ts

@@ -14,5 +14,6 @@ export declare const windowConfig: {
     resizable: false;
     width: number;
     height: number;
+    alwaysOnTop: true;
 };
 export {};

package/lib/modules/dialog/dialogs/confirm-leave-meeting/index.js

@@ -40,5 +40,6 @@ var windowConfig = exports.windowConfig = {
   },
   resizable: false,
   width: 255,
-  height: 158
+  height: 158,
+  alwaysOnTop: true
 };

package/lib/modules/dialog/dialogs/share-screen-selection/index.js

@@ -15,18 +15,6 @@ var ShareScreenSelectionDialog = exports.ShareScreenSelectionDialog = /*#__PURE_
     children = _ref.children;
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare');
-
-  // const body = (
-  //   <DialogContainer
-  //     dialogId={dialogId}
-  //     dialogKey={dialogKey}
-  //     title={title}
-  //     width={790}
-  //     height={550}>
-  //     {children}
-  //   </DialogContainer>
-  // );
-
   var body = children;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow.NormalWindow, {
     title: title,

package/lib/modules/setting/store.base.d.ts

@@ -16,7 +16,6 @@ export declare abstract class SettingStoreBase implements FcrUIManagedObject {
     private _currentRoomControl?;
     private _eventProvider;
     private _deviceProvider;
-    private _sharedLayoutDataSource;
     private _videoView4Setting?;
     private _settingVideoOpened;
     private _deviceStoreObserver;
@@ -31,6 +30,7 @@ export declare abstract class SettingStoreBase implements FcrUIManagedObject {
     private _sharedSettingDataSource;
     private _sharedConfigDataSource;
     private _sharedInterpreterDataSource?;
+    private _sharedLayoutDataSource?;
     private _streamInfoList;
     private _monitorObserver;
     private _roomObserver;

package/lib/modules/setting/store.base.js

@@ -240,7 +240,6 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
     this._messageProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
     this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
     this._sharedConfigDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE);
-    this._sharedLayoutDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE);
     this._sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
     this._monitorProvider.addObserver(this._monitorObserver);
     this._initReactions();
@@ -965,7 +964,7 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
       var _this7 = this;
       var newSetting = this._preHandleSetting(setting);
       this._sharedSettingDataSource.setSetting(newSetting);
-      if (newSetting.displayedMaxAttendees) {
+      if (newSetting.displayedMaxAttendees && this._sharedLayoutDataSource) {
         this._sharedLayoutDataSource.setLayoutSize(newSetting.displayedMaxAttendees);
       }
       var settingActions = {
@@ -1072,6 +1071,7 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
     key: "handleJoinRoom",
     value: function handleJoinRoom() {
       var roomProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
+      this._sharedLayoutDataSource = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE);
       this._currentRoomControl = new _roomProvider.FcrUICurrentRoomControlProviderImpl(roomProvider.currentRoomControl).currentRoomControl;
       this._currentRoomControl.addObserver(this._roomObserver);
       this._streamControl = this._currentRoomControl.getStreamControl();
@@ -1122,6 +1122,7 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
       this.isHiddenStateTab = true;
       this._currentRoomControl = undefined;
       this._interpreterRoomControl = undefined;
+      this._sharedLayoutDataSource = undefined;
       this._deviceProvider.removeObserver(this._deviceProviderObserver);
       this.localAudioStreamMap.clear();
       this.remoteAudioStreamMap.clear();

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

@@ -73,7 +73,6 @@ var _type = require("./type");
 var _type2 = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _struct = require("../../providers/screen-share/struct");
-var _constant = require("../../utilities/constant");
 var _type3 = require("agora-ui-foundation/lib/components/icon/type");
 var _ShareScreenStoreBase;
 var _initProto, _init_isSharing, _init_displayList, _init_applicationList, _init_selectedShareItem, _init_isWhiteboardSelected, _init_isSharingWithAudio, _init_isSharingInSmoothMode, _loadSelectionListDecs, _setSelectedItemDecs, _ref;
@@ -379,7 +378,6 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
                 captureType: captureType
               });
             case 6:
-              this.dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
               _context2.next = 8;
               break;
             case 7:

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

@@ -43,8 +43,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-require("core-js/modules/es.date.to-json.js");
-require("core-js/modules/es.json.stringify.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -66,6 +64,7 @@ var _mobx = require("mobx");
 var _parameters = require("../../utilities/parameters");
 var _type3 = require("fcr-core/lib/type");
 var _levelConfig = require("../dialog/level-config");
+var _imports = require("fcr-core/lib/imports");
 var _ElectronShareScreenStore;
 var _initProto, _handleSelectionOpenDecs, _setShareWithAudioStateDecs, _setShareInSmoothModeDecs, _ref;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -191,28 +190,52 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
     }
   }, {
     key: "_showControlBar",
-    value: function _showControlBar() {
-      this._isSharing = true;
-      this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
-      var videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-      try {
-        if (!videoWindow.isVisible()) {
-          videoWindow.show();
-        }
-      } catch (e) {
-        this.logger.warn('share_screen _showControlBar error', JSON.stringify(e));
-      }
-      videoWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.VIDEO_WINDOW_LEVEL);
-      var isMultiDisplayActive = this._multiDisplayProvider.isActive;
-      this._ensureWindowsAreOpenAndPositioned(true, isMultiDisplayActive);
-      if (isMultiDisplayActive) {
-        this._multiDisplayProvider.moveMainWindowToIndexLeastDisplay();
-      } else {
-        var mainWindow = this._windowProvider.getCurrentWindow();
-        mainWindow.setFullScreen(false);
-        mainWindow.hide();
+    value: function () {
+      var _showControlBar2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var isMultiDisplayActive, mainWindow, videoWindow;
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              this._isSharing = true;
+              this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
+              isMultiDisplayActive = this._multiDisplayProvider.isActive;
+              mainWindow = this._windowProvider.getCurrentWindow();
+              if (isMultiDisplayActive) {
+                _context.next = 1;
+                break;
+              }
+              if (!mainWindow.isFullScreen()) {
+                _context.next = 1;
+                break;
+              }
+              mainWindow.setFullScreen(false);
+
+              // 需要等待窗口退出全屏完成
+              _context.next = 1;
+              return (0, _imports.sleep)(1000);
+            case 1:
+              videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+              if (!videoWindow.isVisible()) {
+                videoWindow.show();
+              }
+              videoWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.VIDEO_WINDOW_LEVEL);
+              this._ensureWindowsAreOpenAndPositioned(true, isMultiDisplayActive);
+              if (isMultiDisplayActive) {
+                this._multiDisplayProvider.moveMainWindowToIndexLeastDisplay();
+              } else {
+                mainWindow.hide();
+              }
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function _showControlBar() {
+        return _showControlBar2.apply(this, arguments);
       }
-    }
+      return _showControlBar;
+    }()
   }, {
     key: "_hideControlBar",
     value: function _hideControlBar() {
@@ -235,20 +258,20 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
   }, {
     key: "_checkAutoStartScreenSharing",
     value: function () {
-      var _checkAutoStartScreenSharing2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _checkAutoStartScreenSharing2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var needStartShare, displayList, _displayList$, bounds, id;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               needStartShare = (0, _parameters.getStartScreenSharing)(this._sharedConfigDataSource.creatorConfig.parameters);
               if (!needStartShare) {
-                _context.next = 2;
+                _context2.next = 2;
                 break;
               }
-              _context.next = 1;
+              _context2.next = 1;
               return this.screenShareProvider.getDisplayList();
             case 1:
-              displayList = _context.sent;
+              displayList = _context2.sent;
               if (displayList.length === 0) {
                 this.logger.error('cannot start auto screen sharing, no display found');
               } else {
@@ -261,9 +284,9 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
               }
             case 2:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
       function _checkAutoStartScreenSharing() {
         return _checkAutoStartScreenSharing2.apply(this, arguments);

package/lib/modules/video-window/popover-watcher.js

@@ -33,7 +33,10 @@ function usePopoverWatcher(_ref) {
       mutationsList.forEach(function (mutation) {
         if (mutation.type === 'childList') {
           mutation.removedNodes.forEach(function (node) {
-            if (node.nodeType === Node.ELEMENT_NODE && node.classList.contains(popoverClassName)) {
+            var hasPopoverNode = function hasPopoverNode(node) {
+              return node.classList.contains(popoverClassName) || node.querySelector(".".concat(popoverClassName));
+            };
+            if (isPopoverOpened && node.nodeType === Node.ELEMENT_NODE && hasPopoverNode(node)) {
               isPopoverOpened = false;
               resetVideoWindowSize();
             }

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

@@ -496,7 +496,13 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
           width: _type.DefaultVideoWindowWidth,
           height: _type.DefaultVideoWindowSmallTypeHeight
         };
-        _this4.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
+
+        // 如果是小窗模式, 则重置为 dialog 为小窗尺寸, 否则切换为小窗模式, reaction 里会更新 dialog 尺寸
+        if (_this4.videoWindowPreviewType === _type.FcrVideoWindowPreviewType.SMALL) {
+          _this4._setVideoWindowDialogSize(_type.DefaultVideoWindowWidth, _type.DefaultVideoWindowSmallTypeHeight);
+        } else {
+          _this4.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
+        }
       });
     }
   }]);

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

@@ -61,14 +61,24 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
   }, [isHover]);
   (0, _react.useEffect)(function () {
     if (divRef.current === null) return;
+
+    // 刚打开 dialog 时, divRef.current 还在主窗口的 document 中, 需要等到下一次渲染才会被移动到 dialog 的 document 中
+    if (divRef.current.ownerDocument === document) return;
     var ownerDocument = divRef.current.ownerDocument;
     var defaultView = ownerDocument.defaultView;
     var body = ownerDocument.body;
     var onResize = function onResize() {
-      handleVideowWindowResize({
-        width: body.offsetWidth,
-        height: body.offsetHeight
-      });
+      if (defaultView) {
+        handleVideowWindowResize({
+          width: defaultView.innerWidth,
+          height: defaultView.innerHeight
+        });
+      } else {
+        handleVideowWindowResize({
+          width: body.clientWidth,
+          height: body.clientHeight
+        });
+      }
     };
     if (defaultView) {
       defaultView.addEventListener('resize', onResize);

package/lib/providers/device-provider.js

@@ -1048,7 +1048,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
       if (level === _type2.FcrUIAiDenoiseLevel.CLOSE) {
         this._microphoneAudioTrack.getAudioEffectEnhancer().disableAiDenoiser();
       } else {
-        this._microphoneAudioTrack.getAudioEffectEnhancer().enableAiDenoiser();
+        // this._microphoneAudioTrack.getAudioEffectEnhancer().enableAiDenoiser();
         this._microphoneAudioTrack.getAudioEffectEnhancer().setAiDenoiseLevel(level);
       }
     }

package/lib/providers/screen-share/strategy/browser.js

@@ -249,7 +249,7 @@ var FcrUIBrowserScreenShareStrategy = exports.FcrUIBrowserScreenShareStrategy =
               });
               screenTrack.addObserver(this._screenTrackObserver);
               screenTrack.setCaptureParams({
-                withAudio: true,
+                withAudio: false,
                 dimensions: _defaultConfig.screenCaptureHighStreamEncoderConfig.dimensions,
                 frameRate: _defaultConfig.screenCaptureHighStreamEncoderConfig.frameRate,
                 bitrate: _defaultConfig.screenCaptureHighStreamEncoderConfig.bitrate