fcr-ui-scene 3.7.5 → 3.7.6

package/lib/providers/widget-provider.js

@@ -58,7 +58,7 @@ var _webWidget = require("../modules/widget/web-widget");
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _logger = require("../utilities/logger");
 var _FcrUIWidgetProviderImpl;
-var _initProto, _init_dialogIds, _init_registeredWidgetConfigs, _init_openedWidgets;
+var _initProto, _init_dialogIds, _init_openedWidgets;
 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; }
@@ -71,11 +71,10 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 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();
 var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/function () {
   function FcrUIWidgetProviderImpl(_ref) {
     var _this = this;
-    var registeredWidgetConfigs = _ref.registeredWidgetConfigs,
+    var sharedWidgetDataSource = _ref.sharedWidgetDataSource,
       roomProvider = _ref.roomProvider,
       dialogProvider = _ref.dialogProvider;
     (0, _classCallCheck2["default"])(this, FcrUIWidgetProviderImpl);
@@ -101,12 +100,11 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
     });
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     _classPrivateFieldInitSpec(this, _A, _init_dialogIds(this, new Map()));
-    _classPrivateFieldInitSpec(this, _B, _init_registeredWidgetConfigs(this, new Map()));
-    _classPrivateFieldInitSpec(this, _C, _init_openedWidgets(this, new Map()));
+    _classPrivateFieldInitSpec(this, _B, _init_openedWidgets(this, new Map()));
     this._roomProvider = roomProvider;
     this._dialogProvider = dialogProvider;
     this._dialogProvider.addObserver(this._dialogProviderObserver);
-    this.registeredWidgetConfigs = registeredWidgetConfigs;
+    this._sharedWidgetDataSource = sharedWidgetDataSource;
   }
   return (0, _createClass2["default"])(FcrUIWidgetProviderImpl, [{
     key: "dialogIds",
@@ -117,7 +115,7 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "registeredWidgetConfigs",
+    key: "openedWidgets",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -125,17 +123,14 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "openedWidgets",
+    key: "registeredWidgetConfigs",
     get: function get() {
-      return _classPrivateFieldGet(_C, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_C, this, v);
+      return this._sharedWidgetDataSource.registeredWidgetConfigs;
     }
   }, {
     key: "openWidget",
     value: function openWidget(widgetId) {
-      var widgetConfig = this.registeredWidgetConfigs.get(widgetId);
+      var widgetConfig = this._sharedWidgetDataSource.registeredWidgetConfigs.get(widgetId);
       if (!widgetConfig) {
         this.logger.error('widgetConfig not found', widgetId);
         return;
@@ -189,10 +184,9 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
   }]);
 }();
 _FcrUIWidgetProviderImpl = FcrUIWidgetProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIWidgetProviderImpl, [[_mobx.observable, 1, "dialogIds"], [_mobx.observable, 1, "registeredWidgetConfigs"], [_mobx.observable, 1, "openedWidgets"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 4);
+var _applyDecs$e = _applyDecs(_FcrUIWidgetProviderImpl, [[_mobx.observable, 1, "dialogIds"], [_mobx.observable, 1, "openedWidgets"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 3);
 _init_dialogIds = _applyDecs$e2[0];
-_init_registeredWidgetConfigs = _applyDecs$e2[1];
-_init_openedWidgets = _applyDecs$e2[2];
-_initProto = _applyDecs$e2[3];
+_init_openedWidgets = _applyDecs$e2[1];
+_initProto = _applyDecs$e2[2];
 _applyDecs$e;

package/lib/providers/window/main-window.js

@@ -155,6 +155,9 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
   }, {
     key: "setAlwaysOnTop",
     value: function setAlwaysOnTop(flag) {
+      //  这里目前没有地方调用，因为annotation调用了setAlwaysOnTop,并且设置了pop-up-menu
+      // 窗口在windows上设置的是pop-up-menu,看看是不是要成对出现
+      this.logger.info('windows_index setAlwaysOnTop in main-window');
       this.browserWindow.setAlwaysOnTop(flag);
     }
   }, {

package/lib/providers/window/renderer-window.js

@@ -122,7 +122,8 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
       _this._synBrowserWindowStateToInnerState();
       _this._observable.notifyObservers('onReady');
       if (options.needResizeObserver && _this._rootNode) {
-        _this._resizeObserver = new ResizeObserver(function () {
+        // @ts-ignore
+        _this._resizeObserver = new _this.rendererWindow.ResizeObserver(function () {
           if (_this._rootNode) {
             var bounds = _this._rootNode.getBoundingClientRect();
             _this.setBounds({
@@ -133,6 +134,7 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
             });
           }
         });
+        // @ts-ignore
         _this._resizeObserver.observe(_this._rootNode);
       }
     }, options);
@@ -283,6 +285,7 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
       this._alwaysOnTopLevel = level;
       this._relativeLevel = relativeLevel;
       if (this._isBrowserWindowReady) {
+        this.logger.info('windows_index setAlwaysOnTop in renderer-window');
         this.browserWindow.setAlwaysOnTop(flag, level, relativeLevel);
       }
     }

package/lib/runtime.d.ts

@@ -64,6 +64,7 @@ export interface Runtime {
     checkMediaPermission(mediaType: 'microphone' | 'camera' | 'sharing'): Promise<boolean>;
     openSystemPreferences(mediaType: 'microphone' | 'camera' | 'sharing'): void;
     setFragmentOptions(entryPath: string, windowOptions: import('electron').BrowserWindowConstructorOptions, webPreferences: import('electron').WebPreferences): void;
+    getBaseUrl(): string;
     setFragmentBaseUrl(isDev: boolean, baseUrl: string): void;
     captureScreen(options?: {
         hideWindow?: boolean;

package/lib/runtime.js

@@ -3,4 +3,5 @@
 require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+var _injections = require("./electron/injections");

package/lib/scenes/main-scene.js

@@ -614,6 +614,13 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.RENAME);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.LEAVE_MEETING);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.END_MEETING);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.REVOKE_HOST);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.MUTE_ALL);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONTROL_BAR_LEAVE_MEETING);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.TOAST);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONFIRM);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.END_MEETING);
       dialogProvider.closeAllConfirms();
     }
   }]);

