fcr-ui-scene 3.7.1 → 3.7.3

package/lib/scenes/main-scene.js

@@ -132,6 +132,11 @@ var _appListData = require("../shared-data-source/app-list-data");
 var _confirmLeaveMeeting = require("../modules/dialog/dialogs/confirm-leave-meeting");
 var _endMeeting = require("../modules/dialog/dialogs/end-meeting");
 var _annotationData = require("../shared-data-source/annotation-data");
+var _subWindow = require("../modules/dialog/dialogs/sub-window");
+var _secondaryWindow = require("../modules/secondary-window");
+var _multiDisplayProvider = require("../providers/multi-display-provider");
+var _whiteboardData = require("../shared-data-source/whiteboard-data");
+var _whiteboardProvider = require("../providers/whiteboard-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 var _FcrMainUIScene;
 var _initProto; // import DeviceSettingDialog from '../modules/dialog/dialogs/device-setting';
@@ -198,7 +203,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider);
     var monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(engine.getMonitorControl());
     var chatProvider = new _chatProvider.FcrUIChatProviderImpl(currentRoomControlProvider.currentRoomControl, roomProvider);
-    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource);
+    var sharedWhiteboardDataSource = new _whiteboardData.FcrUISharedWhiteboardDataSourceImpl(sharingControl.getBoardControl(), privilegeProvider);
     var sharedWaitingRoomDataSource = new _waitingRoom.FcrUISharedWaitingRoomDataSourceImpl(roomProvider, eventProvider);
     var phoneAudioConnectorProvider = new _phoneAudioProvider.FcrUIPhoneAudioConnectorProviderImpl({
       roomControl: mainRoomControl,
@@ -210,13 +215,23 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       mainRoomControl: mainRoomControl
     });
     var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource, eventProvider, mainRoomControl.getSharingControl().getBoardControl());
-    var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource);
+    var whiteboardProvider = new _whiteboardProvider.FcrUIWhiteboardProviderImpl(sharingControl.getBoardControl(), sharedWhiteboardDataSource, userControl);
+    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource, sharedWhiteboardDataSource, whiteboardProvider, userControl);
+    var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource, privilegeProvider);
     var annotationProvider = new _annotationProvider.FcrUIAnnotationProviderImpl(dialogProvider, sharedVideoWindowDataSource, privilegeProvider, sharedScreenShareSharedDataSource);
     var sharedSecurityDataSource = new _securityData.FcrUISecuritySharedDataSourceImpl(privilegeProvider, sharedMemberDataSource);
     var sharedApplistDataSource = new _appListData.FcrUISharedApplistSourceImpl(abilityProvider, privilegeProvider, roomProvider, widgetProvider, sharedMemberDataSource, sharedInterpreterDataSource);
     var sharedAnnotationDataSource = new _annotationData.FcrUISharedAnnotationSourceImpl();
     var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource);
     var localVideoRenderProvider = new _rendererProvider.FcrUILocalVideoRenderProviderImpl(deviceProvider, sharedScreenShareSharedDataSource);
+    var multiDisplayProvider = new _multiDisplayProvider.FcrUIMultiDisplayProviderImpl({
+      eventProvider: eventProvider,
+      sharedSettingDataSource: sharedSettingDataSource,
+      sharedMemberDataSource: sharedMemberDataSource,
+      sharedVideoWindowDataSource: sharedVideoWindowDataSource,
+      sharingProvider: sharingProvider,
+      sharedScreenShareSharedDataSource: sharedScreenShareSharedDataSource
+    });
     _this.messageProvider = messageProvider;
     _this.dialogProvider = dialogProvider;
     _this.eventProvider = eventProvider;
@@ -243,6 +258,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     _this.applistProvider = applistProvider;
     _this.widgetProvider = widgetProvider;
     _this.abilityProvider = abilityProvider;
