fcr-ui-scene 3.6.1 → 3.6.3

package/lib/scenes/waiting-scene.js

@@ -15,6 +15,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _waitingRoomLayout = require("../modules/waiting-room-layout");
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _actionBar = require("../modules/action-bar");
@@ -42,6 +43,7 @@ var _memberData = require("../shared-data-source/member-data");
 var _waitingRoom = require("../shared-data-source/waiting-room");
 var _abilityProvider = require("../providers/ability-provider");
 var _screenShareProvider = require("../providers/screen-share-provider");
+var _sharingProvider = require("../providers/sharing-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 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; })(); }
@@ -54,6 +56,7 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     var _this;
     (0, _classCallCheck2["default"])(this, FcrWaitingUIScene);
     _this = _callSuper(this, FcrWaitingUIScene);
+    (0, _defineProperty2["default"])(_this, "_dom", null);
     var eventProvider = args.eventProvider,
       sharedConfigDataSource = args.sharedConfigDataSource,
       deviceProvider = args.deviceProvider,
@@ -64,18 +67,17 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
       sharedSettingDataSource = args.sharedSettingDataSource,
       sharedDevicePrivilegeDataSource = args.sharedDevicePrivilegeDataSource,
       engine = args.engine,
-      widgetProvider = args.widgetProvider;
+      widgetProvider = args.widgetProvider,
+      sharedScreenShareSharedDataSource = args.sharedScreenShareSharedDataSource;
     var waitingRoomControl = roomProvider.currentRoomControl;
     var privilegeControl = waitingRoomControl.getPrivilegeControl();
     var streamControl = waitingRoomControl.getStreamControl();
     var userControl = waitingRoomControl.getUserControl();
-    var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, dialogProvider, roomProvider);
-    var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, screenShareProvider);
     var devicePrivilegeProvider = new _devicePrivilegeProvider.FcrUIDevicePrivilegeProviderImpl(privilegeControl, streamControl, userControl, deviceProvider, messageProvider);
     var sharedWaitingRoomDataSource = new _waitingRoom.FcrUISharedWaitingRoomDataSourceImpl(roomProvider, eventProvider);
     var localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
     var localVideoRenderProvider = new _rendererProvider.FcrUILocalVideoRenderProviderImpl(deviceProvider);
-    var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider);
+    var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider);
     var abilityControl = waitingRoomControl.getAbilityControl();
     var abilityProvider = new _abilityProvider.FcrUIAbilityProviderImpl(abilityControl);
     var currentRoomControlProvider = new _roomProvider.FcrUICurrentRoomControlProviderImpl(waitingRoomControl);
@@ -89,7 +91,11 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     var monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(engine.getMonitorControl());
     var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(waitingRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource);
     var sharedChatDataSource = new _chatData.FcrUISharedChatDataSourceImpl(chatProvider);
+    var sharingControl = waitingRoomControl.getSharingControl();
+    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource);
     var sharedInterpreterDataSource = new _interpreter.FcrUISharedInterpreterDataSourceImpl();
+    var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource);
+    var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource);
     _this.eventProvider = eventProvider;
     _this.devicePrivilegeProvider = devicePrivilegeProvider;
     _this.sharedSettingDataSource = sharedSettingDataSource;
@@ -112,6 +118,8 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     _this.sharedChatDataSource = sharedChatDataSource;
     _this.deviceStreamProvider = deviceStreamProvider;
     _this.sharedMemberDataSource = sharedMemberDataSource;
+    _this.sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
+    _this.screenShareProvider = screenShareProvider;
     _this.widgetProvider = widgetProvider;
     _this.sharedWaitingRoomDataSource = sharedWaitingRoomDataSource;
     _this.abilityProvider = abilityProvider;
@@ -165,7 +173,7 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
           actionBar: actionBarUIModule.getComponent(),
           layers: _this2.renderLayers([dialogModule.getComponent()]),
           globalToast: eventToastUIModule.getComponent('global'),
-          confirm: eventConfirmUIModule.getComponent()
+          confirm: eventConfirmUIModule.getComponent('waitingroom')
         });
         return _this2.renderWithErrorBoundary(/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           style: {
@@ -176,6 +184,7 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
           children: layoutComponent
         }), 'waitingroom');
       };
