fcr-ui-scene 3.7.4 → 3.7.5

package/lib/providers/renderer-provider.js

@@ -13,6 +13,7 @@ require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -20,7 +21,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUIRemoteVideoRenderProviderImpl = exports.FcrUILocalVideoRenderProviderImpl = void 0;
+exports.FcrUIWaitLocalVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIMainLocalVideoRenderProviderImpl = 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");
@@ -49,17 +50,23 @@ require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 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 _fcrCore = require("fcr-core");
 var _mobx = require("mobx");
 var _mobxUtils = require("mobx-utils");
-var _base = require("../base");
 var _logger = require("../utilities/logger");
 var _decorator = require("agora-foundation/lib/decorator");
-var _FcrUIRemoteVideoRenderProviderImpl, _FcrUILocalVideoRenderProviderImpl;
-var _initProto, _init__firstFrameState, _startRenderRemoteVideoDecs, _stopRenderRemoteVideoDecs, _ref, _initProto2, _startCameraPreviewDecs, _stopCameraPreviewDecs, _startScreenPreviewDecs, _stopScreenPreviewDecs, _ref2;
+var _FcrUIRemoteVideoRenderProviderImpl, _FcrUILocalVideoRenderProviderBase, _FcrUIWaitLocalVideoRenderProviderImpl, _FcrUIMainLocalVideoRenderProviderImpl;
+var _initProto, _init__firstFrameState, _startRenderRemoteVideoDecs, _stopRenderRemoteVideoDecs, _ref, _initProto2, _startCameraPreviewDecs, _stopCameraPreviewDecs, _ref2, _initProto3, _startScreenPreviewDecs, _stopScreenPreviewDecs, _ref3, _initProto4, _startScreenPreviewDecs2, _stopScreenPreviewDecs2, _ref4;
+function _superPropGet(t, o, e, r) { var p = (0, _get2["default"])((0, _getPrototypeOf2["default"])(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
+function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -149,18 +156,17 @@ _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], "logger");
-var FcrUILocalVideoRenderProviderImpl = exports.FcrUILocalVideoRenderProviderImpl = /*#__PURE__*/function () {
-  function FcrUILocalVideoRenderProviderImpl(_deviceProvider, _screenShareDataSource) {
+_ref2 = (_startCameraPreviewDecs = [_mobx.action, _mobx.action.bound], _stopCameraPreviewDecs = [_mobx.action, _mobx.action.bound], "logger");
+var FcrUILocalVideoRenderProviderBase = /*#__PURE__*/function () {
+  function FcrUILocalVideoRenderProviderBase(_deviceProvider) {
     var _this2 = this;
-    (0, _classCallCheck2["default"])(this, FcrUILocalVideoRenderProviderImpl);
+    (0, _classCallCheck2["default"])(this, FcrUILocalVideoRenderProviderBase);
     (0, _defineProperty2["default"])(this, _ref2, (_initProto2(this), (0, _logger.createLogger)({
       prefix: 'FcrUILocalVideoRenderProviderImpl'
     })));
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_viewsAndConfigs", new Map());
     this._deviceProvider = _deviceProvider;
-    this._screenShareDataSource = _screenShareDataSource;
     this._deviceObserver = {
       onCameraChanged: function onCameraChanged() {
         if (_this2._deviceProvider.cameraEnabled) {
@@ -178,7 +184,7 @@ var FcrUILocalVideoRenderProviderImpl = exports.FcrUILocalVideoRenderProviderImp
     };
     this._deviceProvider.addObserver(this._deviceObserver);
   }
-  return (0, _createClass2["default"])(FcrUILocalVideoRenderProviderImpl, [{
+  return (0, _createClass2["default"])(FcrUILocalVideoRenderProviderBase, [{
     key: "cameraEnabled",
     get: function get() {
       return this._deviceProvider.cameraEnabled;
@@ -188,11 +194,6 @@ var FcrUILocalVideoRenderProviderImpl = exports.FcrUILocalVideoRenderProviderImp
     get: function get() {
       return this._deviceProvider.cameraId;
     }
-  }, {
-    key: "currentMirror",
-    get: function get() {
-      return this._deviceProvider.currentIsMirror;
-    }
   }, {
     key: "startCameraPreview",
     value: function startCameraPreview(el, config) {
@@ -216,37 +217,96 @@ var FcrUILocalVideoRenderProviderImpl = exports.FcrUILocalVideoRenderProviderImp
       this.logger.info('current count of render views: ', this._viewsAndConfigs.size);
     }
   }, {
+    key: "release",
+    value: function release() {
+      this._deviceProvider.removeObserver(this._deviceObserver);
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this._disposers = [];
+    }
+  }]);
+}();
+_FcrUILocalVideoRenderProviderBase = FcrUILocalVideoRenderProviderBase;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUILocalVideoRenderProviderBase, [[_startCameraPreviewDecs, 18, "startCameraPreview"], [_stopCameraPreviewDecs, 18, "stopCameraPreview"]], []).e, 1);
+_initProto2 = _applyDecs$e2[0];
+_ref3 = (_startScreenPreviewDecs = [_mobx.action, _mobx.action.bound], _stopScreenPreviewDecs = [_mobx.action, _mobx.action.bound], "startScreenPreview");
+var FcrUIWaitLocalVideoRenderProviderImpl = exports.FcrUIWaitLocalVideoRenderProviderImpl = /*#__PURE__*/function (_FcrUILocalVideoRende) {
+  function FcrUIWaitLocalVideoRenderProviderImpl(deviceProvider) {
+    var _this3;
+    (0, _classCallCheck2["default"])(this, FcrUIWaitLocalVideoRenderProviderImpl);
+    _initProto3(_this3 = _callSuper(this, FcrUIWaitLocalVideoRenderProviderImpl, [deviceProvider]));
+    return _this3;
+  }
+  (0, _inherits2["default"])(FcrUIWaitLocalVideoRenderProviderImpl, _FcrUILocalVideoRende);
+  return (0, _createClass2["default"])(FcrUIWaitLocalVideoRenderProviderImpl, [{
+    key: _ref3,
+    value: function value(el) {
+      this.logger.error('startScreenPreview: not support screen preview in wait room environment');
+    }
+  }, {
+    key: "stopScreenPreview",
+    value: function stopScreenPreview(el) {
+      this.logger.error('stopScreenPreview: not support screen preview in wait room environment');
+    }
+  }]);
+}(FcrUILocalVideoRenderProviderBase);
+_FcrUIWaitLocalVideoRenderProviderImpl = FcrUIWaitLocalVideoRenderProviderImpl;
+var _applyDecs$e3 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIWaitLocalVideoRenderProviderImpl, [[_startScreenPreviewDecs, 18, "startScreenPreview"], [_stopScreenPreviewDecs, 18, "stopScreenPreview"]], [], 0, void 0, FcrUILocalVideoRenderProviderBase).e, 1);
+_initProto3 = _applyDecs$e3[0];
+_ref4 = (_startScreenPreviewDecs2 = [_mobx.action, _mobx.action.bound], _stopScreenPreviewDecs2 = [_mobx.action, _mobx.action.bound], "_screenTrack");
+var FcrUIMainLocalVideoRenderProviderImpl = exports.FcrUIMainLocalVideoRenderProviderImpl = /*#__PURE__*/function (_FcrUILocalVideoRende2) {
+  function FcrUIMainLocalVideoRenderProviderImpl(deviceProvider, _screenShareProvider) {
+    var _this4;
+    (0, _classCallCheck2["default"])(this, FcrUIMainLocalVideoRenderProviderImpl);
+    _this4 = _callSuper(this, FcrUIMainLocalVideoRenderProviderImpl, [deviceProvider]);
+    (0, _defineProperty2["default"])(_this4, _ref4, (_initProto4(_this4), null));
+    (0, _defineProperty2["default"])(_this4, "_screenShareObserver", {
+      onScreenShareStarted: function onScreenShareStarted(screenTrack) {
+        _this4._screenTrack = screenTrack;
+      },
+      onShareSourceReplaced: function onShareSourceReplaced(screenTrack) {
+        _this4._screenTrack = screenTrack;
+      },
+      onScreenShareStopped: function onScreenShareStopped() {
+        _this4._screenTrack = null;
+      }
+    });
+    _this4._screenShareProvider = _screenShareProvider;
+    _this4._screenShareProvider.addObserver(_this4._screenShareObserver);
+    return _this4;
+  }
+  (0, _inherits2["default"])(FcrUIMainLocalVideoRenderProviderImpl, _FcrUILocalVideoRende2);
+  return (0, _createClass2["default"])(FcrUIMainLocalVideoRenderProviderImpl, [{
     key: "startScreenPreview",
     value: function startScreenPreview(el, config) {
-      if (this._screenShareDataSource.screenTrack) {
+      if (this._screenTrack) {
         var _config$isMirror3, _config$renderMode3;
-        this._screenShareDataSource.screenTrack.startPreview({
+        this._screenTrack.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);
+      } else {
+        this.logger.warn('startScreenPreview: screenTrack is null, can not start preview');
       }
     }
   }, {
     key: "stopScreenPreview",
     value: function stopScreenPreview(el) {
-      if (this._screenShareDataSource.screenTrack) {
-        this._viewsAndConfigs["delete"](el);
-        this._screenShareDataSource.screenTrack.stopPreview(el);
+      if (this._screenTrack) {
+        this._screenTrack.stopPreview(el);
       }
     }
   }, {
     key: "release",
     value: function release() {
-      this._deviceProvider.removeObserver(this._deviceObserver);
-      this._disposers.forEach(function (disposer) {
-        return disposer();
-      });
-      this._disposers = [];
+      _superPropGet(FcrUIMainLocalVideoRenderProviderImpl, "release", this, 3)([]);
+      this._screenShareProvider.removeObserver(this._screenShareObserver);
     }
   }]);
-}();
-_FcrUILocalVideoRenderProviderImpl = FcrUILocalVideoRenderProviderImpl;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUILocalVideoRenderProviderImpl, [[_startCameraPreviewDecs, 18, "startCameraPreview"], [_stopCameraPreviewDecs, 18, "stopCameraPreview"], [_startScreenPreviewDecs, 18, "startScreenPreview"], [_stopScreenPreviewDecs, 18, "stopScreenPreview"]], []).e, 1);
-_initProto2 = _applyDecs$e2[0];
-(0, _base.registerDependency)('remoteVideoRenderProvider');
-(0, _base.registerDependency)('localVideoRenderProvider');
+}(FcrUILocalVideoRenderProviderBase);
+_FcrUIMainLocalVideoRenderProviderImpl = FcrUIMainLocalVideoRenderProviderImpl;
+var _applyDecs$e4 = _applyDecs(_FcrUIMainLocalVideoRenderProviderImpl, [[_startScreenPreviewDecs2, 18, "startScreenPreview"], [_stopScreenPreviewDecs2, 18, "stopScreenPreview"]], [], 0, void 0, FcrUILocalVideoRenderProviderBase).e;
+var _applyDecs$e5 = (0, _slicedToArray2["default"])(_applyDecs$e4, 1);
+_initProto4 = _applyDecs$e5[0];
+_applyDecs$e4;

package/lib/providers/{room-provider.d.ts → room-provider/room-provider.d.ts}

@@ -1,13 +1,14 @@
 import { FcrCoreEngine } from 'fcr-core';
 import { FcrBaseRoomControl, FcrMainRoomControl, FcrRoomType, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/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';
-import FcrUIWaitingRoomControlManager from '../waiting-room-control-manager';
+import { FcrUIConnectionObserver, FcrUIExitReason, FcrUIRoomObserver, FcrUISceneConfig } from '../../type';
+import { FcrUIMessageProvider } from '../message/type';
+import { FcrUISharedInterpreterDataSource } from '../../shared-data/interpreter';
+import { FcrUIManagedObject } from '../../object-manager';
+import FcrUIWaitingRoomControlManager from './waiting-room-control-manager';
+import { FcrUIDialogProvider } from '../dialog/type';
+import { FcrUIEventProvider } from '../event-provider';
+import { FcrUIPrivilegeProvider, FcrUIPrivilegeProviderImpl } from '../privilege-provider';
 export interface FcrUIMainRoomControlProvider {
     /**
      * 主房间 privilegeProvider
@@ -46,7 +47,7 @@ export interface FcrUIRoomProvider {
     /**
      * 当前房间
      */
-    get currentRoomControl(): FcrBaseRoomControl | undefined;
+    get currentRoomControl(): FcrBaseRoomControl;
     /**
      * 直播状态
      */
@@ -67,35 +68,10 @@ export interface FcrUIRoomProvider {
      * 设置是不是自己结束会议的
      */
     setIsSelfEndMeeting(isSelfEndMeeting: boolean): void;
-    getRoomDetailCopyText(): string;
-    /**
-     * 启动直播
-     */
-    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;
 }
@@ -113,9 +89,6 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     private _waitingRoomManager?;
     private _lastRoomControlType?;
     private _isSelfJoinRoom;
-    private _roomInfo?;
-    private _roomSchedule?;
-    private _localUserInfo?;
     private _waitingRoomManagerObserver;
     private _baseRoomControlObserver;
     private _userControlObserver;
@@ -127,7 +100,6 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     accessor liveStreamingConfig: FcrLiveStreamingConfig | undefined;
     accessor cloudRecordingState: FcrRecordingState;
     constructor(_eventProvider: FcrUIEventProvider, _sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _messageProvider: FcrUIMessageProvider);
-    getRoomDetailCopyText(): string;
     get currentRoomControl(): FcrBaseRoomControl;
     get waitingRoomManager(): FcrUIWaitingRoomControlManager;
     setIsSelfEndMeeting(isSelfEndMeeting: boolean): void;
@@ -135,25 +107,20 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     release(): void;
     private _releaseWaitingRoomManager;
     handleJoinRoom(): Promise<void>;
-    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 _getJoinRoomOption;
     private _initBaseRoomState;
 }
-export declare class FcrUIConnectionProviderImpl implements FcrUIConnectionProvider {
+export declare class FcrUIConnectionProviderImpl implements FcrUIConnectionProvider, FcrUIManagedObject {
     private _engine;
     constructor(_engine: FcrCoreEngine);
     addObserver(observer: FcrUIConnectionObserver): void;
     removeObserver(observer: FcrUIConnectionObserver): void;
+    release(): void;
 }
-export declare class FcrUIMainRoomControlProviderImpl implements FcrUIMainRoomControlProvider {
+export declare class FcrUIMainRoomControlProviderImpl implements FcrUIMainRoomControlProvider, FcrUIManagedObject {
     private _mainRoomControl;
     private _sharedInterpreterDataSource;
     private _privilegeProvider;
@@ -177,18 +144,22 @@ export declare class FcrUIMainRoomControlProviderImpl implements FcrUIMainRoomCo
     private _handleSecurityUpdated;
     private _handleUserRoleChangeToast;
 }
-export declare class FcrUIWaitingRoomControlProviderImpl implements FcrUIWaitingRoomControlProvider {
+export declare class FcrUIWaitingRoomControlProviderImpl implements FcrUIWaitingRoomControlProvider, FcrUIManagedObject {
     private _waitingRoomControl?;
     private _privilegeProvider?;
+    private _roomProvider;
     private _eventProvider?;
+    private _roomObserver;
     constructor(roomProvider: FcrUIRoomProvider, eventProvider: FcrUIEventProvider);
     get waitingRoomControl(): FcrWaitingRoomControl | undefined;
     get privilegeProvider(): FcrUIPrivilegeProviderImpl | undefined;
+    release(): void;
     private _setWaitingRoomControl;
 }
-export declare class FcrUICurrentRoomControlProviderImpl implements FcrUICurrentRoomControlProvider {
+export declare class FcrUICurrentRoomControlProviderImpl implements FcrUICurrentRoomControlProvider, FcrUIManagedObject {
     private _currentRoomControl;
     constructor(_currentRoomControl: FcrBaseRoomControl);
     get currentRoomControl(): FcrBaseRoomControl;
     get currentRoomType(): FcrRoomType;
+    release(): void;
 }