+    _this.multiDisplayProvider = multiDisplayProvider;
+    _this.whiteboardProvider = whiteboardProvider;
     _this.sharedSpeakerSpotlightDataSource = sharedSpeakerSpotlightDataSource;
     _this.sharedPinDataSource = sharedPinDataSource;
     _this.sharedConfigDataSource = sharedConfigDataSource;
@@ -260,6 +277,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     _this.sharedApplistDataSource = sharedApplistDataSource;
     _this.sharedConfirmDataSource = sharedConfirmDataSource;
     _this.sharedAnnotationDataSource = sharedAnnotationDataSource;
+    _this.sharedWhiteboardDataSource = sharedWhiteboardDataSource;
     _this._addObservers();
     return _this;
   }
@@ -355,6 +373,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       var phoneAudioConnection = new _phoneAudioConnect.PhoneAudioConnectionUIModule(this, this);
       var webWidgetUIModule = new _widget2.WebWidgetUIModule(this, this);
       var annotationUIModule = new _annotation.AnnotationUIModule(this, this);
+      var displayDistributionModule = new _secondaryWindow.FcrUISecondaryWindowModule(this, this);
       this.addSubNode(chatModule);
       this.addSubNode(audioStreamUIModule);
       this.addSubNode(soundEffectUIModule);
@@ -378,6 +397,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       this.addSubNode(phoneAudioConnection);
       this.addSubNode(webWidgetUIModule);
       this.addSubNode(annotationUIModule);
+      this.addSubNode(displayDistributionModule);
       var getView = function getView() {
         dialogModule.addDialogs([
         // {
@@ -532,6 +552,13 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
               params: props.params
             }, "EndMeetingDialog");
           }
+        }, {
+          key: _constant.FcrUIDialogKey.SUB_WINDOW,
+          component: function component() {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_subWindow.SubWindowDialog, {
+              children: displayDistributionModule.component(shareScreenModule)
+            }, "SubWindowDialog");
+          }
         }]);
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_videoTrackRenderContext.FcrVideoTrackRenderContext.Provider, {
           value: {
@@ -561,11 +588,18 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
         });
       };
       _reactDom["default"].render(getView(), dom);
+
+      // for debug use only
+      // @ts-ignore
+      window._mainScene = this;
     }
   }, {
     key: "unmount",
     value: function unmount(dom) {
       _reactDom["default"].unmountComponentAtNode(dom);
+
+      // @ts-ignore
+      window._mainScene = null;
     }
   }, {
     key: "onNodeWillActive",
@@ -581,12 +615,14 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       this.devicePrivilegeProvider.release();
       this.privilegeProvider.release();
       this.deviceStreamProvider.release();
+      this.multiDisplayProvider.release();
       this.sharedInterpreterDataSource.release();
       this.sharedMemberDataSource.release();
       this.sharedMeetingTimeDataSource.release(); // 修复：添加对会议时间数据源的释放
       this.sharedWaitingRoomDataSource.release(); // 修复：添加对等候室数据源的释放
       this.sharedSecuritySharedDataSource.release(); // 修复：添加对安全数据源的释放
       this.sharedVideoWindowDataSource.release(); // 修复：添加对视频窗口数据源的释放
+      this.sharedWhiteboardDataSource.release();
     }
   }, {
     key: "_setIsWaitingRoomNotify",

package/lib/scenes/waiting-scene.d.ts

@@ -22,7 +22,6 @@ import { FcrUIMemberSharedDataSource } from '../shared-data-source/member-data';
 import { FcrUIWidgetProvider } from '../providers/widget-provider';
 import { FcrUISharedWaitingRoomDataSource } from '../shared-data-source/waiting-room';
 import { FcrUIAbilityProviderImpl } from '../providers/ability-provider';
-import { FcrUIScreenShareProviderImpl } from '../providers/screen-share-provider';
 import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
 import { FcrUISharedConfirmDataSource } from '../shared-data-source/confirm-data';
 import { FcrUIApplistProvider } from '../providers/app-list-provider';
@@ -62,7 +61,6 @@ export declare class FcrWaitingUIScene extends FcrBaseUIScene {
     monitorProvider: FcrUIMonitorProviderImpl;
     deviceStreamProvider: FcrUIDeviceStreamProviderImpl;
     widgetProvider: FcrUIWidgetProvider;
-    screenShareProvider: FcrUIScreenShareProviderImpl;
     applistProvider: FcrUIApplistProvider;
     sharedConfigDataSource: FcrUISharedConfigDataSource;
     messageProvider: FcrUIMessageProvider;

package/lib/scenes/waiting-scene.js

@@ -42,8 +42,6 @@ var _eventConfirm = require("../modules/event-confirm");
 var _memberData = require("../shared-data-source/member-data");
 var _waitingRoom = require("../shared-data-source/waiting-room");
 var _abilityProvider = require("../providers/ability-provider");
-var _screenShareProvider = require("../providers/screen-share-provider");
-var _sharingProvider = require("../providers/sharing-provider");
 var _appListProvider = require("../providers/app-list-provider");
 var _appListData = require("../shared-data-source/app-list-data");
 var _endMeeting = require("../modules/dialog/dialogs/end-meeting");
@@ -97,11 +95,8 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     var monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(engine.getMonitorControl());
     var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(waitingRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource);
     var sharedChatDataSource = new _chatData.FcrUISharedChatDataSourceImpl(chatProvider);
-    var sharingControl = waitingRoomControl.getSharingControl();
-    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource);
     var sharedInterpreterDataSource = new _interpreter.FcrUISharedInterpreterDataSourceImpl();
     var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource, eventProvider);
