fcr-ui-scene 3.7.4-rc.1 → 3.7.5

package/lib/{shared-data-source → shared-data}/confirm-data.d.ts

@@ -1,4 +1,8 @@
-import { CurrentShareBounds } from '../modules/control-bar/types';
+import { FcrUIManagedObject } from '../object-manager';
+type FcrMousePositionObserver = {
+    onMouseOver?: (key: string) => void;
+    onMouseOut?: (key: string) => void;
+};
 export interface FcrUISharedConfirmDataSource {
     get position(): {
         x: number;
@@ -12,33 +16,30 @@ export interface FcrUISharedConfirmDataSource {
         x: number;
         y: number;
     }): void;
-    setWindowBounds(key: string, window: CurrentShareBounds): void;
+    setWindowBounds(key: string, window: FcrUI.FcrUIRectangle): void;
     removeWindowBounds(key: string): void;
     addObserver(observer: FcrMousePositionObserver): void;
     removeObserver(observer: FcrMousePositionObserver): void;
 }
-export type FcrMousePositionObserver = {
-    onMouseOver(key: string): void;
-    onMouseOut(key: string): void;
-};
-export declare class FcrUISharedConfirmDataSourceImpl implements FcrUISharedConfirmDataSource {
+export declare class FcrUISharedConfirmDataSourceImpl implements FcrUISharedConfirmDataSource, FcrUIManagedObject {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     accessor position: {
         x: number;
         y: number;
     };
-    accessor windows: Map<string, CurrentShareBounds>;
+    accessor windows: Map<string, FcrUI.FcrUIRectangle>;
     accessor mouseOverState: Set<unknown>;
     constructor();
     setPosition(position: {
         x: number;
         y: number;
     }): void;
-    setWindowBounds(key: string, window: CurrentShareBounds): void;
+    setWindowBounds(key: string, window: FcrUI.FcrUIRectangle): void;
     removeWindowBounds(key: string): void;
     addObserver(observer: FcrMousePositionObserver): void;
     removeObserver(observer: FcrMousePositionObserver): void;
     release(): void;
     private _addLogObserver;
 }
+export {};

package/lib/{shared-data-source → shared-data}/confirm-data.js

@@ -77,9 +77,9 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _mobx = require("mobx");
-var _base = require("../base");
 var _logger = require("../utilities/logger");
-var _imports = require("fcr-core/lib/imports");
+var _observable = require("agora-foundation/lib/utilities/observable");
+var _decorator = require("agora-foundation/lib/decorator");
 var _FcrUISharedConfirmDataSourceImpl;
 var _initProto, _init_position, _init_windows, _init_mouseOverState;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -101,7 +101,7 @@ var FcrUISharedConfirmDataSourceImpl = exports.FcrUISharedConfirmDataSourceImpl
     (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUISharedConfirmDataSourceImpl'
     })));
-    (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
+    (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     _classPrivateFieldInitSpec(this, _A, _init_position(this, {
       x: 0,
       y: 0
@@ -193,9 +193,10 @@ var FcrUISharedConfirmDataSourceImpl = exports.FcrUISharedConfirmDataSourceImpl
   }]);
 }();
 _FcrUISharedConfirmDataSourceImpl = FcrUISharedConfirmDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedConfirmDataSourceImpl, [[_mobx.observable, 1, "position"], [_mobx.observable, 1, "windows"], [_mobx.observable, 1, "mouseOverState"]], []).e, 4);
