fcr-ui-scene 3.4.1 → 3.4.2

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

@@ -4,24 +4,65 @@ import { FcrVideoRenderConfig } from 'fcr-core/lib/type';
 import { FcrUIDeviceProvider } from './device-provider';
 import { FcrRenderConfig } from 'fcr-core/lib/media-control/type';
 export interface FcrUIRemoteVideoRenderProvider {
+    /**
+     * 开始渲染远端视频流
+     * @param streamId
+     * @param streamType
+     * @param config
+     * @param el
+     */
     startRenderRemoteVideo(streamId: string, streamType: AgoraRtcVideoStreamType, config: FcrVideoRenderConfig, el: HTMLElement): void;
+    /**
+     * 停止渲染远端视频流
+     * @param streamId
+     * @param el
+     */
     stopRenderRemoteVideo(streamId: string, el: HTMLElement): void;
+    /**
+     * 远端流首帧是否已渲染
+     * @param streamId
+     */
     isStreamFirstFrameRendered(streamId: string): boolean;
 }
 export interface FcrUILocalVideoRenderProvider {
+    /**
+     * 当前摄像头ID
+     */
     get cameraId(): string;
+    /**
+     * 摄像头是否已开启
+     */
     get cameraEnabled(): boolean;
+    /**
+     * 开始预览摄像头
+     * @param el
+     * @param config
+     */
     startCameraPreview(el: HTMLElement, config?: Partial<FcrRenderConfig>): void;
+    /**
+     * 停止预览摄像头
+     * @param el
+     */
     stopCameraPreview(el: HTMLElement): void;
+    /**
+     * 开始预览本地屏幕
+     * @param el
+     * @param config
+     */
     startScreenPreview(el: HTMLElement, config?: Partial<FcrRenderConfig>): void;
+    /**
+     * 停止预览本地屏幕
+     * @param el
+     */
     stopScreenPreview(el: HTMLElement): void;
 }
 export declare class FcrUIRemoteVideoRenderProviderImpl implements FcrUIRemoteVideoRenderProvider {
     private _streamControl;
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private accessor _firstFrameState;
+    private _disposers;
     private _renderCount;
     private _streamObserver;
+    private accessor _firstFrameState;
     constructor(_streamControl: FcrStreamControl);
     release(): void;
     startRenderRemoteVideo(streamId: string, streamType: AgoraRtcVideoStreamType, config: FcrVideoRenderConfig, el: HTMLElement): void;
@@ -30,14 +71,15 @@ export declare class FcrUIRemoteVideoRenderProviderImpl implements FcrUIRemoteVi
 }
 export declare class FcrUILocalVideoRenderProviderImpl implements FcrUILocalVideoRenderProvider {
     private _deviceProvider;
-    private _views;
+    private _disposers;
+    private _viewsAndConfigs;
     private _deviceObserver;
     constructor(_deviceProvider: FcrUIDeviceProvider);
     get cameraEnabled(): boolean;
     get cameraId(): string;
-    startCameraPreview(el: HTMLElement, config?: Partial<FcrRenderConfig>): void;
+    startCameraPreview(el: HTMLElement, config: FcrRenderConfig): void;
     stopCameraPreview(el: HTMLElement): void;
-    startScreenPreview(el: HTMLElement, config?: Partial<FcrRenderConfig>): void;
+    startScreenPreview(el: HTMLElement, config: FcrRenderConfig): void;
     stopScreenPreview(el: HTMLElement): void;
     release(): void;
 }

package/lib/providers/renderer-provider.js

@@ -6,7 +6,6 @@ require("core-js/modules/es.symbol.to-primitive.js");
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
-require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
@@ -24,9 +23,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.FcrUIRemoteVideoRenderProviderImpl = exports.FcrUILocalVideoRenderProviderImpl = void 0;
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.async-iterator.for-each.js");
@@ -46,29 +45,6 @@ require("core-js/modules/esnext.map.merge.js");
 require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
-require("core-js/modules/esnext.set.add-all.js");
-require("core-js/modules/esnext.set.delete-all.js");
-require("core-js/modules/esnext.set.difference.v2.js");
-require("core-js/modules/esnext.set.difference.js");
-require("core-js/modules/esnext.set.every.js");
-require("core-js/modules/esnext.set.filter.js");
-require("core-js/modules/esnext.set.find.js");
-require("core-js/modules/esnext.set.intersection.v2.js");
-require("core-js/modules/esnext.set.intersection.js");
-require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
-require("core-js/modules/esnext.set.is-disjoint-from.js");
-require("core-js/modules/esnext.set.is-subset-of.v2.js");
-require("core-js/modules/esnext.set.is-subset-of.js");
-require("core-js/modules/esnext.set.is-superset-of.v2.js");
-require("core-js/modules/esnext.set.is-superset-of.js");
-require("core-js/modules/esnext.set.join.js");
-require("core-js/modules/esnext.set.map.js");
-require("core-js/modules/esnext.set.reduce.js");
-require("core-js/modules/esnext.set.some.js");
-require("core-js/modules/esnext.set.symmetric-difference.v2.js");
-require("core-js/modules/esnext.set.symmetric-difference.js");
-require("core-js/modules/esnext.set.union.v2.js");
-require("core-js/modules/esnext.set.union.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.for-each.js");
@@ -103,8 +79,9 @@ var FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderI
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrRemoteVideoRenderManager'
     })));