-    var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource);
     var privilegeProvider = waitingRoomControlProvider.privilegeProvider;
     var sharedApplistDataSource = new _appListData.FcrUISharedApplistSourceImpl(abilityProvider, privilegeProvider, roomProvider, widgetProvider, sharedMemberDataSource);
     var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource);
@@ -133,7 +128,6 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     _this.deviceStreamProvider = deviceStreamProvider;
     _this.sharedMemberDataSource = sharedMemberDataSource;
     _this.sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
-    _this.screenShareProvider = screenShareProvider;
     _this.widgetProvider = widgetProvider;
     _this.sharedWaitingRoomDataSource = sharedWaitingRoomDataSource;
     _this.abilityProvider = abilityProvider;

package/lib/shared-data-source/member-data.d.ts

@@ -4,7 +4,7 @@ import { FcrUserControl } from 'fcr-core/lib/room-control/user-control/type';
 import { FcrRemoteVideoStats } from 'fcr-core/lib/room-control/stream-control/type';
 import { FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 import { FcrUIScreenShareSharedDataSource } from './screen-share-data';
 import { FcrUIEventProvider } from '../providers/event-provider';
 export interface FcrUIMemberSharedDataSource {
@@ -116,7 +116,7 @@ export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberShare
     get remoteMembersUserInfosList(): FcrUserInfo[];
     get memberList(): FcrUIMemberDataImpl[];
     get memberUserInfoList(): FcrUserInfo[];
-    constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _eventProvider: FcrUIEventProvider, _whiteBoardControl?: FcrWhiteboardControl | undefined);
+    constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _eventProvider: FcrUIEventProvider, _whiteBoardControl?: FcrPrivilegedWhiteboardControl | undefined);
     private _addEventListeners;
     private _removeEventListeners;
     private _handleOnEvent;

package/lib/shared-data-source/screen-share-data.d.ts