+      this._dom = dom;
       _reactDom["default"].render(getView(), dom);
     }
   }, {
@@ -195,6 +204,7 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
       this.remoteVideoRenderProvider.release();
       this.devicePrivilegeProvider.release();
       this.sharedInterpreterDataSource.release();
+      this._dom && this.unmount(this._dom);
     }
   }, {
     key: "_runSettingConfig",

package/lib/shared-data-source/config.d.ts

@@ -1,4 +1,3 @@
-import { FcrUILocalStorageProvider } from '../providers/local-storage-provider';
 import { FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISettingConfig } from '../type';
 export interface FcrUISharedConfigDataSource {
     get settingConfig(): FcrUISettingConfig;
@@ -6,15 +5,12 @@ export interface FcrUISharedConfigDataSource {
     get sceneConfig(): FcrUISceneConfig;
 }
 export declare class FcrUISharedConfigDataSourceImpl implements FcrUISharedConfigDataSource {
-    private _localStorageProvider;
     settingConfig: FcrUISettingConfig;
     creatorConfig: FcrUISceneCreatorConfig;
     sceneConfig: FcrUISceneConfig;
-    constructor({ settingConfig, creatorConfig, sceneConfig, localStorageProvider, }: {
+    constructor({ settingConfig, creatorConfig, sceneConfig, }: {
         settingConfig: FcrUISettingConfig;
         creatorConfig: FcrUISceneCreatorConfig;
         sceneConfig?: FcrUISceneConfig;
-        localStorageProvider: FcrUILocalStorageProvider;
     });
-    private _initConfig;
 }

package/lib/shared-data-source/config.js

@@ -1,92 +1,22 @@
 "use strict";
 
-require("core-js/modules/es.symbol.js");
-require("core-js/modules/es.symbol.description.js");
-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.iterator.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");
-require("core-js/modules/es.map.js");
-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.object.to-string.js");
-require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.map.delete-all.js");
-require("core-js/modules/esnext.map.emplace.js");
-require("core-js/modules/esnext.map.every.js");
-require("core-js/modules/esnext.map.filter.js");
-require("core-js/modules/esnext.map.find.js");
-require("core-js/modules/esnext.map.find-key.js");
-require("core-js/modules/esnext.map.includes.js");
-require("core-js/modules/esnext.map.key-of.js");
-require("core-js/modules/esnext.map.map-keys.js");
-require("core-js/modules/esnext.map.map-values.js");
-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.symbol.metadata.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUISharedConfigDataSourceImpl = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _mobx = require("mobx");
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _base = require("../base");
-var _store = require("../modules/setting/store");
-var _FcrUISharedConfigDataSourceImpl;
-var _initProto, _initConfigDecs, _ref;
-function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
-function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
-_ref = (_initConfigDecs = [_mobx.action, _mobx.action.bound], "_localStorageProvider");
-var FcrUISharedConfigDataSourceImpl = exports.FcrUISharedConfigDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUISharedConfigDataSourceImpl(_ref2) {
-    var settingConfig = _ref2.settingConfig,
-      creatorConfig = _ref2.creatorConfig,
-      _ref2$sceneConfig = _ref2.sceneConfig,
-      sceneConfig = _ref2$sceneConfig === void 0 ? {} : _ref2$sceneConfig,
-      localStorageProvider = _ref2.localStorageProvider;
-    (0, _classCallCheck2["default"])(this, FcrUISharedConfigDataSourceImpl);
-    (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
-    this.settingConfig = settingConfig;
-    this.creatorConfig = creatorConfig;
-    this.sceneConfig = sceneConfig;
-    this._localStorageProvider = localStorageProvider;
-    this._initConfig();
-  }
-  return (0, _createClass2["default"])(FcrUISharedConfigDataSourceImpl, [{
-    key: "_initConfig",
-    value: function _initConfig() {
-      var localSetting = this._localStorageProvider.read(_store.SETTING_KEY);
-      if (localSetting) {
-        var _localSetting$cameraE, _localSetting$microph, _localSetting$autoCon;
-        this.settingConfig.media = {
-          cameraExpectedOff: (_localSetting$cameraE = localSetting.cameraExpectedOff) !== null && _localSetting$cameraE !== void 0 ? _localSetting$cameraE : this.settingConfig.media.cameraExpectedOff,
-          microphoneExpectedOff: (_localSetting$microph = localSetting.microphoneExpectedOff) !== null && _localSetting$microph !== void 0 ? _localSetting$microph : this.settingConfig.media.microphoneExpectedOff,
-          autoConnectAudio: (_localSetting$autoCon = localSetting.autoConnectAudio) !== null && _localSetting$autoCon !== void 0 ? _localSetting$autoCon : this.settingConfig.media.autoConnectAudio
-        };
-      }
-    }
-  }]);
-}();
-_FcrUISharedConfigDataSourceImpl = FcrUISharedConfigDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedConfigDataSourceImpl, [[_initConfigDecs, 18, "_initConfig"]], []).e, 1);
-_initProto = _applyDecs$e[0];
+var FcrUISharedConfigDataSourceImpl = exports.FcrUISharedConfigDataSourceImpl = /*#__PURE__*/(0, _createClass2["default"])(function FcrUISharedConfigDataSourceImpl(_ref) {
+  var settingConfig = _ref.settingConfig,
+    creatorConfig = _ref.creatorConfig,
+    _ref$sceneConfig = _ref.sceneConfig,
+    sceneConfig = _ref$sceneConfig === void 0 ? {} : _ref$sceneConfig;
+  (0, _classCallCheck2["default"])(this, FcrUISharedConfigDataSourceImpl);
+  this.settingConfig = settingConfig;
+  this.creatorConfig = creatorConfig;
+  this.sceneConfig = sceneConfig;
+});
 (0, _base.registerDependency)('sharedConfigDataSource');

package/lib/shared-data-source/member-data.d.ts

@@ -1,10 +1,11 @@
 import { FcrUIMemberDataImpl } from '../modules/participant/member-list-data-source';
 import { FcrStreamControl, FcrUserRole } from 'fcr-core';
 import { FcrUserControl } from 'fcr-core/lib/room-control/user-control/type';
+import { FcrRemoteVideoStats } from 'fcr-core/lib/room-control/stream-control/type';
 import { FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
-import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control/types';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIScreenShareProvider } from '../providers/screen-share-provider';
+import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrUIScreenShareSharedDataSource } from './screen-share-data';
 export interface FcrUIMemberSharedDataSource {
     /**
      * 整个房间的人数。
@@ -62,6 +63,16 @@ export interface FcrUIMemberSharedDataSource {
      * @returns 音频音量映射，类型为 Map<string, number>。
      */
     get audioVolumeMap(): Map<string, number>;
+    /**
+     * 获取共享屏幕视频的宽高比。
+     * @returns 共享屏幕视频的宽高比，类型为 number。
+     */
+    get shareScreenVideoRatio(): number;
+    /**
+     * 获取共享屏幕视频的宽高。
+     * @returns 共享屏幕视频的宽高，类型为 FcrRemoteVideoStats['dimensions'] | null。
+     */
+    get shareScreenVideoSize(): FcrRemoteVideoStats['dimensions'] | null;
     /**
      * 根据白板状态更新主房间参与者列表。
      * 此方法用于同步参与者列表与白板状态。
@@ -76,7 +87,7 @@ export interface FcrUIMemberSharedDataSource {
 export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberSharedDataSource {
     private _mainRoomUserControl;
     private _streamControl;
-    private _screenShareProvider;
+    private _sharedScreenShareSharedDataSource;
     private _whiteBoardControl?;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _dataSource;
@@ -88,8 +99,12 @@ export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberShare
     private accessor _localUser;
     private _userObserver;
     private _streamsObserver;
+    private accessor serverPushTotalUserCount;
+    private accessor _shareScreenVideoRatio;
     accessor totalUserCount: number;
-    private get localUserId();
+    accessor shareScreenVideoSize: FcrRemoteVideoStats['dimensions'] | null;
+    get localUserId(): string;
+    get shareScreenVideoRatio(): number;
     get hasOwnPstnStream(): boolean;
     get interpreterInputLanguageList(): {
         userId: string;
@@ -104,7 +119,7 @@ export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberShare
     get remoteMembersUserInfosList(): FcrUserInfo[];
     get memberList(): FcrUIMemberDataImpl[];
     get memberUserInfoList(): FcrUserInfo[];
-    constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _screenShareProvider: FcrUIScreenShareProvider, _whiteBoardControl?: FcrWhiteboardControl | undefined);
+    constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _whiteBoardControl?: FcrWhiteboardControl | undefined);
     updateMemberListWithBoardState(): void;
     release(): void;
     private _setIsLocalUserInPstn;
@@ -115,6 +130,7 @@ export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberShare
     private _syncParticipants;
     private _onAudioVolumeUpdated;
     private _handleRemoteUserJoined;
+    private _handleRemoteVideoStatsUpdated;
     private _handleRemoteUserLeft;
     private _handleStreamsAdded;
     private _handleStreamsUpdated;

package/lib/shared-data-source/member-data.js

@@ -103,7 +103,7 @@ var _type = require("fcr-core/lib/type");
 var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("../utilities/logger");
 var _FcrUIMemberSharedDataSourceImpl;
-var _initProto, _init__serverPushTotalUserCount, _init__audioVolumeMap, _init__isLocalUserInPstn, _init__interpreterInputLanguageList, _init__localUser, _init_totalUserCount, _updateMemberListWithBoardStateDecs, _setIsLocalUserInPstnDecs, _handleAllUserCountUpdatedDecs, _setTotalUserCountDecs, _handleUserInfoUpdatedDecs, _syncParticipantsDecs, _onAudioVolumeUpdatedDecs, _handleRemoteUserJoinedDecs, _handleRemoteUserLeftDecs, _handleStreamsAddedDecs, _handleStreamsUpdatedDecs, _handleStreamsRemovedDecs, _ref;
+var _initProto, _init__serverPushTotalUserCount, _init__audioVolumeMap, _init__isLocalUserInPstn, _init__interpreterInputLanguageList, _init__localUser, _init_serverPushTotalUserCount, _init__shareScreenVideoRatio, _init_totalUserCount, _init_shareScreenVideoSize, _updateMemberListWithBoardStateDecs, _setIsLocalUserInPstnDecs, _handleAllUserCountUpdatedDecs, _setTotalUserCountDecs, _handleUserInfoUpdatedDecs, _syncParticipantsDecs, _onAudioVolumeUpdatedDecs, _handleRemoteUserJoinedDecs, _handleRemoteVideoStatsUpdatedDecs, _handleRemoteUserLeftDecs, _handleStreamsAddedDecs, _handleStreamsUpdatedDecs, _handleStreamsRemovedDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -122,9 +122,12 @@ var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
-_ref = (_updateMemberListWithBoardStateDecs = [_mobx.action, _mobx.action.bound], _setIsLocalUserInPstnDecs = [_mobx.action, _mobx.action.bound], _handleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], _setTotalUserCountDecs = [_mobx.action, _mobx.action.bound], _handleUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _syncParticipantsDecs = (0, _decorator.debounced)(800), _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUserJoinedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUserLeftDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsRemovedDecs = [_mobx.action, _mobx.action.bound], "logger");
+var _G = /*#__PURE__*/new WeakMap();
+var _H = /*#__PURE__*/new WeakMap();
+var _I = /*#__PURE__*/new WeakMap();
+_ref = (_updateMemberListWithBoardStateDecs = [_mobx.action, _mobx.action.bound], _setIsLocalUserInPstnDecs = [_mobx.action, _mobx.action.bound], _handleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], _setTotalUserCountDecs = [_mobx.action, _mobx.action.bound], _handleUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _syncParticipantsDecs = (0, _decorator.debounced)(800), _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUserJoinedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteVideoStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUserLeftDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsRemovedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUIMemberSharedDataSourceImpl(_mainRoomUserControl, _streamControl, _screenShareProvider, _whiteBoardControl) {
+  function FcrUIMemberSharedDataSourceImpl(_mainRoomUserControl, _streamControl, _sharedScreenShareSharedDataSource, _whiteBoardControl) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUIMemberSharedDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
@@ -147,12 +150,16 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
       onStreamsAdded: this._handleStreamsAdded,
       onStreamsUpdated: this._handleStreamsUpdated,
       onStreamVolumeIndicationUpdated: this._onAudioVolumeUpdated,
-      onStreamsRemoved: this._handleStreamsRemoved
+      onStreamsRemoved: this._handleStreamsRemoved,
+      onRemoteVideoStatsUpdated: this._handleRemoteVideoStatsUpdated
     });
-    _classPrivateFieldInitSpec(this, _F, _init_totalUserCount(this, 1));
+    _classPrivateFieldInitSpec(this, _F, _init_serverPushTotalUserCount(this, 1));
+    _classPrivateFieldInitSpec(this, _G, _init__shareScreenVideoRatio(this, 0));
+    _classPrivateFieldInitSpec(this, _H, _init_totalUserCount(this, 1));
+    _classPrivateFieldInitSpec(this, _I, _init_shareScreenVideoSize(this, null));
     this._mainRoomUserControl = _mainRoomUserControl;
     this._streamControl = _streamControl;
-    this._screenShareProvider = _screenShareProvider;
+    this._sharedScreenShareSharedDataSource = _sharedScreenShareSharedDataSource;
     this._whiteBoardControl = _whiteBoardControl;
     this._mainRoomUserControl.addObserver(this._userObserver);
     this._streamControl.addObserver(this._streamsObserver);
@@ -208,17 +215,46 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "totalUserCount",
+    key: "serverPushTotalUserCount",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_F, this, v);
     }
