fcr-ui-scene 3.7.3 → 3.7.4

package/lib/providers/device-stream-provider.js

@@ -61,7 +61,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _decorator = require("agora-foundation/lib/decorator");
 var _mobx = require("mobx");
-var _type = require("agora-rte-sdk/lib/core/rtc/type");
+var _type = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _rendererEvent = require("../utilities/renderer-event");
 var _type2 = require("fcr-core/lib/room-control/type");
@@ -103,7 +103,7 @@ var FcrUIDeviceStreamProviderImpl = exports.FcrUIDeviceStreamProviderImpl = /*#_
       onStreamsAdded: function onStreamsAdded(_, events) {
         var _events$find;
         var localCameraStream = (_events$find = events.find(function (event) {
-          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type.AgoraRtcVideoSourceType.CAMERA;
+          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
         })) === null || _events$find === void 0 ? void 0 : _events$find.modifiedStream;
         if (localCameraStream) {
           _this._bindLocalAudioStream();
@@ -112,7 +112,7 @@ var FcrUIDeviceStreamProviderImpl = exports.FcrUIDeviceStreamProviderImpl = /*#_
       },
       onStreamsUpdated: function onStreamsUpdated(_, events) {
         var localCamera = events.find(function (event) {
-          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type.AgoraRtcVideoSourceType.CAMERA;
+          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
         });
         var localCameraStream = localCamera === null || localCamera === void 0 ? void 0 : localCamera.modifiedStream;
         if (localCameraStream) {
@@ -179,7 +179,7 @@ var FcrUIDeviceStreamProviderImpl = exports.FcrUIDeviceStreamProviderImpl = /*#_
     get: function get() {
       var localStreams = this._roomControl.getStreamControl().getStreamsByUserId(this._localUser.userId);
       return localStreams.find(function (stream) {
-        return stream.videoSourceType === _type.AgoraRtcVideoSourceType.CAMERA;
+        return stream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
       });
     }
   }, {

package/lib/providers/interpreter-provider.js

@@ -36,9 +36,7 @@ var _base = require("../base");
 var _fcrCore = require("fcr-core");
 var _interpreter = require("../shared-data-source/interpreter");
 var _type = require("../modules/interpreter/type");
-var _imports = require("fcr-core/lib/imports");
-var _type2 = require("agora-rte-sdk/lib/type");
-var _type3 = require("fcr-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _utils = require("../modules/interpreter/utils");
 var _constant = require("../utilities/constant");
 var _enums = require("../modules/action-bar/enums");
@@ -49,18 +47,18 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var getRoomJoinOptions = function getRoomJoinOptions(localUser) {
   var roomJoinOptions = {
     userName: localUser.userName,
-    userRole: _type3.FcrUserRole.PARTICIPANT,
+    userRole: _type2.FcrUserRole.PARTICIPANT,
     roomToken: '',
     streamLatency: _fcrCore.FcrStreamLatencyLevel.ULTRA_LOW,
     createStreamConfigs: [{
-      videoSourceState: _imports.AgoraRtcMediaSourceState.CLOSE,
-      audioSourceState: _imports.AgoraRtcMediaSourceState.CLOSE,
+      videoSourceState: _type2.FcrMediaSourceState.CLOSE,
+      audioSourceState: _type2.FcrMediaSourceState.CLOSE,
       videoSourceId: '',
       audioSourceId: '',
       streamName: 'default',
-      streamType: _imports.AgoraRteMediaStreamType.NONE,
-      videoSourceType: _type2.AgoraRteVideoSourceType.CAMERA,
-      audioSourceType: _type2.AgoraRteAudioSourceType.MICROPHONE
+      streamType: _type2.FcrStreamType.NONE,
+      videoSourceType: _type2.FcrVideoSourceType.CAMERA,
+      audioSourceType: _type2.FcrAudioSourceType.MICROPHONE
     }]
   };
   return roomJoinOptions;

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

@@ -1,10 +1,11 @@
-import { FcrUIDisplayContentDistribution, FcrUIDisplayDistributionContentType, FcrUIDisplayState, FcrUIMultiDisplayObserver } from '../modules/secondary-window/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';
 export interface FcrUIMultiDisplayProvider {
     get mianWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
     get secondaryWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
@@ -43,6 +44,8 @@ export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayP
     private _sharedVideoWindowDataSource;
     private _sharingProvider;
     private _sharedScreenShareDataSource;
+    private _fcrUIMainWindowRenderer;
+    private _sharedWhiteboardDataSource;
     private _contentDistribution;
     private get _userId();
     private accessor _displayCount;
@@ -56,13 +59,15 @@ export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayP
     get mianWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
     get secondaryWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
     get isLocalCameraInSecondaryWindow(): boolean;
-    constructor({ eventProvider, sharedSettingDataSource, sharedMemberDataSource, sharedVideoWindowDataSource, sharingProvider, sharedScreenShareSharedDataSource, }: {
+    constructor({ eventProvider, sharedSettingDataSource, sharedMemberDataSource, sharedVideoWindowDataSource, sharingProvider, sharedScreenShareSharedDataSource, fcrUIMainWindowRenderer, sharedWhiteboardDataSource, }: {
         eventProvider: FcrUIEventProvider;
         sharedSettingDataSource: FcrUISharedSettingDataSource;
         sharedMemberDataSource: FcrUIMemberSharedDataSource;
         sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
         sharingProvider: FcrUISharingProvider;
         sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
+        fcrUIMainWindowRenderer: FcrUIMainWindowRenderer;
+        sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource;
     });
     addObserver(observer: FcrUIMultiDisplayObserver): void;
     removeObserver(observer: FcrUIMultiDisplayObserver): void;
@@ -70,7 +75,7 @@ export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayP
     moveMainWindowToIndexLeastDisplay(): void;
     showMainWindowInIndexLeastDisplay(options?: {
         displayOfCurrentSharingBounds?: Electron.Display;
-        maximize?: boolean;
+        isMaximized?: boolean;
     }): void;
     setMainWindowMaximize(): void;
     private _getContentDistribution;

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

@@ -98,7 +98,9 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
       sharedMemberDataSource = _ref.sharedMemberDataSource,
       sharedVideoWindowDataSource = _ref.sharedVideoWindowDataSource,
       sharingProvider = _ref.sharingProvider,
-      sharedScreenShareSharedDataSource = _ref.sharedScreenShareSharedDataSource;
+      sharedScreenShareSharedDataSource = _ref.sharedScreenShareSharedDataSource,
+      fcrUIMainWindowRenderer = _ref.fcrUIMainWindowRenderer,
+      sharedWhiteboardDataSource = _ref.sharedWhiteboardDataSource;
     (0, _classCallCheck2["default"])(this, FcrUIMultiDisplayProviderImpl);
     (0, _defineProperty2["default"])(this, "_logger", (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUIMultiDisplayProvider'
@@ -135,6 +137,8 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
     this._sharedVideoWindowDataSource = sharedVideoWindowDataSource;
     this._sharingProvider = sharingProvider;
     this._sharedScreenShareDataSource = sharedScreenShareSharedDataSource;
+    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);
@@ -232,6 +236,7 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         window.runtime.screen.removeListener('display-added', this._handleDisplayCountUpdated);
         window.runtime.screen.removeListener('display-removed', this._handleDisplayCountUpdated);
       }
+      this._fcrUIMainWindowRenderer.removeAllObservers();
       this._observers.removeAllObservers();
       this._disposers.forEach(function (disposer) {
         return disposer();
@@ -258,7 +263,7 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
       var isMaximized = browserWindow.isMaximized();
       this.showMainWindowInIndexLeastDisplay({
         displayOfCurrentSharingBounds: displayOfCurrentSharingBounds,
-        maximize: isMaximized
+        isMaximized: isMaximized
       });
     }
   }, {
@@ -266,8 +271,8 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
     value: function showMainWindowInIndexLeastDisplay() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var displayOfCurrentSharingBounds = options.displayOfCurrentSharingBounds;
-      var _options$maximize = options.maximize,
-        maximize = _options$maximize === void 0 ? false : _options$maximize;
+      var _options$isMaximized = options.isMaximized,
+        isMaximized = _options$isMaximized === void 0 ? false : _options$isMaximized;
       if (!this.isActive) {
         this._logger.warn('show: Secondary window mode is not enabled, cannot show main window in least display.');
         return;
@@ -297,10 +302,11 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         x: x + Math.floor(width / 2 - mainWindowWidth / 2),
         y: y + Math.floor(height / 2 - mainWindowHeight / 2)
       };
+      isMaximized && browserWindow.unmaximize();
       browserWindow.setBounds(bounds);
-      if (maximize) {
+      if (isMaximized) {
         browserWindow.maximize();
-        browserWindow.focus();
+        // browserWindow.focus();
       } else {
         browserWindow.show();
       }
@@ -504,6 +510,12 @@ 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);
     }

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

@@ -130,9 +130,8 @@ export interface FcrUIPrivilegeProvider {
     hasMutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
     /**
      * 是否有权限停止对方的屏幕共享
-     * @param targetRole 目标角色
      */
