fcr-ui-scene 3.4.1 → 3.4.2

package/lib/modules/live-streaming/store.js

@@ -6,7 +6,6 @@ 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.bind.js");
 require("core-js/modules/es.function.name.js");
@@ -37,14 +36,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.StoreContext = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.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 _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -52,13 +57,12 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("fcr-core/lib/type");
 var _mobx = require("mobx");
-var _constant = require("../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("agora-foundation/lib/logger");
-var _i18n = require("agora-ui-foundation/lib/i18n");
 var _react = require("react");
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _LiveStreamingStore;
-var _initProto, _init_videoSteamingUrl, _init_videoStreamingKey, _init_playUrl, _init_liveStreamingState, _init_isStartError, _onLiveButtonClickDecs, _startLiveStreamingDecs, _handleLiveStreamingStateUpdatedDecs, _handleEventDecs, _ref;
+var _initProto, _init_isStartError, _onLiveButtonClickDecs, _startLiveStreamingDecs, _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; }
@@ -70,48 +74,39 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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();
-var _D = /*#__PURE__*/new WeakMap();
-var _E = /*#__PURE__*/new WeakMap();
-_ref = (_onLiveButtonClickDecs = [_mobx.action, _mobx.action.bound], _startLiveStreamingDecs = [_mobx.action, _mobx.action.bound], _handleLiveStreamingStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleEventDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_onLiveButtonClickDecs = [_mobx.action, _mobx.action.bound], _startLiveStreamingDecs = [_mobx.action, _mobx.action.bound], "logger");
 var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
   function LiveStreamingStore(_ref2) {
+    var _this = this;
     var roomControl = _ref2.roomControl,
-      uiEventStore = _ref2.uiEventStore;
+      sharedLayoutDataSource = _ref2.sharedLayoutDataSource,
+      roomProvider = _ref2.roomProvider,
+      dialogProvider = _ref2.dialogProvider,
+      messageProvider = _ref2.messageProvider,
+      sharedVideoWindowDataSource = _ref2.sharedVideoWindowDataSource;
     (0, _classCallCheck2["default"])(this, LiveStreamingStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
-    _classPrivateFieldInitSpec(this, _A, _init_videoSteamingUrl(this));
-    _classPrivateFieldInitSpec(this, _B, _init_videoStreamingKey(this));
-    _classPrivateFieldInitSpec(this, _C, _init_playUrl(this));
-    _classPrivateFieldInitSpec(this, _D, _init_liveStreamingState(this));
-    _classPrivateFieldInitSpec(this, _E, _init_isStartError(this, false));
-    (0, _defineProperty2["default"])(this, "_layoutView", 'gallery');
+    _classPrivateFieldInitSpec(this, _A, _init_isStartError(this, false));
     (0, _defineProperty2["default"])(this, "_disposers", []);
-    (0, _defineProperty2["default"])(this, "_uiEventObserver", {
-      onEvent: this._handleEvent
-    });
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onUserInfoUpdated: this._onUserInfoUpdated
     });
-    (0, _defineProperty2["default"])(this, "_roomObserver", {
-      onLiveStreamingStateUpdated: this._handleLiveStreamingStateUpdated
-    });
     this._roomControl = roomControl;
     this._userControl = roomControl.getUserControl();
     this._isHost = this._userControl.getLocalUser().userRole === _type.FcrUserRole.HOST;
-    this._uiEventStore = uiEventStore;
+    this._roomProvider = roomProvider;
+    this._dialogProvider = dialogProvider;
+    this._messageProvider = messageProvider;
+    this._sharedLayoutDataSource = sharedLayoutDataSource;
+    this._sharedVideoWindowDataSource = sharedVideoWindowDataSource;
     this._userControl.addObserver(this._userObserver);