-    _classPrivateFieldInitSpec(this, _A, _init__firstFrameState(this, new Map()));
+    (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_renderCount", new Map());
+    _classPrivateFieldInitSpec(this, _A, _init__firstFrameState(this, new Map()));
     (0, _defineProperty2["default"])(this, "isStreamFirstFrameRendered", (0, _mobxUtils.computedFn)(function (streamId) {
       return _this._firstFrameState.get(streamId) || false;
     }));
@@ -118,6 +95,9 @@ var FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderI
       }
     };
     _streamControl.addObserver(this._streamObserver);
+    this._disposers.push(function () {
+      _streamControl.removeObserver(_this._streamObserver);
+    });
   }
   return (0, _createClass2["default"])(FcrUIRemoteVideoRenderProviderImpl, [{
     key: "_firstFrameState",
@@ -132,7 +112,10 @@ var FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderI
     value: function release() {
       this._renderCount.clear();
       this._firstFrameState.clear();
-      this._streamControl.removeObserver(this._streamObserver);
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this._disposers = [];
     }
   }, {
     key: "startRenderRemoteVideo",
@@ -144,7 +127,9 @@ var FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderI
       } else {
         this._renderCount.set(streamId, 1);
       }
-      this._streamControl.startRenderRemoteVideoStream(streamId, streamType, config, el);
+      try {
+        this._streamControl.startRenderRemoteVideoStream(streamId, streamType, config, el);
+      } catch (e) {}
     }
   }, {
     key: "stopRenderRemoteVideo",
@@ -157,7 +142,9 @@ var FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderI
         this._renderCount["delete"](streamId);
         this._firstFrameState["delete"](streamId);
       }
-      this._streamControl.stopRenderRemoteVideoStream(streamId, el);
+      try {
+        this._streamControl.stopRenderRemoteVideoStream(streamId, el);
+      } catch (e) {}
     }
   }]);
 }();
@@ -165,25 +152,45 @@ _FcrUIRemoteVideoRenderProviderImpl = FcrUIRemoteVideoRenderProviderImpl;
 var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIRemoteVideoRenderProviderImpl, [[_mobx.observable, 1, "_firstFrameState"], [_mobx.action, 2, "release"], [_startRenderRemoteVideoDecs, 18, "startRenderRemoteVideo"], [_stopRenderRemoteVideoDecs, 18, "stopRenderRemoteVideo"]], []).e, 2);
 _init__firstFrameState = _applyDecs$e[0];
 _initProto = _applyDecs$e[1];
-_ref2 = (_startCameraPreviewDecs = [_mobx.action, _mobx.action.bound], _stopCameraPreviewDecs = [_mobx.action, _mobx.action.bound], _startScreenPreviewDecs = [_mobx.action, _mobx.action.bound], _stopScreenPreviewDecs = [_mobx.action, _mobx.action.bound], "_views");
+_ref2 = (_startCameraPreviewDecs = [_mobx.action, _mobx.action.bound], _stopCameraPreviewDecs = [_mobx.action, _mobx.action.bound], _startScreenPreviewDecs = [_mobx.action, _mobx.action.bound], _stopScreenPreviewDecs = [_mobx.action, _mobx.action.bound], "_disposers");
 var FcrUILocalVideoRenderProviderImpl = exports.FcrUILocalVideoRenderProviderImpl = /*#__PURE__*/function () {
   function FcrUILocalVideoRenderProviderImpl(_deviceProvider) {
     var _this2 = this;
     (0, _classCallCheck2["default"])(this, FcrUILocalVideoRenderProviderImpl);
-    (0, _defineProperty2["default"])(this, _ref2, (_initProto2(this), new Set()));
+    (0, _defineProperty2["default"])(this, _ref2, (_initProto2(this), []));
+    (0, _defineProperty2["default"])(this, "_viewsAndConfigs", new Map());
     this._deviceProvider = _deviceProvider;
     this._deviceObserver = {
       onCameraChanged: function onCameraChanged() {
-        _this2._views.forEach(function (el) {
+        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);
+          });
+        }
+      }
+    };
+    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: false,
-            renderMode: _fcrCore.FcrVideoRenderMode.FIT
+            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);
+        });
       }