-_init_position = _applyDecs$e[0];
-_init_windows = _applyDecs$e[1];
-_init_mouseOverState = _applyDecs$e[2];
-_initProto = _applyDecs$e[3];
-(0, _base.registerDependency)('sharedConfirmDataSource');
+var _applyDecs$e = _applyDecs(_FcrUISharedConfirmDataSourceImpl, [[_mobx.observable, 1, "position"], [_mobx.observable, 1, "windows"], [_mobx.observable, 1, "mouseOverState"], [_decorator.trace, 2, "setPosition"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 4);
+_init_position = _applyDecs$e2[0];
+_init_windows = _applyDecs$e2[1];
+_init_mouseOverState = _applyDecs$e2[2];
+_initProto = _applyDecs$e2[3];
+_applyDecs$e;

package/lib/{shared-data-source → shared-data}/device-privilege-data.d.ts

@@ -1,8 +1,10 @@
+import { FcrUIManagedObject } from '../object-manager';
 export interface FcrUISharedDevicePrivilegeDataSource {
     get shouldIncludeMicrophone(): boolean;
     setShouldIncludeMicrophone(state: boolean): void;
 }
-export declare class FcrUISharedDevicePrivilegeDataSourceImpl implements FcrUISharedDevicePrivilegeDataSource {
+export declare class FcrUISharedDevicePrivilegeDataSourceImpl implements FcrUISharedDevicePrivilegeDataSource, FcrUIManagedObject {
     shouldIncludeMicrophone: boolean;
     setShouldIncludeMicrophone(state: boolean): void;
+    release(): void;
 }

package/lib/{shared-data-source → shared-data}/device-privilege-data.js

@@ -9,7 +9,6 @@ exports.FcrUISharedDevicePrivilegeDataSourceImpl = void 0;
 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 _base = require("../base");
 var FcrUISharedDevicePrivilegeDataSourceImpl = exports.FcrUISharedDevicePrivilegeDataSourceImpl = /*#__PURE__*/function () {
   function FcrUISharedDevicePrivilegeDataSourceImpl() {
     (0, _classCallCheck2["default"])(this, FcrUISharedDevicePrivilegeDataSourceImpl);
@@ -20,6 +19,8 @@ var FcrUISharedDevicePrivilegeDataSourceImpl = exports.FcrUISharedDevicePrivileg
     value: function setShouldIncludeMicrophone(state) {
       this.shouldIncludeMicrophone = state;
     }
+  }, {
+    key: "release",
+    value: function release() {}
   }]);
-}();
-(0, _base.registerDependency)('sharedDevicePrivilegeDataSource');
+}();

package/lib/{shared-data-source → shared-data}/interpreter.d.ts

