fcr-ui-scene 3.7.2 → 3.7.4

package/lib/providers/privilege-provider.js

@@ -45,9 +45,7 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.some.js");
-require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.function.bind.js");
-require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
@@ -269,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);
@@ -393,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);
     });
@@ -406,7 +401,6 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       });
       var shareState = info === null || info === void 0 ? void 0 : info.payload;
       var annotationStartSecurityInfoState = (shareState === null || shareState === void 0 ? void 0 : shareState.start) === _enums.FcrSharePermissionState.ON;
-      _this.logger.info("[Annotation] hasAnnotationStartPermission, ".concat(annotationStartSecurityInfoState));
       return annotationStartSecurityInfoState;
     });
     (0, _defineProperty2["default"])(this, "hasAnnotationAllowWritePermission", function () {
@@ -710,9 +704,6 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       _this._userControl.removeObserver(userObserver);
       _this._privilegeControl.removeObserver(privilegeObserver);
     });
-
-    //@ts-ignore
-    window.securityStore = this;
   }
   return (0, _createClass2["default"])(FcrUIPrivilegeProviderImpl, [{
     key: "canOperateWatermark",
@@ -774,7 +765,7 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
   }, {
     key: "printAllPermissions",
     value: function printAllPermissions() {
-      this.logger.debug(JSON.stringify((0, _mobx.toJS)(this.permissionInfos)));
+      this.logger.debug((0, _imports.jsonstring)((0, _mobx.toJS)(this.permissionInfos)));
     }
   }, {
     key: "release",

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 = [];
@@ -556,6 +555,9 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
     this._privilegeControl = _mainRoomControl.getPrivilegeControl();
     this._userControl = _mainRoomControl.getUserControl();
     this._privilegeProvider = new _privilegeProvider.FcrUIPrivilegeProviderImpl(_mainRoomControl.getPrivilegeControl(), _mainRoomControl.getUserControl(), _mainRoomControl.getStreamControl(), eventProvider);
+
+    // @ts-ignore
+    window._mainRoomPrivilegeProvider = this._privilegeProvider;
     this._privilegeObserver = {
       onSecurityInfoUpdated: this._handleSecurityUpdated.bind(this)
     };
@@ -571,9 +573,9 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
         });
       },
       onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
-        if (event.reason === _type4.AgoraRteUserUpdatedReason.ROLE) {
-          _this2._handleUserRoleChangeToast(event.modifiedUser);
+        if (event.reason === _type3.FcrUserUpdatedReason.ROLE) {
           _this2._userMap.set(event.modifiedUser.userId, event.modifiedUser);
+          _this2._handleUserRoleChangeToast(event.modifiedUser);
         }
       }
     };
@@ -582,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;
@@ -716,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() {
@@ -884,6 +886,9 @@ var FcrUIWaitingRoomControlProviderImpl = exports.FcrUIWaitingRoomControlProvide
     value: function _setWaitingRoomControl(roomControl) {
       this._waitingRoomControl = roomControl;
       this._privilegeProvider = new _privilegeProvider.FcrUIPrivilegeProviderImpl(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), this._eventProvider);
+
+      // @ts-ignore
+      window._waitingRoomPrivilegeProvider = this._privilegeProvider;
     }
   }]);
 }();

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

@@ -2,13 +2,14 @@ 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';
 import { FcrUIMemberSharedDataSourceImpl } from '../shared-data-source/member-data';
 import { CurrentShareBounds } from '../modules/control-bar/types';
 import { FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrUIPrivilegeProvider } from './privilege-provider';
 export interface FcrUIScreenShareObserver {
     /**
      * 本地屏幕开启采集
@@ -24,7 +25,7 @@ export interface FcrUIScreenShareObserver {
      * 本地屏幕替换开始
      * @returns
      */
-    onScreenShareReplaceBegin?: (id: string, type: AgoraRtcScreenCaptureType, bounds: CurrentShareBounds) => void;
+    onScreenShareReplaceBegin?: (id: string, type: FcrScreenCaptureType, bounds: CurrentShareBounds) => void;
     /**
      * 本地屏幕替换开始
      * @returns
@@ -83,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 - 可选参数，要停止的屏幕共享轨道对象，默认停止当前活动的共享
@@ -129,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;
     /**
      * 屏幕共享缩小窗口
      */
@@ -169,15 +170,16 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
     private _sharingProvider;
     private _sharedScreenShareSharedDataSource;
     private _sharedMemberDataSource;
+    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;
@@ -192,7 +194,8 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
         height: number;
     };
     get screenShareScenarioType(): FcrScreenScenarioType;
-    constructor(_deviceProvider: FcrUIDeviceProvider, _eventProvider: FcrUIEventProvider, _roomProvider: FcrUIRoomProvider, _sharingProvider: FcrUISharingProvider, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _sharedMemberDataSource: FcrUIMemberSharedDataSourceImpl);
+    private get _currentRoomControl();
+    constructor(_deviceProvider: FcrUIDeviceProvider, _eventProvider: FcrUIEventProvider, _roomProvider: FcrUIRoomProvider, _sharingProvider: FcrUISharingProvider, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _sharedMemberDataSource: FcrUIMemberSharedDataSourceImpl, _privilegeProvider: FcrUIPrivilegeProvider);
     setSharingInReplace(isInReplace: boolean): void;
     zoomOut(): void;
     zoomIn(): void;
@@ -205,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>;
@@ -230,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;