-    };
-
-    // this._deviceProvider.addObserver(this._deviceObserver);
+    }));
   }
   return (0, _createClass2["default"])(FcrUILocalVideoRenderProviderImpl, [{
     key: "cameraEnabled",
@@ -197,44 +204,34 @@ var FcrUILocalVideoRenderProviderImpl = exports.FcrUILocalVideoRenderProviderImp
     }
   }, {
     key: "startCameraPreview",
-    value: function startCameraPreview(el) {
-      var _config$isMirror, _config$renderMode;
-      var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      this._views.add(el);
+    value: function startCameraPreview(el, config) {
+      var _config$isMirror3, _config$renderMode3;
+      this._viewsAndConfigs.set(el, config);
       this._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
+        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);
     }
   }, {
     key: "stopCameraPreview",
     value: function stopCameraPreview(el) {
-      this._views["delete"](el);
+      this._viewsAndConfigs["delete"](el);
       this._deviceProvider.cameraTrack.stopPreview(el);
     }
   }, {
     key: "startScreenPreview",
-    value: function startScreenPreview(el) {
-      var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      if (this._deviceProvider.screenTrack) {
-        var _config$isMirror2, _config$renderMode2;
-        this._deviceProvider.screenTrack.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);
-      }
-    }
+    value: function startScreenPreview(el, config) {}
   }, {
     key: "stopScreenPreview",
-    value: function stopScreenPreview(el) {
-      if (this._deviceProvider.screenTrack) {
-        this._deviceProvider.screenTrack.stopPreview(el);
-      }
-    }
+    value: function stopScreenPreview(el) {}
   }, {
     key: "release",
     value: function release() {
-      // this._deviceProvider.removeObserver(this._deviceObserver);
+      this._deviceProvider.removeObserver(this._deviceObserver);
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this._disposers = [];
     }
   }]);
 }();

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

