fcr-ui-scene 3.7.2 → 3.7.4-rc.1

package/lib/modules/state-bar/store.js

@@ -131,7 +131,8 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
       sharedMeetingTimeDataSource = _ref2.sharedMeetingTimeDataSource,
       annotationProvider = _ref2.annotationProvider,
       dialogProvider = _ref2.dialogProvider,
-      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource;
+      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource,
+      multiDisplayProvider = _ref2.multiDisplayProvider;
     (0, _classCallCheck2["default"])(this, StateBarStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'StateBarStore'
@@ -180,13 +181,13 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     this._roomControl.addObserver(this._roomObserver);
     this._abilityProvider = abilityProvider;
     this._annotationProvider = annotationProvider;
+    this._multiDisplayProvider = multiDisplayProvider;
     this._uiEventStore.addObserver({
       onEvent: this._uiEvents.bind(this)
     });
     this._onNetworkQualityUpdated = this._onNetworkQualityUpdated.bind(this);
     this.toggleLayout = this.toggleLayout.bind(this);
     this.toggleLayoutBarLock = this.toggleLayoutBarLock.bind(this);
-    this.openVideoWindowDialog = this.openVideoWindowDialog.bind(this);
     this.cloudRecordingState = this._roomControl.getCloudRecordingState();
     this._initRoomInfo();
     var resizeHandler = this._setBrowserWidth();
@@ -368,6 +369,17 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedScreenShareSharedDataSource.isSharingScreen;
     }