-    hasStopScreenSharePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
+    hasStopScreenSharePermission(): boolean;
     /**
      * 是否有权限取消静音（让目标角色可以开麦）
      * @param targetRole 目标角色
@@ -291,11 +290,6 @@ export interface FcrUIPrivilegeProvider {
      * 是否允许开启白板
      */
     hasStartBoardPermission(): boolean;
-    /**
-     * 是否允许关闭指定角色的白板
-     * @param targerRole 目标角色
-     */
-    hasCloseBoardPermission(targerRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
     /**
      * 是否允许在白板上书写
      */
@@ -385,9 +379,8 @@ export interface FcrUIPrivilegeProvider {
     setAllowWaterMarkLine(isWaterMarkEnabled: boolean, type?: FcrLineType): void;
     /**
      * 是否有权限停止他人屏幕共享
-     * @param targetRole 目标角色
      */
-    hasStopScreenSharePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
+    hasStopScreenSharePermission(): boolean;
     /**
      * 将房间内所有用户静音
      */
@@ -508,7 +501,7 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     isWaterMarkEnabled: () => boolean;
     hasWaitingRoomPermission: (role?: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasMutePermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
-    hasStopScreenSharePermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
+    hasStopScreenSharePermission: () => boolean;
     hasUnmutePermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasRequestStartAudioPermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasRequestStartVideoPermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
@@ -546,7 +539,6 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     hasEndRoomPermission: () => boolean;
     hasAssignHostBeforeLeavingPermission: (role: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasStartBoardPermission: () => boolean;
-    hasCloseBoardPermission: (targerRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasWriteBoardPermission: () => boolean;
     hasAnnotationStartPermission: () => boolean;
     hasAnnotationAllowWritePermission: () => boolean;

package/lib/providers/privilege-provider.js

@@ -267,8 +267,8 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     (0, _defineProperty2["default"])(this, "hasMutePermission", function (targetRole) {
       return _this._hasPermission(_type2.FcrPermissionAction.StreamMuteAudio, targetRole);
     });
-    (0, _defineProperty2["default"])(this, "hasStopScreenSharePermission", function (targetRole) {
-      return _this._hasPermission(_type2.FcrPermissionAction.StreamStopScreenShare, targetRole);
+    (0, _defineProperty2["default"])(this, "hasStopScreenSharePermission", function () {
+      return _this._hasPermission(_type2.FcrPermissionAction.StreamEnableStartScreenShare, _type2.FcrPrivilegeUserRole.SELF);
     });
     (0, _defineProperty2["default"])(this, "hasUnmutePermission", function (targetRole) {
       return _this._hasPermission(_type2.FcrPermissionAction.StreamStartAudio, targetRole);
@@ -391,9 +391,6 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     (0, _defineProperty2["default"])(this, "hasStartBoardPermission", function () {
       return _this._hasPermission(_type2.FcrPermissionAction.BoardStart, _type2.FcrPrivilegeUserRole.SELF);
     });
-    (0, _defineProperty2["default"])(this, "hasCloseBoardPermission", function (targerRole) {
-      return _this._hasPermission(_type2.FcrPermissionAction.BoardClose, targerRole);
-    });
     (0, _defineProperty2["default"])(this, "hasWriteBoardPermission", function () {
       return _this._hasPermission(_type2.FcrPermissionAction.BoardWrite, _type2.FcrPrivilegeUserRole.SELF);
     });

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

@@ -1,4 +1,4 @@
-import { AgoraRtcVideoStreamType } from 'agora-rte-sdk/lib/core/rtc/type';
+import { FcrVideoStreamType } from 'fcr-core/lib/type';
 import { FcrStreamControl } from 'fcr-core';
 import { FcrVideoRenderConfig } from 'fcr-core/lib/type';
 import { FcrUIDeviceProvider } from './device-provider';
@@ -12,7 +12,7 @@ export interface FcrUIRemoteVideoRenderProvider {
      * @param config
      * @param el
      */
-    startRenderRemoteVideo(streamId: string, streamType: AgoraRtcVideoStreamType, config: FcrVideoRenderConfig, el: HTMLElement): void;
+    startRenderRemoteVideo(streamId: string, streamType: FcrVideoStreamType, config: FcrVideoRenderConfig, el: HTMLElement): void;
     /**
      * 停止渲染远端视频流
      * @param streamId
@@ -70,7 +70,7 @@ export declare class FcrUIRemoteVideoRenderProviderImpl implements FcrUIRemoteVi
     private accessor _firstFrameState;
     constructor(_streamControl: FcrStreamControl);
     release(): void;
-    startRenderRemoteVideo(streamId: string, streamType: AgoraRtcVideoStreamType, config: FcrVideoRenderConfig, el: HTMLElement): void;
+    startRenderRemoteVideo(streamId: string, streamType: FcrVideoStreamType, config: FcrVideoRenderConfig, el: HTMLElement): void;
     stopRenderRemoteVideo(streamId: string, el: HTMLElement): void;
     isStreamFirstFrameRendered: (streamId: string) => boolean;
 }

package/lib/providers/renderer-provider.js

@@ -165,33 +165,18 @@ var FcrUILocalVideoRenderProviderImpl = exports.FcrUILocalVideoRenderProviderImp
       onCameraChanged: function onCameraChanged() {
         if (_this2._deviceProvider.cameraEnabled) {
           _this2._viewsAndConfigs.forEach(function (config, el) {
-            var _config$isMirror, _config$renderMode;
-            _this2._deviceProvider.cameraTrack.startPreview({
-              isMirror: (_config$isMirror = config.isMirror) !== null && _config$isMirror !== void 0 ? _config$isMirror : false,
-              renderMode: (_config$renderMode = config.renderMode) !== null && _config$renderMode !== void 0 ? _config$renderMode : _fcrCore.FcrVideoRenderMode.FIT
-            }, el);
+            if (_this2._deviceProvider.cameraTrack) {
+              var _config$isMirror, _config$renderMode;
+              _this2._deviceProvider.cameraTrack.startPreview({
+                isMirror: (_config$isMirror = config.isMirror) !== null && _config$isMirror !== void 0 ? _config$isMirror : false,
+                renderMode: (_config$renderMode = config.renderMode) !== null && _config$renderMode !== void 0 ? _config$renderMode : _fcrCore.FcrVideoRenderMode.FIT
+              }, el);
+            }
           });
         }
       }
     };
     this._deviceProvider.addObserver(this._deviceObserver);
-    this._disposers.push((0, _mobx.reaction)(function () {
-      return _this2._deviceProvider.cameraEnabled;
-    }, function (enabled) {
-      if (enabled) {
-        _this2._viewsAndConfigs.forEach(function (config, el) {
-          var _config$isMirror2, _config$renderMode2;
-          _this2._deviceProvider.cameraTrack.startPreview({
-            isMirror: (_config$isMirror2 = config.isMirror) !== null && _config$isMirror2 !== void 0 ? _config$isMirror2 : false,
-            renderMode: (_config$renderMode2 = config.renderMode) !== null && _config$renderMode2 !== void 0 ? _config$renderMode2 : _fcrCore.FcrVideoRenderMode.FIT
-          }, el);
-        });
-      } else {
-        _this2._viewsAndConfigs.forEach(function (_, el) {
-          _this2._deviceProvider.cameraTrack.stopPreview(el);
-        });
-      }
-    }));
   }
   return (0, _createClass2["default"])(FcrUILocalVideoRenderProviderImpl, [{
     key: "cameraEnabled",
@@ -211,30 +196,33 @@ var FcrUILocalVideoRenderProviderImpl = exports.FcrUILocalVideoRenderProviderImp
   }, {
     key: "startCameraPreview",
     value: function startCameraPreview(el, config) {
-      var _config$isMirror3, _config$renderMode3;
       this._viewsAndConfigs.set(el, config);
-      this._deviceProvider.cameraTrack.startPreview({
-        isMirror: (_config$isMirror3 = config.isMirror) !== null && _config$isMirror3 !== void 0 ? _config$isMirror3 : false,
-        renderMode: (_config$renderMode3 = config.renderMode) !== null && _config$renderMode3 !== void 0 ? _config$renderMode3 : _fcrCore.FcrVideoRenderMode.FIT
-      }, el);
+      if (this._deviceProvider.cameraTrack) {
+        var _config$isMirror2, _config$renderMode2;
+        this._deviceProvider.cameraTrack.startPreview({
+          isMirror: (_config$isMirror2 = config.isMirror) !== null && _config$isMirror2 !== void 0 ? _config$isMirror2 : false,
+          renderMode: (_config$renderMode2 = config.renderMode) !== null && _config$renderMode2 !== void 0 ? _config$renderMode2 : _fcrCore.FcrVideoRenderMode.FIT
+        }, el);
+      }
       this.logger.info('current count of render views: ', this._viewsAndConfigs.size);
     }
   }, {
     key: "stopCameraPreview",
     value: function stopCameraPreview(el) {
       this._viewsAndConfigs["delete"](el);
-      this._deviceProvider.cameraTrack.stopPreview(el);
+      if (this._deviceProvider.cameraTrack) {
+        this._deviceProvider.cameraTrack.stopPreview(el);
+      }
       this.logger.info('current count of render views: ', this._viewsAndConfigs.size);
     }
   }, {
     key: "startScreenPreview",
     value: function startScreenPreview(el, config) {
       if (this._screenShareDataSource.screenTrack) {
-        var _config$isMirror4, _config$renderMode4;
-        this._viewsAndConfigs.set(el, config);
+        var _config$isMirror3, _config$renderMode3;
         this._screenShareDataSource.screenTrack.startPreview({
-          isMirror: (_config$isMirror4 = config.isMirror) !== null && _config$isMirror4 !== void 0 ? _config$isMirror4 : false,
-          renderMode: (_config$renderMode4 = config.renderMode) !== null && _config$renderMode4 !== void 0 ? _config$renderMode4 : _fcrCore.FcrVideoRenderMode.FIT
+          isMirror: (_config$isMirror3 = config.isMirror) !== null && _config$isMirror3 !== void 0 ? _config$isMirror3 : false,
+          renderMode: (_config$renderMode3 = config.renderMode) !== null && _config$renderMode3 !== void 0 ? _config$renderMode3 : _fcrCore.FcrVideoRenderMode.FIT
         }, el);
       }
     }

package/lib/providers/room-provider.js

@@ -72,16 +72,14 @@ var _type = require("fcr-core/lib/room-control/type");
 var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
 var _type3 = require("fcr-core/lib/type");
 var _observable = require("agora-foundation/lib/utilities/observable");
-var _type4 = require("agora-rte-sdk/lib/core/scene/type");
-var _type5 = require("../type");
-var _type6 = require("agora-rte-sdk/lib/type");
+var _type4 = require("../type");
 var _constant = require("../utilities/constant");
 var _base = require("../base");
 var _privilegeProvider = require("./privilege-provider");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobx = require("mobx");
-var _type7 = require("agora-ui-foundation/lib/components/icon/type");
-var _type8 = require("../modules/whiteboard/type");
+var _type5 = require("agora-ui-foundation/lib/components/icon/type");
+var _type6 = require("../modules/whiteboard/type");
 var _waitingRoomControlManager = _interopRequireDefault(require("../waiting-room-control-manager"));
 var _meetingDetail = require("../utilities/meeting-detail");
 var _decorator = require("agora-foundation/lib/decorator");
@@ -117,7 +115,7 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
       },
       onWaitingRoomControlLeft: function onWaitingRoomControlLeft() {
         _this._observable.notifyObservers('onWaitingRoomManageCanceled');
-        _this._messageProvider.closeNotification(_type5.FcrUINotificationContentType.WAITING_ROOM);
+        _this._messageProvider.closeNotification(_type4.FcrUINotificationContentType.WAITING_ROOM);
       }
     });
     (0, _defineProperty2["default"])(this, "_isSelfEndMeeting", false);
@@ -391,7 +389,8 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
                     height: 720
                   },
                   bitrate: 1200,
-                  frameRate: 15
+                  frameRate: 15,
+                  isMirror: false
                 },
                 retryTimeout: 60
               });
@@ -485,11 +484,11 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
       var config = this._sceneConfig;
       var streams = [{
         streamName: 'default',
-        streamType: _type4.AgoraRteMediaStreamType.BOTH,
-        videoSourceType: _type6.AgoraRteVideoSourceType.CAMERA,
-        audioSourceType: _type6.AgoraRteAudioSourceType.MICROPHONE,
-        videoSourceState: _type6.AgoraRteMediaSourceState.CLOSE,
-        audioSourceState: _type6.AgoraRteMediaSourceState.CLOSE
+        streamType: _type3.FcrStreamType.BOTH,
+        videoSourceType: _type3.FcrVideoSourceType.CAMERA,
+        audioSourceType: _type3.FcrAudioSourceType.MICROPHONE,
+        videoSourceState: _type3.FcrMediaSourceState.CLOSE,
+        audioSourceState: _type3.FcrMediaSourceState.CLOSE
       }];
       if (config.userRole === _type3.FcrUserRole.ROBOT) {
         streams = [];
@@ -574,7 +573,7 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
         });
       },
       onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
-        if (event.reason === _type4.AgoraRteUserUpdatedReason.ROLE) {
+        if (event.reason === _type3.FcrUserUpdatedReason.ROLE) {
           _this2._userMap.set(event.modifiedUser.userId, event.modifiedUser);
           _this2._handleUserRoleChangeToast(event.modifiedUser);
         }
@@ -585,7 +584,7 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
     this._eventObserver = {
       onEvent: function onEvent(action, payload) {
         if (action === _constant.FcrUIAction.WHITEBOARD_CHANGED) {
-          if (payload.action === _type8.WhiteboardBaseEvents.SET_OWNER_USER_ID) {
+          if (payload.action === _type6.WhiteboardBaseEvents.SET_OWNER_USER_ID) {
             var _mainRoomControl$getU;
             _this2.boardOwnerUser = Object.values((_mainRoomControl$getU = _mainRoomControl.getUserControl()) === null || _mainRoomControl$getU === void 0 ? void 0 : _mainRoomControl$getU.getUsers()).find(function (u) {
               return u.userId === payload.payload;
@@ -719,7 +718,7 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
             content: (0, _i18n.transI18n)('fmt_settings_tips_sharingprohibited', {
               reason1: operator
             }),
-            icon: _type7.FcrIconType.FCR_SCREENSHARING,
+            icon: _type5.FcrIconType.FCR_SCREENSHARING,
             okText: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_button_gotit'),
             showCancel: false,
             onOk: function onOk() {

package/lib/providers/screen-share-provider.d.ts

@@ -2,7 +2,7 @@ import { FcrUIDeviceProvider } from './device-provider';
 import { FcrUIRoomProvider } from './room-provider';
 import { FcrScreenScenarioType } from 'fcr-core/lib/imports';
 import { FcrScreenTrack } from 'fcr-core/lib/media-control/type';
-import { AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
+import { FcrScreenCaptureType } from 'fcr-core/lib/type';
 import { FcrUISharingProvider } from './sharing-provider';
 import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
 import { FcrUIEventProvider } from './event-provider';
@@ -25,7 +25,7 @@ export interface FcrUIScreenShareObserver {
      * 本地屏幕替换开始
      * @returns
      */
-    onScreenShareReplaceBegin?: (id: string, type: AgoraRtcScreenCaptureType, bounds: CurrentShareBounds) => void;
+    onScreenShareReplaceBegin?: (id: string, type: FcrScreenCaptureType, bounds: CurrentShareBounds) => void;
     /**
      * 本地屏幕替换开始
      * @returns
@@ -84,7 +84,7 @@ export interface FcrUIScreenShareProvider {
      * @param isReplace - 是否替换当前已有的共享
      * @returns 返回一个Promise，成功时解析为屏幕共享轨道对象，失败时返回null
      */
-    startShareScreen(id: string, type: AgoraRtcScreenCaptureType, withAudio: boolean, isReplace: boolean): Promise<FcrScreenTrack | null>;
+    startShareScreen(id: string, type: FcrScreenCaptureType, withAudio: boolean, isReplace: boolean): Promise<FcrScreenTrack | null>;
     /**
      * 停止屏幕共享
      * @param targetScreenTrack - 可选参数，要停止的屏幕共享轨道对象，默认停止当前活动的共享
@@ -130,7 +130,7 @@ export interface FcrUIScreenShareProvider {
      * @param withAudio - 是否包含音频
      * @param bounds - 共享区域的边界信息
      */
-    replaceScreenShare(id: string, type: AgoraRtcScreenCaptureType, withAudio: boolean, bounds: CurrentShareBounds): void;
+    replaceScreenShare(id: string, type: FcrScreenCaptureType, withAudio: boolean, bounds: CurrentShareBounds): void;
     /**
      * 屏幕共享缩小窗口
      */
@@ -173,13 +173,13 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
     private _privilegeProvider;
     protected logger: import("agora-foundation/lib/logger").Logger;
     shareLock: boolean;
-    private _sharingControl?;
+    private _sharingControl;
     private _previewDom;
     private _prevFullScalc;
     private _observable;
     private _streamObserver;
     private _screenCaptureObserver;
-    private _streamControl?;
+    private _streamControl;
     private _maxScalcValue;
     private _minScalcValue;
     private _diffScalcValue;
@@ -194,6 +194,7 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
         height: number;
     };
     get screenShareScenarioType(): FcrScreenScenarioType;
+    private get _currentRoomControl();
     constructor(_deviceProvider: FcrUIDeviceProvider, _eventProvider: FcrUIEventProvider, _roomProvider: FcrUIRoomProvider, _sharingProvider: FcrUISharingProvider, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _sharedMemberDataSource: FcrUIMemberSharedDataSourceImpl, _privilegeProvider: FcrUIPrivilegeProvider);
     setSharingInReplace(isInReplace: boolean): void;
     zoomOut(): void;
@@ -207,15 +208,14 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
     bootstrap(): void;
     private _handleWebScreenCaptureStateUpdated;
     private _handleScreenCaptureStateUpdated;
-    private _handleShareStopWithAudio;
-    replaceScreenShare(id: string, type: AgoraRtcScreenCaptureType, withAudio: boolean, bounds: CurrentShareBounds): void;
+    replaceScreenShare(id: string, type: FcrScreenCaptureType, withAudio: boolean, bounds: CurrentShareBounds): void;
     private _handleRemoteVideoStatsUpdated;
     get localUserId(): string;
     get shareAudioTrack(): import("fcr-core/lib/media-control/type").FcrLoopbackTrack | null;
     get loopbackAudioSourceId(): string;
     get currentShareId(): string;
     get screenTrack(): FcrScreenTrack | null;
-    get currentShareStreamId(): string;
+    get currentShareStreamId(): string | undefined;
     get currentSelectionBounds(): CurrentShareBounds;
     setShareLock(lock: boolean): void;
     createScreenShareWithSelectionId(videoSourceId: string, bounds: CurrentShareBounds): Promise<string>;
@@ -232,9 +232,11 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
     removeObserver(observer: FcrUIScreenShareObserver): void;
     startShareWhiteboard(): void;
     release(): void;
-    startShareScreen(id: string, type: AgoraRtcScreenCaptureType, withAudio: boolean, isReplace: boolean): Promise<FcrScreenTrack | null>;
+    startShareScreen(id: string, type: FcrScreenCaptureType, withAudio: boolean, isReplace: boolean): Promise<FcrScreenTrack | null>;
     stopShareScreen(targetScreenTrack?: FcrScreenTrack | null | undefined): void;
     stopShareScreenByExitRoom(targetScreenTrack?: FcrScreenTrack | null | undefined): void;
+    private _updateShareAudioPrivilege;
+    private _handleShareStopWithAudio;
     private _handleShareStartWithAudio;
     toggleScreenshareWithAudio(withAudio: boolean): void;
     private _getExcludeWindows;