fcr-ui-scene 3.7.5 → 3.7.7

package/lib/shared-data-source/waiting-room.d.ts

@@ -0,0 +1,46 @@
+import { FcrUIRoomProvider } from '../providers/room-provider';
+import { FcrUIEventProvider } from '../providers/event-provider';
+import { FcrUIMemberListDataSourceImpl } from '../modules/participant/member-list-data-source';
+export interface FcrUISharedWaitingRoomDataSource {
+    /**
+     * 设置action-bar成员列表icon小红点未读状态
+     * @param state 状态
+     */
+    set unReadState(state: boolean);
+    /**
+     * 获取action-bar成员列表icon小红点未读状态
+     */
+    get unReadState(): boolean;
+    /**
+     * 获取等候室参会者人数
+     */
+    get totalWaitingRoomUser(): number;
+    /**
+     * 获取等候室参会者列表
+     */
+    get waitingRoomDataSource(): FcrUIMemberListDataSourceImpl;
+    release(): void;
+}
+export declare class FcrUISharedWaitingRoomDataSourceImpl implements FcrUISharedWaitingRoomDataSource {
+    private _roomProvider;
+    private _uiEventStore;
+    private _waitingRoomControl?;
+    private _mainRoomControl?;
+    private _waitingRoomUserControl?;
+    accessor waitingRoomDataSource: FcrUIMemberListDataSourceImpl;
+    private _waitingRoomTargetUserRole?;
+    private _localUserId?;
+    private _streamControl?;
+    private _roomProviderObserver;
+    private _userControlObserver;
+    accessor totalWaitingRoomUser: number;
+    accessor unReadState: boolean;
+    constructor(_roomProvider: FcrUIRoomProvider, _uiEventStore: FcrUIEventProvider);
+    private _isWaitingRoomTargetUser;
+    private _getWaitingRoomUserCount;
+    private _handleRemoteWaitingUserJoined;
+    private _handleRemoteWaitingUserLeft;
+    private _addWaitingRoomDataSource;
+    private _initWaitingRoomUserList;
+    release(): void;
+}

package/lib/shared-data-source/waiting-room.js