+  }, {
+    key: "_shareScreenVideoRatio",
+    get: function get() {
+      return _classPrivateFieldGet(_G, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_G, this, v);
+    }
+  }, {
+    key: "totalUserCount",
+    get: function get() {
+      return _classPrivateFieldGet(_H, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_H, this, v);
+    }
+  }, {
+    key: "shareScreenVideoSize",
+    get: function get() {
+      return _classPrivateFieldGet(_I, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_I, this, v);
+    }
   }, {
     key: "localUserId",
     get: function get() {
-      return this.localUser.userId;
+      return this._localUser.userId;
+    }
+  }, {
+    key: "shareScreenVideoRatio",
+    get: function get() {
+      return this._shareScreenVideoRatio;
     }
   }, {
     key: "hasOwnPstnStream",
@@ -289,9 +325,8 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
       var _this3 = this;
       (0, _mobx.runInAction)(function () {
         if (_this3._whiteBoardControl) {
-          var boardInfo = _this3._whiteBoardControl.getBoardActiveInfo();
-          var isActive = boardInfo.isActive,
-            ownerUserId = boardInfo.ownerUserId;
+          var isActive = _this3._whiteBoardControl.getActivity();
+          var ownerUserId = _this3._whiteBoardControl.getOwnerId();
           _this3._dataSource.list.forEach(function (user) {
             var isBoardActive = isActive && user.userId === ownerUserId;
             user.setUserInfo(_objectSpread(_objectSpread({}, user.userInfo), {}, {
@@ -346,16 +381,16 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
   }, {
     key: "_handleUserInfoUpdated",
     value: function _handleUserInfoUpdated(roomId, event) {
-      var _this$_screenSharePro;
+      var _this$_sharedScreenSh;
       var targetUser = event.modifiedUser;
       if (event.modifiedUser.userId === this.localUserId) {
         this._localUser = this._mainRoomUserControl.getLocalUser();
       }
       this._dataSource.updateUserInfo(targetUser, true);
       // 共享屏幕
-      var isModifiySharingScreenUser = this._screenShareProvider.isSharingScreen && ((_this$_screenSharePro = this._screenShareProvider.screenSharingOwner) === null || _this$_screenSharePro === void 0 ? void 0 : _this$_screenSharePro.userId) === targetUser.userId;
+      var isModifiySharingScreenUser = this._sharedScreenShareSharedDataSource.isSharingScreen && ((_this$_sharedScreenSh = this._sharedScreenShareSharedDataSource.screenSharingOwner) === null || _this$_sharedScreenSh === void 0 ? void 0 : _this$_sharedScreenSh.userId) === targetUser.userId;
       if (isModifiySharingScreenUser) {
-        this._screenShareProvider.screenSharingOwner = targetUser;
+        this._sharedScreenShareSharedDataSource.setScreenSharingOwner(targetUser);
       }
       this.updateMemberListWithBoardState();
     }
@@ -402,6 +437,20 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
       });
       this.updateMemberListWithBoardState();
     }
+  }, {
+    key: "_handleRemoteVideoStatsUpdated",
+    value: function _handleRemoteVideoStatsUpdated(roomId, streamId, videoStats) {
+      var stream = this._streamControl.getStreamByStreamId(streamId);
+      if ((stream === null || stream === void 0 ? void 0 : stream.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN) {
+        var _videoStats$dimension = videoStats.dimensions,
+          width = _videoStats$dimension.width,
+          height = _videoStats$dimension.height;
+        if (width !== 0 && height !== 0) {
+          this._shareScreenVideoRatio = width / height;
+          this.shareScreenVideoSize = videoStats.dimensions;
+        }
+      }
+    }
   }, {
     key: "_handleRemoteUserLeft",
     value: function _handleRemoteUserLeft(roomId, events) {
@@ -451,12 +500,15 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
   }]);
 }();
 _FcrUIMemberSharedDataSourceImpl = FcrUIMemberSharedDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMemberSharedDataSourceImpl, [[_mobx.observable, 1, "_serverPushTotalUserCount"], [_mobx.observable, 1, "_audioVolumeMap"], [_mobx.observable, 1, "_isLocalUserInPstn"], [_mobx.observable, 1, "_interpreterInputLanguageList"], [_mobx.observable, 1, "_localUser"], [_mobx.observable, 1, "totalUserCount"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "interpreterInputLanguageList"], [_mobx.computed, 3, "audioVolumeMap"], [_mobx.computed, 3, "isLocalUserHost"], [_mobx.computed, 3, "remoteMembers"], [_mobx.computed, 3, "remoteMembersUserInfosList"], [_mobx.computed, 3, "memberUserInfoList"], [_updateMemberListWithBoardStateDecs, 18, "updateMemberListWithBoardState"], [_setIsLocalUserInPstnDecs, 18, "_setIsLocalUserInPstn"], [_handleAllUserCountUpdatedDecs, 18, "_handleAllUserCountUpdated"], [_setTotalUserCountDecs, 18, "_setTotalUserCount"], [_handleUserInfoUpdatedDecs, 18, "_handleUserInfoUpdated"], [_syncParticipantsDecs, 2, "_syncParticipants"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_handleRemoteUserJoinedDecs, 18, "_handleRemoteUserJoined"], [_handleRemoteUserLeftDecs, 18, "_handleRemoteUserLeft"], [_handleStreamsAddedDecs, 18, "_handleStreamsAdded"], [_handleStreamsUpdatedDecs, 18, "_handleStreamsUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).e, 7);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMemberSharedDataSourceImpl, [[_mobx.observable, 1, "_serverPushTotalUserCount"], [_mobx.observable, 1, "_audioVolumeMap"], [_mobx.observable, 1, "_isLocalUserInPstn"], [_mobx.observable, 1, "_interpreterInputLanguageList"], [_mobx.observable, 1, "_localUser"], [_mobx.observable, 1, "serverPushTotalUserCount"], [_mobx.observable, 1, "_shareScreenVideoRatio"], [_mobx.observable, 1, "totalUserCount"], [_mobx.observable, 1, "shareScreenVideoSize"], [_mobx.computed, 3, "shareScreenVideoRatio"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "interpreterInputLanguageList"], [_mobx.computed, 3, "audioVolumeMap"], [_mobx.computed, 3, "isLocalUserHost"], [_mobx.computed, 3, "remoteMembers"], [_mobx.computed, 3, "remoteMembersUserInfosList"], [_mobx.computed, 3, "memberUserInfoList"], [_updateMemberListWithBoardStateDecs, 18, "updateMemberListWithBoardState"], [_setIsLocalUserInPstnDecs, 18, "_setIsLocalUserInPstn"], [_handleAllUserCountUpdatedDecs, 18, "_handleAllUserCountUpdated"], [_setTotalUserCountDecs, 18, "_setTotalUserCount"], [_handleUserInfoUpdatedDecs, 18, "_handleUserInfoUpdated"], [_syncParticipantsDecs, 2, "_syncParticipants"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_handleRemoteUserJoinedDecs, 18, "_handleRemoteUserJoined"], [_handleRemoteVideoStatsUpdatedDecs, 18, "_handleRemoteVideoStatsUpdated"], [_handleRemoteUserLeftDecs, 18, "_handleRemoteUserLeft"], [_handleStreamsAddedDecs, 18, "_handleStreamsAdded"], [_handleStreamsUpdatedDecs, 18, "_handleStreamsUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).e, 10);
 _init__serverPushTotalUserCount = _applyDecs$e[0];
 _init__audioVolumeMap = _applyDecs$e[1];
 _init__isLocalUserInPstn = _applyDecs$e[2];
 _init__interpreterInputLanguageList = _applyDecs$e[3];
 _init__localUser = _applyDecs$e[4];
-_init_totalUserCount = _applyDecs$e[5];
-_initProto = _applyDecs$e[6];
+_init_serverPushTotalUserCount = _applyDecs$e[5];
+_init__shareScreenVideoRatio = _applyDecs$e[6];
+_init_totalUserCount = _applyDecs$e[7];
+_init_shareScreenVideoSize = _applyDecs$e[8];
+_initProto = _applyDecs$e[9];
 (0, _base.registerDependency)('sharedMemberDataSource');