@@ -173,6 +173,11 @@ export interface FcrUIScreenShareSharedDataSource {
      * @returns boolean
      */
     get sharingInReplace(): boolean;
+    /**
+     * 获取当前engine是否是连接状态
+     * @returns boolean
+     */
+    get isEngineConnected(): boolean;
     /**
      * 设置当前是否在屏幕共享替换中状态
      */
@@ -326,6 +331,7 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
     get isZoomMinimum(): boolean;
     get isFullScreenAdaptived(): boolean;
     get isCurrentOriginal(): boolean;
+    get isEngineConnected(): boolean;
     constructor(_connectionProvider: FcrUIConnectionProvider, _deviceProvider: FcrUIDeviceProvider);
     setScreenShareScenarioType(type: FcrScreenScenarioType): void;
     setScreenShareSpeakerViewSize(width: number, height: number): void;

package/lib/shared-data-source/screen-share-data.js

@@ -334,6 +334,11 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
     get: function get() {
       return this.screenShareScalcValue === 1;
     }
+  }, {
+    key: "isEngineConnected",
+    get: function get() {
+      return this.connectionState === _fcrCore.FcrConnectionState.CONNECTED;
+    }
   }, {
     key: "setScreenShareScenarioType",
     value: function setScreenShareScenarioType(type) {

package/lib/shared-data-source/setting.js

@@ -112,7 +112,8 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
         spotlightEnabled: true,
         isPlaySound: true,
         language: 'zh',
-        shouldHideMyVideo: false
+        shouldHideMyVideo: false,
+        isDualDisplayMode: false
       }
     }));
     (0, _defineProperty2["default"])(this, "_useDefaultAudioEchoCancellation", true);

package/lib/shared-data-source/video-window.d.ts

@@ -55,6 +55,7 @@ export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
     get hasLoopbackAudioStream(): boolean;
     get phoneMicEnabled(): boolean;
     get hasVideoStream(): boolean;
+    get hasBoard(): boolean;
     get userId(): string;
     get userName(): string;
     get ownerRoleType(): FcrUserRole;
@@ -82,6 +83,7 @@ export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
     setHasScreenSharing(screenSharing: boolean): void;
     setHasLoopbackSharing(hasLoopbackSharing: boolean): void;
     setBoardCanEdit(canEdit: boolean): void;