package/lib/shared-context/board-context.d.ts

@@ -1,4 +1,6 @@
+import { FcrUILayoutType } from '../modules/layout/type';
 declare const BoardContext: import("react").Context<{
+    videoWindowLayoutType: FcrUILayoutType;
     showToolbar: boolean;
 }>;
 export default BoardContext;

package/lib/shared-context/board-context.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _react = require("react");
+var _type = require("../modules/layout/type");
 var BoardContext = /*#__PURE__*/(0, _react.createContext)({
+  videoWindowLayoutType: _type.FcrUILayoutType.GALLERY,
   showToolbar: true
 });
 var _default = exports["default"] = BoardContext;

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

@@ -85,7 +85,6 @@ export declare class FcrUISharedMemberDataSourceImpl implements FcrUISharedMembe
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _dataSource;
     private _disposers;
-    private accessor _serverPushTotalUserCount;
     private accessor _audioVolumeMap;
     private accessor _isLocalUserInPstn;
     private accessor _interpreterInputLanguageList;
@@ -93,8 +92,6 @@ export declare class FcrUISharedMemberDataSourceImpl implements FcrUISharedMembe
     private _userObserver;
     private _streamsObserver;
     private _eventProviderObserver;
-    private _isOnline;
-    private accessor serverPushTotalUserCount;
     accessor totalUserCount: number;
     accessor shareScreenVideoSize: FcrRemoteVideoStats['dimensions'] | null;
     get localUserId(): string;
@@ -113,16 +110,11 @@ export declare class FcrUISharedMemberDataSourceImpl implements FcrUISharedMembe
     get memberList(): FcrUIMemberDataImpl[];
     get memberUserInfoList(): FcrUserInfo[];
     constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _sharedScreenShareSharedDataSource: FcrUISharedScreenShareDataSource, _eventProvider: FcrUIEventProvider, _whiteBoardControl?: FcrPrivilegedWhiteboardControl | undefined);
-    private _addEventListeners;
-    private _removeEventListeners;
     private _handleOnEvent;
-    private _handleOnline;
-    private _handleOffline;
     updateMemberListWithBoardState(): void;
     release(): void;
     private _setIsLocalUserInPstn;
     private _handleAllUserCountUpdated;
-    private _setTotalUserCount;
     private _initUserList;
     private _handleUserInfoUpdated;
     private _syncParticipants;

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

@@ -97,7 +97,7 @@ var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("../utilities/logger");
 var _constant = require("../utilities/constant");
 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;
+var _initProto, _init__audioVolumeMap, _init__isLocalUserInPstn, _init__interpreterInputLanguageList, _init__localUser, _init_totalUserCount, _init_shareScreenVideoSize, _updateMemberListWithBoardStateDecs, _setIsLocalUserInPstnDecs, _handleAllUserCountUpdatedDecs, _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); }
@@ -116,9 +116,7 @@ var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 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], _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");
+_ref = (_updateMemberListWithBoardStateDecs = [_mobx.action, _mobx.action.bound], _setIsLocalUserInPstnDecs = [_mobx.action, _mobx.action.bound], _handleAllUserCountUpdatedDecs = [_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;
@@ -128,11 +126,10 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
     })));
     (0, _defineProperty2["default"])(this, "_dataSource", new _memberListDataSource.FcrUIMemberListDataSourceImpl());
     (0, _defineProperty2["default"])(this, "_disposers", []);