@@ -0,0 +1,222 @@
+"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.push.js");
+require("core-js/modules/es.date.to-primitive.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/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");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUISharedWaitingRoomDataSourceImpl = void 0;
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.object.entries.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.includes.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/web.dom-collections.iterator.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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _type = require("fcr-core/lib/room-control/privilege-control/type");
+var _mobx = require("mobx");
+var _constant = require("../utilities/constant");
+var _base = require("../base");
+var _memberListDataSource = require("../modules/participant/member-list-data-source");
+var _type2 = require("../type");
+var _FcrUISharedWaitingRoomDataSourceImpl;
+var _initProto, _init_waitingRoomDataSource, _init_totalWaitingRoomUser, _init_unReadState, _initWaitingRoomUserListDecs, _releaseDecs, _ref;
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
+function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
+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; }
+var _A = /*#__PURE__*/new WeakMap();
+var _B = /*#__PURE__*/new WeakMap();
+var _C = /*#__PURE__*/new WeakMap();
+_ref = (_initWaitingRoomUserListDecs = [_mobx.action, _mobx.action.bound], _releaseDecs = [_mobx.action, _mobx.action.bound], "_waitingRoomControl");
+var FcrUISharedWaitingRoomDataSourceImpl = exports.FcrUISharedWaitingRoomDataSourceImpl = /*#__PURE__*/function () {
+  function FcrUISharedWaitingRoomDataSourceImpl(_roomProvider, _uiEventStore) {
+    var _this = this;
+    (0, _classCallCheck2["default"])(this, FcrUISharedWaitingRoomDataSourceImpl);
+    (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
+    _classPrivateFieldInitSpec(this, _A, _init_waitingRoomDataSource(this, new _memberListDataSource.FcrUIMemberListDataSourceImpl()));
+    (0, _defineProperty2["default"])(this, "_userControlObserver", {
+      onRemoteUsersJoined: this._handleRemoteWaitingUserJoined.bind(this),
+      onRemoteUsersLeft: this._handleRemoteWaitingUserLeft.bind(this)
+    });
+    _classPrivateFieldInitSpec(this, _B, _init_totalWaitingRoomUser(this, 0));
+    _classPrivateFieldInitSpec(this, _C, _init_unReadState(this, false));
+    this._roomProvider = _roomProvider;
+    this._uiEventStore = _uiEventStore;
+    this._mainRoomControl = _roomProvider.currentRoomControl;
+    this._roomProviderObserver = {
+      onJoinWaitingRoom: function onJoinWaitingRoom(roomControl) {
+        var _privilegeControl$get;
+        _this._waitingRoomControl = roomControl;
+        _this._waitingRoomUserControl = roomControl.getUserControl();
+        var privilegeControl = _this._mainRoomControl.getPrivilegeControl();
+        _this._waitingRoomTargetUserRole = (_privilegeControl$get = privilegeControl.getSecurityInfo(_type.FcrSecurityAction.WaitingRoom).info) === null || _privilegeControl$get === void 0 ? void 0 : _privilegeControl$get.targetRoles;
+        _this.totalWaitingRoomUser = _this._getWaitingRoomUserCount();
+        _this._localUserId = _this._waitingRoomUserControl.getLocalUser().userId;
+        _this._streamControl = _this._waitingRoomControl.getStreamControl();
+        _this._initWaitingRoomUserList();
+        roomControl.getUserControl().addObserver(_this._userControlObserver);
+      },
+      onWaitingRoomManageCanceled: function onWaitingRoomManageCanceled() {
+        _this.totalWaitingRoomUser = 0;
+        _this.unReadState = false;
+      }
+    };
+    _roomProvider.addObserver(this._roomProviderObserver);
+  }
+  return (0, _createClass2["default"])(FcrUISharedWaitingRoomDataSourceImpl, [{
+    key: "waitingRoomDataSource",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "totalWaitingRoomUser",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "unReadState",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "_isWaitingRoomTargetUser",
+    value: function _isWaitingRoomTargetUser(user) {
+      if (this._waitingRoomTargetUserRole) {
+        return this._waitingRoomTargetUserRole.includes(user.userRole);
+      }
+    }
+  }, {
+    key: "_getWaitingRoomUserCount",
+    value: function _getWaitingRoomUserCount() {
+      var _this2 = this;
+      if (this._waitingRoomUserControl) {
+        this.totalWaitingRoomUser = this._waitingRoomUserControl.getUserList().filter(function (user) {
+          return _this2._isWaitingRoomTargetUser(user);
+        }).length;
+        if (this.totalWaitingRoomUser === 0) {
+          this._uiEventStore.sendEvent(_constant.FcrUIAction.CHANGE_PARTICIPANT_TAB, _type2.FcrUIRoomType.MAIN_ROOM);
+          this.unReadState = false;
+        }
+        return this.totalWaitingRoomUser;
+      } else {
+        return 0;
+      }
+    }
+  }, {
+    key: "_handleRemoteWaitingUserJoined",
+    value: function _handleRemoteWaitingUserJoined(roomId, events) {
+      var _this3 = this;
+      var totalWaitingRoomUser = this._getWaitingRoomUserCount();
+      if (totalWaitingRoomUser > 0) {
+        this.unReadState = true;
+      }
+      events.forEach(function (event) {
+        var userInfo = event.userInfo;
+        _this3._addWaitingRoomDataSource(userInfo);
+      });
+    }
+  }, {
+    key: "_handleRemoteWaitingUserLeft",
+    value: function _handleRemoteWaitingUserLeft(roomId, events) {
+      var _this4 = this;
+      this._getWaitingRoomUserCount();
+      events.forEach(function (event) {
+        var userInfo = event.userInfo;
+        _this4.waitingRoomDataSource["delete"](userInfo);
+      });
+    }
+  }, {
+    key: "_addWaitingRoomDataSource",
+    value: function _addWaitingRoomDataSource(modifiedUser) {
+      if (modifiedUser.userId !== this._localUserId && this._isWaitingRoomTargetUser(modifiedUser)) {
+        this.waitingRoomDataSource.add(modifiedUser, this._streamControl.getStreamsByUserId(modifiedUser.userId), false);
+      }
+    }
+  }, {
+    key: "_initWaitingRoomUserList",
+    value: function _initWaitingRoomUserList() {
+      if (!this._waitingRoomUserControl) return;
+      var users = this._waitingRoomUserControl.getUsers();
+      for (var _i = 0, _Object$entries = Object.entries(users); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
+          userId = _Object$entries$_i[0],
+          user = _Object$entries$_i[1];
+        this._addWaitingRoomDataSource(user);
+      }
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      var _this$_waitingRoomUse;
+      (_this$_waitingRoomUse = this._waitingRoomUserControl) === null || _this$_waitingRoomUse === void 0 || _this$_waitingRoomUse.removeObserver(this._userControlObserver);
+      this._roomProvider.removeObserver(this._roomProviderObserver);
+    }
+  }]);
+}();
+_FcrUISharedWaitingRoomDataSourceImpl = FcrUISharedWaitingRoomDataSourceImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedWaitingRoomDataSourceImpl, [[_mobx.observable, 1, "waitingRoomDataSource"], [_mobx.observable, 1, "totalWaitingRoomUser"], [_mobx.observable, 1, "unReadState"], [_initWaitingRoomUserListDecs, 18, "_initWaitingRoomUserList"], [_releaseDecs, 18, "release"]], []).e, 4);
+_init_waitingRoomDataSource = _applyDecs$e[0];
+_init_totalWaitingRoomUser = _applyDecs$e[1];
+_init_unReadState = _applyDecs$e[2];
+_initProto = _applyDecs$e[3];
+(0, _base.registerDependency)('sharedWaitingRoomDataSource');

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