-    this._roomControl.addObserver(this._roomObserver);
-    this._uiEventStore.addObserver(this._uiEventObserver);
-    this.liveStreamingState = roomControl.getLiveStreamingState();
-    var liveStreamingConfig = roomControl.getLiveStreamingConfig();
-    this.videoSteamingUrl = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pushStreamingUrl) || '';
-    this.videoStreamingKey = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pushStreamingKey) || '';
-    this.playUrl = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pullStreamingUrl) || '';
+    this._disposers.push((0, _mobx.reaction)(function () {
+      var _this$_sharedVideoWin;
+      return (_this$_sharedVideoWin = _this._sharedVideoWindowDataSource) === null || _this$_sharedVideoWin === void 0 ? void 0 : _this$_sharedVideoWin.layoutType;
+    }, this._updateLiveStreamingLayout));
   }
   return (0, _createClass2["default"])(LiveStreamingStore, [{
-    key: "videoSteamingUrl",
+    key: "isStartError",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -119,44 +114,47 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "videoStreamingKey",
+    key: "liveStreamingState",
     get: function get() {
-      return _classPrivateFieldGet(_B, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_B, this, v);
+      return this._roomProvider.liveStreamingState;
     }
   }, {
-    key: "playUrl",
+    key: "videoStreamingUrl",
     get: function get() {
-      return _classPrivateFieldGet(_C, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_C, this, v);
+      var _this$_roomProvider$l;
+      return ((_this$_roomProvider$l = this._roomProvider.liveStreamingConfig) === null || _this$_roomProvider$l === void 0 ? void 0 : _this$_roomProvider$l.pushStreamingUrl) || '';
     }
   }, {
-    key: "liveStreamingState",
+    key: "videoStreamingKey",
     get: function get() {
-      return _classPrivateFieldGet(_D, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_D, this, v);
+      var _this$_roomProvider$l2;
+      return ((_this$_roomProvider$l2 = this._roomProvider.liveStreamingConfig) === null || _this$_roomProvider$l2 === void 0 ? void 0 : _this$_roomProvider$l2.pushStreamingKey) || '';
     }
   }, {
-    key: "isStartError",
+    key: "playUrl",
     get: function get() {
-      return _classPrivateFieldGet(_E, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_E, this, v);
+      var _this$_roomProvider$l3;
+      return ((_this$_roomProvider$l3 = this._roomProvider.liveStreamingConfig) === null || _this$_roomProvider$l3 === void 0 ? void 0 : _this$_roomProvider$l3.pullStreamingUrl) || '';
     }
   }, {
     key: "release",
-    value: function release() {}
+    value: function release() {
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this._disposers = [];
+      this._userControl.removeObserver(this._userObserver);
+    }
   }, {
     key: "closeLiveStreaming",
     value: function closeLiveStreaming() {
-      this._uiEventStore.closeLiveStreamingDialog();
+      this._dialogProvider.closeLiveStreamingDialog();
+    }
+  }, {
+    key: "_layoutView",
+    get: function get() {
+      var _this$_sharedVideoWin2;
+      return (_this$_sharedVideoWin2 = this._sharedVideoWindowDataSource) === null || _this$_sharedVideoWin2 === void 0 ? void 0 : _this$_sharedVideoWin2.layoutType;
     }
   }, {
     key: "onLiveButtonClick",
@@ -166,17 +164,22 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!(this.liveStreamingState === _type.FcrLiveStreamingState.STOPPED)) {
-                _context.next = 6;
+                _context.next = 3;
                 break;
               }
               this._startLiveStreaming(videoSteamingUrl, videoStreamingKey, playUrl);
-              this.videoSteamingUrl = videoSteamingUrl;
-              this.videoStreamingKey = videoStreamingKey;
-              this.playUrl = playUrl;
               return _context.abrupt("return");
-            case 6:
-              this._stopLiveStreaming();
-            case 7:
+            case 3:
+              try {
+                this._roomProvider.stopLiveStreaming();
+              } catch (e) {
+                this._dialogProvider.closeLiveStreamingDialog();
+                this._messageProvider.showToast({
+                  message: (0, _i18n.transI18n)('fmt_broadcast_livestream_stopped'),
+                  type: 'info'
+                });
+              }
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -191,34 +194,36 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
     key: "_startLiveStreaming",
     value: function () {
       var _startLiveStreaming2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(videoSteamingUrl, videoStreamingKey, playUrl) {
+        var _this2 = this;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.prev = 0;
-              this.liveStreamingState = _type.FcrLiveStreamingState.STARTING;
-              _context2.next = 4;
-              return this._roomControl.startLiveStreaming({
+              _context2.next = 3;
+              return this._roomProvider.startLiveStreaming({
                 pushStreamingUrl: videoSteamingUrl,
                 pullStreamingUrl: playUrl,
                 pushStreamingKey: videoStreamingKey,
                 layoutType: this._layoutView === 'speaker' ? _type.FcrLiveStreamingLayoutType.SPEAKER : _type.FcrLiveStreamingLayoutType.GALLERY
               });
-            case 4:
-              this.isStartError = false;
-              this.liveStreamingState = _type.FcrLiveStreamingState.STARTED;
-              this._uiEventStore.closeLiveStreamingDialog();
-              _context2.next = 13;
+            case 3:
+              (0, _mobx.runInAction)(function () {
+                _this2.isStartError = false;
+              });
+              this._dialogProvider.closeLiveStreamingDialog();
+              _context2.next = 10;
               break;
-            case 9:
-              _context2.prev = 9;
+            case 7:
+              _context2.prev = 7;
               _context2.t0 = _context2["catch"](0);
-              this.liveStreamingState = _type.FcrLiveStreamingState.STOPPED;
-              this.isStartError = true;
-            case 13:
+              (0, _mobx.runInAction)(function () {
+                _this2.isStartError = true;
+              });
+            case 10:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[0, 9]]);
+        }, _callee2, this, [[0, 7]]);
       }));
       function _startLiveStreaming(_x4, _x5, _x6) {
         return _startLiveStreaming2.apply(this, arguments);
@@ -230,63 +235,6 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
     value: function _onUserInfoUpdated(roomId, event) {
       this._isHost = this._userControl.getLocalUser().userRole === _type.FcrUserRole.HOST;
     }
-  }, {
-    key: "_handleLiveStreamingStateUpdated",
-    value: function _handleLiveStreamingStateUpdated(_roomId, state) {
-      this.liveStreamingState = state;
-      var liveStreamingConfig = this._roomControl.getLiveStreamingConfig();
-      this.videoSteamingUrl = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pushStreamingUrl) || '';
-      this.videoStreamingKey = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pushStreamingKey) || '';
-      this.playUrl = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pullStreamingUrl) || '';
-    }
-  }, {
-    key: "_handleEvent",
-    value: function _handleEvent(action, payload) {
-      switch (action) {
-        case _constant.UIAction.STOP_LIVE_STREAMING:
-          this._stopLiveStreaming();
-          break;
-        case _constant.UIAction.LAYOUT_CHANGED:
-          var _ref3 = payload,
-            layout = _ref3.layout;
-          this._layoutView = layout;
-          this._updateLiveStreamingLayout();
-      }
-    }
-  }, {
-    key: "_stopLiveStreaming",
-    value: function () {
-      var _stopLiveStreaming2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.prev = 0;
-              _context3.next = 3;
-              return this._roomControl.stopLiveStreaming();
-            case 3:
-              this.isStartError = false;
-              this.liveStreamingState = _type.FcrLiveStreamingState.STOPPED;
-              this._uiEventStore.closeLiveStreamingDialog();
-              this._uiEventStore.showToast({
-                message: (0, _i18n.transI18n)('fmt_broadcast_livestream_stopped'),
-                type: 'info'
-              });
-              return _context3.abrupt("return");
-            case 10:
-              _context3.prev = 10;
-              _context3.t0 = _context3["catch"](0);
-              this.logger.error('stopLiveStreaming error', _context3.t0);
-            case 13:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this, [[0, 10]]);
-      }));
-      function _stopLiveStreaming() {
-        return _stopLiveStreaming2.apply(this, arguments);
-      }
-      return _stopLiveStreaming;
-    }()
   }, {
     key: "_updateLiveStreamingLayout",
     value: function _updateLiveStreamingLayout() {
@@ -296,20 +244,12 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
       if (this.liveStreamingState !== _type.FcrLiveStreamingState.STARTED) {
         return;
       }
-      try {
-        this._roomControl.updateLiveStreamingLayout(this._layoutView === 'speaker' ? _type.FcrLiveStreamingLayoutType.SPEAKER : _type.FcrLiveStreamingLayoutType.GALLERY);
-      } catch (error) {
-        this.logger.error('updateLiveStreamingLayout error', error);
-      }
+      this._roomControl.updateLiveStreamingLayout(this._layoutView === 'speaker' ? _type.FcrLiveStreamingLayoutType.SPEAKER : _type.FcrLiveStreamingLayoutType.GALLERY);
     }
   }]);
 }();
 _LiveStreamingStore = LiveStreamingStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LiveStreamingStore, [[_mobx.observable, 1, "videoSteamingUrl"], [_mobx.observable, 1, "videoStreamingKey"], [_mobx.observable, 1, "playUrl"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "isStartError"], [_onLiveButtonClickDecs, 18, "onLiveButtonClick"], [_startLiveStreamingDecs, 18, "_startLiveStreaming"], [_decorator.bound, 2, "_onUserInfoUpdated"], [_handleLiveStreamingStateUpdatedDecs, 18, "_handleLiveStreamingStateUpdated"], [_handleEventDecs, 18, "_handleEvent"], [_decorator.bound, 2, "_updateLiveStreamingLayout"]], []).e, 6);