-    _classPrivateFieldInitSpec(this, _A, _init__serverPushTotalUserCount(this, 1));
-    _classPrivateFieldInitSpec(this, _B, _init__audioVolumeMap(this, new Map()));
-    _classPrivateFieldInitSpec(this, _C, _init__isLocalUserInPstn(this, false));
-    _classPrivateFieldInitSpec(this, _D, _init__interpreterInputLanguageList(this, []));
-    _classPrivateFieldInitSpec(this, _E, _init__localUser(this));
+    _classPrivateFieldInitSpec(this, _A, _init__audioVolumeMap(this, new Map()));
+    _classPrivateFieldInitSpec(this, _B, _init__isLocalUserInPstn(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init__interpreterInputLanguageList(this, []));
+    _classPrivateFieldInitSpec(this, _D, _init__localUser(this));
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onRemoteUsersJoined: this._handleRemoteUserJoined,
       onRemoteUsersLeft: this._handleRemoteUserLeft,
@@ -148,10 +145,8 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
     (0, _defineProperty2["default"])(this, "_eventProviderObserver", {
       onEvent: this._handleOnEvent
     });
-    (0, _defineProperty2["default"])(this, "_isOnline", true);
-    _classPrivateFieldInitSpec(this, _F, _init_serverPushTotalUserCount(this, 1));
-    _classPrivateFieldInitSpec(this, _G, _init_totalUserCount(this, 1));
-    _classPrivateFieldInitSpec(this, _H, _init_shareScreenVideoSize(this, null));
+    _classPrivateFieldInitSpec(this, _E, _init_totalUserCount(this, 1));
+    _classPrivateFieldInitSpec(this, _F, _init_shareScreenVideoSize(this, null));
     this._mainRoomUserControl = _mainRoomUserControl;
     this._streamControl = _streamControl;
     this._sharedScreenShareSharedDataSource = _sharedScreenShareSharedDataSource;
@@ -160,20 +155,19 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
     this._mainRoomUserControl.addObserver(this._userObserver);
     this._streamControl.addObserver(this._streamsObserver);
     this._eventProvider.addObserver(this._eventProviderObserver);
-    this._setTotalUserCount();
     this._initUserList();
     this.updateMemberListWithBoardState();
     this._localUser = this._mainRoomUserControl.getLocalUser();
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.memberList.length;
     }, function () {
-      _this._setTotalUserCount();
+      // this._setTotalUserCount();
       _this._syncParticipants();
     }));
-    this._addEventListeners();
+    this.totalUserCount = this._mainRoomUserControl.getAllUserCount();
   }
   return (0, _createClass2["default"])(FcrUISharedMemberDataSourceImpl, [{
-    key: "_serverPushTotalUserCount",
+    key: "_audioVolumeMap",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -181,7 +175,7 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "_audioVolumeMap",
+    key: "_isLocalUserInPstn",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -189,7 +183,7 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "_isLocalUserInPstn",
+    key: "_interpreterInputLanguageList",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -197,7 +191,7 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "_interpreterInputLanguageList",
+    key: "_localUser",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -205,7 +199,7 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "_localUser",
+    key: "totalUserCount",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -213,29 +207,13 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "serverPushTotalUserCount",
+    key: "shareScreenVideoSize",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_F, this, v);
     }
-  }, {
-    key: "totalUserCount",
-    get: function get() {
-      return _classPrivateFieldGet(_G, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_G, this, v);
-    }
-  }, {
-    key: "shareScreenVideoSize",
-    get: function get() {
-      return _classPrivateFieldGet(_H, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_H, this, v);
-    }
   }, {
     key: "localUserId",
     get: function get() {
@@ -304,18 +282,6 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
         return memberData.userInfo;
       });
     }
-  }, {
-    key: "_addEventListeners",
-    value: function _addEventListeners() {
-      window.addEventListener('online', this._handleOnline);
-      window.addEventListener('offline', this._handleOffline);
-    }
-  }, {
-    key: "_removeEventListeners",
-    value: function _removeEventListeners() {
-      window.removeEventListener('online', this._handleOnline);
-      window.removeEventListener('offline', this._handleOffline);
-    }
   }, {
     key: "_handleOnEvent",
     value: function _handleOnEvent(action, payload) {
@@ -324,16 +290,6 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
         this._syncParticipants();
       }
     }