@@ -1,6 +1,7 @@
 import { FcrInterpreterControl, FcrInterpreterUserInfo, FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
 import { FcrUserControl } from 'fcr-core/lib/room-control/user-control/type';
 import { LanguageRoomType } from '../modules/interpreter/type';
+import { FcrUIManagedObject } from '../object-manager';
 export declare const ORIGIN = "ORIGIN";
 export type OriginType = typeof ORIGIN;
 export type FcrUILanguage = FcrLanguage | OriginType;
@@ -53,11 +54,10 @@ export interface FcrUISharedInterpreterDataSource {
      * */
     get languageRoomListByStatus(): Map<FcrLanguage, LanguageRoomType>;
     set languageRoomListByStatus(language: Map<FcrLanguage, LanguageRoomType>);
-    release(): void;
 }
-export declare class FcrUISharedInterpreterDataSourceImpl implements FcrUISharedInterpreterDataSource {
-    private _interpreterControl?;
-    private _userControl?;
+export declare class FcrUISharedInterpreterDataSourceImpl implements FcrUISharedInterpreterDataSource, FcrUIManagedObject {
+    private _interpreterControl;
+    private _userControl;
     accessor isInterpreterEnabled: boolean;
     accessor interpreterUserList: FcrInterpreterUserInfo[] | null;
     accessor localInterpreterUserInfo: FcrInterpreterUserInfo | null;
@@ -68,7 +68,7 @@ export declare class FcrUISharedInterpreterDataSourceImpl implements FcrUIShared
     accessor subscribeLanguageOptionList: FcrUILanguage[];
     accessor languageRoomListByStatus: Map<FcrLanguage, LanguageRoomType>;
     private _interpreterObserver;
-    constructor(interpreterControl?: FcrInterpreterControl, userControl?: FcrUserControl);
+    constructor(interpreterControl: FcrInterpreterControl, userControl: FcrUserControl);
     private _handleInterpreterUsersUpdated;
     private _handleInterpreterStateUpdated;
     get supportedLanguages(): FcrLanguage[];

package/lib/{shared-data-source → shared-data}/interpreter.js

@@ -54,7 +54,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 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 _base = require("../base");
 var _mobx = require("mobx");
 var _FcrUISharedInterpreterDataSourceImpl;
 var _initProto, _init_isInterpreterEnabled, _init_interpreterUserList, _init_localInterpreterUserInfo, _init_preLocalInterpreterUserInfo, _init_hasSubscribedLanguageList, _init_preHasSubscribedLanguageList, _init_outputLanguage, _init_subscribeLanguageOptionList, _init_languageRoomListByStatus;
@@ -80,8 +79,7 @@ var _H = /*#__PURE__*/new WeakMap();
 var _I = /*#__PURE__*/new WeakMap();
 var FcrUISharedInterpreterDataSourceImpl = exports.FcrUISharedInterpreterDataSourceImpl = /*#__PURE__*/function () {
   function FcrUISharedInterpreterDataSourceImpl(interpreterControl, userControl) {
-    var _this = this,
-      _this$_interpreterCon;
+    var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUISharedInterpreterDataSourceImpl);
     (0, _defineProperty2["default"])(this, "_interpreterControl", void _initProto(this));
     _classPrivateFieldInitSpec(this, _A, _init_isInterpreterEnabled(this, false));
@@ -104,7 +102,7 @@ var FcrUISharedInterpreterDataSourceImpl = exports.FcrUISharedInterpreterDataSou
     });
     this._userControl = userControl;
     this._interpreterControl = interpreterControl;
-    (_this$_interpreterCon = this._interpreterControl) === null || _this$_interpreterCon === void 0 || _this$_interpreterCon.addObserver(this._interpreterObserver);
+    this._interpreterControl.addObserver(this._interpreterObserver);
     this._handleInterpreterStateUpdated();
     this._handleInterpreterUsersUpdated();
   }
@@ -184,14 +182,12 @@ var FcrUISharedInterpreterDataSourceImpl = exports.FcrUISharedInterpreterDataSou
     key: "_handleInterpreterUsersUpdated",
     value: function _handleInterpreterUsersUpdated() {
       var _this$interpreterUser;
-      if (!this._interpreterControl) return;
       var interpreterRoomList = this._interpreterControl.getInterpreterRoomList() || []; //语言房间列表
       var initSubscribeLanguageOptionList = [ORIGIN];
       this.subscribeLanguageOptionList = initSubscribeLanguageOptionList.concat(interpreterRoomList.map(function (interpreterRoom) {
         return interpreterRoom.language;
       }));
       this.interpreterUserList = this._interpreterControl.getInterpreterUserList();
-      if (!this._userControl) return;
       this.preLocalInterpreterUserInfo = this.localInterpreterUserInfo;
       var localUser = this._userControl.getLocalUser();
       this.localInterpreterUserInfo = ((_this$interpreterUser = this.interpreterUserList) === null || _this$interpreterUser === void 0 ? void 0 : _this$interpreterUser.find(function (ele) {
@@ -201,7 +197,6 @@ var FcrUISharedInterpreterDataSourceImpl = exports.FcrUISharedInterpreterDataSou
   }, {
     key: "_handleInterpreterStateUpdated",
     value: function _handleInterpreterStateUpdated() {
-      if (!this._interpreterControl) return;
       this.isInterpreterEnabled = this._interpreterControl.getState().enable;
     }
   }, {
@@ -227,21 +222,21 @@ var FcrUISharedInterpreterDataSourceImpl = exports.FcrUISharedInterpreterDataSou
   }, {
     key: "release",
     value: function release() {
-      var _this$_interpreterCon2;
-      (_this$_interpreterCon2 = this._interpreterControl) === null || _this$_interpreterCon2 === void 0 || _this$_interpreterCon2.removeObserver(this._interpreterObserver);
+      this._interpreterControl.removeObserver(this._interpreterObserver);
     }
   }]);
 }();
 _FcrUISharedInterpreterDataSourceImpl = FcrUISharedInterpreterDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedInterpreterDataSourceImpl, [[_mobx.observable, 1, "isInterpreterEnabled"], [_mobx.observable, 1, "interpreterUserList"], [_mobx.observable, 1, "localInterpreterUserInfo"], [_mobx.observable, 1, "preLocalInterpreterUserInfo"], [_mobx.observable, 1, "hasSubscribedLanguageList"], [_mobx.observable, 1, "preHasSubscribedLanguageList"], [_mobx.observable, 1, "outputLanguage"], [_mobx.observable, 1, "subscribeLanguageOptionList"], [_mobx.observable, 1, "languageRoomListByStatus"]], []).e, 10);