+  }, {
+    key: "isLayoutSwitchDisabled",
+    get: function get() {
+      // 如果多屏幕功能开启，则始终不禁用布局切换
+      if (this.isMainRoom && this._multiDisplayProvider.isActive) {
+        return false;
+      }
+
+      // 如果正在共享屏幕，则切禁用布局切换
+      return this.isSharingScreen;
+    }
   }, {
     key: "layoutSize",
     get: function get() {
@@ -443,11 +455,6 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     value: function toggleLayoutBarLock(state) {
       this._uiEventStore.sendEvent(_constant.FcrUIAction.TOGGLE_LAYOUT_BAR_LOCK, state);
     }
-  }, {
-    key: "openVideoWindowDialog",
-    value: function openVideoWindowDialog() {
-      this._uiEventStore.openDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-    }
   }, {
     key: "release",
     value: function release() {

package/lib/modules/state-bar/view.js

@@ -68,7 +68,7 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     showNotification = _useContext.showNotification,
     closeNotification = _useContext.closeNotification,
     isRoomDetailSupported = _useContext.isRoomDetailSupported,
-    isSharingScreen = _useContext.isSharingScreen;
+    isLayoutSwitchDisabled = _useContext.isLayoutSwitchDisabled;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     isFullScreen = _useState2[0],
@@ -211,10 +211,10 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingTime.MeetingTime, {})
       }), attendeeCount > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: (0, _classnames["default"])(ns.e('layout'), {
-          'fcr-state-bar_layout_disable': isSharingScreen
+          'fcr-state-bar_layout_disable': isLayoutSwitchDisabled
         }),
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layoutConfig.LayoutConfig, {
-          disable: isSharingScreen
+          disable: isLayoutSwitchDisabled
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(MyFcrToolTip, {
         placement: "bottom",

package/lib/modules/video-window/components/members/index.js

@@ -18,10 +18,8 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type2 = require("agora-ui-foundation/lib/components/icon/type");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _memberWindow = require("../../../components/member-window");
-var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
+var _type3 = require("fcr-core/lib/type");
 require("./index.css");
-var _fcrCore = require("fcr-core");
-var _muteAction = require("../../../../utilities/mute-action");
 var _env = require("agora-foundation/lib/utilities/env");
 var _memberActions = require("../../../components/member-window/components/member-actions");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -46,7 +44,8 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
     interpreterUserList = _useContext.interpreterUserList,
     isInterpreterEnabled = _useContext.isInterpreterEnabled,
     openRenameDialog = _useContext.openRenameDialog,
-    userVolumeMap = _useContext.userVolumeMap;
+    userVolumeMap = _useContext.userVolumeMap,
+    deviceMicrophoneEnabled = _useContext.deviceMicrophoneEnabled;
   var ref = (0, _react.useRef)(null);
   var onScaleChange = (0, _react.useCallback)(function (scale) {}, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -56,12 +55,6 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
     }),
     ref: ref,
     children: [foldListRenderData.map(function (windowData, index) {
-      var muteAudioPermission = hasMutePermission(windowData.isMySelf ? _fcrCore.FcrPrivilegeUserRole.SELF : windowData.ownerRoleType);
-      var startAudioPermission = hasUnmutePermission(windowData.isMySelf ? _fcrCore.FcrPrivilegeUserRole.SELF : windowData.ownerRoleType);
-      var requestStartAudioPermission = hasRequestStartAudioPermission(windowData.ownerRoleType);
-      var _actionMute = (0, _muteAction.actionMute)(windowData.isMySelf, windowData.hasMicrophoneAudioStream, muteAudioPermission, startAudioPermission, requestStartAudioPermission),
-        isShowActionAudio = _actionMute.isShowActionAudio,
-        actionAudioTag = _actionMute.actionAudioTag;
       var isMySelf = windowData.isMySelf,
         videoStreamId = windowData.videoStreamId,
         audioStreamId = windowData.audioStreamId;
@@ -81,8 +74,6 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
             videoWindowCurrentWidth: videoWindowCurrentWidth,
             videoWindowCurrentHeight: videoWindowCurrentHeight,
             videoWindowPreviewType: videoWindowPreviewType,
-            isShowActionAudio: isShowActionAudio,
-            actionAudioTag: actionAudioTag,
             showActionBottomLabel: windowData.isSpeakerSpotlight || wrapperHovering,
             allowedOperations: getAllowedOperations(windowData.ownerRoleType, windowData.isMySelf),
             setVideoOrientation: setVideoOrientation,
@@ -98,10 +89,14 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
             handleRename: openRenameDialog,
             renderListLength: foldListRenderData.length,
             id: id,
-            volume: volume
+            volume: volume,
+            deviceMicrophoneEnabled: deviceMicrophoneEnabled,
+            hasMutePermission: hasMutePermission,
+            hasUnmutePermission: hasUnmutePermission,
+            hasRequestStartAudioPermission: hasRequestStartAudioPermission
           }),
-          videoRenderMode: _type3.AgoraRtcRenderMode.FIT,
-          videoStreamType: _type3.AgoraRtcVideoStreamType.LOW_STREAM,
+          videoRenderMode: _type3.FcrVideoRenderMode.FIT,
+          videoStreamType: _type3.FcrVideoStreamType.LOW_STREAM,
           windowData: windowData,
           showAvatar: true,
           isVideoSuspended: false,

package/lib/modules/video-window/store.d.ts

@@ -35,6 +35,7 @@ export default class VideoWindowStore {
     get filterFoldList(): FcrUIVideoWindowData[];
     get shouldHaveListView(): boolean;
     get localUserRole(): FcrUserRole;
+    get deviceMicrophoneEnabled(): boolean;
     constructor(params: VideoWindowStoreParams);
     setVideoOrientation(): void;
     release(): void;

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

@@ -64,7 +64,7 @@ var _constant = require("../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
 var _type = require("./type");
 var _type2 = require("../layout/type");
-var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
+var _type3 = require("fcr-core/lib/type");
 var _attendee = require("agora-ui-foundation/lib/components/participants/attendee");
 var _react = require("react");
 var _type4 = require("../../type");
@@ -245,10 +245,10 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     key: "filterFoldList",
     get: function get() {
       var sourceList = this.foldList.filter(function (i) {
-        return !i.isMySelf || i.videoSourceType !== _type3.AgoraRtcVideoSourceType.SCREEN;
+        return !i.isMySelf || i.videoSourceType !== _type3.FcrVideoSourceType.SCREEN;
       });
       var _list = this.shouldHideNonVideoParticipants ? sourceList.filter(function (i) {
-        return i.isMySelf || i.hasVideoStream || i.videoSourceType === _type3.AgoraRtcVideoSourceType.SCREEN || i.type === _type2.FcrUIWindowType.BOARD;
+        return i.isMySelf || i.hasVideoStream || i.videoSourceType === _type3.FcrVideoSourceType.SCREEN || i.type === _type2.FcrUIWindowType.BOARD;
       }) : sourceList;
       return _list;
     }
@@ -262,6 +262,11 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedMemberDataSource.localUserRole;
     }
+  }, {
+    key: "deviceMicrophoneEnabled",
+    get: function get() {
+      return this._deviceStore.microphoneEnabled;
+    }
   }, {
     key: "setVideoOrientation",
     value: function setVideoOrientation() {

package/lib/modules/whiteboard/components/control-bar/store.d.ts

@@ -20,6 +20,8 @@ export declare class WhiteboardControlBarStore {
     private _securityStore;
     private _annotationProvider;
     private _sharedAnnotationDataSource;
+    private _uiEventObserver;
+    private _userObserver;
     constructor({ uiEventStore, userControl, securityStore, annotationProvider, sharedAnnotationDataSource, }: {
         uiEventStore: FcrUIEventProvider;
         streamControl: FcrStreamControl;
@@ -38,5 +40,6 @@ export declare class WhiteboardControlBarStore {
     onClose(): void;
     setOwnerUser(user: FcrUserInfo): void;
     onEnable(controlEnabled: boolean): void;
+    release(): void;
 }
 export declare const WhiteboardControlBarUIContext: import("react").Context<WhiteboardControlBarStore>;

package/lib/modules/whiteboard/components/control-bar/store.js

@@ -48,6 +48,7 @@ require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 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 _react = require("react");
 var _constant = require("../../../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
@@ -79,8 +80,8 @@ var _J = /*#__PURE__*/new WeakMap();
 _ref = (_setOwnerUserDecs = [_mobx.action, _mobx.action.bound], _onEnableDecs = [_mobx.action, _mobx.action.bound], "ownerUser");
 var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*/function () {
   function WhiteboardControlBarStore(_ref2) {
-    var _userControl$getLocal,
-      _this = this;
+    var _this = this,
+      _userControl$getLocal;
     var uiEventStore = _ref2.uiEventStore,
       userControl = _ref2.userControl,
       securityStore = _ref2.securityStore,
@@ -97,14 +98,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
     _classPrivateFieldInitSpec(this, _H, _init_scaleValue(this, 1));
     _classPrivateFieldInitSpec(this, _I, _init_controlEnabled(this, false));
     _classPrivateFieldInitSpec(this, _J, _init_isHost(this, false));
-    this._uiEventStore = uiEventStore;
-    this._userControl = userControl;
-    this.currentUser = userControl.getLocalUser();
-    this._securityStore = securityStore;
-    this._annotationProvider = annotationProvider;
-    this._sharedAnnotationDataSource = sharedAnnotationDataSource;
-    this.isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes((_userControl$getLocal = userControl.getLocalUser()) === null || _userControl$getLocal === void 0 ? void 0 : _userControl$getLocal.userRole);
-    uiEventStore.addObserver({
+    (0, _defineProperty2["default"])(this, "_uiEventObserver", {
       onEvent: function onEvent(action, payload) {
         if (action === _constant.FcrUIAction.WHITEBOARD_CHANGED) {
           if (payload.action === _type.WhiteboardBaseEvents.SET_OWNER_USER_ID) {
@@ -120,7 +114,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
         }
       }
     });
-    userControl.addObserver({
+    (0, _defineProperty2["default"])(this, "_userObserver", {
       onUserInfoUpdated: function onUserInfoUpdated(_, event) {
         var localUser = _this._userControl.getLocalUser();
         if (event.modifiedUser.userId === localUser.userId) {
@@ -128,6 +122,15 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
         }
       }
     });
+    this._uiEventStore = uiEventStore;
+    this._userControl = userControl;
+    this.currentUser = userControl.getLocalUser();
+    this._securityStore = securityStore;
+    this._annotationProvider = annotationProvider;
+    this._sharedAnnotationDataSource = sharedAnnotationDataSource;
+    this.isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes((_userControl$getLocal = userControl.getLocalUser()) === null || _userControl$getLocal === void 0 ? void 0 : _userControl$getLocal.userRole);
+    this._uiEventStore.addObserver(this._uiEventObserver);
+    this._userControl.addObserver(this._userObserver);
   }
   return (0, _createClass2["default"])(WhiteboardControlBarStore, [{
     key: _ref,
@@ -280,6 +283,12 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
       });
       this._uiEventStore.sendEvent(_constant.FcrUIAction.RESET_WHITEBOARD_TOOLBAR_VARS);
     }
+  }, {
+    key: "release",
+    value: function release() {
+      this._uiEventStore.removeObserver(this._uiEventObserver);
+      this._userControl.removeObserver(this._userObserver);
+    }
   }]);
 }();
 _WhiteboardControlBarStore = WhiteboardControlBarStore;

package/lib/modules/whiteboard/components/toolbar/store.d.ts

@@ -2,7 +2,7 @@ import { FcrBoardShape, WhiteboardThemeType } from '../../type';
 import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 import { FcrBoardMainWindow } from 'fcr-core/lib/room-control/whiteboard-control/types';
 import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/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 { FcrUIAnnotationProvider } from '../../../../providers/annotation-provider';
 import { FcrUIEventProvider } from '../../../../providers/event-provider';
 import { FcrUISharedAnnotationSource } from '../../../../shared-data-source/annotation-data';
@@ -47,7 +47,7 @@ export declare class ToolbarStore {
     };
     get roomInfo(): import("fcr-core/lib/type").FcrRoomInfo | undefined;
     get boardMainWindow(): FcrBoardMainWindow | undefined;
-    constructor(_whiteboardControl: FcrWhiteboardControl, _roomControl: FcrBaseRoomControl, _annotationProvider: FcrUIAnnotationProvider, _eventProvider: FcrUIEventProvider, _sharedAnnotationDataSource: FcrUISharedAnnotationSource);
+    constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _roomControl: FcrBaseRoomControl, _annotationProvider: FcrUIAnnotationProvider, _eventProvider: FcrUIEventProvider, _sharedAnnotationDataSource: FcrUISharedAnnotationSource);
     private _onUiEvent;
     resetToolbarVars(): void;
     get annotationHasStart(): boolean;

package/lib/modules/whiteboard/components/toolbar/store.js

@@ -59,7 +59,7 @@ var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _libs = _interopRequireDefault(require("../switch-theme/libs"));
 var _tinycolor = _interopRequireDefault(require("tinycolor2"));
 var _decorator = require("agora-foundation/lib/decorator");
-var _imports = require("fcr-core/lib/imports");
+var _type2 = require("fcr-core/lib/type");
 var _utils = require("../../utils");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _constant = require("../../../../utilities/constant");
@@ -97,7 +97,7 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
         if (!_this._whiteboardControl) {
           return;
         }
-        if (state === _imports.AgoraRteConnectionState.CONNECTED) {
+        if (state === _type2.FcrConnectionState.CONNECTED) {
           var _this$_boardMainWindo;
           _this._boardMainWindow = _this._whiteboardControl.getMainWindow();
           _this._lastStrokeWidth = 0;

package/lib/modules/whiteboard/index.d.ts

@@ -1,4 +1,4 @@
-import { FcrBoardRegion, WhiteboardBaseEvents, WhiteboardControlbarEvents } from './type';
+import { WhiteboardBaseEvents, WhiteboardControlbarEvents } from './type';
 import { FcrUIDialogKey, FcrUIAction } from '../../utilities/constant';
 import { UIModule } from '../../base';
 import { FcrUserInfo } from 'fcr-core/lib/type';
@@ -8,11 +8,14 @@ import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
+import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
 export declare class FcrWhiteboardUIModule extends UIModule {
+    protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
     private _uiEventStore?;
     private _userControl?;
     private _roomControl?;
+    private _streamControl?;
     private _securityStore?;
     private _whiteboardControl?;
     private _boardStore?;
@@ -27,23 +30,25 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     private _timer;
     private _isMyBoard;
     private _boardObserver;
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    protected _mounted: boolean;
-    protected _initialized: boolean;
-    protected _joined: boolean;
-    protected _boardDom?: HTMLDivElement | null;
-    protected _collectorDom?: HTMLDivElement | null;
-    protected _grantedUsers: Set<string>;
-    protected _outerDom?: Element;
-    protected _initArgs?: {
-        appId: string;
-        region: FcrBoardRegion;
-    };
+    private _multiDisplayObserver;
+    private _streamObserver;
+    private _userObserver;
+    private _eventObserver;
+    private _mounted;
+    private _initialized;
+    private _joined;
+    private _boardDom?;
+    private _collectorDom?;
+    private _grantedUsers;
+    private _outerDom?;
+    private _initArgs?;
     currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
     eventProvider?: FcrUIEventProvider;
     privilegeProvider?: FcrUIPrivilegeProvider;
     annotationProvider: FcrUIAnnotationProvider;
     sharedAnnotationDataSource: FcrUISharedAnnotationSource;
+    multiDisplayProvider?: FcrUIMultiDisplayProvider;
+    private accessor _isMultiDisplay;
     private accessor _lonelyWindowState;
     private accessor _ownerUser;
     private accessor _isHost;
@@ -68,15 +73,14 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     } & {
         layout: FcrUIVideoWindowLayoutType;
     }): void;
-    onPropertiesUpdate(params: {
-        operatorUser: FcrUserInfo;
-    }): void;
+    private _handleActive;
     onDestroy(params?: {
         operatorUser?: FcrUserInfo;
     }): void;
     mount(): void;
     unmount(): void;
     unload(): void;
+    release(): void;
     private _setBackground;
     private _checkBoard;
     private _boardUIEvents;
@@ -88,7 +92,6 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     private _setConnectionState;
     private _open;
     private _close;
-    private _openLonelyWindow;
     private _setJoinSuccessed;
     private _addDisposers;
     private _alertWhenBeenStopByOthers;