fcr-ui-scene 3.7.4 → 3.7.6

package/lib/providers/board-share/provider.electron.js

@@ -0,0 +1,163 @@
+"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.reflect.construct.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.FcrUIBoardShareProviderImpl = void 0;
+require("core-js/modules/web.timers.js");
+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 _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectManager2 = require("../../object-manager");
+var _logger = require("../../utilities/logger");
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
+var _mobx = require("mobx");
+var _decorator = require("agora-foundation/lib/decorator");
+var _electron = require("./bar-control/electron");
+var _provider = require("./provider.base");
+var _FcrUIBoardShareProviderImpl;
+var _initProto, _handleStateUpdatedDecs, _handleRedoStateUpdatedDecs, _handleUndoStateUpdatedDecs, _ref;
+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 _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 _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 = (_handleStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleRedoStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleUndoStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PURE__*/function (_FcrUIBoardShareProvi) {
+  function FcrUIBoardShareProviderImpl(_objectManager, _mainWindowRenderer) {
+    var _this;
+    (0, _classCallCheck2["default"])(this, FcrUIBoardShareProviderImpl);
+    _this = _callSuper(this, FcrUIBoardShareProviderImpl, [_objectManager]);
+    (0, _defineProperty2["default"])(_this, _ref, (_initProto(_this), (0, _logger.createLogger)({
+      prefix: 'FcrUIBoardShareProviderImpl'
+    })));
+    (0, _defineProperty2["default"])(_this, "_boardMainWindowObserver", {
+      onRedoStateUpdated: _this._handleRedoStateUpdated,
+      onUndoStateUpdated: _this._handleUndoStateUpdated
+    });
+    (0, _defineProperty2["default"])(_this, "_boardControlObserver", {
+      onConnectionStateUpdated: _this._handleStateUpdated
+    });
+    _this._objectManager = _objectManager;
+    _this._mainWindowRenderer = _mainWindowRenderer;
+    _this._boardControl.addObserver(_this._boardControlObserver);
+    var privilegeProvider = _this._objectManager.getObject(_objectManager2.FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
+    _this._renderer = _this._objectManager.getObject(_objectManager2.FcrUIObjectKeys.RENDERER_WRAPPER);
+    _this._boardBarControl = new _electron.FcrUIBoardControlShareProviderImpl(privilegeProvider, _this._boardControl, _this._mainWindowRenderer);
+    var roomInfo = _this._roomProvider.currentRoomControl.getRoomInfo();
+    if (roomInfo) {
+      _this._boardBarControl.setRoomName(roomInfo.roomName);
+    } else {
+      _this.logger.warn('Room info not found');
+    }
+    return _this;
+  }
+  (0, _inherits2["default"])(FcrUIBoardShareProviderImpl, _FcrUIBoardShareProvi);
+  return (0, _createClass2["default"])(FcrUIBoardShareProviderImpl, [{
+    key: "boardBarControl",
+    get: function get() {
+      return this._boardBarControl;
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      _superPropGet(FcrUIBoardShareProviderImpl, "release", this, 3)([]);
+      this._boardBarControl.release();
+    }
+  }, {
+    key: "setIsDualDisplayMode",
+    value: function setIsDualDisplayMode(isDualDisplayMode) {
+      this._boardBarControl.setIsDualDisplayMode(isDualDisplayMode);
+    }
+  }, {
+    key: "captureScreen",
+    value: function captureScreen(hideWindow) {
+      this._renderer.captureScreen({
+        hideWindow: hideWindow
+      });
+    }
+  }, {
+    key: "_handleStateUpdated",
+    value: function _handleStateUpdated(state) {
+      if (this.joined) {
+        this.boardMainWindow.removeObserver(this._boardMainWindowObserver);
+      }
+      switch (state) {
+        case _fcrCore.FcrConnectionState.CONNECTED:
+          setTimeout(this._resetWhiteboardTool);
+          this.boardMainWindow.addObserver(this._boardMainWindowObserver);
+          break;
+      }
+    }
+  }, {
+    key: "_handleRedoStateUpdated",
+    value: function _handleRedoStateUpdated(enable) {
+      this._boardBarControl.toolbarState.undoSteps = enable;
+    }
+  }, {
+    key: "_handleUndoStateUpdated",
+    value: function _handleUndoStateUpdated(enable) {
+      this._boardBarControl.toolbarState.redoSteps = enable;
+    }
+  }, {
+    key: "_resetWhiteboardTool",
+    value: function _resetWhiteboardTool() {
+      this.boardMainWindow.setToolType(_enums.FcrBoardToolType.LASER_POINTER);
+      this.boardMainWindow.setStrokeWidth(2);
+      this.boardMainWindow.setStrokeColor(this._boardBarControl.currentTheme.colors[2]);
+      this.boardBarControl.resetWhiteboardTool();
+    }
+  }]);
+}(_provider.FcrUIBoardShareProviderBase);
+_FcrUIBoardShareProviderImpl = FcrUIBoardShareProviderImpl;
+var _applyDecs$e = _applyDecs(_FcrUIBoardShareProviderImpl, [[_decorator.bound, 2, "captureScreen"], [_handleStateUpdatedDecs, 18, "_handleStateUpdated"], [_handleRedoStateUpdatedDecs, 18, "_handleRedoStateUpdated"], [_handleUndoStateUpdatedDecs, 18, "_handleUndoStateUpdated"], [_decorator.bound, 2, "_resetWhiteboardTool"]], [], 0, void 0, _provider.FcrUIBoardShareProviderBase).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
+_initProto = _applyDecs$e2[0];
+_applyDecs$e;

package/lib/providers/board-share/struct.d.ts

@@ -0,0 +1,14 @@
+export declare enum FcrUIBoardShareStopReason {
+    /**
+     * 正常停止
+     */
+    NORMAL_STOP = 1,
+    /**
+     * 被其他用户停止
+     */
+    STOPPED_BY_OTHER = 2,
+    /**
+     * 白板错误
+     */
+    ABORTED = 3
+}

package/lib/providers/board-share/struct.js

@@ -0,0 +1,23 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUIBoardShareStopReason = void 0;
+// enum, class
+var FcrUIBoardShareStopReason = exports.FcrUIBoardShareStopReason = /*#__PURE__*/function (FcrUIBoardShareStopReason) {
+  /**
+   * 正常停止
+   */
+  FcrUIBoardShareStopReason[FcrUIBoardShareStopReason["NORMAL_STOP"] = 1] = "NORMAL_STOP";
+  /**
+   * 被其他用户停止
+   */
+  FcrUIBoardShareStopReason[FcrUIBoardShareStopReason["STOPPED_BY_OTHER"] = 2] = "STOPPED_BY_OTHER";
+  /**
+   * 白板错误
+   */
+  FcrUIBoardShareStopReason[FcrUIBoardShareStopReason["ABORTED"] = 3] = "ABORTED";
+  return FcrUIBoardShareStopReason;
+}({});

package/lib/providers/board-share/type.d.ts

@@ -0,0 +1,161 @@
+import { FcrUIBoardShareStopReason } from './struct';
+import { FcrConnectionState, FcrUserInfo, FcrWhiteboardState } from 'fcr-core/lib/type';
+import { WhiteboardThemeType } from '../../modules/whiteboard/type';
+import { FcrToolbarState } from '../../modules/components/toolbar/types';
+import { FcrUIMainWindowRendererObserver, WhiteboardToolAction } from '../../modules/secondary-window/type';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { FcrColor } from 'fcr-core/lib/room-control/whiteboard-control/types';
+export interface FcrUIBoardShareObserver {
+    /**
+     * 白板共享开启
+     */
+    onBoardShareStarted?: (event: {
+        ownerId: string;
+        operatorUser: FcrUserInfo;
+    }) => void;
+    /**
+     * 白板共享关闭
+     * @param reason
+     */
+    onBoardShareStopped?: (event: {
+        reason: FcrUIBoardShareStopReason;
+        operatorUser?: FcrUserInfo;
+    }) => void;
+    /**
+     * 白板已准备好挂载
+     * @param boardDom
+     */
+    onBoardReady?: (boardDom: HTMLElement) => void;
+    /**
+     * 白板错误
+     * @param error
+     */
+    onBoardError?: (error: string) => void;
+}
+export interface FcrUIBoardShareProvider {
+    /**
+     * 获取白板bar控制器
+     */
+    get boardBarControl(): FcrUIBoardBarControl;
+    /**
+     * 获取白板是否处于激活状态
+     */
+    get isActive(): boolean;
+    /**
+     * 获取owner用户
+     */
+    get ownerUser(): FcrUserInfo;
+    /**
+     * 获取loading
+     */
+    get loading(): boolean;
+    /**
+     * 获取白板连接状态
+     */
+    get boardState(): FcrWhiteboardState;
+    /**
+     * 获取白板连接状态
+     */
+    get connectionState(): FcrConnectionState;
+    /**
+     * 获取白板是否已加入
+     */
+    get joined(): boolean;
+    /**
+     * 获取白板是否可写
+     */
+    get canWriteBoard(): boolean;
+    /**
+     * 获取白板是否可停止其他白板
+     */
+    get canStopOtherBoard(): boolean;
+    /**
+     * 获取白板是否是本地用户
+     */
+    get isMyBoard(): boolean;
+    /**
+     * 开始白板共享
+     */
+    startShare(): Promise<void>;
+    /**
+     * 停止白板共享
+     */
+    stopShare(): Promise<void>;
+    /**
+     * 设置画笔宽度
+     * @param width
+     */
+    setStrokeWidth(width: number): Promise<void>;
+    /**
+     * 设置画笔颜色
+     * @param color
+     */
+    setStrokeColor(color: FcrColor): Promise<void>;
+    /**
+     * 选择工具
+     */
+    selectTool(tool: FcrBoardToolType): Promise<void>;
+    /**
+     * 清除画布
+     */
+    clear(): Promise<void>;
+    /**
+     * 撤销
+     */
+    undo(): Promise<void>;
+    /**
+     * 重做
+     */
+    redo(): Promise<void>;
+    /**
+     * 截屏
+     * @param hideWindow
+     */
+    captureScreen(hideWindow: boolean): void;
+    /**
+     * 获取白板dom
+     */
+    getBoardDom(): HTMLElement | null;
+    /**
+     * 设置是否双屏显示模式
+     * @param isDualDisplayMode
+     */
+    setIsDualDisplayMode: (isDualDisplayMode: boolean) => void;
+    /**
+     * 添加观察者
+     */
+    addObserver(observer: FcrUIBoardShareObserver): void;
+    /**
+     * 移除观察者
+     */
+    removeObserver(observer: FcrUIBoardShareObserver): void;
+}
+export interface FcrUIBoardBarControl {
+    get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
+    get canWriteBoard(): boolean;
+    get sharingUserInfo(): FcrUserInfo | undefined;
+    get backgroundColor(): string;
+    get currentTheme(): WhiteboardThemeType;
+    get connectionState(): FcrConnectionState;
+    get showLoading(): boolean;
+    get joinSuccess(): boolean;
+    get toolbarState(): FcrToolbarState;
+    release(): void;
+    setSharingUser: (userInfo: FcrUserInfo) => void;
+    setBackgroundColor: (color: string) => void;
+    setWhiteboardTool: (tool: {
+        action: WhiteboardToolAction;
+        tool: FcrBoardToolType | FcrBoardShape | string | number;
+    }) => void;
+    setTheme: (theme: WhiteboardThemeType) => void;
+    setControlEnable: (enable: boolean) => void;
+    setShowLoading: (show: boolean) => void;
+    setCommonColors: (colors: string[]) => void;
+    saveDraft: () => void;
+    setProgress: (progress: number) => void;
+    setJoinSuccess: (success: boolean) => void;
+    setRoomName: (roomName: string) => void;
+    inActive: () => void;
+    resetWhiteboardTool: () => void;
+    setIsDualDisplayMode: (isDualDisplayMode: boolean) => void;
+}

package/lib/providers/board-share/type.js

@@ -0,0 +1,6 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -1,8 +1,9 @@
 import { FcrChatRoomConnectionState, FcrChatRoomReceivedImageMessage, FcrChatRoomReceivedTextMessage } from 'fcr-core/lib/room-control/chatroom-control/type';
 import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIRoomProvider } from './room-provider';
+import { FcrUIRoomProvider } from './room-provider/room-provider';
 import { FcrUIRoomType } from '../type';
+import { FcrUIManagedObject } from '../object-manager';
 export type FcrChatRoomReceiveMessage = FcrChatRoomReceivedImageMessage | FcrChatRoomReceivedTextMessage;
 export type FcrUILatestMessageInfo = {
     notifyMsgs: FcrChatRoomReceiveMessage[];
@@ -59,13 +60,18 @@ export interface FcrUIChatProvider {
     addObserver(observer: FcrUIChatProviderObserver): void;
     removeObserver(observer: FcrUIChatProviderObserver): void;
 }
-export declare class FcrUIChatProviderImpl implements FcrUIChatProvider {
+export declare class FcrUIChatProviderImpl implements FcrUIChatProvider, FcrUIManagedObject {
+    private _currentRoomControl;
+    private _roomProvider;
     private _observable;
     private _latestsMessageInfo;
+    private _waitingRoomControl?;
     private _chatRoomObserver;
     accessor chatConnectionState: FcrChatRoomConnectionState;
     private _waitingChatRoomObserver;
+    private _roomProviderObserver;
     constructor(_currentRoomControl: FcrBaseRoomControl, _roomProvider: FcrUIRoomProvider);
+    release(): void;
     get latestsMessageInfo(): FcrUILatestMessageInfo;
     set latestsMessageInfo(info: FcrUILatestMessageInfo);
     setPrivateChatTargetUser(user: FcrUserInfo, roomType: FcrUIRoomType): void;

package/lib/providers/chat-provider.js

@@ -51,7 +51,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _imports = require("fcr-core/lib/imports");
 var _type = require("fcr-core/lib/room-control/chatroom-control/type");
 var _type2 = require("fcr-core/lib/room-control/type");
-var _base = require("../base");
 var _mobx = require("mobx");
 var _type3 = require("../type");
 var _FcrUIChatProviderImpl;
@@ -69,8 +68,8 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var FcrUIChatProviderImpl = exports.FcrUIChatProviderImpl = /*#__PURE__*/function () {
   function FcrUIChatProviderImpl(_currentRoomControl, _roomProvider) {
-    var _currentRoomControl$g,
-      _this = this;
+    var _this = this,
+      _currentRoomControl$g;
     (0, _classCallCheck2["default"])(this, FcrUIChatProviderImpl);
     (0, _defineProperty2["default"])(this, "_observable", (_initProto(this), new _imports.AgoraObservable()));
     (0, _defineProperty2["default"])(this, "_latestsMessageInfo", {
@@ -86,13 +85,17 @@ var FcrUIChatProviderImpl = exports.FcrUIChatProviderImpl = /*#__PURE__*/functio
       onTextMessageReceived: this._handleWaitingRoomTextMessageReceived.bind(this),
       onConnectionStateUpdated: this._handleWaitingRoomConnectionUpdated.bind(this)
     });
+    (0, _defineProperty2["default"])(this, "_roomProviderObserver", {
+      onJoinWaitingRoom: function onJoinWaitingRoom(roomControl) {
+        _this._waitingRoomControl = roomControl;
+        roomControl.getChatRoomControl().addObserver(_this._waitingChatRoomObserver);
+      }
+    });
+    this._currentRoomControl = _currentRoomControl;
+    this._roomProvider = _roomProvider;
     if (((_currentRoomControl$g = _currentRoomControl.getRoomInfo()) === null || _currentRoomControl$g === void 0 ? void 0 : _currentRoomControl$g.roomType) === _type2.FcrRoomType.Mainroom) {
       _currentRoomControl.getChatRoomControl().addObserver(this._chatRoomObserver);
-      _roomProvider.addObserver({
-        onJoinWaitingRoom: function onJoinWaitingRoom(roomControl) {
-          roomControl.getChatRoomControl().addObserver(_this._waitingChatRoomObserver);
-        }
-      });
+      _roomProvider.addObserver(this._roomProviderObserver);
     } else {
       _currentRoomControl.getChatRoomControl().addObserver(this._waitingChatRoomObserver);
     }
@@ -105,6 +108,16 @@ var FcrUIChatProviderImpl = exports.FcrUIChatProviderImpl = /*#__PURE__*/functio
     set: function set(v) {
       _classPrivateFieldSet(_A, this, v);
     }
+  }, {
+    key: "release",
+    value: function release() {
+      this._currentRoomControl.getChatRoomControl().removeObserver(this._chatRoomObserver);
+      this._roomProvider.removeObserver(this._roomProviderObserver);
+      this._currentRoomControl.getChatRoomControl().removeObserver(this._waitingChatRoomObserver);
+      if (this._waitingRoomControl) {
+        this._waitingRoomControl.getChatRoomControl().removeObserver(this._waitingChatRoomObserver);
+      }
+    }
   }, {
     key: "latestsMessageInfo",
     get: function get() {
@@ -153,7 +166,8 @@ var FcrUIChatProviderImpl = exports.FcrUIChatProviderImpl = /*#__PURE__*/functio
   }]);
 }();
 _FcrUIChatProviderImpl = FcrUIChatProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIChatProviderImpl, [[_mobx.observable, 1, "chatConnectionState"]], []).e, 2);
-_init_chatConnectionState = _applyDecs$e[0];
-_initProto = _applyDecs$e[1];
-(0, _base.registerDependency)('chatProvider');
+var _applyDecs$e = _applyDecs(_FcrUIChatProviderImpl, [[_mobx.observable, 1, "chatConnectionState"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 2);
+_init_chatConnectionState = _applyDecs$e2[0];
+_initProto = _applyDecs$e2[1];
+_applyDecs$e;

package/lib/providers/device-privilege-provider.d.ts

@@ -1,6 +1,7 @@
 import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'fcr-core';
-import { FcrUIMessageProvider } from './message-provider';
+import { FcrUIMessageProvider } from './message/type';
 import { FcrUIDeviceProvider } from './device-provider';
+import { FcrUIManagedObject } from '../object-manager';
 export interface FcrUIDevicePrivilegeObserver {
     /**
      * 可开启摄像头权限变更
@@ -53,7 +54,7 @@ export interface FcrUIDevicePrivilegeProvider {
     addObserver(observer: FcrUIDevicePrivilegeObserver): void;
     removeObserver(observer: FcrUIDevicePrivilegeObserver): void;
 }
-export declare class FcrUIDevicePrivilegeProviderImpl implements FcrUIDevicePrivilegeProvider {
+export declare class FcrUIDevicePrivilegeProviderImpl implements FcrUIDevicePrivilegeProvider, FcrUIManagedObject {
     private _privilegeControl;
     private _streamControl;
     private _userControl;

package/lib/providers/device-privilege-provider.js

@@ -20,7 +20,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("fcr-core/lib/type");
 var _imports = require("fcr-core/lib/imports");
-var _base = require("../base");
 var _fcrCore = require("fcr-core");
 var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
 var _privilege = require("../utilities/privilege");
@@ -408,5 +407,4 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
       this._observable.removeObserver(observer);
     }
   }]);
-}();
-(0, _base.registerDependency)('devicePrivilegeProvider');
+}();

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

@@ -3,10 +3,13 @@ import { FcrDeviceInfo } from 'fcr-core/lib/type';
 import { FcrCapability, FcrDesktopMediaControl } from 'fcr-core';
 import { FcrDisplayInfo, FcrWindowInfo } from 'fcr-core/lib/type';
 import { VirtualBackground } from '../modules/device-pretest/assets/virtual-backdound-resources';
-import { FcrUIVideoEffectType, FcrUIBeautyKey, FcrUIConnectType, FcrUIResource, FcrUIDeviceObserver, FcrUIAiDenoiseLevel, FcrUiResourceType } from '../type';
-import { FcrUIEventProvider } from './event-provider';
-import { BeautyKey } from '../modules/setting/store';
-import { FcrUISharedSettingDataSource } from '../shared-data-source/setting';
+import { FcrUIVideoEffectType, FcrUIBeautyKey, FcrUIConnectType, FcrUIResource, FcrUIDeviceObserver, FcrUIAiDenoiseLevel, FcrUiResourceType, FcrUIMicrophoneState } from '../type';
+import { FcrUISharedSettingDataSource } from '../shared-data/setting';
+import { FcrUIManagedObject } from '../object-manager';
+import { FcrUIMessageProvider } from './message/type';
+import { BeautyKey } from '../modules/setting/type';
+import { FcrUIFacilityProvider } from './facility/type';
+import { FcrUIRendererWrapper } from '../utilities/renderer';
 export declare const DEFAULT_DEVICE_ID = "default";
 export interface FcrUIDeviceProvider {
     /**
@@ -30,6 +33,10 @@ export interface FcrUIDeviceProvider {
         microphoneDeviceId: string;
         speakerDeviceId: string;
     };
+    get currentDeviceName(): {
+        microphoneDeviceName: string;
+        speakerDeviceName: string;
+    };
     /**
      * 当前摄像头Track对象
      */
@@ -46,6 +53,10 @@ export interface FcrUIDeviceProvider {
      * 当前是否开启了麦克风
      */
     get microphoneEnabled(): boolean;
+    /**
+     * 当前麦克风状态
+     */
+    get microphoneState(): FcrUIMicrophoneState;
     /**
      * 摄像头列表
      */
@@ -104,6 +115,14 @@ export interface FcrUIDeviceProvider {
      * 是否要在会前启用麦克风
      */
     get shouldEnableMicBeforeSession(): boolean;
+    /**
+     * 是否要跟随系统扬声器
+     */
+    get followSystemSpeakerDevice(): boolean;
+    /**
+     * 是否要跟随系统麦克风
+     */
+    get followSystemMicrophoneDevice(): boolean;
     /**
      * 设置扬声器音量
      * @param value
@@ -266,11 +285,14 @@ export interface FcrUIDeviceProvider {
      * 获取声卡采集设备ID
      */
     getLoopbackDeviceId(): string | null;
+    resetDevice(): void;
     addObserver(observer: FcrUIDeviceObserver): void;
     removeObserver(observer: FcrUIDeviceObserver): void;
 }
-export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
-    private _eventProvider;
+export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, FcrUIManagedObject {
+    private _renderer;
+    private _facilityProvider;
+    private _messageProvider;
     private _mediaControl;
     private _sharedSettingDataSource;
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -292,6 +314,8 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     private _mediaControlObserver;
     private _defaultMirror;
     private _volumeIndicationInterval;
+    private accessor _microphoneEnabled;
+    private accessor _isMicrophoneWorking;
     private accessor _microphoneDevice;
     private accessor _microphone;
     private accessor _speakerDevice;
@@ -301,7 +325,6 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     accessor showForceOpenEffectDialog: boolean;
     accessor cameraEnabled: boolean;
     accessor showCameraPreview: boolean;
-    accessor microphoneEnabled: boolean;
     accessor cameraList: FcrDeviceInfo[];
     accessor microphoneList: FcrDeviceInfo[];
     accessor microphoneVolumeLevel: number;
@@ -341,9 +364,16 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
         microphoneDeviceId: string;
         speakerDeviceId: string;
     };
+    get currentDeviceName(): {
+        microphoneDeviceName: string;
+        speakerDeviceName: string;
+    };
     get isAudioConnected(): boolean;
     get shouldEnableMicBeforeSession(): boolean;
-    constructor(_eventProvider: FcrUIEventProvider, _mediaControl: FcrDesktopMediaControl, _sharedSettingDataSource: FcrUISharedSettingDataSource);
+    get microphoneEnabled(): boolean;
+    get microphoneState(): FcrUIMicrophoneState;
+    constructor(_renderer: FcrUIRendererWrapper, _facilityProvider: FcrUIFacilityProvider, _messageProvider: FcrUIMessageProvider, _mediaControl: FcrDesktopMediaControl, _sharedSettingDataSource: FcrUISharedSettingDataSource);
+    resetDevice(): void;
     release(): void;
     getScreenTrack(id: string): FcrScreenTrack;
     getLoopbackTrack(id: string): FcrLoopbackTrack;
@@ -394,6 +424,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     getLoopbackDeviceId(): string | null;
     private _initDeviceList;
     private _handleMicrophoneAudioTrack;
+    private _handleMicrophoneStateUpdated;
     private _handleMicrophoneEnabledChanged;
     private _handleCameraVideoTrack;
     private _handleCameraDeviceIdChanged;