-_init_isInterpreterEnabled = _applyDecs$e[0];
-_init_interpreterUserList = _applyDecs$e[1];
-_init_localInterpreterUserInfo = _applyDecs$e[2];
-_init_preLocalInterpreterUserInfo = _applyDecs$e[3];
-_init_hasSubscribedLanguageList = _applyDecs$e[4];
-_init_preHasSubscribedLanguageList = _applyDecs$e[5];
-_init_outputLanguage = _applyDecs$e[6];
-_init_subscribeLanguageOptionList = _applyDecs$e[7];
-_init_languageRoomListByStatus = _applyDecs$e[8];
-_initProto = _applyDecs$e[9];
-(0, _base.registerDependency)('sharedInterpreterDataSource');
+var _applyDecs$e = _applyDecs(_FcrUISharedInterpreterDataSourceImpl, [[_mobx.observable, 1, "isInterpreterEnabled"], [_mobx.observable, 1, "interpreterUserList"], [_mobx.observable, 1, "localInterpreterUserInfo"], [_mobx.observable, 1, "preLocalInterpreterUserInfo"], [_mobx.observable, 1, "hasSubscribedLanguageList"], [_mobx.observable, 1, "preHasSubscribedLanguageList"], [_mobx.observable, 1, "outputLanguage"], [_mobx.observable, 1, "subscribeLanguageOptionList"], [_mobx.observable, 1, "languageRoomListByStatus"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 10);
+_init_isInterpreterEnabled = _applyDecs$e2[0];
+_init_interpreterUserList = _applyDecs$e2[1];
+_init_localInterpreterUserInfo = _applyDecs$e2[2];
+_init_preLocalInterpreterUserInfo = _applyDecs$e2[3];
+_init_hasSubscribedLanguageList = _applyDecs$e2[4];
+_init_preHasSubscribedLanguageList = _applyDecs$e2[5];
+_init_outputLanguage = _applyDecs$e2[6];
+_init_subscribeLanguageOptionList = _applyDecs$e2[7];
+_init_languageRoomListByStatus = _applyDecs$e2[8];
+_initProto = _applyDecs$e2[9];
+_applyDecs$e;

package/lib/{shared-data-source → shared-data}/layout-data.d.ts

@@ -1,5 +1,6 @@
 import { FcrUISharedConfigDataSource } from './config';
 import { FcrUIUpdateAsideParams } from '../type';
+import { FcrUIManagedObject } from '../object-manager';
 type SidebarCompRenderAtType = 'aside' | 'dialog';
 export interface FcrUISharedLayoutDataSource {
     setLayoutSize(size: string | number): void;
@@ -12,7 +13,7 @@ export interface FcrUISharedLayoutDataSource {
     get participantsRenderAt(): SidebarCompRenderAtType;
     endMeetingPopoverOpened: boolean;
 }
-export declare class FcrUISharedLayoutDataSourceImpl implements FcrUISharedLayoutDataSource {
+export declare class FcrUISharedLayoutDataSourceImpl implements FcrUISharedLayoutDataSource, FcrUIManagedObject {
     accessor _layoutSize: number;
     accessor asideLayout: FcrUIUpdateAsideParams;
     accessor _chatRenderAt: 'aside' | 'dialog';
@@ -20,6 +21,7 @@ export declare class FcrUISharedLayoutDataSourceImpl implements FcrUISharedLayou
     accessor endMeetingPopoverOpened: boolean;
     private _sharedConfigDataSource;
     constructor(sharedConfigDataSource: FcrUISharedConfigDataSource);
+    release(): void;
     setChatRenderAt(renderPosition: SidebarCompRenderAtType): void;
     get chatRenderAt(): SidebarCompRenderAtType;
     setParticipantsRenderAt(renderPosition: SidebarCompRenderAtType): void;

package/lib/{shared-data-source → shared-data}/layout-data.js

@@ -57,7 +57,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _base = require("../base");
 var _mobx = require("mobx");
 var _parameters = require("../utilities/parameters");
 var _FcrUISharedLayoutDataSourceImpl;
@@ -141,6 +140,9 @@ var FcrUISharedLayoutDataSourceImpl = exports.FcrUISharedLayoutDataSourceImpl =
     set: function set(v) {
       _classPrivateFieldSet(_E, this, v);
     }
+  }, {
+    key: "release",
+    value: function release() {}
   }, {
     key: "setChatRenderAt",
     value: function setChatRenderAt(renderPosition) {
@@ -179,11 +181,12 @@ var FcrUISharedLayoutDataSourceImpl = exports.FcrUISharedLayoutDataSourceImpl =
   }]);
 }();
 _FcrUISharedLayoutDataSourceImpl = FcrUISharedLayoutDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedLayoutDataSourceImpl, [[_mobx.observable, 1, "_layoutSize"], [_mobx.observable, 1, "asideLayout"], [_mobx.observable, 1, "_chatRenderAt"], [_mobx.observable, 1, "_participantsRenderAt"], [_mobx.observable, 1, "endMeetingPopoverOpened"], [_setLayoutSizeDecs, 18, "setLayoutSize"]], []).e, 6);