-  }, {
-    key: "_handleOnline",
-    value: function _handleOnline() {
-      this._isOnline = true;
-    }
-  }, {
-    key: "_handleOffline",
-    value: function _handleOffline() {
-      this._isOnline = false;
-    }
   }, {
     key: "updateMemberListWithBoardState",
     value: function updateMemberListWithBoardState() {
@@ -359,7 +315,6 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
         return disposer();
       });
       this._disposers = [];
-      this._removeEventListeners();
       this._eventProvider.removeObserver(this._eventProviderObserver);
       this._mainRoomUserControl.removeObserver(this._userObserver);
       this._streamControl.removeObserver(this._streamsObserver);
@@ -377,12 +332,7 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
   }, {
     key: "_handleAllUserCountUpdated",
     value: function _handleAllUserCountUpdated(_roomId, count) {
-      this._serverPushTotalUserCount = count;
-    }
-  }, {
-    key: "_setTotalUserCount",
-    value: function _setTotalUserCount() {
-      this.totalUserCount = this._mainRoomUserControl.getAllUserCount();
+      this.totalUserCount = count;
     }
   }, {
     key: "_initUserList",
@@ -527,15 +477,13 @@ var FcrUISharedMemberDataSourceImpl = exports.FcrUISharedMemberDataSourceImpl =
   }]);
 }();
 _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];
+var _applyDecs$e = _applyDecs(_FcrUISharedMemberDataSourceImpl, [[_mobx.observable, 1, "_audioVolumeMap"], [_mobx.observable, 1, "_isLocalUserInPstn"], [_mobx.observable, 1, "_interpreterInputLanguageList"], [_mobx.observable, 1, "_localUser"], [_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"], [_updateMemberListWithBoardStateDecs, 18, "updateMemberListWithBoardState"], [_setIsLocalUserInPstnDecs, 18, "_setIsLocalUserInPstn"], [_handleAllUserCountUpdatedDecs, 18, "_handleAllUserCountUpdated"], [_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, 7);
+_init__audioVolumeMap = _applyDecs$e2[0];
+_init__isLocalUserInPstn = _applyDecs$e2[1];
+_init__interpreterInputLanguageList = _applyDecs$e2[2];
+_init__localUser = _applyDecs$e2[3];
+_init_totalUserCount = _applyDecs$e2[4];
+_init_shareScreenVideoSize = _applyDecs$e2[5];
+_initProto = _applyDecs$e2[6];
 _applyDecs$e;

package/lib/shared-data/widget-data.d.ts

@@ -0,0 +1,13 @@
+import { FcrRegisteredWidgetConfigs } from '../modules/widget/type';
+import { FcrUIManagedObject } from '../object-manager';
+export interface FcrUISharedWidgetDataSource {
+    get registeredWidgetConfigs(): FcrRegisteredWidgetConfigs;
+    setRegisteredWidgetConfigs(registeredWidgetConfigs: FcrRegisteredWidgetConfigs): void;
+}
+export declare class FcrUISharedWidgetDataSourceImpl implements FcrUISharedWidgetDataSource, FcrUIManagedObject {
+    private _registeredWidgetConfigs;
+    get registeredWidgetConfigs(): FcrRegisteredWidgetConfigs;
+    constructor();
+    release(): void;
+    setRegisteredWidgetConfigs(registeredWidgetConfigs: FcrRegisteredWidgetConfigs): void;
+}

package/lib/shared-data/widget-data.js

@@ -0,0 +1,50 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUISharedWidgetDataSourceImpl = void 0;
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.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/web.dom-collections.iterator.js");
+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 FcrUISharedWidgetDataSourceImpl = exports.FcrUISharedWidgetDataSourceImpl = /*#__PURE__*/function () {
+  function FcrUISharedWidgetDataSourceImpl() {
+    (0, _classCallCheck2["default"])(this, FcrUISharedWidgetDataSourceImpl);
+    (0, _defineProperty2["default"])(this, "_registeredWidgetConfigs", new Map());
+  }
+  return (0, _createClass2["default"])(FcrUISharedWidgetDataSourceImpl, [{
+    key: "registeredWidgetConfigs",
+    get: function get() {
+      return this._registeredWidgetConfigs;
+    }
+  }, {
+    key: "release",
+    value: function release() {}
+  }, {
+    key: "setRegisteredWidgetConfigs",
+    value: function setRegisteredWidgetConfigs(registeredWidgetConfigs) {
+      this._registeredWidgetConfigs = registeredWidgetConfigs;
+    }
+  }]);
+}();

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;
 }