fcr-ui-scene 3.7.4 → 3.7.6

package/lib/providers/mouse-detect/type.js

@@ -0,0 +1,6 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/providers/multi-display-provider.d.ts

@@ -1,11 +1,13 @@
+import { FcrSharingControl } from 'fcr-core/lib/type';
 import { FcrUIDisplayContentDistribution, FcrUIDisplayDistributionContentType, FcrUIDisplayState, FcrUIMainWindowRenderer, FcrUIMultiDisplayObserver } from '../modules/secondary-window/type';
-import { FcrUIMemberSharedDataSource } from '../shared-data-source/member-data';
-import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
-import { FcrUISharedSettingDataSource } from '../shared-data-source/setting';
-import { FcrUIVideoWindowDataSource } from '../shared-data-source/video-window';
-import { FcrUIEventProvider } from './event-provider';
-import { FcrUISharingProvider } from './sharing-provider';
-import { FcrUISharedWhiteboardDataSource } from '../shared-data-source/whiteboard-data';
+import { FcrUIManagedObject } from '../object-manager';
+import { FcrUISharedMemberDataSource } from '../shared-data/member-data';
+import { FcrUISharedSettingDataSource } from '../shared-data/setting';
+import { FcrUIVideoWindowDataSource } from '../shared-data/video-window';
+import { FcrUIRendererWrapper } from '../utilities/renderer';
+import { FcrUIWindowProvider } from './window/type';
+import { FcrUIBoardShareProvider } from './board-share/type';
+import { FcrUIScreenShareProvider } from './screen-share/type';
 export interface FcrUIMultiDisplayProvider {
     get mianWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
     get secondaryWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
@@ -33,21 +35,26 @@ export interface FcrUIMultiDisplayProvider {
     /** 设置主窗口为窗口最大化 */
     setMainWindowMaximize(): void;
 }
-export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayProvider {
+export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayProvider, FcrUIManagedObject {
     protected _logger: import("agora-foundation/lib/logger").Logger;
     private _observers;
     private _disposers;
-    private _isElectron;
-    private _eventProvider;
+    private _isHidden;
     private _sharedSettingDataSource;
     private _sharedMemberDataSource;
     private _sharedVideoWindowDataSource;
-    private _sharingProvider;
-    private _sharedScreenShareDataSource;
+    private _sharingControl;
+    private _whiteboardProvider;
+    private _screenShareProvider;
+    private _mainWindow;
+    private _renderer;
     private _fcrUIMainWindowRenderer;
-    private _sharedWhiteboardDataSource;
     private _contentDistribution;
+    private _isLocalUserNotScreenSharing;
+    private _screenShareObserver;
     private get _userId();
+    private get _isScreenSharing();
+    private get _screenSharingState();
     private accessor _displayCount;
     private accessor _displayState;
     private accessor _secondaryWindowContentType;
@@ -59,15 +66,16 @@ export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayP
     get mianWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
     get secondaryWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
     get isLocalCameraInSecondaryWindow(): boolean;
-    constructor({ eventProvider, sharedSettingDataSource, sharedMemberDataSource, sharedVideoWindowDataSource, sharingProvider, sharedScreenShareSharedDataSource, fcrUIMainWindowRenderer, sharedWhiteboardDataSource, }: {
-        eventProvider: FcrUIEventProvider;
+    constructor({ sharedSettingDataSource, sharedMemberDataSource, sharedVideoWindowDataSource, windowProvider, renderer, sharingControl, whiteboardProvider, fcrUIMainWindowRenderer, screenShareProvider, }: {
         sharedSettingDataSource: FcrUISharedSettingDataSource;
-        sharedMemberDataSource: FcrUIMemberSharedDataSource;
+        sharedMemberDataSource: FcrUISharedMemberDataSource;
         sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
-        sharingProvider: FcrUISharingProvider;
-        sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
+        windowProvider: FcrUIWindowProvider;
+        renderer: FcrUIRendererWrapper;
+        sharingControl: FcrSharingControl;
+        whiteboardProvider: FcrUIBoardShareProvider;
         fcrUIMainWindowRenderer: FcrUIMainWindowRenderer;
-        sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource;
+        screenShareProvider: FcrUIScreenShareProvider;
     });
     addObserver(observer: FcrUIMultiDisplayObserver): void;
     removeObserver(observer: FcrUIMultiDisplayObserver): void;

package/lib/providers/multi-display-provider.js

@@ -62,14 +62,13 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _env = require("agora-foundation/lib/utilities/env");
 var _imports = require("fcr-core/lib/imports");
 var _type = require("fcr-core/lib/type");
-var _logger = require("../utilities/logger");
 var _mobx = require("mobx");
-var _base = require("../base");
 var _type2 = require("../modules/secondary-window/type");
 var _type3 = require("../type");
+var _constant = require("../utilities/constant");
+var _logger = require("../utilities/logger");
 var _FcrUIMultiDisplayProviderImpl;
 var _initProto, _init__displayCount, _init__displayState, _init__secondaryWindowContentType, _init__mainWindowContentType;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -93,21 +92,23 @@ var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#__PURE__*/function () {
   function FcrUIMultiDisplayProviderImpl(_ref) {
-    var eventProvider = _ref.eventProvider,
-      sharedSettingDataSource = _ref.sharedSettingDataSource,
+    var _this = this;
+    var sharedSettingDataSource = _ref.sharedSettingDataSource,
       sharedMemberDataSource = _ref.sharedMemberDataSource,
       sharedVideoWindowDataSource = _ref.sharedVideoWindowDataSource,
-      sharingProvider = _ref.sharingProvider,
-      sharedScreenShareSharedDataSource = _ref.sharedScreenShareSharedDataSource,
+      windowProvider = _ref.windowProvider,
+      renderer = _ref.renderer,
+      sharingControl = _ref.sharingControl,
+      whiteboardProvider = _ref.whiteboardProvider,
       fcrUIMainWindowRenderer = _ref.fcrUIMainWindowRenderer,
-      sharedWhiteboardDataSource = _ref.sharedWhiteboardDataSource;
+      screenShareProvider = _ref.screenShareProvider;
     (0, _classCallCheck2["default"])(this, FcrUIMultiDisplayProviderImpl);
     (0, _defineProperty2["default"])(this, "_logger", (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUIMultiDisplayProvider'
     })));
     (0, _defineProperty2["default"])(this, "_observers", new _imports.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_disposers", []);
-    (0, _defineProperty2["default"])(this, "_isElectron", (0, _env.isElectron)());
+    (0, _defineProperty2["default"])(this, "_isHidden", false);
     (0, _defineProperty2["default"])(this, "_contentDistribution", {
       mainWindow: {
         type: _type2.FcrUIDisplayDistributionContentType.LOCAL_CAMERA
@@ -116,6 +117,15 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         type: _type2.FcrUIDisplayDistributionContentType.HIDDEN
       }
     });
+    (0, _defineProperty2["default"])(this, "_isLocalUserNotScreenSharing", true);
+    (0, _defineProperty2["default"])(this, "_screenShareObserver", {
+      onScreenShareStarted: function onScreenShareStarted() {
+        _this._isLocalUserNotScreenSharing = false;
+      },
+      onScreenShareStopped: function onScreenShareStopped() {
+        _this._isLocalUserNotScreenSharing = true;
+      }
+    });
     _classPrivateFieldInitSpec(this, _A, _init__displayCount(this, 1));
     _classPrivateFieldInitSpec(this, _B, _init__displayState(this, {
       participantCount: 1,
@@ -131,27 +141,41 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
     }));
     _classPrivateFieldInitSpec(this, _C, _init__secondaryWindowContentType(this));
     _classPrivateFieldInitSpec(this, _D, _init__mainWindowContentType(this));
-    this._eventProvider = eventProvider;
     this._sharedSettingDataSource = sharedSettingDataSource;
     this._sharedMemberDataSource = sharedMemberDataSource;
     this._sharedVideoWindowDataSource = sharedVideoWindowDataSource;
-    this._sharingProvider = sharingProvider;
-    this._sharedScreenShareDataSource = sharedScreenShareSharedDataSource;
+    this._whiteboardProvider = whiteboardProvider;
+    this._sharingControl = sharingControl;
+    this._mainWindow = windowProvider.getCurrentWindow();
+    this._renderer = renderer;
     this._fcrUIMainWindowRenderer = fcrUIMainWindowRenderer;
-    this._sharedWhiteboardDataSource = sharedWhiteboardDataSource;
-    if (this._isElectron) {
-      window.runtime.screen.addListener('display-added', this._handleDisplayCountUpdated);
-      window.runtime.screen.addListener('display-removed', this._handleDisplayCountUpdated);
-      this._displayCount = window.runtime.screen.getAllDisplays().length;
-      this._initDisplayState();
-      this._addReaction();
-    }
+    this._screenShareProvider = screenShareProvider;
+    this._renderer.addEventListener(this._handleDisplayCountUpdated);
+    this._screenShareProvider.addObserver(this._screenShareObserver);
+    this._displayCount = renderer.getAllDisplays().length;
+    this._initDisplayState();
+    this._addReaction();
   }
   return (0, _createClass2["default"])(FcrUIMultiDisplayProviderImpl, [{
     key: "_userId",
     get: function get() {
       return this._sharedMemberDataSource.localUser.userId;
     }
+  }, {
+    key: "_isScreenSharing",
+    get: function get() {
+      var screenShareProvider = this._screenShareProvider;
+      return screenShareProvider.isLocalUserScreenSharing || screenShareProvider.isRemoteUserScreenSharing;
+    }
+  }, {
+    key: "_screenSharingState",
+    get: function get() {
+      if (this._isScreenSharing) {
+        return this._sharingControl.getScreenSharingState();
+      } else {
+        return _type.FcrScreenSharingState.END;
+      }
+    }
   }, {
     key: "_displayCount",
     get: function get() {
@@ -232,11 +256,8 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
   }, {
     key: "release",
     value: function release() {
-      if (this._isElectron) {
-        window.runtime.screen.removeListener('display-added', this._handleDisplayCountUpdated);
-        window.runtime.screen.removeListener('display-removed', this._handleDisplayCountUpdated);
-      }
-      this._fcrUIMainWindowRenderer.removeAllObservers();
+      this._renderer.removeEventListener(this._handleDisplayCountUpdated);
+      this._screenShareProvider.removeObserver(this._screenShareObserver);
       this._observers.removeAllObservers();
       this._disposers.forEach(function (disposer) {
         return disposer();
@@ -251,16 +272,15 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         this._logger.warn('move: Secondary window mode is not enabled, cannot move main window to least display.');
         return;
       }
-      var browserWindow = window.runtime.browserWindow;
-      var currentSharingBounds = this._sharedScreenShareDataSource.currentSelectionBounds;
-      var mainWindowBounds = browserWindow.getBounds();
-      var displayOfCurrentSharingBounds = window.runtime.screen.getDisplayMatching(currentSharingBounds);
-      var displaysOfCurrentMainWindow = window.runtime.screen.getDisplayMatching(mainWindowBounds);
+      var currentSharingBounds = this._screenShareProvider.selectionBounds;
+      var mainWindowBounds = this._mainWindow.getBounds();
+      var displayOfCurrentSharingBounds = this._renderer.getDisplayMatching(currentSharingBounds);
+      var displaysOfCurrentMainWindow = this._renderer.getDisplayMatching(mainWindowBounds);
       if (displayOfCurrentSharingBounds.id !== displaysOfCurrentMainWindow.id) {
         this._logger.info('Main window is not in the sharing display, no need to move.');
         return;
       }
-      var isMaximized = browserWindow.isMaximized();
+      var isMaximized = this._mainWindow.isMaximized();
       this.showMainWindowInIndexLeastDisplay({
         displayOfCurrentSharingBounds: displayOfCurrentSharingBounds,
         isMaximized: isMaximized
@@ -277,16 +297,16 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         this._logger.warn('show: Secondary window mode is not enabled, cannot show main window in least display.');
         return;
       }
-      var currentSharingBounds = this._sharedScreenShareDataSource.currentSelectionBounds;
-      displayOfCurrentSharingBounds = displayOfCurrentSharingBounds || window.runtime.screen.getDisplayMatching(currentSharingBounds);
-      var browserWindow = window.runtime.browserWindow;
-      var displayOfMainWindow = window.runtime.screen.getAllDisplays().find(function (_ref2) {
+      var currentSharingBounds = this._screenShareProvider.selectionBounds;
+      displayOfCurrentSharingBounds = displayOfCurrentSharingBounds || this._renderer.getDisplayMatching(currentSharingBounds);
+      var displayOfMainWindow = this._renderer.getAllDisplays().find(function (_ref2) {
         var id = _ref2.id;
         return id !== displayOfCurrentSharingBounds.id;
       });
+      var mainWindow = this._mainWindow;
       if (!displayOfMainWindow) {
         this._logger.error('No available display found to show main window.');
-        browserWindow.show();
+        mainWindow.show();
         return;
       }
       this._logger.info("Showing main window in display: ".concat(displayOfMainWindow.id, " - ").concat(displayOfMainWindow.label));
@@ -295,20 +315,21 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         y = _displayOfMainWindow$.y,
         width = _displayOfMainWindow$.width,
         height = _displayOfMainWindow$.height;
-      var _browserWindow$getBou = browserWindow.getBounds(),
-        mainWindowWidth = _browserWindow$getBou.width,
-        mainWindowHeight = _browserWindow$getBou.height;
+      var _mainWindow$getBounds = mainWindow.getBounds(),
+        mainWindowWidth = _mainWindow$getBounds.width,
+        mainWindowHeight = _mainWindow$getBounds.height;
+      mainWindowWidth = Math.min(mainWindowWidth, width);
+      mainWindowHeight = Math.min(mainWindowHeight, height);
       var bounds = {
         x: x + Math.floor(width / 2 - mainWindowWidth / 2),
         y: y + Math.floor(height / 2 - mainWindowHeight / 2)
       };
-      isMaximized && browserWindow.unmaximize();
-      browserWindow.setBounds(bounds);
+      isMaximized && mainWindow.unmaximize();
+      mainWindow.setBounds(bounds);
       if (isMaximized) {
-        browserWindow.maximize();
-        // browserWindow.focus();
+        mainWindow.maximize();
       } else {
-        browserWindow.show();
+        mainWindow.show();
       }
     }
   }, {
@@ -318,8 +339,7 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         this._logger.warn('makeFullScreen: Secondary window mode is not enabled, cannot make main window full screen.');
         return;
       }
-      var browserWindow = window.runtime.browserWindow;
-      browserWindow.maximize();
+      this._mainWindow.maximize();
       this._logger.info("Main window set to maximize state.");
     }
   }, {
@@ -423,37 +443,37 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
   }, {
     key: "_addReaction",
     value: function _addReaction() {
-      var _this = this;
+      var _this2 = this;
       this._disposers.push((0, _mobx.reaction)(function () {
-        return _this._sharedSettingDataSource.setting.isDualDisplayMode;
+        return _this2._sharedSettingDataSource.setting.isDualDisplayMode;
       }, function (isDualDisplayMode) {
-        _this._setDisplayState({
-          isSecondaryWindowModeEnabled: getIsSecondaryWindowModeEnabled(_this._displayCount, isDualDisplayMode)
+        _this2._setDisplayState({
+          isSecondaryWindowModeEnabled: getIsSecondaryWindowModeEnabled(_this2._displayCount, isDualDisplayMode)
         });
       }), (0, _mobx.reaction)(function () {
-        return _this._sharedMemberDataSource.totalUserCount;
+        return _this2._sharedMemberDataSource.totalUserCount;
       }, function (participantCount) {
-        _this._setDisplayState({
+        _this2._setDisplayState({
           participantCount: participantCount
         });
       }), (0, _mobx.reaction)(function () {
-        return _this._sharedVideoWindowDataSource.layoutType;
+        return _this2._sharedVideoWindowDataSource.layoutType;
       }, function (layoutMode) {
-        _this._setDisplayState({
+        _this2._setDisplayState({
           layoutMode: layoutMode
         });
       }), (0, _mobx.reaction)(function () {
-        return _this._sharingProvider.screenSharingState;
+        return _this2._isScreenSharing;
       }, function () {
-        var state = _objectSpread({}, _this._displayState);
-        _this._handleScreenSharingState(state);
-        _this._setDisplayState(state);
+        var state = _objectSpread({}, _this2._displayState);
+        _this2._handleScreenSharingState(state);
+        _this2._setDisplayState(state);
       }), (0, _mobx.reaction)(function () {
-        return _this._sharingProvider.whiteboardState;
+        return _this2._whiteboardProvider.boardState;
       }, function () {
-        var state = _objectSpread({}, _this._displayState);
-        _this._handleWhiteboardState(state);
-        _this._setDisplayState(state);
+        var state = _objectSpread({}, _this2._displayState);
+        _this2._handleWhiteboardState(state);
+        _this2._setDisplayState(state);
       }));
     }
   }, {
@@ -469,8 +489,12 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
     }
   }, {
     key: "_handleDisplayCountUpdated",
-    value: function _handleDisplayCountUpdated() {
-      var count = window.runtime.screen.getAllDisplays().length;
+    value: function _handleDisplayCountUpdated(event) {
+      var eventAction = event.action;
+      if (eventAction !== _constant.FcrUIRendererEventAction.SCREEN_DISPLAY_ADDED && eventAction !== _constant.FcrUIRendererEventAction.SCREEN_DISPLAY_REMOVED) {
+        return;
+      }
+      var count = this._renderer.getAllDisplays().length;
       this._logger.info("notify observers of display count update, prevCont: ".concat(this._displayCount, ", count: ").concat(count));
       this._displayCount = count;
       this._observers.notifyObservers('onDisplayCountUpdated', count);
@@ -482,20 +506,9 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         var _this$_displayState = this._displayState,
           sharingBySelf = _this$_displayState.sharingBySelf,
           isSharingScreen = _this$_displayState.isSharingScreen;
-
-        /**
-         * 正在共享的显示器被拔出时，会先触发 FcrUIScreenShareProvider 的 _handleScreenCaptureStateUpdated，然后才触发显示器的移除事件。
-         * _handleScreenCaptureStateUpdated 内会设置 localUserScreenSharingState。
-         * _sharingProvider.screenSharingState 是通过 fcr core 内的事件设置的，存在延迟的情况。
-         *
-         * 有一种异常情况：当正在共享的显示器被移除时，本地先关闭屏幕共享，然后才触发显示器移除事件，此时双屏显示处于禁用状态。
-         * 这时应该根据屏幕共享的状态来决定是否更新主窗口、悬浮视频窗的显示状态。
-         * 但是因为 _sharingProvider.screenSharingState 存在延迟，会导窗口显示异常。
-         * 所以这里需要判断 localUserScreenSharingState 和 screenSharingState 是否一致
-         * 如果不一致，则重置 displayState 内与屏幕共享相关的状态。
-         */
-        var isLocalUserNotScreenSharing = this._sharedScreenShareDataSource.localUserScreenSharingState !== _type.FcrMediaSourceState.OPEN;
-        var isSharingScreenBySelf = sharingBySelf && isSharingScreen;
+        var isLocalUserNotScreenSharing = this._isLocalUserNotScreenSharing;
+        // this._sharedScreenShareDataSource.localUserScreenSharingState !== FcrMediaSourceState.OPEN;
+        var isSharingScreenBySelf = isSharingScreen && sharingBySelf;
         if (!isSecondaryWindowModeEnabled && isSharingScreenBySelf && isLocalUserNotScreenSharing) {
           state.isSharing = false;
           state.sharingBySelf = false;
@@ -510,22 +523,27 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
     key: "_handleContentDistributionUpdated",
     value: function _handleContentDistributionUpdated() {
       var distribution = this._getContentDistribution();
-      if (distribution.secondaryWindow.type === 'hidden') {
-        // this._fcrUIMainWindowRenderer.notifyObservers('onSecondaryWindowHidden');
-        this._fcrUIMainWindowRenderer.removeAllObservers();
-      } else {
-        this._fcrUIMainWindowRenderer.addObserver(this._sharedWhiteboardDataSource.toolbarStateObserver);
-      }
       this._logger.info('notify observers of content distribution update');
       this._observers.notifyObservers('onContentDistributionUpdated', distribution);
+      if (distribution.secondaryWindow.type === 'hidden' && !this._isHidden) {
+        this._whiteboardProvider.setIsDualDisplayMode(false);
+        this._fcrUIMainWindowRenderer.removeAllObservers();
+        this._isHidden = true;
+        return;
+      }
+      if (distribution.secondaryWindow.type !== 'hidden' && this._isHidden) {
+        this._whiteboardProvider.setIsDualDisplayMode(true);
+        this._fcrUIMainWindowRenderer.addObserver(this._whiteboardProvider.boardBarControl.toolbarStateObserver);
+        this._isHidden = false;
+        return;
+      }
     }
   }, {
     key: "_initDisplayState",
     value: function _initDisplayState() {
       var state = _objectSpread({}, this._displayState);
-      var _this$_sharingProvide = this._sharingProvider,
-        screenSharingState = _this$_sharingProvide.screenSharingState,
-        whiteboardState = _this$_sharingProvide.whiteboardState;
+      var screenSharingState = this._screenSharingState;
+      var whiteboardState = this._whiteboardProvider.boardState;
       state.layoutMode = this._sharedVideoWindowDataSource.layoutType;
       state.participantCount = this._sharedMemberDataSource.totalUserCount;
       state.isSecondaryWindowModeEnabled = getIsSecondaryWindowModeEnabled(this._displayCount, this._sharedSettingDataSource.setting.isDualDisplayMode);
@@ -536,12 +554,18 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         this._handleWhiteboardState(state);
       }
       this._setDisplayState(state);
+      this._whiteboardProvider.setIsDualDisplayMode(state.isSecondaryWindowModeEnabled);
+      if (state.isSecondaryWindowModeEnabled) {
+        this._fcrUIMainWindowRenderer.addObserver(this._whiteboardProvider.boardBarControl.toolbarStateObserver);
+      } else {
+        this._fcrUIMainWindowRenderer.removeAllObservers();
+      }
     }
   }, {
     key: "_handleScreenSharingState",
     value: function _handleScreenSharingState(state) {
-      var sharingProvider = this._sharingProvider;
-      if (sharingProvider.screenSharingState === _type.FcrScreenSharingState.END) {
+      var sharingState = this._screenSharingState;
+      if (sharingState === _type.FcrScreenSharingState.END) {
         state.isSharing = false;
         state.sharingBySelf = false;
         state.sharingType = undefined;
@@ -549,14 +573,15 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         state.isSharingScreen = false;
         return;
       }
-      var stream = this._getSharingStream(sharingProvider.screenSharingOwnerId);
+      var sharingUser = this._screenShareProvider.sharingUser;
+      var stream = this._getSharingStream(sharingUser.userId);
       state.isSharing = true;
       state.isSharingScreen = true;
       if (stream) {
         state.sharingBySelf = stream.isMySelf;
         state.sharingStreamId = stream.videoStreamId || '';
       }
-      switch (sharingProvider.screenSharingState) {
+      switch (sharingState) {
         case _type.FcrScreenSharingState.START_ONLY_SCREEN:
           state.sharingType = _type2.FcrUIDisplayDistributionContentType.SHARING_SCREEN;
           break;
@@ -568,8 +593,8 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
   }, {
     key: "_handleWhiteboardState",
     value: function _handleWhiteboardState(state) {
-      var sharingProvider = this._sharingProvider;
-      if (sharingProvider.whiteboardState === _type.FcrWhiteboardState.END) {
+      var whiteboardProvider = this._whiteboardProvider;
+      if (whiteboardProvider.boardState === _type.FcrWhiteboardState.END) {
         state.isSharing = false;
         state.sharingBySelf = false;
         state.sharingType = undefined;
@@ -577,17 +602,18 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         return;
       }
       state.isSharing = true;
-      state.sharingBySelf = sharingProvider.whiteboardOwnerId === this._userId;
+      state.sharingBySelf = whiteboardProvider.isMyBoard;
       state.sharingType = _type2.FcrUIDisplayDistributionContentType.SHARING_WHITEBOARD;
       state.isSharingBoard = true;
     }
   }]);
 }();
 _FcrUIMultiDisplayProviderImpl = FcrUIMultiDisplayProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMultiDisplayProviderImpl, [[_mobx.observable, 1, "_displayCount"], [_mobx.observable, 1, "_displayState"], [_mobx.observable, 1, "_secondaryWindowContentType"], [_mobx.observable, 1, "_mainWindowContentType"], [_imports.bound, 2, "moveMainWindowToIndexLeastDisplay"], [_imports.bound, 2, "showMainWindowInIndexLeastDisplay"], [_imports.bound, 2, "setMainWindowMaximize"], [_imports.bound, 2, "_handleDisplayCountUpdated"]], []).e, 5);
-_init__displayCount = _applyDecs$e[0];
-_init__displayState = _applyDecs$e[1];
-_init__secondaryWindowContentType = _applyDecs$e[2];
-_init__mainWindowContentType = _applyDecs$e[3];
-_initProto = _applyDecs$e[4];
-(0, _base.registerDependency)('multiDisplayProvider');
+var _applyDecs$e = _applyDecs(_FcrUIMultiDisplayProviderImpl, [[_mobx.observable, 1, "_displayCount"], [_mobx.observable, 1, "_displayState"], [_mobx.observable, 1, "_secondaryWindowContentType"], [_mobx.observable, 1, "_mainWindowContentType"], [_imports.bound, 2, "moveMainWindowToIndexLeastDisplay"], [_imports.bound, 2, "showMainWindowInIndexLeastDisplay"], [_imports.bound, 2, "setMainWindowMaximize"], [_imports.bound, 2, "_handleDisplayCountUpdated"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 5);
+_init__displayCount = _applyDecs$e2[0];
+_init__displayState = _applyDecs$e2[1];
+_init__secondaryWindowContentType = _applyDecs$e2[2];
+_init__mainWindowContentType = _applyDecs$e2[3];
+_initProto = _applyDecs$e2[4];
+_applyDecs$e;

package/lib/providers/phone-audio-provider.d.ts

@@ -3,7 +3,8 @@ import { FcrUIDeviceProvider } from './device-provider';
 import { FcrPhoneConnectorSession, FcrRoomConnectorPhoneInfo, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'fcr-core/lib/room-control/room-connector-control/type';
 import { FcrUIConnectType } from '../type';
 import { ConnectorRegion } from '../modules/connection-gateway/enums';
-import { FcrUIMessageProvider } from './message-provider';
+import { FcrUIMessageProvider } from './message/type';
+import { FcrUIManagedObject } from '../object-manager';
 export interface FcrUIPhoneAudioConnectorProvider {
     /**
      * @getter 接听状态
@@ -88,7 +89,7 @@ export interface FcrUIPhoneAudioConnectorProvider {
      */
     release(): void;
 }
-export declare class FcrUIPhoneAudioConnectorProviderImpl implements FcrUIPhoneAudioConnectorProvider {
+export declare class FcrUIPhoneAudioConnectorProviderImpl implements FcrUIPhoneAudioConnectorProvider, FcrUIManagedObject {
     private _roomControl;
     private _userControl;
     private _disposers;

package/lib/providers/phone-audio-provider.js

@@ -73,7 +73,6 @@ var _type = require("fcr-core/lib/room-control/room-connector-control/type");
 var _decorator = require("agora-foundation/lib/decorator");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type2 = require("../type");
-var _base = require("../base");
 var _enums = require("../modules/connection-gateway/enums");
 var _FcrUIPhoneAudioConnectorProviderImpl;
 var _initProto, _init_accepted, _init_connectionPhoneInfos, _init_connectInfo, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling, _init_outgoingCall, _init_isHangup, _init_hasPstnStream, _init_hasOwnPstnStream, _init_hasNeedMergedStream, _getConnectorInfoDecs, _setConnectionInfoDecs, _startCallDecs, _stopCallDecs, _phoneCallUpdatedDecs, _phoneCallReasonDecs, _setStreamStateDecs, _handleStreamsAddedOrUpdatedDecs, _handleStreamsRemovedDecs, _ref;
@@ -502,18 +501,19 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
   }]);
 }();
 _FcrUIPhoneAudioConnectorProviderImpl = FcrUIPhoneAudioConnectorProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIPhoneAudioConnectorProviderImpl, [[_mobx.observable, 1, "accepted"], [_mobx.observable, 1, "connectionPhoneInfos"], [_mobx.observable, 1, "connectInfo"], [_mobx.observable, 1, "phoneCallState"], [_mobx.observable, 1, "phoneCallReason"], [_mobx.observable, 1, "connectSession"], [_mobx.observable, 1, "calling"], [_mobx.observable, 1, "outgoingCall"], [_mobx.observable, 1, "isHangup"], [_mobx.observable, 1, "hasPstnStream"], [_mobx.observable, 1, "hasOwnPstnStream"], [_mobx.observable, 1, "hasNeedMergedStream"], [_mobx.computed, 3, "connectType"], [_getConnectorInfoDecs, 18, "getConnectorInfo"], [_setConnectionInfoDecs, 18, "setConnectionInfo"], [_startCallDecs, 18, "startCall"], [_stopCallDecs, 18, "stopCall"], [_decorator.bound, 2, "_setResetTimer"], [_phoneCallUpdatedDecs, 18, "_phoneCallUpdated"], [_phoneCallReasonDecs, 18, "_phoneCallReason"], [_setStreamStateDecs, 18, "_setStreamState"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).e, 13);
-_init_accepted = _applyDecs$e[0];
-_init_connectionPhoneInfos = _applyDecs$e[1];
-_init_connectInfo = _applyDecs$e[2];
-_init_phoneCallState = _applyDecs$e[3];
-_init_phoneCallReason = _applyDecs$e[4];
-_init_connectSession = _applyDecs$e[5];
-_init_calling = _applyDecs$e[6];
-_init_outgoingCall = _applyDecs$e[7];
-_init_isHangup = _applyDecs$e[8];
-_init_hasPstnStream = _applyDecs$e[9];
-_init_hasOwnPstnStream = _applyDecs$e[10];
-_init_hasNeedMergedStream = _applyDecs$e[11];
-_initProto = _applyDecs$e[12];
-(0, _base.registerDependency)('phoneAudioConnectorProvider');
+var _applyDecs$e = _applyDecs(_FcrUIPhoneAudioConnectorProviderImpl, [[_mobx.observable, 1, "accepted"], [_mobx.observable, 1, "connectionPhoneInfos"], [_mobx.observable, 1, "connectInfo"], [_mobx.observable, 1, "phoneCallState"], [_mobx.observable, 1, "phoneCallReason"], [_mobx.observable, 1, "connectSession"], [_mobx.observable, 1, "calling"], [_mobx.observable, 1, "outgoingCall"], [_mobx.observable, 1, "isHangup"], [_mobx.observable, 1, "hasPstnStream"], [_mobx.observable, 1, "hasOwnPstnStream"], [_mobx.observable, 1, "hasNeedMergedStream"], [_mobx.computed, 3, "connectType"], [_getConnectorInfoDecs, 18, "getConnectorInfo"], [_setConnectionInfoDecs, 18, "setConnectionInfo"], [_startCallDecs, 18, "startCall"], [_stopCallDecs, 18, "stopCall"], [_decorator.bound, 2, "_setResetTimer"], [_phoneCallUpdatedDecs, 18, "_phoneCallUpdated"], [_phoneCallReasonDecs, 18, "_phoneCallReason"], [_setStreamStateDecs, 18, "_setStreamState"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 13);
+_init_accepted = _applyDecs$e2[0];
+_init_connectionPhoneInfos = _applyDecs$e2[1];
+_init_connectInfo = _applyDecs$e2[2];
+_init_phoneCallState = _applyDecs$e2[3];
+_init_phoneCallReason = _applyDecs$e2[4];
+_init_connectSession = _applyDecs$e2[5];
+_init_calling = _applyDecs$e2[6];
+_init_outgoingCall = _applyDecs$e2[7];
+_init_isHangup = _applyDecs$e2[8];
+_init_hasPstnStream = _applyDecs$e2[9];
+_init_hasOwnPstnStream = _applyDecs$e2[10];
+_init_hasNeedMergedStream = _applyDecs$e2[11];
+_initProto = _applyDecs$e2[12];
+_applyDecs$e;

package/lib/providers/privilege-provider.d.ts

@@ -4,6 +4,7 @@ import { FcrSharePermissionState } from 'fcr-core/lib/room-control/whiteboard-co
 import { FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecurityInfoUpdatedEvent, FcrSecuritySendChatPayload } from 'fcr-core/lib/room-control/privilege-control/type';
 import { FcrUISecuritySendChatOriginalPayload } from '../type';
 import { FcrUIEventProvider } from './event-provider';
+import { FcrUIManagedObject } from '../object-manager';
 export interface FcrUIPrivilegeProviderObserver {
     /**
      * 安全信息变更
@@ -459,7 +460,7 @@ export interface FcrUIPrivilegeProvider {
     addObserver(observer: FcrUIPrivilegeProviderObserver): void;
     removeObserver(observer: FcrUIPrivilegeProviderObserver): void;
 }
-export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvider {
+export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvider, FcrUIManagedObject {
     private _privilegeControl;
     private _userControl;
     private _streamControl;

package/lib/providers/privilege-provider.js

@@ -76,7 +76,6 @@ var _toast = require("agora-ui-foundation/lib/components/toast");
 var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
-var _base = require("../base");
 var _logger = require("../utilities/logger");
 var _imports = require("fcr-core/lib/imports");
 var _FcrUIPrivilegeProviderImpl;
@@ -898,11 +897,12 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
   }]);
 }();
 _FcrUIPrivilegeProviderImpl = FcrUIPrivilegeProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIPrivilegeProviderImpl, [[_mobx.observable, 1, "canOperateWatermark"], [_mobx.observable, 1, "targetLoadingWatermarkLineTypeIsMulti"], [_mobx.observable, 1, "securityInfos"], [_mobx.observable, 1, "permissionInfos"], [_mobx.observable, 1, "privilegeOperator"], [_handlePermissionUpdatedDecs, 18, "_handlePermissionUpdated"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"], [_setAllowWaterMarkDecs, 18, "setAllowWaterMark"], [_setAllowWaterMarkLineDecs, 18, "setAllowWaterMarkLine"]], []).e, 6);
-_init_canOperateWatermark = _applyDecs$e[0];
-_init_targetLoadingWatermarkLineTypeIsMulti = _applyDecs$e[1];
-_init_securityInfos = _applyDecs$e[2];
-_init_permissionInfos = _applyDecs$e[3];
-_init_privilegeOperator = _applyDecs$e[4];
-_initProto = _applyDecs$e[5];
-(0, _base.registerDependency)('privilegeProvider');
+var _applyDecs$e = _applyDecs(_FcrUIPrivilegeProviderImpl, [[_mobx.observable, 1, "canOperateWatermark"], [_mobx.observable, 1, "targetLoadingWatermarkLineTypeIsMulti"], [_mobx.observable, 1, "securityInfos"], [_mobx.observable, 1, "permissionInfos"], [_mobx.observable, 1, "privilegeOperator"], [_handlePermissionUpdatedDecs, 18, "_handlePermissionUpdated"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"], [_setAllowWaterMarkDecs, 18, "setAllowWaterMark"], [_setAllowWaterMarkLineDecs, 18, "setAllowWaterMarkLine"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 6);
+_init_canOperateWatermark = _applyDecs$e2[0];
+_init_targetLoadingWatermarkLineTypeIsMulti = _applyDecs$e2[1];
+_init_securityInfos = _applyDecs$e2[2];
+_init_permissionInfos = _applyDecs$e2[3];
+_init_privilegeOperator = _applyDecs$e2[4];
+_initProto = _applyDecs$e2[5];
+_applyDecs$e;