-_init__layoutSize = _applyDecs$e[0];
-_init_asideLayout = _applyDecs$e[1];
-_init__chatRenderAt = _applyDecs$e[2];
-_init__participantsRenderAt = _applyDecs$e[3];
-_init_endMeetingPopoverOpened = _applyDecs$e[4];
-_initProto = _applyDecs$e[5];
-(0, _base.registerDependency)('sharedLayoutDataSource');
+var _applyDecs$e = _applyDecs(_FcrUISharedLayoutDataSourceImpl, [[_mobx.observable, 1, "_layoutSize"], [_mobx.observable, 1, "asideLayout"], [_mobx.observable, 1, "_chatRenderAt"], [_mobx.observable, 1, "_participantsRenderAt"], [_mobx.observable, 1, "endMeetingPopoverOpened"], [_setLayoutSizeDecs, 18, "setLayoutSize"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 6);
+_init__layoutSize = _applyDecs$e2[0];
+_init_asideLayout = _applyDecs$e2[1];
+_init__chatRenderAt = _applyDecs$e2[2];
+_init__participantsRenderAt = _applyDecs$e2[3];
+_init_endMeetingPopoverOpened = _applyDecs$e2[4];
+_initProto = _applyDecs$e2[5];
+_applyDecs$e;

package/lib/{shared-data-source → shared-data}/meeting-time.d.ts

@@ -1,4 +1,5 @@
 import { FcrMainRoomControl } from 'fcr-core/lib/room-control/type';
+import { FcrUIManagedObject } from '../object-manager';
 export declare enum MeetingStatus {
     NORMAL = "normal",
     SOON_TO_END = "soon2end",
@@ -35,13 +36,8 @@ export interface FcrUIMeetingTimeSharedDataSource {
      * @returns number
      */
     get totalMins(): number;
-    /**
-     * 释放数据源占用的资源。
-     * 当不再需要使用该数据源时，调用此方法进行资源清理。
-     */
-    release(): void;
 }
-export declare class FcrUIMeetingTimeSharedDataSourceImpl implements FcrUIMeetingTimeSharedDataSource {
+export declare class FcrUIMeetingTimeSharedDataSourceImpl implements FcrUIMeetingTimeSharedDataSource, FcrUIManagedObject {
     accessor _totalHourText: string;
     accessor _totalMinuteText: string;
     accessor _status: MeetingStatus;

package/lib/{shared-data-source → shared-data}/meeting-time.js

@@ -58,7 +58,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _duration = _interopRequireDefault(require("dayjs/plugin/duration"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _base = require("../base");
 var _mobx = require("mobx");
 var _FcrUIMeetingTimeSharedDataSourceImpl;
 var _initProto, _init__totalHourText, _init__totalMinuteText, _init__status, _init__meetingTime, _init__totalHours, _init__totalMins, _init__totalHoursText, _init__totalMinsText;
@@ -403,14 +402,15 @@ var FcrUIMeetingTimeSharedDataSourceImpl = exports.FcrUIMeetingTimeSharedDataSou
   }]);
 }();
 _FcrUIMeetingTimeSharedDataSourceImpl = FcrUIMeetingTimeSharedDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMeetingTimeSharedDataSourceImpl, [[_mobx.observable, 1, "_totalHourText"], [_mobx.observable, 1, "_totalMinuteText"], [_mobx.observable, 1, "_status"], [_mobx.observable, 1, "_meetingTime"], [_mobx.observable, 1, "_totalHours"], [_mobx.observable, 1, "_totalMins"], [_mobx.observable, 1, "_totalHoursText"], [_mobx.observable, 1, "_totalMinsText"], [_mobx.action, 2, "_setTotalHoursAndMinutes"], [_mobx.action, 2, "_setMeetingTime"], [_mobx.action, 2, "_setStatues"]], []).e, 9);
-_init__totalHourText = _applyDecs$e[0];
-_init__totalMinuteText = _applyDecs$e[1];
-_init__status = _applyDecs$e[2];
-_init__meetingTime = _applyDecs$e[3];
-_init__totalHours = _applyDecs$e[4];
-_init__totalMins = _applyDecs$e[5];
-_init__totalHoursText = _applyDecs$e[6];
-_init__totalMinsText = _applyDecs$e[7];
-_initProto = _applyDecs$e[8];
-(0, _base.registerDependency)('sharedMeetingTimeDataSource');
+var _applyDecs$e = _applyDecs(_FcrUIMeetingTimeSharedDataSourceImpl, [[_mobx.observable, 1, "_totalHourText"], [_mobx.observable, 1, "_totalMinuteText"], [_mobx.observable, 1, "_status"], [_mobx.observable, 1, "_meetingTime"], [_mobx.observable, 1, "_totalHours"], [_mobx.observable, 1, "_totalMins"], [_mobx.observable, 1, "_totalHoursText"], [_mobx.observable, 1, "_totalMinsText"], [_mobx.action, 2, "_setTotalHoursAndMinutes"], [_mobx.action, 2, "_setMeetingTime"], [_mobx.action, 2, "_setStatues"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 9);
+_init__totalHourText = _applyDecs$e2[0];
+_init__totalMinuteText = _applyDecs$e2[1];
+_init__status = _applyDecs$e2[2];
+_init__meetingTime = _applyDecs$e2[3];
+_init__totalHours = _applyDecs$e2[4];
+_init__totalMins = _applyDecs$e2[5];
+_init__totalHoursText = _applyDecs$e2[6];
+_init__totalMinsText = _applyDecs$e2[7];
+_initProto = _applyDecs$e2[8];
+_applyDecs$e;

package/lib/{shared-data-source → shared-data}/member-data.d.ts

@@ -5,9 +5,10 @@ import { FcrRemoteVideoStats } from 'fcr-core/lib/room-control/stream-control/ty
 import { FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
 import { FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
-import { FcrUIScreenShareSharedDataSource } from './screen-share-data';
+import { FcrUISharedScreenShareDataSource } from './screen-share/type';
 import { FcrUIEventProvider } from '../providers/event-provider';
-export interface FcrUIMemberSharedDataSource {
+import { FcrUIManagedObject } from '../object-manager';
+export interface FcrUISharedMemberDataSource {
     /**
      * 整个房间的人数。
      * @returns 来自onAllUserCountUpdated 的回调 。
@@ -74,13 +75,8 @@ export interface FcrUIMemberSharedDataSource {
      * 此方法用于同步参与者列表与白板状态。
      */
     updateMemberListWithBoardState(): void;
-    /**
-     * 释放数据源占用的资源。
-     * 当不再需要使用该数据源时，调用此方法进行资源清理。
-     */
-    release(): void;
 }
-export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberSharedDataSource {
+export declare class FcrUISharedMemberDataSourceImpl implements FcrUISharedMemberDataSource, FcrUIManagedObject {
     private _mainRoomUserControl;
     private _streamControl;
     private _sharedScreenShareSharedDataSource;
@@ -116,7 +112,7 @@ export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberShare
     get remoteMembersUserInfosList(): FcrUserInfo[];
     get memberList(): FcrUIMemberDataImpl[];
     get memberUserInfoList(): FcrUserInfo[];
-    constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _eventProvider: FcrUIEventProvider, _whiteBoardControl?: FcrPrivilegedWhiteboardControl | undefined);
+    constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _sharedScreenShareSharedDataSource: FcrUISharedScreenShareDataSource, _eventProvider: FcrUIEventProvider, _whiteBoardControl?: FcrPrivilegedWhiteboardControl | undefined);
     private _addEventListeners;
     private _removeEventListeners;
     private _handleOnEvent;
@@ -134,6 +130,9 @@ export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberShare
     private _handleRemoteUserJoined;
     private _handleRemoteUserLeft;
     private _handleStreamsAdded;
+    private _debouncedHandleStreamsAdded;
     private _handleStreamsUpdated;
+    private _debouncedHandleStreamsUpdated;
     private _handleStreamsRemoved;
+    private _debouncedHandleStreamsRemoved;
 }

package/lib/{shared-data-source → shared-data}/member-data.js

@@ -23,7 +23,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUIMemberSharedDataSourceImpl = void 0;
+exports.FcrUISharedMemberDataSourceImpl = void 0;
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
@@ -92,13 +92,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _mobx = require("mobx");
 var _memberListDataSource = require("../modules/participant/member-list-data-source");
 var _fcrCore = require("fcr-core");
-var _base = require("../base");
 var _type = require("fcr-core/lib/type");
 var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("../utilities/logger");
 var _constant = require("../utilities/constant");
-var _FcrUIMemberSharedDataSourceImpl;
-var _initProto, _init__serverPushTotalUserCount, _init__audioVolumeMap, _init__isLocalUserInPstn, _init__interpreterInputLanguageList, _init__localUser, _init_serverPushTotalUserCount, _init_totalUserCount, _init_shareScreenVideoSize, _updateMemberListWithBoardStateDecs, _setIsLocalUserInPstnDecs, _handleAllUserCountUpdatedDecs, _setTotalUserCountDecs, _handleUserInfoUpdatedDecs, _syncParticipantsDecs, _onAudioVolumeUpdatedDecs, _handleRemoteUserJoinedDecs, _handleRemoteUserLeftDecs, _handleStreamsAddedDecs, _handleStreamsUpdatedDecs, _handleStreamsRemovedDecs, _ref;
+var _FcrUISharedMemberDataSourceImpl;
+var _initProto, _init__serverPushTotalUserCount, _init__audioVolumeMap, _init__isLocalUserInPstn, _init__interpreterInputLanguageList, _init__localUser, _init_serverPushTotalUserCount, _init_totalUserCount, _init_shareScreenVideoSize, _updateMemberListWithBoardStateDecs, _setIsLocalUserInPstnDecs, _handleAllUserCountUpdatedDecs, _setTotalUserCountDecs, _handleUserInfoUpdatedDecs, _syncParticipantsDecs, _onAudioVolumeUpdatedDecs, _handleRemoteUserJoinedDecs, _handleRemoteUserLeftDecs, _handleStreamsAddedDecs, _debouncedHandleStreamsAddedDecs, _handleStreamsUpdatedDecs, _debouncedHandleStreamsUpdatedDecs, _handleStreamsRemovedDecs, _debouncedHandleStreamsRemovedDecs, _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); }
@@ -119,13 +118,13 @@ var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__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 FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUIMemberSharedDataSourceImpl(_mainRoomUserControl, _streamControl, _sharedScreenShareSharedDataSource, _eventProvider, _whiteBoardControl) {
+_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], _debouncedHandleStreamsAddedDecs = (0, _decorator.debounced)(50), _handleStreamsUpdatedDecs = [_mobx.action, _mobx.action.bound], _debouncedHandleStreamsUpdatedDecs = (0, _decorator.debounced)(50), _handleStreamsRemovedDecs = [_mobx.action, _mobx.action.bound], _debouncedHandleStreamsRemovedDecs = (0, _decorator.debounced)(50), "logger");
+var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl = /*#__PURE__*/function () {
+  function FcrUISharedMemberDataSourceImpl(_mainRoomUserControl, _streamControl, _sharedScreenShareSharedDataSource, _eventProvider, _whiteBoardControl) {
     var _this = this;
-    (0, _classCallCheck2["default"])(this, FcrUIMemberSharedDataSourceImpl);
+    (0, _classCallCheck2["default"])(this, FcrUISharedMemberDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrUIMemberSharedDataSourceImpl'
+      prefix: 'FcrUISharedMemberDataSourceImpl'
     })));
     (0, _defineProperty2["default"])(this, "_dataSource", new _memberListDataSource.FcrUIMemberListDataSourceImpl());
     (0, _defineProperty2["default"])(this, "_disposers", []);
@@ -173,7 +172,7 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
     }));
     this._addEventListeners();
   }