@@ -1,23 +1,99 @@
 import { FcrCoreEngine } from 'fcr-core';
 import { FcrBaseRoomControl, FcrMainRoomControl, FcrRoomType, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
-import { FcrUIConnectionObserver, FcrUIRoomObserver, FcrUISceneConfig } from '../type';
+import { FcrLiveStreamingConfig, FcrLiveStreamingState, FcrRecordingState, FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrUIConnectionObserver, FcrUIExitReason, FcrUIRoomObserver, FcrUISceneConfig } from '../type';
 import { FcrUIEventProvider } from './event-provider';
 import { FcrUIPrivilegeProvider, FcrUIPrivilegeProviderImpl } from './privilege-provider';
+import { FcrUIMessageProvider } from './message-provider';
+import { FcrUIDialogProvider } from './dialog-provider';
+import { FcrUISharedInterpreterDataSource } from '../shared-data-source/interpreter';
 export interface FcrUIMainRoomControlProvider {
+    /**
+     * 主房间 privilegeProvider
+     */
     get privilegeProvider(): FcrUIPrivilegeProvider;
+    /**
+     * 主房间
+     */
     get mainRoomControl(): FcrMainRoomControl;
 }
 export interface FcrUIWaitingRoomControlProvider {
+    /**
+     * 等候室 privilegeProvider
+     */
     get privilegeProvider(): FcrUIPrivilegeProvider | undefined;
+    /**
+     * 等候室
+     */
     get waitingRoomControl(): FcrWaitingRoomControl | undefined;
 }
 export interface FcrUICurrentRoomControlProvider {
+    /**
+     * 当前房间
+     */
     get currentRoomControl(): FcrBaseRoomControl;
+    /**
+     * 当前房间类型
+     */
     get currentRoomType(): FcrRoomType;
 }
+export interface FcrUIExitRoomParamsType {
+    reason: FcrUIExitReason;
+    roomType?: number;
+}
 export interface FcrUIRoomProvider {
+    /**
+     * 等候室
+     */
     get waitingRoomControl(): FcrWaitingRoomControl | undefined;
+    /**
+     * 主房间
+     */
     get mainRoomControl(): FcrMainRoomControl | undefined;
+    /**
+     * 当前房间
+     */
+    get currentRoomControl(): FcrBaseRoomControl | undefined;
+    /**
+     * 直播状态
+     */
+    get liveStreamingState(): FcrLiveStreamingState;
+    /**
+     * 直播配置
+     */
+    get liveStreamingConfig(): FcrLiveStreamingConfig | undefined;
+    /**
+     * 云录制状态
+     */
+    get cloudRecordingState(): FcrRecordingState;
+    /**
+     * 启动直播
+     */
+    startLiveStreaming(params: FcrLiveStreamingConfig): Promise<void>;
+    /**
+     * 停止直播
+     */
+    stopLiveStreaming(): Promise<void>;
+    /**
+     * 退出房间
+     */
+    exitRoom(): void;
+    /**
+     * 开启云录制
+     */
+    startCloudRecording(): Promise<void>;
+    /**
+     * 暂停云录制
+     */
+    pauseCloudRecording(): Promise<void>;
+    /**
+     * 恢复云录制
+     */
+    resumeCloudRecording(): Promise<void>;
+    /**
+     * 停止云录制
+     */
+    stopCloudRecording(): Promise<void>;
     addObserver(observer: FcrUIRoomObserver): void;
     removeObserver(observer: FcrUIRoomObserver): void;
 }
@@ -29,6 +105,7 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     private _eventProvider;
     private _sceneConfig;
     private _engine;
+    private _messageProvider;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _mainRoomControl?;
@@ -37,17 +114,31 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     private _mainRoomUserObserver;
     private _waitingRoomUserObserver;
     private _waitingRoomObserver;
-    constructor(_eventProvider: FcrUIEventProvider, _sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine);
+    private _currentRoomControl?;
+    accessor liveStreamingState: FcrLiveStreamingState;
+    accessor liveStreamingConfig: FcrLiveStreamingConfig | undefined;
+    accessor cloudRecordingState: FcrRecordingState;
+    constructor(_eventProvider: FcrUIEventProvider, _sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _messageProvider: FcrUIMessageProvider);
     get waitingRoomControl(): FcrWaitingRoomControl | undefined;
     get mainRoomControl(): FcrMainRoomControl | undefined;
+    get currentRoomControl(): FcrBaseRoomControl | undefined;
     release(): void;
+    leaveWaitingRoom(): void;
     handleJoinRoom(roomId: string): Promise<readonly [FcrRoomType.Mainroom, FcrMainRoomControl] | readonly [FcrRoomType.Waitingroom, FcrWaitingRoomControl]>;
-    handleJoinMainRoom(roomId: string, ticket: string): Promise<FcrMainRoomControl>;
+    handleJoinMainRoom(roomId: string, ticket: string): Promise<FcrMainRoomControl | undefined>;
+    startLiveStreaming(params: FcrLiveStreamingConfig): Promise<void>;
+    stopLiveStreaming(): Promise<void>;
+    exitRoom(): void;
+    startCloudRecording(): Promise<void>;
+    pauseCloudRecording(): Promise<void>;
+    resumeCloudRecording(): Promise<void>;
+    stopCloudRecording(): Promise<void>;
     addObserver(observer: FcrUIRoomObserver): void;
     removeObserver(observer: FcrUIRoomObserver): void;
     private _judgeWaitingRoomPremissionAndCreateRoomControl;
-    private _destroyWaitingRoom;
     private _getJoinRoomOption;
+    private _initMainRoomState;
+    private _initWaitingRoomState;
 }
 export declare class FcrUIConnectionProviderImpl implements FcrUIConnectionProvider {
     private _engine;
@@ -57,16 +148,32 @@ export declare class FcrUIConnectionProviderImpl implements FcrUIConnectionProvi
 }
 export declare class FcrUIMainRoomControlProviderImpl implements FcrUIMainRoomControlProvider {
     private _mainRoomControl;
+    private _sharedInterpreterDataSource;
     private _privilegeProvider;
-    constructor(_mainRoomControl: FcrMainRoomControl, eventProvider: FcrUIEventProvider);
+    private _privilegeControl;
+    private _userControl;
+    private _privilegeObserver;
+    private _eventObserver;
+    private _userObserver;
+    private _messageProvider;
+    private _dialogProvider;
+    private _eventProvider;
+    private _prevWaterMarkEnable;
+    private _userMap;
+    accessor privilegeOperator: FcrUserInfo | undefined;
+    accessor boardOwnerUser: FcrUserInfo | undefined;
+    constructor(_mainRoomControl: FcrMainRoomControl, eventProvider: FcrUIEventProvider, messageProvider: FcrUIMessageProvider, dialogProvider: FcrUIDialogProvider, _sharedInterpreterDataSource: FcrUISharedInterpreterDataSource);
     get mainRoomControl(): FcrMainRoomControl;
     get privilegeProvider(): FcrUIPrivilegeProviderImpl;
+    private get _localUser();
     release(): void;
+    private _handleSecurityUpdated;
+    private _handleUserRoleChangeToast;
 }
 export declare class FcrUIWaitingRoomControlProviderImpl implements FcrUIWaitingRoomControlProvider {
     private _waitingRoomControl?;
     private _privilegeProvider?;
-    constructor(roomProvider: FcrUIRoomProvider, eventProvider: FcrUIEventProvider);
+    constructor(roomProvider: FcrUIRoomProvider);
     get waitingRoomControl(): FcrWaitingRoomControl | undefined;
     get privilegeProvider(): FcrUIPrivilegeProviderImpl | undefined;
     private _setWaitingRoomControl;