@@ -5,7 +5,6 @@ import { WhiteboardThemeType } from '../modules/whiteboard/type';
 import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 import { FcrUIPrivilegeProvider } from '../providers/privilege-provider';
 import { FcrToolbarState } from '../modules/components/toolbar/types';
-import { FcrUIManagedObject } from '../object-manager';
 export interface FcrUISharedWhiteboardDataSource {
     get canWriteBoard(): boolean;
     get sharingUserInfo(): FcrUserInfo | undefined;
@@ -30,8 +29,9 @@ export interface FcrUISharedWhiteboardDataSource {
     setProgress: (progress: number) => void;
     setJoinSuccess: (success: boolean) => void;
     inActive: () => void;
+    release: () => void;
 }
-export declare class FcrUISharedWhiteboardDataSourceImpl implements FcrUISharedWhiteboardDataSource, FcrUIManagedObject {
+export declare class FcrUISharedWhiteboardDataSourceImpl implements FcrUISharedWhiteboardDataSource {
     private _whiteboardControl;
     private _privilegeProvider;
     private _fcrUIMainWindowRenderer;

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

@@ -58,6 +58,7 @@ 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 _type = require("fcr-core/lib/type");
+var _base = require("../base");
 var _mobx = require("mobx");
 var _type2 = require("../modules/secondary-window/type");
 var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
@@ -133,7 +134,8 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.canWriteBoard;
     }, function (canWrite) {
-      _this._fcrUIMainWindowRenderer.notifyObservers('onPermissionUpdated', canWrite);
+      var _this$_fcrUIMainWindo;
+      (_this$_fcrUIMainWindo = _this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo === void 0 || _this$_fcrUIMainWindo.notifyObservers('onPermissionUpdated', canWrite);
     }));
   }
   return (0, _createClass2["default"])(FcrUISharedWhiteboardDataSourceImpl, [{
@@ -221,15 +223,17 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
   }, {
     key: "setBackgroundColor",
     value: function setBackgroundColor(color) {
+      var _this$_fcrUIMainWindo2;
       this.logger.info("[shared-whiteboard-data-source]: setBackgroundColor ".concat(color));
       this.backgroundColor = color;
-      this._fcrUIMainWindowRenderer.notifyObservers('onBackgroundColorUpdated', color);
+      (_this$_fcrUIMainWindo2 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo2 === void 0 || _this$_fcrUIMainWindo2.notifyObservers('onBackgroundColorUpdated', color);
     }
   }, {
     key: "setWhiteboardTool",
     value: function setWhiteboardTool(tool) {
+      var _this$_fcrUIMainWindo3;
       this.logger.info("[shared-whiteboard-data-source]: setWhiteboardTool ".concat(tool));
-      this._fcrUIMainWindowRenderer.notifyObservers('onWhiteboardToolSelected', tool);
+      (_this$_fcrUIMainWindo3 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo3 === void 0 || _this$_fcrUIMainWindo3.notifyObservers('onWhiteboardToolSelected', tool);
       switch (tool.action) {
         case _type2.WhiteboardToolAction.TOOL:
           this.toolbarState.currentTool = tool.tool;
@@ -248,7 +252,8 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
   }, {
     key: "setTheme",
     value: function setTheme(theme) {
-      this._fcrUIMainWindowRenderer.notifyObservers('onBackgroundColorUpdated', theme.background);
+      var _this$_fcrUIMainWindo4;
+      (_this$_fcrUIMainWindo4 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo4 === void 0 || _this$_fcrUIMainWindo4.notifyObservers('onBackgroundColorUpdated', theme.background);
       this.toolbarState.themeColors = theme.colors;
       this.currentTheme = (0, _libs["default"])().find(function (t) {
         return t.theme === theme.theme;
@@ -268,7 +273,8 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
   }, {
     key: "saveDraft",
     value: function saveDraft() {
-      this._fcrUIMainWindowRenderer.notifyObservers('onSaveDraft');
+      var _this$_fcrUIMainWindo5;
+      (_this$_fcrUIMainWindo5 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo5 === void 0 || _this$_fcrUIMainWindo5.notifyObservers('onSaveDraft');
     }
   }, {
     key: "setProgress",
@@ -283,7 +289,8 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
   }, {
     key: "inActive",
     value: function inActive() {
-      this._fcrUIMainWindowRenderer.notifyObservers('onWhiteboardInActive');
+      var _this$_fcrUIMainWindo6;
+      (_this$_fcrUIMainWindo6 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo6 === void 0 || _this$_fcrUIMainWindo6.notifyObservers('onWhiteboardInActive');
     }
   }, {
     key: "release",
@@ -329,14 +336,13 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
   }]);
 }();
 _FcrUISharedWhiteboardDataSourceImpl = FcrUISharedWhiteboardDataSourceImpl;
-var _applyDecs$e = _applyDecs(_FcrUISharedWhiteboardDataSourceImpl, [[_mobx.observable, 1, "currentTheme"], [_mobx.observable, 1, "sharingUserInfo"], [_mobx.observable, 1, "backgroundColor"], [_mobx.observable, 1, "hasWriteBoardPermission"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "joinSuccess"], [_mobx.observable, 1, "toolbarState"], [_mobx.computed, 3, "canWriteBoard"], [_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_setShowLoadingDecs, 18, "setShowLoading"], [_setCommonColorsDecs, 18, "setCommonColors"], [_decorator.bound, 2, "saveDraft"], [_setProgressDecs, 18, "setProgress"], [_setJoinSuccessDecs, 18, "setJoinSuccess"], [_decorator.bound, 2, "inActive"], [_decorator.bound, 2, "_resetWhiteboardTool"], [_handleConnectionStateUpdatedDecs, 18, "_handleConnectionStateUpdated"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 8);
-_init_currentTheme = _applyDecs$e2[0];
-_init_sharingUserInfo = _applyDecs$e2[1];
-_init_backgroundColor = _applyDecs$e2[2];
-_init_hasWriteBoardPermission = _applyDecs$e2[3];
-_init_connectionState = _applyDecs$e2[4];
-_init_joinSuccess = _applyDecs$e2[5];
-_init_toolbarState = _applyDecs$e2[6];
-_initProto = _applyDecs$e2[7];
-_applyDecs$e;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedWhiteboardDataSourceImpl, [[_mobx.observable, 1, "currentTheme"], [_mobx.observable, 1, "sharingUserInfo"], [_mobx.observable, 1, "backgroundColor"], [_mobx.observable, 1, "hasWriteBoardPermission"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "joinSuccess"], [_mobx.observable, 1, "toolbarState"], [_mobx.computed, 3, "canWriteBoard"], [_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_setShowLoadingDecs, 18, "setShowLoading"], [_setCommonColorsDecs, 18, "setCommonColors"], [_decorator.bound, 2, "saveDraft"], [_setProgressDecs, 18, "setProgress"], [_setJoinSuccessDecs, 18, "setJoinSuccess"], [_decorator.bound, 2, "inActive"], [_decorator.bound, 2, "_resetWhiteboardTool"], [_handleConnectionStateUpdatedDecs, 18, "_handleConnectionStateUpdated"]], []).e, 8);
+_init_currentTheme = _applyDecs$e[0];
+_init_sharingUserInfo = _applyDecs$e[1];
+_init_backgroundColor = _applyDecs$e[2];
+_init_hasWriteBoardPermission = _applyDecs$e[3];
+_init_connectionState = _applyDecs$e[4];
+_init_joinSuccess = _applyDecs$e[5];
+_init_toolbarState = _applyDecs$e[6];
+_initProto = _applyDecs$e[7];
+(0, _base.registerDependency)('sharedWhiteboardDataSource');

package/lib/translations/enUS.d.ts

@@ -494,9 +494,7 @@ export declare const enUs: {
     fmt_screenshare_controlbar_security_list_participantManagement: string;
     fmt_screenshare_button_chosecontent: string;
     fmt_screenshare_tips_newsharing: string;
-    fmt_screenshare_label_screenshare: string;
     fmt_screenshare_button_sharewhiteboard: string;
-    fmt_screenshare_button_chosewhiteboard: string;
     fmt_screenshare_options_alreadyopend: string;
     fmt_screenshare_options_allow: string;
     fmt_screenshare_options_editable: string;

package/lib/translations/enUS.js

@@ -505,9 +505,7 @@ var enUs = exports.enUs = {
   fmt_screenshare_controlbar_security_list_participantManagement: 'Allow attendees',
   fmt_screenshare_button_chosecontent: 'Select shared content',
   fmt_screenshare_tips_newsharing: 'Initiate a new sharing',
-  fmt_screenshare_label_screenshare: 'Share Screen',
   fmt_screenshare_button_sharewhiteboard: 'Share Whiteboard',
-  fmt_screenshare_button_chosewhiteboard: 'Close whiteboard',
   fmt_screenshare_options_alreadyopend: 'Whiteboard (Already ON)',
   fmt_screenshare_options_allow: 'Allow attendees',
   fmt_screenshare_options_editable: 'Annotate and edit whiteboards',
@@ -805,8 +803,8 @@ var enUs = exports.enUs = {
   fmt_failure_popup_label_startup_fail: 'Startup Failure',
   fmt_failure_popup_label_startup_check: 'Please check startup parameters and network settings as a priority',
   fmt_failure_popup_button_i_know: 'I know',
-  fmt_failure_popup_label_crash: 'Exception occurred',
-  fmt_failure_popup_label_crash_tips: 'The app is error, please close the app and try again.',
+  fmt_failure_popup_label_crash: 'App crash',
+  fmt_failure_popup_label_crash_tips: 'The app is crashing, please close the app and try again.',
   fmt_failure_popup_button_close_app: 'Close the app',
   fmt_failure_popup_button_refresh: 'Refresh',
   fmt_qualitystatistics_label_video: 'Video',
@@ -859,7 +857,7 @@ var enUs = exports.enUs = {
   fmt_setting_option_3ahigh: 'High',
   fmt_setting_label_professional: 'Music and Professional Audio',
   fmt_setting_option_orinalvoise: 'Display the option in the meeting in case of you want to turn the original sound',
-  fmt_setting_tips_speaker: "Click on the test speaker to confirm that you can hear other people's voices",
+  fmt_setting_tips_speaker: 'Click to test the speaker',
   fmt_setting_tips_mic: 'Please speak into your microphone. If you cannot hear your own voice, please replace the microphone',
   fmt_setting_tips_speaker_unwork: 'If you cannot hear the test sound, please replace the speaker',
   fmt_setting_tips_mic_unwork: 'If you cannot hear the test sound, please replace the microphone',
@@ -1552,7 +1550,7 @@ var enUs = exports.enUs = {
   fmt_premeeting_setting_label_automatically_adjust_volume: 'Automatically adjust {reason1} volume',
   fmt_premeeting_setting_label_microphone: 'Microphone',
   fmt_premeeting_setting_button_test_microphone: 'Test Microphone',
-  fmt_premeeting_setting_label_speak_into_your_microphone: "Click 'Test Microphone' to ensure other participants can hear you clearly.",
+  fmt_premeeting_setting_label_speak_into_your_microphone: 'Click to test the microphone',
   fmt_premeeting_setting_button_recording: 'Recording',
   fmt_premeeting_setting_label_change_the_microphone: 'If you cannot hear the test sound, please change the microphone.',
   fmt_premeeting_setting_label_input_level: 'Input Level',

package/lib/translations/zhCN.d.ts

@@ -494,9 +494,7 @@ export declare const zhCn: {
     fmt_screenshare_controlbar_security_list_participantManagement: string;
     fmt_screenshare_button_chosecontent: string;
     fmt_screenshare_tips_newsharing: string;
-    fmt_screenshare_label_screenshare: string;
     fmt_screenshare_button_sharewhiteboard: string;
-    fmt_screenshare_button_chosewhiteboard: string;
     fmt_screenshare_options_alreadyopend: string;
     fmt_screenshare_options_allow: string;
     fmt_screenshare_options_editable: string;

package/lib/translations/zhCN.js

@@ -505,9 +505,7 @@ var zhCn = exports.zhCn = {
   fmt_screenshare_controlbar_security_list_participantManagement: '允许参会者',
   fmt_screenshare_button_chosecontent: '选择共享内容',
   fmt_screenshare_tips_newsharing: '发起新的屏幕共享',
-  fmt_screenshare_label_screenshare: '屏幕共享',
   fmt_screenshare_button_sharewhiteboard: '共享白板',
-  fmt_screenshare_button_chosewhiteboard: '关闭白板',
   fmt_screenshare_options_alreadyopend: '共享白板(其他人已开启)',
   fmt_screenshare_options_allow: '允许参会者',
   fmt_screenshare_options_editable: '可标注和编辑白板',
@@ -805,8 +803,8 @@ var zhCn = exports.zhCn = {
   fmt_failure_popup_label_startup_fail: '启动失败',
   fmt_failure_popup_label_startup_check: '请优先检查启动参数与网络设置',
   fmt_failure_popup_button_i_know: '我已知悉',
-  fmt_failure_popup_label_crash: '出现异常',
-  fmt_failure_popup_label_crash_tips: '应用出现异常，请关闭应用重试',
+  fmt_failure_popup_label_crash: '应用崩溃',
+  fmt_failure_popup_label_crash_tips: '应用遇到崩溃问题，请关闭应用重试',
   fmt_failure_popup_button_close_app: '关闭应用',
   fmt_failure_popup_button_refresh: '刷新',
   fmt_qualitystatistics_label_video: '视频',
@@ -859,7 +857,7 @@ var zhCn = exports.zhCn = {
   fmt_setting_option_3ahigh: '高',
   fmt_setting_label_professional: '音乐和专业音频',
   fmt_setting_option_orinalvoise: '显示会议中选项，以通过麦克风“打开原声”',
-  fmt_setting_tips_speaker: '点击测试扬声器，以确定你可以听到他人的声音',
+  fmt_setting_tips_speaker: '点击测试扬声器',
   fmt_setting_tips_mic: '请对着你的麦克风说话。如果你无法听到自己的声音，请更换麦克风',
   fmt_setting_tips_speaker_unwork: '如果你无法听到测试音，请更换扬声器',
   fmt_setting_tips_mic_unwork: '如果你无法听到测试音，请更换麦克风',
@@ -1552,7 +1550,7 @@ var zhCn = exports.zhCn = {
   fmt_premeeting_setting_label_automatically_adjust_volume: '自动调整{xxxxx}音量',
   fmt_premeeting_setting_label_microphone: '麦克风',
   fmt_premeeting_setting_button_test_microphone: '检测麦克风',
-  fmt_premeeting_setting_label_speak_into_your_microphone: '点击测试麦克风，确保其他参会人员可以听到您的声音',
+  fmt_premeeting_setting_label_speak_into_your_microphone: '点击测试麦克风',
   fmt_premeeting_setting_button_recording: '录制中',
   fmt_premeeting_setting_label_change_the_microphone: '如果你无法听到测试音，请更换麦克风',
   fmt_premeeting_setting_label_input_level: '输入级别',

package/lib/type.d.ts

@@ -175,6 +175,11 @@ export interface FcrUIDeviceObserver {
      * 音频已连接
      */
     onAudioConnected?(): void;
+    /**
+     * 系统选中设备变更
+     * @param device
+     */
+    onSystemSelectedDeviceChanged?(device: FcrDeviceInfo): void;
 }
 export declare enum FcrUIVideoEffectType {
     NONE = 0,

package/lib/ui-scene.d.ts

@@ -2,6 +2,7 @@ import { FcrUIDefaultSceneConstructorArgs, FcrUISceneFacadeInternal, FcrUISceneO
 import { FcrUIManager } from './ui-manager';
 export declare class FcrUIDefaultScene implements FcrUISceneFacadeInternal {
     private _joinAbortController;
+    private _widgetObserver;
     get uiManager(): FcrUIManager;
     constructor({ registeredWidgetConfigs, objectManager, providerInitializer, }: FcrUIDefaultSceneConstructorArgs);
     private _resetPreventClose;
@@ -12,6 +13,7 @@ export declare class FcrUIDefaultScene implements FcrUISceneFacadeInternal {
     private _removeLocalMeetingTimeKey;
     private _setLocalMeetingTimeKey;
     private _addObservers;
+    private _addWidgetObserver;
     private _joinRoom;
     private _renderSceneUI;
     private _release;
@@ -19,8 +21,4 @@ export declare class FcrUIDefaultScene implements FcrUISceneFacadeInternal {
     private _createWaitingScene;
     private _releaseCurrentScene;
     private _addLogObserver;
-    /**
-     * 统一管理provider和dataSource的创建/获取
-     */
-    private _createWidgetProvider;
 }