-  return (0, _createClass2["default"])(FcrUIMemberSharedDataSourceImpl, [{
+  return (0, _createClass2["default"])(FcrUISharedMemberDataSourceImpl, [{
     key: "_serverPushTotalUserCount",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
@@ -399,17 +398,19 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
   }, {
     key: "_handleUserInfoUpdated",
     value: function _handleUserInfoUpdated(roomId, event) {
-      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._sharedScreenShareSharedDataSource.isSharingScreen && ((_this$_sharedScreenSh = this._sharedScreenShareSharedDataSource.screenSharingOwner) === null || _this$_sharedScreenSh === void 0 ? void 0 : _this$_sharedScreenSh.userId) === targetUser.userId;
-      if (isModifiySharingScreenUser) {
-        this._sharedScreenShareSharedDataSource.setScreenSharingOwner(targetUser);
-      }
+      var isModifiySharingScreenUser = false;
+      // TODO:
+      // this._sharedScreenShareSharedDataSource.isSharingScreen &&
+      // this._sharedScreenShareSharedDataSource.screenSharingOwner?.userId === targetUser.userId;
+      // if (isModifiySharingScreenUser) {
+      //   this._sharedScreenShareSharedDataSource.setScreenSharingOwner(targetUser);
+      // }
       this.updateMemberListWithBoardState();
     }
   }, {
@@ -417,11 +418,11 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
     value: function _syncParticipants() {
       var _this4 = this;
       var syncTimber = setTimeout(function () {
-        _this4.logger.warn('[FcrUIMemberSharedDataSourceImpl] _syncParticipants: start sync');
+        _this4.logger.warn('[FcrUISharedMemberDataSourceImpl] _syncParticipants: start sync');
         var mainRoomUsersCount = _this4._mainRoomUserControl.getAllUserCount();
         var pureListLen = _this4.memberList.length;
         if (mainRoomUsersCount !== pureListLen) {
-          _this4.logger.warn('[FcrUIMemberSharedDataSourceImpl] _syncParticipants: need sync');
+          _this4.logger.warn('[FcrUISharedMemberDataSourceImpl] _syncParticipants: need sync');
           // 有差异,优先进行以userControl内列表的遍历补充
           var controlUserList = _this4._mainRoomUserControl.getUserList();
           var storeUserListIds = new Set(_this4.memberList.map(function (participant) {
@@ -468,6 +469,12 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
   }, {
     key: "_handleStreamsAdded",
     value: function _handleStreamsAdded(roomId, events) {
+      // 使用 debounce 来减少频繁的流更新导致的重复渲染
+      this._debouncedHandleStreamsAdded(events);
+    }
+  }, {
+    key: "_debouncedHandleStreamsAdded",
+    value: function _debouncedHandleStreamsAdded(events) {
       var _this7 = this;
       (0, _mobx.runInAction)(function () {
         events.forEach(function (e) {
@@ -480,6 +487,16 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
   }, {
     key: "_handleStreamsUpdated",
     value: function _handleStreamsUpdated(roomId, events) {
+      // TODO：目前先 使用 debounce 来减少频繁的流更新导致的重复渲染
+      // muteAll的时候_handleStreamsUpdated会触发和人数相等的次数
+      // 如房间人数为10，则_handleStreamsUpdated会触发10次
+      // 所以暂时使用 debounce 来减少频繁的流更新导致的重复渲染，后续需要调查这里是否符合预期
+      // 列表肯定是不能频繁更新的
+      this._debouncedHandleStreamsUpdated(events);
+    }
+  }, {
+    key: "_debouncedHandleStreamsUpdated",
+    value: function _debouncedHandleStreamsUpdated(events) {
       var _this8 = this;
       (0, _mobx.runInAction)(function () {
         events.forEach(function (e) {
@@ -492,6 +509,12 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
   }, {
     key: "_handleStreamsRemoved",
     value: function _handleStreamsRemoved(roomId, events) {
+      // 使用 debounce 来减少频繁的流更新导致的重复渲染
+      this._debouncedHandleStreamsRemoved(events);
+    }
+  }, {
+    key: "_debouncedHandleStreamsRemoved",
+    value: function _debouncedHandleStreamsRemoved(events) {
       var _this9 = this;
       (0, _mobx.runInAction)(function () {
         events.forEach(function (e) {
@@ -503,15 +526,16 @@ 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, "serverPushTotalUserCount"], [_mobx.observable, 1, "totalUserCount"], [_mobx.observable, 1, "shareScreenVideoSize"], [_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"], [_decorator.bound, 2, "_handleOnEvent"], [_decorator.bound, 2, "_handleOnline"], [_decorator.bound, 2, "_handleOffline"], [_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, 9);
-_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_serverPushTotalUserCount = _applyDecs$e[5];
-_init_totalUserCount = _applyDecs$e[6];
-_init_shareScreenVideoSize = _applyDecs$e[7];
-_initProto = _applyDecs$e[8];
-(0, _base.registerDependency)('sharedMemberDataSource');
+_FcrUISharedMemberDataSourceImpl = FcrUISharedMemberDataSourceImpl;
+var _applyDecs$e = _applyDecs(_FcrUISharedMemberDataSourceImpl, [[_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, "totalUserCount"], [_mobx.observable, 1, "shareScreenVideoSize"], [_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"], [_decorator.bound, 2, "_handleOnEvent"], [_decorator.bound, 2, "_handleOnline"], [_decorator.bound, 2, "_handleOffline"], [_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"], [_debouncedHandleStreamsAddedDecs, 2, "_debouncedHandleStreamsAdded"], [_handleStreamsUpdatedDecs, 18, "_handleStreamsUpdated"], [_debouncedHandleStreamsUpdatedDecs, 2, "_debouncedHandleStreamsUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"], [_debouncedHandleStreamsRemovedDecs, 2, "_debouncedHandleStreamsRemoved"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 9);
+_init__serverPushTotalUserCount = _applyDecs$e2[0];
+_init__audioVolumeMap = _applyDecs$e2[1];
+_init__isLocalUserInPstn = _applyDecs$e2[2];
+_init__interpreterInputLanguageList = _applyDecs$e2[3];
+_init__localUser = _applyDecs$e2[4];
+_init_serverPushTotalUserCount = _applyDecs$e2[5];
+_init_totalUserCount = _applyDecs$e2[6];
+_init_shareScreenVideoSize = _applyDecs$e2[7];
+_initProto = _applyDecs$e2[8];
+_applyDecs$e;

package/lib/{shared-data-source → shared-data}/pin-data.d.ts

@@ -1,13 +1,15 @@
-import { FcrUIEventProvider } from '../providers/event-provider';
 import { FcrUIVideoWindowDataSource } from './video-window';
+import { FcrUIManagedObject } from '../object-manager';
+import { FcrUIMessageProvider } from '../providers/message/type';
 export interface FcrUISharedPinDataSource {
     addPin(streamId: string): void;
     removePin(streamId: string, toastText?: string): void;
 }
-export declare class FcrUISharedPinDataSourceImpl implements FcrUISharedPinDataSource {
-    private readonly _eventProvider;
+export declare class FcrUISharedPinDataSourceImpl implements FcrUISharedPinDataSource, FcrUIManagedObject {
+    private readonly _messageProvider;
     private readonly _videoWindowDataSource;
-    constructor(_eventProvider: FcrUIEventProvider, _videoWindowDataSource: FcrUIVideoWindowDataSource);
+    constructor(_messageProvider: FcrUIMessageProvider, _videoWindowDataSource: FcrUIVideoWindowDataSource);
+    release(): void;
     addPin(streamId: string): boolean;
     removePin(streamId: string, toastText?: string): void;
 }