-_init_videoSteamingUrl = _applyDecs$e[0];
-_init_videoStreamingKey = _applyDecs$e[1];
-_init_playUrl = _applyDecs$e[2];
-_init_liveStreamingState = _applyDecs$e[3];
-_init_isStartError = _applyDecs$e[4];
-_initProto = _applyDecs$e[5];
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LiveStreamingStore, [[_mobx.observable, 1, "isStartError"], [_onLiveButtonClickDecs, 18, "onLiveButtonClick"], [_startLiveStreamingDecs, 18, "_startLiveStreaming"], [_decorator.bound, 2, "_onUserInfoUpdated"], [_decorator.bound, 2, "_updateLiveStreamingLayout"]], []).e, 2);
+_init_isStartError = _applyDecs$e[0];
+_initProto = _applyDecs$e[1];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/live-streaming/view.js

@@ -13,7 +13,7 @@ var _type = require("fcr-core/lib/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var View = exports.View = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
-    videoSteamingUrl = _useContext.videoSteamingUrl,
+    videoStreamingUrl = _useContext.videoStreamingUrl,
     videoStreamingKey = _useContext.videoStreamingKey,
     playUrl = _useContext.playUrl,
     onLiveButtonClick = _useContext.onLiveButtonClick,
@@ -21,7 +21,7 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     liveStreamingState = _useContext.liveStreamingState;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_container.FcrLiveStreamingContainer, {
-      defaultVideoSteamingUrl: videoSteamingUrl,
+      defaultVideoStreamingUrl: videoStreamingUrl,
       defaultVideoStreamingKey: videoStreamingKey,
       defaultPlayUrl: playUrl,
       isStarted: liveStreamingState === _type.FcrLiveStreamingState.STARTED,

package/lib/modules/notification/index.d.ts

@@ -1,15 +1,13 @@
-import { FcrPrivilegeControl } from 'fcr-core';
 import { UIModule } from '../../base';
-import { FcrUIEventStore } from '../../common/event-store';
-import { FcrRoomStore } from '../../common/room-store';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUIMessageProvider } from '../../providers/message-provider';
+import { FcrUISharedWaitingRoomDataSource } from '../../shared-data-source/waiting-room';
 export declare class NotificationUIModule extends UIModule {
-    private _store;
-    private _uiEventStore;
-    constructor(args: {
-        uiEventStore: FcrUIEventStore;
-        privilegeControl: FcrPrivilegeControl;
-        roomStore: FcrRoomStore;
-    });
-    protected onUnload(): void;
+    private _store?;
+    eventProvider?: FcrUIEventProvider;
+    messageProvider?: FcrUIMessageProvider;
+    sharedWaitingRoomDataSource?: FcrUISharedWaitingRoomDataSource;
+    onNodeWillActive(): void;
+    onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
 }

package/lib/modules/notification/index.js

@@ -22,38 +22,45 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _base = require("../../base");
-var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
+var _store = _interopRequireWildcard(require("./store"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 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; })(); }
 var NotificationUIModule = exports.NotificationUIModule = /*#__PURE__*/function (_UIModule) {
-  function NotificationUIModule(args) {
-    var _this;
+  function NotificationUIModule() {
     (0, _classCallCheck2["default"])(this, NotificationUIModule);
-    _this = _callSuper(this, NotificationUIModule);
-    _this._uiEventStore = args.uiEventStore;
-    _this._store = new _store["default"]({
-      privilegeControl: args.privilegeControl,
-      roomStore: args.roomStore
-    });
-    return _this;
+    return _callSuper(this, NotificationUIModule, arguments);
   }
   (0, _inherits2["default"])(NotificationUIModule, _UIModule);
   return (0, _createClass2["default"])(NotificationUIModule, [{
-    key: "onUnload",
-    value: function onUnload() {
-      this._store.release();
+    key: "onNodeWillActive",
+    value: function onNodeWillActive() {
+      if (this.messageProvider && this.sharedWaitingRoomDataSource) {
+        this._store = new _store["default"]({
+          sharedWaitingRoomDataSource: this.sharedWaitingRoomDataSource
+        });
+      }
+    }
+  }, {
+    key: "onNodeWillInactive",
+    value: function onNodeWillInactive() {
+      var _this$_store;
+      (_this$_store = this._store) === null || _this$_store === void 0 || _this$_store.release();
     }
   }, {
     key: "getComponent",
     value: function getComponent() {
+      if (!this._store || !this.eventProvider || !this.messageProvider) {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+      }
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: this._store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {
-          uiEventStore: this._uiEventStore
+          uiEventStore: this.eventProvider,
+          messageProvider: this.messageProvider
         })
       }, "notification");
     }

package/lib/modules/notification/interpreter-status/index.js

@@ -27,7 +27,6 @@ var InterpreterStatus = exports.InterpreterStatus = (0, _mobxReact.observer)(fun
     return ele.userName;
   }).join('、');
   var t = (0, _i18n.useI18n)();
-  console.log(operatorUser, 'operatorUser');
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "interpreter-status-confirm-dialog",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -51,7 +50,7 @@ var InterpreterStatus = exports.InterpreterStatus = (0, _mobxReact.observer)(fun
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "interpreter-status-confirm-dialog-content-title",
-          children: "\u540C\u58F0\u4F20\u8BD1\u5DF2\u542F\u7528"
+          children: t('fmt_interpretation_popup_toast_interpretation_online')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "interpreter-status-confirm-dialog-content-desc",
           children: " ".concat(t(operatorUser.userRole === _.FcrUserRole.HOST ? 'fmt_role_host' : 'fmt_role_cohost'), " ").concat(operatorUser.userName, "\u6307\u5B9A\u4E86").concat(userNames, "\u7B49").concat(interpreterUserList.length, "\u4E2A\u4EBA\u4E3A\u7FFB\u8BD1\u5B98\u3002")

package/lib/modules/notification/store.d.ts

@@ -1,17 +1,11 @@
-import { FcrPrivilegeControl } from 'fcr-core';
-import { FcrRoomStore } from '../../common/room-store';
+import { FcrUISharedWaitingRoomDataSource } from '../../shared-data-source/waiting-room';
 export default class NotificationStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private _waitingRoomControl?;
-    private _privilegeControl;
-    private _waitingRoomUserObserver;
-    accessor waitingRoomUserCount: number;
-    constructor({ privilegeControl, roomStore, }: {
-        privilegeControl: FcrPrivilegeControl;
-        roomStore: FcrRoomStore;
+    private _sharedWaitingRoomDataSource?;
+    constructor({ sharedWaitingRoomDataSource, }: {
+        sharedWaitingRoomDataSource: FcrUISharedWaitingRoomDataSource;
     });
+    get waitingRoomUserCount(): number;
     release(): void;
-    private _getWaitingRoomUserCount;
-    private _handleRemoteWaitingUserChanged;
 }
 export declare const StoreContext: import("react").Context<NotificationStore>;

package/lib/modules/notification/store.js

@@ -6,14 +6,18 @@ require("core-js/modules/es.symbol.to-primitive.js");
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
@@ -30,100 +34,46 @@ 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["default"] = exports.StoreContext = void 0;
-require("core-js/modules/es.array.filter.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.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.async-iterator.filter.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.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.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 _logger = require("agora-foundation/lib/logger");
 var _mobx = require("mobx");
-var _decorator = require("agora-foundation/lib/decorator");
-var _type = require("fcr-core/lib/room-control/privilege-control/type");
 var _react = require("react");
 var _NotificationStore;
-var _initProto, _init_waitingRoomUserCount;
-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"); }
+var _initProto;
 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 NotificationStore = exports["default"] = /*#__PURE__*/function () {
   function NotificationStore(_ref) {
-    var _this = this;
-    var privilegeControl = _ref.privilegeControl,
-      roomStore = _ref.roomStore;
+    var sharedWaitingRoomDataSource = _ref.sharedWaitingRoomDataSource;
     (0, _classCallCheck2["default"])(this, NotificationStore);
     (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.getLogger)()));
-    (0, _defineProperty2["default"])(this, "_waitingRoomUserObserver", {
-      onRemoteUsersJoined: this._handleRemoteWaitingUserChanged.bind(this),
-      onRemoteUsersLeft: this._handleRemoteWaitingUserChanged.bind(this)
-    });
-    _classPrivateFieldInitSpec(this, _A, _init_waitingRoomUserCount(this, 0));
-    this._privilegeControl = privilegeControl;
-    roomStore.addObserver({
-      onJoinWaitingRoom: function onJoinWaitingRoom(roomControl) {
-        var room = roomControl;
-        _this._waitingRoomControl = room;
-        var waitingRoomUserControl = room.getUserControl();
-        waitingRoomUserControl.addObserver(_this._waitingRoomUserObserver);
-      }
-    });
+    this._sharedWaitingRoomDataSource = sharedWaitingRoomDataSource;
   }
   return (0, _createClass2["default"])(NotificationStore, [{
     key: "waitingRoomUserCount",
     get: function get() {
-      return _classPrivateFieldGet(_A, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_A, this, v);
+      var _this$_sharedWaitingR;
+      return ((_this$_sharedWaitingR = this._sharedWaitingRoomDataSource) === null || _this$_sharedWaitingR === void 0 ? void 0 : _this$_sharedWaitingR.totalWaitingRoomUser) || 0;
     }
   }, {
     key: "release",
     value: function release() {}
-  }, {
-    key: "_getWaitingRoomUserCount",
-    value: function _getWaitingRoomUserCount() {
-      var _this$_privilegeContr;
-      var userControl = this._waitingRoomControl.getUserControl();
-      var targetRoles = (_this$_privilegeContr = this._privilegeControl.getSecurityInfo(_type.FcrSecurityAction.WaitingRoom).info) === null || _this$_privilegeContr === void 0 ? void 0 : _this$_privilegeContr.targetRoles;
-      this.waitingRoomUserCount = userControl.getUserList().filter(function (user) {
-        return targetRoles.includes(user.userRole);
-      }).length;
-    }
-  }, {
-    key: "_handleRemoteWaitingUserChanged",
-    value: function _handleRemoteWaitingUserChanged() {
-      this._getWaitingRoomUserCount();
-    }
   }]);
 }();
 _NotificationStore = NotificationStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_NotificationStore, [[_mobx.observable, 1, "waitingRoomUserCount"], [_decorator.bound, 2, "_getWaitingRoomUserCount"], [_decorator.bound, 2, "_handleRemoteWaitingUserChanged"]], []).e, 2);
-_init_waitingRoomUserCount = _applyDecs$e[0];
-_initProto = _applyDecs$e[1];
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_NotificationStore, [[_mobx.computed, 3, "waitingRoomUserCount"]], []).e, 1);
+_initProto = _applyDecs$e[0];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);