+    getVideoStream(): FcrStreamUIData | undefined;
 }
 export interface FcrUIVideoWindowDataSourceObserver {
     onLayoutUpdated?: (layout: FcrUIVideoWindowLayoutType) => void;

package/lib/shared-data-source/video-window.js

@@ -81,7 +81,7 @@ var _type2 = require("fcr-core/lib/type");
 var _fcrCore = require("fcr-core");
 var _base = require("../base");
 var _FcrUIVideoWindowDataImpl, _FcrUIVideoWindowDataSourceImpl;
-var _initProto, _init__boardUserInfo, _init__videoStream, _init__audioStream, _init__spotlightEnabled, _init__isSpeakerSpotlight, _init__boardCanEdit, _init__isFirstCameraOpen, _init_isPin, _init_hasScreenSharing, _init_hasBoardSharing, _init_hasLoopbackSharing, _setVideoStreamDecs, _setVideoStreamOwnerInfoDecs, _setAudioStreamDecs, _setAudioStreamOwnerInfoDecs, _setPinDecs, _setSpotlightEnabledDecs, _setHasBoardSharingDecs, _setBoardUserInfoDecs, _setSpeakerSpotlightDecs, _setHasScreenSharingDecs, _setHasLoopbackSharingDecs, _setBoardCanEditDecs, _ref, _initProto2, _init_spotlightEnabled, _init_layoutType, _init_manualLayout, _init_pinLimitedCount, _init_mainListLimitedCount, _init_foldListLimitedCount, _init_mainList, _init_foldList, _init_spotlightStreamId, _setSpotlightEnabledDecs2, _setLayoutDecs, _onSpotlightRemovedDecs, _resetListDecs, _addBoardDecs, _updateBoardDecs, _removeBoardDecs, _mergePstnStreamOrInsertNewDataDecs, _addDecs, _updateDecs, _deleteDecs, _addPinDecs, _updateSpeakerSpotlightPositionDecs, _removePinDecs, _setSpeakerSpotlightDecs2, _toggleMainStreamDecs, _insertBeginningByPriorityDecs, _insertEndByPriorityDecs, _findInsertBeginningIndexDecs, _findInsertEndIndexDecs, _insertBoardDecs, _insertNewDataDecs, _ref5;
+var _initProto, _init__boardUserInfo, _init__videoStream, _init__audioStream, _init__spotlightEnabled, _init__isSpeakerSpotlight, _init__boardCanEdit, _init__isFirstCameraOpen, _init_isPin, _init_hasScreenSharing, _init_hasBoardSharing, _init_hasLoopbackSharing, _setVideoStreamDecs, _setVideoStreamOwnerInfoDecs, _setAudioStreamDecs, _setAudioStreamOwnerInfoDecs, _setPinDecs, _setSpotlightEnabledDecs, _setHasBoardSharingDecs, _setBoardUserInfoDecs, _setSpeakerSpotlightDecs, _setHasScreenSharingDecs, _setHasLoopbackSharingDecs, _setBoardCanEditDecs, _getVideoStreamDecs, _ref, _initProto2, _init_spotlightEnabled, _init_layoutType, _init_manualLayout, _init_pinLimitedCount, _init_mainListLimitedCount, _init_foldListLimitedCount, _init_mainList, _init_foldList, _init_spotlightStreamId, _setSpotlightEnabledDecs2, _setLayoutDecs, _onSpotlightRemovedDecs, _resetListDecs, _addBoardDecs, _updateBoardDecs, _removeBoardDecs, _mergePstnStreamOrInsertNewDataDecs, _addDecs, _updateDecs, _deleteDecs, _addPinDecs, _updateSpeakerSpotlightPositionDecs, _removePinDecs, _setSpeakerSpotlightDecs2, _toggleMainStreamDecs, _insertBeginningByPriorityDecs, _insertEndByPriorityDecs, _findInsertBeginningIndexDecs, _findInsertEndIndexDecs, _insertBoardDecs, _insertNewDataDecs, _ref5;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -106,7 +106,7 @@ var _H = /*#__PURE__*/new WeakMap();
 var _I = /*#__PURE__*/new WeakMap();
 var _J = /*#__PURE__*/new WeakMap();
 var _K = /*#__PURE__*/new WeakMap();
-_ref = (_setVideoStreamDecs = [_mobx.action, _mobx.action.bound], _setVideoStreamOwnerInfoDecs = [_mobx.action, _mobx.action.bound], _setAudioStreamDecs = [_mobx.action, _mobx.action.bound], _setAudioStreamOwnerInfoDecs = [_mobx.action, _mobx.action.bound], _setPinDecs = [_mobx.action, _mobx.action.bound], _setSpotlightEnabledDecs = [_mobx.action, _mobx.action.bound], _setHasBoardSharingDecs = [_mobx.action, _mobx.action.bound], _setBoardUserInfoDecs = [_mobx.action, _mobx.action.bound], _setSpeakerSpotlightDecs = [_mobx.action, _mobx.action.bound], _setHasScreenSharingDecs = [_mobx.action, _mobx.action.bound], _setHasLoopbackSharingDecs = [_mobx.action, _mobx.action.bound], _setBoardCanEditDecs = [_mobx.action, _mobx.action.bound], "_boardUserInfo");
+_ref = (_setVideoStreamDecs = [_mobx.action, _mobx.action.bound], _setVideoStreamOwnerInfoDecs = [_mobx.action, _mobx.action.bound], _setAudioStreamDecs = [_mobx.action, _mobx.action.bound], _setAudioStreamOwnerInfoDecs = [_mobx.action, _mobx.action.bound], _setPinDecs = [_mobx.action, _mobx.action.bound], _setSpotlightEnabledDecs = [_mobx.action, _mobx.action.bound], _setHasBoardSharingDecs = [_mobx.action, _mobx.action.bound], _setBoardUserInfoDecs = [_mobx.action, _mobx.action.bound], _setSpeakerSpotlightDecs = [_mobx.action, _mobx.action.bound], _setHasScreenSharingDecs = [_mobx.action, _mobx.action.bound], _setHasLoopbackSharingDecs = [_mobx.action, _mobx.action.bound], _setBoardCanEditDecs = [_mobx.action, _mobx.action.bound], _getVideoStreamDecs = [_mobx.action, _mobx.action.bound], "_boardUserInfo");
 var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/function () {
   function FcrUIVideoWindowDataImpl(type, _ref2, _placement, _isMySelf) {
     var videoStream = _ref2.videoStream,
@@ -318,6 +318,11 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
       var _this$_videoStream4, _this$_videoStream5, _this$_videoStream6;
       return ((_this$_videoStream4 = this._videoStream) === null || _this$_videoStream4 === void 0 ? void 0 : _this$_videoStream4.videoSourceState) === _fcrCore.FcrMediaSourceState.OPEN && (((_this$_videoStream5 = this._videoStream) === null || _this$_videoStream5 === void 0 ? void 0 : _this$_videoStream5.streamType) === _fcrCore.FcrStreamType.BOTH || ((_this$_videoStream6 = this._videoStream) === null || _this$_videoStream6 === void 0 ? void 0 : _this$_videoStream6.streamType) === _fcrCore.FcrStreamType.VIDEO);
     }
+  }, {
+    key: "hasBoard",
+    get: function get() {
+      return this.type === _type.FcrUIWindowType.BOARD;
+    }
   }, {
     key: "userId",
     get: function get() {
@@ -511,10 +516,15 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     value: function setBoardCanEdit(canEdit) {
       this._boardCanEdit = canEdit;
     }
+  }, {
+    key: "getVideoStream",
+    value: function getVideoStream() {
+      return this._videoStream;
+    }
   }]);
 }();
 _FcrUIVideoWindowDataImpl = FcrUIVideoWindowDataImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataImpl, [[_mobx.observable, 1, "_boardUserInfo"], [_mobx.observable, 1, "_videoStream"], [_mobx.observable, 1, "_audioStream"], [_mobx.observable, 1, "_spotlightEnabled"], [_mobx.observable, 1, "_isSpeakerSpotlight"], [_mobx.observable, 1, "_boardCanEdit"], [_mobx.observable, 1, "_isFirstCameraOpen"], [_mobx.observable, 1, "isPin"], [_mobx.observable, 1, "hasScreenSharing"], [_mobx.observable, 1, "hasBoardSharing"], [_mobx.observable, 1, "hasLoopbackSharing"], [_mobx.computed, 3, "isSpeakerSpotlight"], [_mobx.computed, 3, "windowId"], [_mobx.computed, 3, "videoStreamId"], [_mobx.computed, 3, "audioStreamId"], [_mobx.computed, 3, "audioStreamConnectorType"], [_mobx.computed, 3, "videoStreamConnectorType"], [_mobx.computed, 3, "hasMicrophoneAudioStream"], [_mobx.computed, 3, "hasLoopbackAudioStream"], [_mobx.computed, 3, "phoneMicEnabled"], [_mobx.computed, 3, "hasVideoStream"], [_mobx.computed, 3, "userId"], [_mobx.computed, 3, "ownerRoleType"], [_mobx.computed, 3, "videoSourceType"], [_mobx.computed, 3, "audioSourceType"], [_mobx.computed, 3, "avatar"], [_mobx.computed, 3, "sortingPriority"], [_setVideoStreamDecs, 18, "setVideoStream"], [_setVideoStreamOwnerInfoDecs, 18, "setVideoStreamOwnerInfo"], [_setAudioStreamDecs, 18, "setAudioStream"], [_setAudioStreamOwnerInfoDecs, 18, "setAudioStreamOwnerInfo"], [_setPinDecs, 18, "setPin"], [_setSpotlightEnabledDecs, 18, "setSpotlightEnabled"], [_setHasBoardSharingDecs, 18, "setHasBoardSharing"], [_setBoardUserInfoDecs, 18, "setBoardUserInfo"], [_setSpeakerSpotlightDecs, 18, "setSpeakerSpotlight"], [_setHasScreenSharingDecs, 18, "setHasScreenSharing"], [_setHasLoopbackSharingDecs, 18, "setHasLoopbackSharing"], [_setBoardCanEditDecs, 18, "setBoardCanEdit"]], []).e, 12);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataImpl, [[_mobx.observable, 1, "_boardUserInfo"], [_mobx.observable, 1, "_videoStream"], [_mobx.observable, 1, "_audioStream"], [_mobx.observable, 1, "_spotlightEnabled"], [_mobx.observable, 1, "_isSpeakerSpotlight"], [_mobx.observable, 1, "_boardCanEdit"], [_mobx.observable, 1, "_isFirstCameraOpen"], [_mobx.observable, 1, "isPin"], [_mobx.observable, 1, "hasScreenSharing"], [_mobx.observable, 1, "hasBoardSharing"], [_mobx.observable, 1, "hasLoopbackSharing"], [_mobx.computed, 3, "isSpeakerSpotlight"], [_mobx.computed, 3, "windowId"], [_mobx.computed, 3, "videoStreamId"], [_mobx.computed, 3, "audioStreamId"], [_mobx.computed, 3, "audioStreamConnectorType"], [_mobx.computed, 3, "videoStreamConnectorType"], [_mobx.computed, 3, "hasMicrophoneAudioStream"], [_mobx.computed, 3, "hasLoopbackAudioStream"], [_mobx.computed, 3, "phoneMicEnabled"], [_mobx.computed, 3, "hasVideoStream"], [_mobx.computed, 3, "hasBoard"], [_mobx.computed, 3, "userId"], [_mobx.computed, 3, "ownerRoleType"], [_mobx.computed, 3, "videoSourceType"], [_mobx.computed, 3, "audioSourceType"], [_mobx.computed, 3, "avatar"], [_mobx.computed, 3, "sortingPriority"], [_setVideoStreamDecs, 18, "setVideoStream"], [_setVideoStreamOwnerInfoDecs, 18, "setVideoStreamOwnerInfo"], [_setAudioStreamDecs, 18, "setAudioStream"], [_setAudioStreamOwnerInfoDecs, 18, "setAudioStreamOwnerInfo"], [_setPinDecs, 18, "setPin"], [_setSpotlightEnabledDecs, 18, "setSpotlightEnabled"], [_setHasBoardSharingDecs, 18, "setHasBoardSharing"], [_setBoardUserInfoDecs, 18, "setBoardUserInfo"], [_setSpeakerSpotlightDecs, 18, "setSpeakerSpotlight"], [_setHasScreenSharingDecs, 18, "setHasScreenSharing"], [_setHasLoopbackSharingDecs, 18, "setHasLoopbackSharing"], [_setBoardCanEditDecs, 18, "setBoardCanEdit"], [_getVideoStreamDecs, 18, "getVideoStream"]], []).e, 12);
 _init__boardUserInfo = _applyDecs$e[0];
 _init__videoStream = _applyDecs$e[1];
 _init__audioStream = _applyDecs$e[2];
@@ -552,6 +562,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     _classPrivateFieldInitSpec(this, _H2, _init_foldList(this, []));
     _classPrivateFieldInitSpec(this, _I2, _init_spotlightStreamId(this, ''));
     this._sharedSettingDataSource = _sharedSettingDataSource;
+    this.spotlightEnabled = _sharedSettingDataSource.setting.spotlightEnabled;
     this._spotlightPool.addObserver({
       onRemoved: this.onSpotlightRemoved
     });
@@ -666,7 +677,11 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
         }
         return true;
       });
-      if (this.layoutType === _type.FcrUIVideoWindowLayoutType.Gallery && layout === _type.FcrUIVideoWindowLayoutType.Speaker && windowList.length < 2 || this.layoutType === layout) {
+      // 有白板共享时，即使隐藏了未开启视频的参数者,数量总是大于等于2,不应提前return，setLayout失效
+      var boardInShow = this.mainList.some(function (item) {
+        return item.hasBoard;
+      });
+      if (this.layoutType === _type.FcrUIVideoWindowLayoutType.Gallery && layout === _type.FcrUIVideoWindowLayoutType.Speaker && windowList.length < 2 && !boardInShow || this.layoutType === layout) {
         return;
       }
       this.layoutType = layout;
@@ -788,7 +803,6 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     key: "update",
     value: function update(param) {
       var _this5 = this;
-      console.log('onStreamsAdded update', param);
       var handleStreamInfoUpdated = function handleStreamInfoUpdated(stream, list, limitCount, placement) {
         var existedUserStream = list[_this5._findItemIndexWithWindowId(stream.streamId, list)];
         if (existedUserStream) {
@@ -1149,7 +1163,6 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
   }, {
     key: "_insertNewData",
     value: function _insertNewData(stream, list, limitCount, isMySelf, placement) {
-      console.log('onStreamsAdded', stream);
       var videoWindowData = new FcrUIVideoWindowDataImpl(_type.FcrUIWindowType.VIDEO, stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN ? {
         audioStream: stream
       } : {

package/lib/shared-data-source/whiteboard-data.d.ts

@@ -0,0 +1,68 @@
+import { FcrConnectionState, FcrUserInfo } from 'fcr-core/lib/type';
+import { WhiteboardToolAction } from '../modules/secondary-window/type';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { WhiteboardThemeType } from '../modules/whiteboard/type';
+import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrUIPrivilegeProvider } from '../providers/privilege-provider';
+import { FcrToolbarState } from '../modules/components/toolbar/types';
+export interface FcrUISharedWhiteboardDataSource {
+    get canWriteBoard(): boolean;
+    get sharingUserInfo(): FcrUserInfo | undefined;
+    get backgroundColor(): string;
+    get currentTheme(): WhiteboardThemeType;
+    get connectionState(): FcrConnectionState;
+    get showLoading(): boolean;
+    get joinSuccess(): boolean;
+    get toolbarState(): FcrToolbarState;
+    setSharingUser: (userInfo: FcrUserInfo) => void;
+    setBackgroundColor: (color: string) => void;
+    setWhiteboardTool: (tool: {
+        action: WhiteboardToolAction;
+        tool: FcrBoardToolType | FcrBoardShape | string | number;
+    }) => void;
+    setTheme: (theme: WhiteboardThemeType) => void;
+    setControlEnable: (enable: boolean) => void;
+    setShowLoading: (show: boolean) => void;
+    setCommonColors: (colors: string[]) => void;
+    saveDraft: () => void;
+    setProgress: (progress: number) => void;
+    setJoinSuccess: (success: boolean) => void;
+    inActive: () => void;
+    release: () => void;
+}
+export declare class FcrUISharedWhiteboardDataSourceImpl implements FcrUISharedWhiteboardDataSource {
+    private _whiteboardControl;
+    private _privilegeProvider;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _showLoading;
+    private _disposers;
+    private _fcrUIMainWindowRenderer;
+    private _toolbarStateObserver;
+    accessor currentTheme: Required<WhiteboardThemeType>;
+    accessor sharingUserInfo: FcrUserInfo | undefined;
+    accessor backgroundColor: string;
+    accessor hasWriteBoardPermission: boolean;
+    accessor connectionState: FcrConnectionState;
+    accessor joinSuccess: boolean;
+    accessor toolbarState: FcrToolbarState;
+    get showLoading(): boolean;
+    get canWriteBoard(): boolean;
+    constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _privilegeProvider: FcrUIPrivilegeProvider);
+    setControlEnable(enable: boolean): void;
+    setSharingUser(userInfo: FcrUserInfo): void;
+    setBackgroundColor(color: string): void;
+    setWhiteboardTool(tool: {
+        action: WhiteboardToolAction;
+        tool: FcrBoardToolType | FcrBoardShape | string | number;
+    }): void;
+    setTheme(theme: WhiteboardThemeType): void;
+    setShowLoading(show: boolean): void;
+    setCommonColors(colors: string[]): void;
+    saveDraft(): void;
+    setProgress(progress: number): void;
+    setJoinSuccess(success: boolean): void;
+    inActive(): void;
+    release(): void;
+    private _resetWhiteboardTool;
+    private _handleConnectionStateUpdated;
+}