fcr-ui-scene 3.1.1 → 3.3.0

package/lib/modules/action-bar/store.js

@@ -7,12 +7,15 @@ 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.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.number.constructor.js");
 require("core-js/modules/es.object.create.js");
+require("core-js/modules/es.object.define-properties.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.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/esnext.function.metadata.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", {
@@ -24,17 +27,51 @@ require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.find-index.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.array.map.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.array.reduce.js");
 require("core-js/modules/es.array.some.js");
 require("core-js/modules/es.array.splice.js");
 require("core-js/modules/es.date.to-string.js");
+require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.object.values.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.async-iterator.find.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.async-iterator.reduce.js");
+require("core-js/modules/esnext.async-iterator.some.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/esnext.iterator.reduce.js");
+require("core-js/modules/esnext.iterator.some.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.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");
 require("core-js/modules/web.timers.js");
@@ -45,6 +82,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 _logger = require("agora-foundation/lib/logger");
+var _agoraEduCore = require("agora-edu-core");
 var _mobx = require("mobx");
 var _type = require("agora-edu-core/lib/type");
 var _decorator = require("agora-foundation/lib/decorator");
@@ -59,10 +97,14 @@ var _type5 = require("agora-ui-foundation/lib/components/icon/type");
 var _type6 = require("agora-rte-sdk/lib/core/scene/type");
 var _type7 = require("agora-rte-sdk/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _type8 = require("agora-edu-core/lib/room-control/type");
+var _type9 = require("agora-edu-core/lib/room-control/privilege-control/type");
 var _ActionBarStore;
-var _initProto, _init_users, _init_newMessageTooltipVisible, _init_newMessageCount, _init_latestMessage, _init_totalUser, _init_liveStreamingState, _init_currentMenuIs, _init_cloudRecordingState, _init_localUserRole, _init_localUser, _init_connectionSettingVisible, _init_connectType, _init_folded, _init_boardOwnerUser, _init_hasScreenShare, _init_showArrow, _init_phoneMicEnabled, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _toggleLayoutBarLockDecs, _showNewMessageTooltipDecs, _hideNewMessageTooltipDecs, _switchMenuDecs, _assignHostDecs, _toggleFoldDecs, _setShowArrowDecs, _handleRemoteUsersJoinedDecs, _handleRemoteUsersLeftDecs, _handleAllUserCountUpdatedDecs, _handleUserInfoUpdatedDecs, _handleLiveStreamingStateUpdatedDecs, _handleNewMessageEventDecs, _init__handleNewMessageEvent, _handleChatVisibleDecs, _handleCloudRecordingStateUpdatedDecs, _handleStreamsAddedOrUpdatedDecs, _ref;
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+var _initProto, _init_users, _init_newMessageTooltipVisible, _init_newMessageCount, _init_latestMessage, _init_totalUser, _init_totalWaitingRoomUser, _init_liveStreamingState, _init_currentMenuIs, _init_cloudRecordingState, _init_localUserRole, _init_localUser, _init_connectionSettingVisible, _init_connectType, _init_folded, _init_boardOwnerUser, _init_hasScreenShare, _init_showArrow, _init_phoneMicEnabled, _init_isNewWaitingRoomUserEnter, _init_chatTabIndex, _init_popoverOpened, _init_isPstnUser, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _toggleLayoutBarLockDecs, _showNewMessageTooltipDecs, _hideNewMessageTooltipDecs, _switchMenuDecs, _assignHostDecs, _setPopoverOpenedDecs, _toggleFoldDecs, _setShowArrowDecs, _setEnableWaitingRoomDecs, _kickOutWaitingRoomAllMemberDecs, _moveToMainRoomAllMemberDecs, _handleRemoteUsersJoinedDecs, _handleRemoteUsersLeftDecs, _handleAllUserCountUpdatedDecs, _getWaitingRoomUserCountDecs, _handleRemoteWaitingUserLeftDecs, _handleRemoteWaitingUserJoinedDecs, _handleUserInfoUpdatedDecs, _handleLiveStreamingStateUpdatedDecs, _handleNewMessageEventDecs, _init__handleNewMessageEvent, _handleChatVisibleDecs, _handlerTraceScreenCaptureStateUpdateDecs, _operateWaitingRoomDecs, _handleCloudRecordingStateUpdatedDecs, _handleStreamsAddedOrUpdatedDecs, _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); }
+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"); }
@@ -99,13 +141,18 @@ var _N = /*#__PURE__*/new WeakMap();
 var _O = /*#__PURE__*/new WeakMap();
 var _P = /*#__PURE__*/new WeakMap();
 var _Q = /*#__PURE__*/new WeakMap();
+var _R = /*#__PURE__*/new WeakMap();
+var _S = /*#__PURE__*/new WeakMap();
+var _T = /*#__PURE__*/new WeakMap();
+var _U = /*#__PURE__*/new WeakMap();
+var _V = /*#__PURE__*/new WeakMap();
 _ref = (_pauseCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
 })], _resumeCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
 })], _stopCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
-})], _toggleLayoutBarLockDecs = [_mobx.action, _mobx.action.bound], _showNewMessageTooltipDecs = [_mobx.action, _mobx.action.bound], _hideNewMessageTooltipDecs = [_mobx.action, _mobx.action.bound], _switchMenuDecs = [_mobx.action, _mobx.action.bound], _assignHostDecs = [_mobx.action, _mobx.action.bound], _toggleFoldDecs = [_mobx.action, _mobx.action.bound], _setShowArrowDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUsersJoinedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUsersLeftDecs = [_mobx.action, _mobx.action.bound], _handleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleLiveStreamingStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleNewMessageEventDecs = [_mobx.action, _mobx.action.bound], _handleChatVisibleDecs = [_mobx.action, _mobx.action.bound], _handleCloudRecordingStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedOrUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+})], _toggleLayoutBarLockDecs = [_mobx.action, _mobx.action.bound], _showNewMessageTooltipDecs = [_mobx.action, _mobx.action.bound], _hideNewMessageTooltipDecs = [_mobx.action, _mobx.action.bound], _switchMenuDecs = [_mobx.action, _mobx.action.bound], _assignHostDecs = [_mobx.action, _mobx.action.bound], _setPopoverOpenedDecs = [_mobx.action, _mobx.action.bound], _toggleFoldDecs = [_mobx.action, _mobx.action.bound], _setShowArrowDecs = [_mobx.action, _mobx.action.bound], _setEnableWaitingRoomDecs = [_mobx.action, _mobx.action.bound], _kickOutWaitingRoomAllMemberDecs = [_mobx.action, _mobx.action.bound], _moveToMainRoomAllMemberDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUsersJoinedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUsersLeftDecs = [_mobx.action, _mobx.action.bound], _handleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], _getWaitingRoomUserCountDecs = [_mobx.action, _mobx.action.bound], _handleRemoteWaitingUserLeftDecs = [_mobx.action, _mobx.action.bound], _handleRemoteWaitingUserJoinedDecs = [_mobx.action, _mobx.action.bound], _handleUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleLiveStreamingStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleNewMessageEventDecs = [_mobx.action, _mobx.action.bound], _handleChatVisibleDecs = [_mobx.action, _mobx.action.bound], _handlerTraceScreenCaptureStateUpdateDecs = [_mobx.action, _mobx.action.bound], _operateWaitingRoomDecs = [_mobx.action, _mobx.action.bound], _handleCloudRecordingStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedOrUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   function ActionBarStore(args) {
     var _this = this;
@@ -114,12 +161,17 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_chatRenderAt", 'aside');
     (0, _defineProperty2["default"])(this, "_participantsRenderAt", 'aside');
+    (0, _defineProperty2["default"])(this, "_screenVideoTrack", null);
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onRemoteUsersJoined: this._handleRemoteUsersJoined,
       onRemoteUsersLeft: this._handleRemoteUsersLeft,
       onUserInfoUpdated: this._handleUserInfoUpdated,
       onAllUserCountUpdated: this._handleAllUserCountUpdated
     });
+    (0, _defineProperty2["default"])(this, "_waitingRoomUserObserver", {
+      onRemoteUsersJoined: this._handleRemoteWaitingUserJoined,
+      onRemoteUsersLeft: this._handleRemoteWaitingUserLeft
+    });
     (0, _defineProperty2["default"])(this, "_roomObserver", {
       onLiveStreamingStateUpdated: this._handleLiveStreamingStateUpdated,
       onCloudRecordingStateUpdated: this._handleCloudRecordingStateUpdated
@@ -137,26 +189,35 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_isSharingScreen", false);
     (0, _defineProperty2["default"])(this, "_microponeInitCount", 0);
     (0, _defineProperty2["default"])(this, "_speakerInitCount", 0);
+    (0, _defineProperty2["default"])(this, "_participantTab", _constant.RoomType.MAIN_ROOM);
     _classPrivateFieldInitSpec(this, _A, _init_users(this));
     _classPrivateFieldInitSpec(this, _B, _init_newMessageTooltipVisible(this, false));
-    _classPrivateFieldInitSpec(this, _C, _init_newMessageCount(this, 0));
+    _classPrivateFieldInitSpec(this, _C, _init_newMessageCount(this, (0, _defineProperty2["default"])({}, _constant.RoomType.MAIN_ROOM, 0)));
     _classPrivateFieldInitSpec(this, _D, _init_latestMessage(this));
     _classPrivateFieldInitSpec(this, _E, _init_totalUser(this));
-    _classPrivateFieldInitSpec(this, _F, _init_liveStreamingState(this));
-    _classPrivateFieldInitSpec(this, _G, _init_currentMenuIs(this, MoreMenuType.DEFAULT));
-    _classPrivateFieldInitSpec(this, _H, _init_cloudRecordingState(this));
-    _classPrivateFieldInitSpec(this, _I, _init_localUserRole(this));
-    _classPrivateFieldInitSpec(this, _J, _init_localUser(this));
-    _classPrivateFieldInitSpec(this, _K, _init_connectionSettingVisible(this, false));
-    _classPrivateFieldInitSpec(this, _L, _init_connectType(this, _type3.ConnectType.COMPUTER));
-    _classPrivateFieldInitSpec(this, _M, _init_folded(this, false));
-    _classPrivateFieldInitSpec(this, _N, _init_boardOwnerUser(this, null));
-    _classPrivateFieldInitSpec(this, _O, _init_hasScreenShare(this, false));
-    _classPrivateFieldInitSpec(this, _P, _init_showArrow(this, false));
-    _classPrivateFieldInitSpec(this, _Q, _init_phoneMicEnabled(this, false));
+    _classPrivateFieldInitSpec(this, _F, _init_totalWaitingRoomUser(this, 0));
+    _classPrivateFieldInitSpec(this, _G, _init_liveStreamingState(this));
+    _classPrivateFieldInitSpec(this, _H, _init_currentMenuIs(this, MoreMenuType.DEFAULT));
+    _classPrivateFieldInitSpec(this, _I, _init_cloudRecordingState(this));
+    _classPrivateFieldInitSpec(this, _J, _init_localUserRole(this));
+    _classPrivateFieldInitSpec(this, _K, _init_localUser(this));
+    _classPrivateFieldInitSpec(this, _L, _init_connectionSettingVisible(this, false));
+    _classPrivateFieldInitSpec(this, _M, _init_connectType(this, _type3.ConnectType.COMPUTER));
+    _classPrivateFieldInitSpec(this, _N, _init_folded(this, false));
+    _classPrivateFieldInitSpec(this, _O, _init_boardOwnerUser(this, null));
+    _classPrivateFieldInitSpec(this, _P, _init_hasScreenShare(this, false));
+    _classPrivateFieldInitSpec(this, _Q, _init_showArrow(this, false));
+    _classPrivateFieldInitSpec(this, _R, _init_phoneMicEnabled(this, false));
+    _classPrivateFieldInitSpec(this, _S, _init_isNewWaitingRoomUserEnter(this, false));
+    _classPrivateFieldInitSpec(this, _T, _init_chatTabIndex(this, _constant.RoomType.MAIN_ROOM));
+    _classPrivateFieldInitSpec(this, _U, _init_popoverOpened(this, false));
+    _classPrivateFieldInitSpec(this, _V, _init_isPstnUser(this, false));
     (0, _defineProperty2["default"])(this, "_handleNewMessageEvent", _init__handleNewMessageEvent(this, function (e) {
-      if (_this._chatVisible) return;
-      _this.newMessageCount += e.count;
+      var _msgObj;
+      // if (this._chatVisible) return;
+      var msgObj = _objectSpread({}, _this.newMessageCount);
+      msgObj[e.type] = ((_msgObj = msgObj[e.type]) !== null && _msgObj !== void 0 ? _msgObj : 0) + Number(e.count);
+      _this.newMessageCount = _objectSpread({}, msgObj);
       _this.latestMessage = e.latestMessage;
       _this._newMessageTooltipTimer && clearTimeout(_this._newMessageTooltipTimer);
       _this.showNewMessageTooltip();
@@ -193,6 +254,9 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
         _this.connectType = microphoneId ? _type3.ConnectType.COMPUTER : _type3.ConnectType.NONE;
       }
     });
+    this._observer = {
+      onScreenCaptureStateUpdated: this._handlerTraceScreenCaptureStateUpdate.bind(this)
+    };
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.cloudRecordingState;
     }, function (state) {
@@ -221,6 +285,41 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
         action: _constant.RendererEventAction.USER_ROLE_CHANGED,
         payload: role
       });
+    }), (0, _mobx.reaction)(function () {
+      return _this.remoteUsers;
+    }, function (users) {
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.RendererEventAction.SET_REMOTE_USERS,
+        payload: users
+      });
+    }), (0, _mobx.reaction)(function () {
+      return _this.hasAssignHostBeforeLeavingPermission;
+    }, function (hasAssignHostBeforeLeavingPermission) {
+      return (0, _rendererEvent.sendEvent)({
+        action: _constant.RendererEventAction.SET_HAS_ASSIGN_HOST_BEFORE_LEAVING_PERMISSION,
+        payload: hasAssignHostBeforeLeavingPermission
+      });
+    }), (0, _mobx.reaction)(function () {
+      return _this.isPstnUser;
+    }, function (isPstnUser) {
+      return (0, _rendererEvent.sendEvent)({
+        action: _constant.RendererEventAction.SET_IS_PSTN_USER,
+        payload: isPstnUser
+      });
+    }), (0, _mobx.reaction)(function () {
+      return _this.hasEndRoomPermission;
+    }, function (hasEndRoomPermission) {
+      return (0, _rendererEvent.sendEvent)({
+        action: _constant.RendererEventAction.SET_HAS_END_ROOM_PERMISSION,
+        payload: hasEndRoomPermission
+      });
+    }), (0, _mobx.reaction)(function () {
+      return _this.isLocked;
+    }, function (isLocked) {
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.RendererEventAction.SET_IS_LOCKED,
+        payload: isLocked
+      });
     }));
   }
   return (0, _createClass2["default"])(ActionBarStore, [{
@@ -264,7 +363,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "liveStreamingState",
+    key: "totalWaitingRoomUser",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -272,7 +371,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "currentMenuIs",
+    key: "liveStreamingState",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -280,7 +379,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "cloudRecordingState",
+    key: "currentMenuIs",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -288,7 +387,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "localUserRole",
+    key: "cloudRecordingState",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -296,7 +395,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "localUser",
+    key: "localUserRole",
     get: function get() {
       return _classPrivateFieldGet(_J, this);
     },
@@ -304,7 +403,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "connectionSettingVisible",
+    key: "localUser",
     get: function get() {
       return _classPrivateFieldGet(_K, this);
     },
@@ -312,7 +411,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "connectType",
+    key: "connectionSettingVisible",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
@@ -320,7 +419,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "folded",
+    key: "connectType",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
@@ -328,7 +427,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "boardOwnerUser",
+    key: "folded",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
@@ -336,7 +435,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "hasScreenShare",
+    key: "boardOwnerUser",
     get: function get() {
       return _classPrivateFieldGet(_O, this);
     },
@@ -344,7 +443,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_O, this, v);
     }
   }, {
-    key: "showArrow",
+    key: "hasScreenShare",
     get: function get() {
       return _classPrivateFieldGet(_P, this);
     },
@@ -352,13 +451,77 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_P, this, v);
     }
   }, {
-    key: "phoneMicEnabled",
+    key: "showArrow",
     get: function get() {
       return _classPrivateFieldGet(_Q, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_Q, this, v);
     }
+  }, {
+    key: "phoneMicEnabled",
+    get: function get() {
+      return _classPrivateFieldGet(_R, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_R, this, v);
+    }
+  }, {
+    key: "isNewWaitingRoomUserEnter",
+    get: function get() {
+      return _classPrivateFieldGet(_S, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_S, this, v);
+    }
+  }, {
+    key: "chatTabIndex",
+    get: function get() {
+      return _classPrivateFieldGet(_T, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_T, this, v);
+    }
+  }, {
+    key: "popoverOpened",
+    get: function get() {
+      return _classPrivateFieldGet(_U, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_U, this, v);
+    }
+  }, {
+    key: "isPstnUser",
+    get: function get() {
+      return _classPrivateFieldGet(_V, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_V, this, v);
+    }
+  }, {
+    key: "fetchNewestLeavingRoomCompProps",
+    value: function fetchNewestLeavingRoomCompProps() {
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.RendererEventAction.SET_REMOTE_USERS,
+        payload: this.remoteUsers
+      });
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.RendererEventAction.SET_HAS_ASSIGN_HOST_BEFORE_LEAVING_PERMISSION,
+        payload: this.hasAssignHostBeforeLeavingPermission
+      });
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.RendererEventAction.SET_IS_PSTN_USER,
+        payload: this.isPstnUser
+      });
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.RendererEventAction.SET_HAS_END_ROOM_PERMISSION,
+        payload: this.hasEndRoomPermission
+      });
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.RendererEventAction.SET_IS_LOCKED,
+        payload: this.isLocked
+      });
+    }
   }, {
     key: "remoteUsers",
     get: function get() {
@@ -397,6 +560,21 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._securityStore.hasLockRoomPermission();
     }
+  }, {
+    key: "hasWaitingRoomPermission",
+    get: function get() {
+      return this._securityStore.hasWaitingRoomPermission();
+    }
+  }, {
+    key: "hasWatermarkEnablePermission",
+    get: function get() {
+      return this._securityStore.hasWatermarkEnablePermission();
+    }
+  }, {
+    key: "hasWatermarkDisablePermission",
+    get: function get() {
+      return this._securityStore.hasWatermarkDisablePermission();
+    }
   }, {
     key: "hasEnableStartSharePermission",
     get: function get() {
@@ -448,14 +626,14 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       return this._securityStore.allowBoardWrite();
     }
   }, {
-    key: "isPstnUser",
+    key: "isWaterMarkEnabled",
     get: function get() {
-      var streams = this._streamControl.getStreamsByUserId(this._userControl.getLocalUser().userId);
-      var hasPstnStream = streams.some(function (_ref2) {
-        var connectorType = _ref2.connectorType;
-        return connectorType === _type.FcrRoomConnectorType.PSTN;
-      });
-      return hasPstnStream;
+      return this._securityStore.isWaterMarkEnabled();
+    }
+  }, {
+    key: "isMulti",
+    get: function get() {
+      return this._securityStore.isMulti();
     }
   }, {
     key: "cameraEnabled",
@@ -502,6 +680,19 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._deviceStore.speakerList;
     }
+  }, {
+    key: "allNewMessage",
+    get: function get() {
+      return Object.values(this.newMessageCount).reduce(function (a, b) {
+        return a + b;
+      }, 0);
+    }
+  }, {
+    key: "isMainRoom",
+    get: function get() {
+      var _this$_roomControl$ge;
+      return ((_this$_roomControl$ge = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge === void 0 ? void 0 : _this$_roomControl$ge.roomType) === _type8.FcrRoomType.Mainroom;
+    }
   }, {
     key: "pauseCloudRecording",
     value: function pauseCloudRecording() {
@@ -555,13 +746,23 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "isLocked",
-    value: function isLocked() {
+    get: function get() {
       return this._securityStore.isLockRoomEnabled();
     }
+  }, {
+    key: "isWaitingRoomEnabled",
+    value: function isWaitingRoomEnabled() {
+      return this._securityStore.isWaitingRoomEnabled();
+    }
   }, {
     key: "enableCamera",
     value: function enableCamera(enable) {
-      this._deviceStreamStore.enableCameraWithStream(enable);
+      var _this$_roomControl$ge2;
+      if (((_this$_roomControl$ge2 = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge2 === void 0 ? void 0 : _this$_roomControl$ge2.roomType) === _type8.FcrRoomType.Mainroom) {
+        this._deviceStreamStore.enableCameraWithStream(enable);
+      } else {
+        this._deviceStore.setCameraEnabled(enable);
+      }
     }
   }, {
     key: "setCameraId",
@@ -571,7 +772,12 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "enableMicrophone",
     value: function enableMicrophone(enable) {
-      this._deviceStreamStore.enableMicrophoneWithStream(enable);
+      var _this$_roomControl$ge3;
+      if (((_this$_roomControl$ge3 = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge3 === void 0 ? void 0 : _this$_roomControl$ge3.roomType) === _type8.FcrRoomType.Mainroom) {
+        this._deviceStreamStore.enableMicrophoneWithStream(enable);
+      } else {
+        this._deviceStore.setMicrophoneEnabled(enable);
+      }
     }
   }, {
     key: "setMicrophoneId",
@@ -583,22 +789,22 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     value: function setSpeakerId(speakerId) {
       this._deviceStore.setSpeakerId(speakerId);
     }
+  }, {
+    key: "closeSpeaker",
+    value: function closeSpeaker() {
+      this._mediaControl.setSelectedSpeakerVolume(0);
+    }
   }, {
     key: "setAllowBoardWrite",
     value: function () {
-      var _setAllowBoardWrite = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var write, payload;
+      var _setAllowBoardWrite = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var write;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               write = this.isBoardWriteEnabled ? _enums.FcrSharePermissionState.OFF : _enums.FcrSharePermissionState.ON;
-              payload = {
-                board: {
-                  write: write
-                }
-              };
-              return _context.abrupt("return", this._securityStore.setAllowWriteBoard(_enums.FcrSharePermissionState.ON, payload));
-            case 3:
+              return _context.abrupt("return", this._securityStore.setAllowWriteBoard(write));
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -611,68 +817,45 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     }()
   }, {
     key: "setAllowScreenShare",
-    value: function setAllowScreenShare(state) {
-      var enable = state ? state : this.isScreenShareAndBoardEnabled ? _enums.FcrSharePermissionState.OFF : _enums.FcrSharePermissionState.ON;
-      var payload = {
-        screen: enable,
-        board: {
-          start: enable
-        }
-      };
-      return this._securityStore.allowShare(_enums.FcrSharePermissionState.ON, payload);
+    value: function setAllowScreenShare() {
+      var enable = this.isScreenShareAndBoardEnabled ? _enums.FcrSharePermissionState.OFF : _enums.FcrSharePermissionState.ON;
+      return this._securityStore.allowShare(enable);
     }
   }, {
     key: "closeBoard",
     value: function closeBoard() {
       this._uiEventStore.sendEvent(_constant.UIAction.CLOSE_WHITEBOARD);
     }
-  }, {
-    key: "enableShare",
-    value: function () {
-      var _enableShare = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(state) {
-        var _this$boardOwnerUser;
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return this._securityStore.allowShare(state);
-            case 2:
-              if (state === _enums.FcrSharePermissionState.OFF) {
-                this._uiEventStore.showToast({
-                  type: 'info',
-                  message: this._userControl.getLocalUser().userId === ((_this$boardOwnerUser = this.boardOwnerUser) === null || _this$boardOwnerUser === void 0 ? void 0 : _this$boardOwnerUser.userId) ? (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_stoppedboard') : (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_stopped')
-                });
-              }
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function enableShare(_x) {
-        return _enableShare.apply(this, arguments);
-      }
-      return enableShare;
-    }()
   }, {
     key: "assignHost",
     value: function assignHost(user) {
-      this._userControl.updateUserRole(user.userId, _type.FcrUserRole.HOST);
+      this._userControl.updateRemoteUserRole(user.userId, _type.FcrUserRole.HOST);
       this.leave();
     }
   }, {
     key: "leave",
     value: function leave() {
-      var _this$boardOwnerUser2;
-      this._uiEventStore.exitRoom(_type2.FcrUIExitReason.LEAVE_ROOM);
-      if (((_this$boardOwnerUser2 = this.boardOwnerUser) === null || _this$boardOwnerUser2 === void 0 ? void 0 : _this$boardOwnerUser2.userId) === this.localUser.userId) {
+      var _this$boardOwnerUser;
+      this._uiEventStore.exitRoom(_type2.FcrUIExitReason.LEAVE_ROOM, this.getRoomType());
+      if (((_this$boardOwnerUser = this.boardOwnerUser) === null || _this$boardOwnerUser === void 0 ? void 0 : _this$boardOwnerUser.userId) === this.localUser.userId) {
         this._uiEventStore.sendEvent(_constant.UIAction.CLOSE_WHITEBOARD);
       }
     }
   }, {
     key: "keepPhoneAudioConnection",
     value: function keepPhoneAudioConnection() {
-      this._userControl.splitAudioStream(this._userControl.getLocalUser().userId);
+      this._streamControl.splitAudioStream(this._userControl.getLocalUser().userId);
+    }
+  }, {
+    key: "setPopoverOpened",
+    value: function setPopoverOpened(isShow) {
+      this.popoverOpened = isShow;
+    }
+  }, {
+    key: "getRoomType",
+    value: function getRoomType() {
+      var _this$_roomControl$ge4;
+      return (_this$_roomControl$ge4 = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge4 === void 0 ? void 0 : _this$_roomControl$ge4.roomType;
     }
   }, {
     key: "end",
@@ -682,10 +865,12 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "release",
     value: function release() {
+      var _this$_screenVideoTra;
       this._disposers.forEach(function (dispose) {
         return dispose();
       });
       this._hideBarArrowTimer && clearTimeout(this._hideBarArrowTimer);
+      (_this$_screenVideoTra = this._screenVideoTrack) === null || _this$_screenVideoTra === void 0 || _this$_screenVideoTra.removeObserver(this._observer);
     }
   }, {
     key: "allowJoinWithMuteAudio",
@@ -804,6 +989,11 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       if (this._participantsRenderAt === 'dialog') {
         this._uiEventStore.openDialog(_constant.DialogKey.PARTICIPANT);
       }
+      if (this._participantVisible) {
+        if (this._participantTab === _constant.RoomType.WAITING_ROOM) {
+          this.isNewWaitingRoomUserEnter = false;
+        }
+      }
     }
   }, {
     key: "closeParticipants",
@@ -848,11 +1038,6 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     value: function closeWhiteboard() {
       this._uiEventStore.sendEvent(_constant.UIAction.CLOSE_WHITEBOARD);
     }
-  }, {
-    key: "stopScreenShare",
-    value: function stopScreenShare() {
-      this._uiEventStore.stopShareScreen();
-    }
   }, {
     key: "openLiveStreamingDialog",
     value: function openLiveStreamingDialog() {
@@ -914,6 +1099,98 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
         }, 1000);
       }
     }
+  }, {
+    key: "setEnableWaitingRoom",
+    value: function () {
+      var _setEnableWaitingRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(enable, isNeedShowDialog) {
+        return _regenerator["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (enable) {
+                _context2.next = 10;
+                break;
+              }
+              if (!(this.totalWaitingRoomUser && isNeedShowDialog)) {
+                _context2.next = 5;
+                break;
+              }
+              this._uiEventStore.openDialog(_constant.DialogKey.WAITING_ROOM, '', {
+                totalWaitingRoomUser: this.totalWaitingRoomUser
+              });
+              _context2.next = 8;
+              break;
+            case 5:
+              _context2.next = 7;
+              return this._roomControl.enableWaitingRoom(enable);
+            case 7:
+              this._uiEventStore.showToast({
+                type: 'normal',
+                message: (0, _i18n.transI18n)('fmt_waitingroom_mobile_setting_tips_disable')
+              });
+            case 8:
+              _context2.next = 13;
+              break;
+            case 10:
+              _context2.next = 12;
+              return this._roomControl.enableWaitingRoom(enable);
+            case 12:
+              this._uiEventStore.showToast({
+                type: 'normal',
+                message: (0, _i18n.transI18n)('fmt_waitingroom_setting_tips_enable')
+              });
+            case 13:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function setEnableWaitingRoom(_x, _x2) {
+        return _setEnableWaitingRoom.apply(this, arguments);
+      }
+      return setEnableWaitingRoom;
+    }()
+  }, {
+    key: "kickOutWaitingRoomAllMember",
+    value: function () {
+      var _kickOutWaitingRoomAllMember = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(type) {
+        var _this$_userControl;
+        return _regenerator["default"].wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return (_this$_userControl = this._userControl) === null || _this$_userControl === void 0 ? void 0 : _this$_userControl.kickOutByUserRoles([_type.FcrUserRole.PARTICIPANT], type);
+            case 2:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function kickOutWaitingRoomAllMember(_x3) {
+        return _kickOutWaitingRoomAllMember.apply(this, arguments);
+      }
+      return kickOutWaitingRoomAllMember;
+    }()
+  }, {
+    key: "moveToMainRoomAllMember",
+    value: function () {
+      var _moveToMainRoomAllMember = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+        var _this$_waitingRoomCon;
+        return _regenerator["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return (_this$_waitingRoomCon = this._waitingRoomControl) === null || _this$_waitingRoomCon === void 0 ? void 0 : _this$_waitingRoomCon.moveToMainRoomByUserRoles([_type.FcrUserRole.PARTICIPANT]);
+            case 2:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function moveToMainRoomAllMember() {
+        return _moveToMainRoomAllMember.apply(this, arguments);
+      }
+      return moveToMainRoomAllMember;
+    }()
   }, {
     key: "_interceptShareScreen",
     value: function _interceptShareScreen() {
@@ -1007,6 +1284,37 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     value: function _handleAllUserCountUpdated(_roomId, count) {
       this.totalUser = count;
     }
+  }, {
+    key: "_getWaitingRoomUserCount",
+    value: function _getWaitingRoomUserCount() {
+      var _privilegeControl$get;
+      var userControl = this._waitingRoomControl.getUserControl();
+      var privilegeControl = this._roomControl.getPrivilegeControl();
+      var targetRoles = (_privilegeControl$get = privilegeControl.getSecurityInfo(_type9.FcrSecurityAction.WaitingRoom).info) === null || _privilegeControl$get === void 0 ? void 0 : _privilegeControl$get.targetRoles;
+      this.totalWaitingRoomUser = userControl.getUserList().filter(function (user) {
+        return targetRoles.includes(user.userRole);
+      }).length;
+      if (this.totalWaitingRoomUser === 0) {
+        this._uiEventStore.sendEvent(_constant.UIAction.CHANGE_PARTICIPANT_TAB, _constant.RoomType.MAIN_ROOM);
+      }
+    }
+  }, {
+    key: "_handleRemoteWaitingUserLeft",
+    value: function _handleRemoteWaitingUserLeft(roomId, events) {
+      this._getWaitingRoomUserCount();
+    }
+  }, {
+    key: "_handleRemoteWaitingUserJoined",
+    value: function _handleRemoteWaitingUserJoined(roomId, events) {
+      if (this._participantVisible) {
+        if (this._participantTab !== _constant.RoomType.WAITING_ROOM) {
+          this.isNewWaitingRoomUserEnter = true;
+        }
+      } else {
+        this.isNewWaitingRoomUserEnter = true;
+      }
+      this._getWaitingRoomUserCount();
+    }
   }, {
     key: "_handleUserInfoUpdated",
     value: function _handleUserInfoUpdated(_roomId, event) {
@@ -1030,19 +1338,38 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     key: "_handleChatVisible",
     value: function _handleChatVisible(visible) {
       this._chatVisible = visible;
-      if (visible) {
-        this._newMessageTooltipTimer && clearTimeout(this._newMessageTooltipTimer);
-        this.hideNewMessageTooltip();
-        this.newMessageCount = 0;
-      }
+      this._uiEventStore.sendEvent(_constant.UIAction.CHAT_VISIBLE, visible);
+      this._newMessageTooltipTimer && clearTimeout(this._newMessageTooltipTimer);
+      this.hideNewMessageTooltip();
+      this.newMessageCount[this.chatTabIndex] = 0;
+    }
+  }, {
+    key: "_handlerTraceScreenCaptureStateUpdate",
+    value: function _handlerTraceScreenCaptureStateUpdate(_, state) {
+      this.hasScreenShare = state === _agoraEduCore.FcrMediaSourceState.STARTED;
+      // if (state === FcrMediaSourceState.STOPPED) {
+      //   this.stopScreenShare();
+      // }
+    }
+  }, {
+    key: "setAllowWaterMark",
+    value: function setAllowWaterMark() {
+      var allowState = !this.isWaterMarkEnabled;
+      // 开启关闭前,进行权限判断
+      this._securityStore.setAllowWaterMark(allowState, void 0);
+    }
+  }, {
+    key: "setWaterMarkLineType",
+    value: function setWaterMarkLineType(lineType) {
+      this._securityStore.setAllowWaterMark(this.isWaterMarkEnabled, lineType);
     }
   }, {
     key: "_onEvent",
     value: function _onEvent(action, payload) {
       if (action === _constant.UIAction.UPDATE_ASIDE) {
-        var _ref3 = payload,
-          chat = _ref3.chat,
-          participant = _ref3.participant;
+        var _ref2 = payload,
+          chat = _ref2.chat,
+          participant = _ref2.participant;
         if (chat) {
           this._chatRenderAt = 'aside';
           this._handleChatVisible(true);
@@ -1062,8 +1389,8 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
         this._handleNewMessageEvent(payload);
       }
       if (action === _constant.UIAction.CLOSE_DIALOG) {
-        var _ref4 = payload,
-          dialogId = _ref4.dialogId;
+        var _ref3 = payload,
+          dialogId = _ref3.dialogId;
         var dialogKey = this._openedDialogIdMap.get(dialogId);
         if (dialogKey === _constant.DialogKey.CHAT) {
           this._handleChatVisible(false);
@@ -1078,9 +1405,9 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
         }
       }
       if (action === _constant.UIAction.OPEN_DIALOG) {
-        var _ref5 = payload,
-          _dialogKey = _ref5.dialogKey,
-          _dialogId = _ref5.dialogId;
+        var _ref4 = payload,
+          _dialogKey = _ref4.dialogKey,
+          _dialogId = _ref4.dialogId;
         this._openedDialogIdMap.set(_dialogId, _dialogKey);
         if (_dialogKey === _constant.DialogKey.CHAT) {
           this._chatRenderAt = 'dialog';
@@ -1101,8 +1428,8 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
         this.openLiveStreamingDialog();
       }
       if (action === _constant.UIAction.CLOUD_RECORDING) {
-        var _ref6 = payload,
-          _action = _ref6.action;
+        var _ref5 = payload,
+          _action = _ref5.action;
         if (_action === 'start') this.startCloudRecording();else if (_action === 'pause') this.pauseCloudRecording();else if (_action === 'resume') this.resumeCloudRecording();else this.stopCloudRecording();
       }
       if (action === _constant.UIAction.OPEN_CONNECTION_DIALOG) {
@@ -1112,16 +1439,93 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
         this.closeConnection();
       }
       if (action === _constant.UIAction.WHITEBOARD_CHANGED) {
-        var _ref7 = payload,
-          _action2 = _ref7.action,
-          value = _ref7.payload;
+        var _ref6 = payload,
+          _action2 = _ref6.action,
+          value = _ref6.payload;
         if (_action2 === _type4.WhiteboardBaseEvents.SET_OWNER_USER_ID) {
           this.boardOwnerUser = value ? this.users.find(function (u) {
             return u.userId === value;
           }) : null;
         }
       }
+      if (action === _constant.UIAction.SET_CURRENT_SHARE_SCREEN) {
+        var _this$_mediaControl, _this$_screenVideoTra2;
+        var _ref7 = payload,
+          id = _ref7.id;
+        this._screenVideoTrack = (_this$_mediaControl = this._mediaControl) === null || _this$_mediaControl === void 0 ? void 0 : _this$_mediaControl.getScreenTrack(id);
+        (_this$_screenVideoTra2 = this._screenVideoTrack) === null || _this$_screenVideoTra2 === void 0 || _this$_screenVideoTra2.addObserver(this._observer);
+      }
+      if (action === _constant.UIAction.TOGGLE_PARTICIPANT_TAB) {
+        if (!this._participantVisible) {
+          this.toggleParticipants();
+        }
+      }
+      if (action === _constant.UIAction.CURRENT_PARTITIPANT_TAB) {
+        if (payload === _constant.RoomType.WAITING_ROOM) {
+          this.isNewWaitingRoomUserEnter = false;
+        }
+        this._participantTab = payload;
+      }
+      if (action === _constant.UIAction.WAITING_ROOM_CREATED) {
+        var room = payload.room;
+        this._waitingRoomControl = room;
+        var waitingRoomUserControl = room.getUserControl();
+        waitingRoomUserControl.addObserver(this._waitingRoomUserObserver);
+        this.newMessageCount = (0, _defineProperty2["default"])({}, _constant.RoomType.WAITING_ROOM, 0);
+      }
+      if (action === _constant.UIAction.CHAT_ROOM_TAB_CHANGE) {
+        this.chatTabIndex = payload;
+        this.newMessageCount[this.chatTabIndex] = 0;
+      }
+      if (action === _constant.UIAction.CLOSE_WAITING_ROOM_DIALOG) {
+        var waitingDialogId = '';
+        this._openedDialogIdMap.forEach(function (dialogKey, dialogId) {
+          if (dialogKey === _constant.DialogKey.WAITING_ROOM) {
+            waitingDialogId = dialogId;
+          }
+        });
+        this._uiEventStore.closeDialog(waitingDialogId);
+      }
+      if (action === _constant.UIAction.CLOSE_REMOVE_ADMIT_WAITING_ROOM_DIALOG) {
+        var operationDialogId = '';
+        this._openedDialogIdMap.forEach(function (dialogKey, dialogId) {
+          if (dialogKey === payload) {
+            operationDialogId = dialogId;
+          }
+        });
+        this._uiEventStore.closeDialog(operationDialogId);
+      }
+      if (action === _constant.UIAction.MOVE_TO_MAIN_ROOM_ALL_MEMBER) {
+        this._operateWaitingRoom(payload);
+      }
     }
+  }, {
+    key: "_operateWaitingRoom",
+    value: function () {
+      var _operateWaitingRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(isOperate) {
+        return _regenerator["default"].wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              if (!isOperate) {
+                _context5.next = 3;
+                break;
+              }
+              _context5.next = 3;
+              return this.moveToMainRoomAllMember();
+            case 3:
+              _context5.next = 5;
+              return this.setEnableWaitingRoom(false, false);
+            case 5:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this);
+      }));
+      function _operateWaitingRoom(_x4) {
+        return _operateWaitingRoom2.apply(this, arguments);
+      }
+      return _operateWaitingRoom;
+    }()
   }, {
     key: "_handleCloudRecordingStateUpdated",
     value: function _handleCloudRecordingStateUpdated(roomId, state) {
@@ -1142,12 +1546,13 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       var streams = this._streamControl.getStreamsByUserId(userId);
       var pstnStream = streams.find(function (_ref8) {
         var connectorType = _ref8.connectorType;
-        return connectorType === _type.FcrRoomConnectorType.PSTN;
+        return connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN;
       });
       var hasPstnStream = !!pstnStream;
+      this.isPstnUser = hasPstnStream;
       this.connectType = hasPstnStream ? _type3.ConnectType.PHONE : this.microphoneId ? _type3.ConnectType.COMPUTER : _type3.ConnectType.NONE;
       if (hasPstnStream) {
-        this.phoneMicEnabled = pstnStream.streamType === _type6.AgoraRteMediaStreamType.BOTH || pstnStream.audioSourceState === _type.FcrMediaSourceState.STARTED;
+        this.phoneMicEnabled = pstnStream.streamType === _type6.AgoraRteMediaStreamType.BOTH || pstnStream.audioSourceState === _agoraEduCore.FcrMediaSourceState.STARTED;
         (0, _rendererEvent.sendEvent)({
           action: _constant.RendererEventAction.SET_CONTROL_BAR_PHONECALL_STATE,
           payload: this.phoneMicEnabled
@@ -1157,23 +1562,28 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ActionBarStore = ActionBarStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ActionBarStore, [[_mobx.observable, 1, "users"], [_mobx.observable, 1, "newMessageTooltipVisible"], [_mobx.observable, 1, "newMessageCount"], [_mobx.observable, 1, "latestMessage"], [_mobx.observable, 1, "totalUser"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "currentMenuIs"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "localUserRole"], [_mobx.observable, 1, "localUser"], [_mobx.observable, 1, "connectionSettingVisible"], [_mobx.observable, 1, "connectType"], [_mobx.observable, 1, "folded"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "hasScreenShare"], [_mobx.observable, 1, "showArrow"], [_mobx.observable, 1, "phoneMicEnabled"], [_mobx.computed, 3, "remoteUsers"], [_mobx.computed, 3, "hasStartScreenSharePermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasEnableStartAudioPermission"], [_mobx.computed, 3, "hasEnableChangeNamePermission"], [_mobx.computed, 3, "hasEnableStartVideoPermission"], [_mobx.computed, 3, "hasLockRoomPermission"], [_mobx.computed, 3, "hasEnableStartSharePermission"], [_mobx.computed, 3, "hasAllowWriteBoardPermission"], [_mobx.computed, 3, "hasCloseWriteBoardPermission"], [_mobx.computed, 3, "hasAllowScreenShareAndBoardPermission"], [_mobx.computed, 3, "hasAllowChatPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "isScreenShareAndBoardEnabled"], [_mobx.computed, 3, "isBoardWriteEnabled"], [_mobx.computed, 3, "isPstnUser"], [_mobx.computed, 3, "cameraId"], [_mobx.computed, 3, "cameraList"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "microphoneId"], [_mobx.computed, 3, "microphoneVolumeLevel"], [_mobx.computed, 3, "microphoneList"], [_mobx.computed, 3, "speakerId"], [_mobx.computed, 3, "speakerList"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_showNewMessageTooltipDecs, 18, "showNewMessageTooltip"], [_hideNewMessageTooltipDecs, 18, "hideNewMessageTooltip"], [_switchMenuDecs, 18, "switchMenu"], [_decorator.bound, 2, "isLocked"], [_decorator.bound, 2, "enableCamera"], [_decorator.bound, 2, "setCameraId"], [_decorator.bound, 2, "enableMicrophone"], [_decorator.bound, 2, "setMicrophoneId"], [_decorator.bound, 2, "setSpeakerId"], [_decorator.bound, 2, "setAllowBoardWrite"], [_decorator.bound, 2, "setAllowScreenShare"], [_decorator.bound, 2, "closeBoard"], [_decorator.bound, 2, "enableShare"], [_assignHostDecs, 18, "assignHost"], [_decorator.bound, 2, "leave"], [_decorator.bound, 2, "keepPhoneAudioConnection"], [_decorator.bound, 2, "end"], [_decorator.bound, 2, "allowJoinWithMuteAudio"], [_decorator.bound, 2, "setAllowJoinWithMuteAudio"], [_decorator.bound, 2, "isLockRoomEnabled"], [_decorator.bound, 2, "setLockRoomEnabled"], [_decorator.bound, 2, "setAllowShareScreen"], [_decorator.bound, 2, "allowShareScreen"], [_decorator.bound, 2, "allowWriteBoard"], [_decorator.bound, 2, "allowChat"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "allowUnmuteSelfAudio"], [_decorator.bound, 2, "setAllowUnmuteSelfAudio"], [_decorator.bound, 2, "allowUnmuteSelfVideo"], [_decorator.bound, 2, "setAllowUnmuteSelfVideo"], [_decorator.bound, 2, "toggleChat"], [_decorator.bound, 2, "openChat"], [_decorator.bound, 2, "closeChat"], [_decorator.bound, 2, "toggleParticipants"], [_decorator.bound, 2, "openParticipants"], [_decorator.bound, 2, "closeParticipants"], [_decorator.bound, 2, "openDeviceSettingDialog"], [_decorator.bound, 2, "startScreenShare"], [_decorator.bound, 2, "openWhiteboard"], [_decorator.bound, 2, "closeWhiteboard"], [_decorator.bound, 2, "stopScreenShare"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_decorator.bound, 2, "closeLiveStreamingDialog"], [_decorator.bound, 2, "toggleConnection"], [_decorator.bound, 2, "openConnection"], [_decorator.bound, 2, "closeConnection"], [_toggleFoldDecs, 18, "toggleFold"], [_setShowArrowDecs, 18, "setShowArrow"], [_decorator.bound, 2, "_interceptShareScreen"], [_decorator.bound, 2, "_interceptShareBoard"], [_handleRemoteUsersJoinedDecs, 18, "_handleRemoteUsersJoined"], [_handleRemoteUsersLeftDecs, 18, "_handleRemoteUsersLeft"], [_handleAllUserCountUpdatedDecs, 18, "_handleAllUserCountUpdated"], [_handleUserInfoUpdatedDecs, 18, "_handleUserInfoUpdated"], [_handleLiveStreamingStateUpdatedDecs, 18, "_handleLiveStreamingStateUpdated"], [_handleChatVisibleDecs, 18, "_handleChatVisible"], [_decorator.bound, 2, "_onEvent"], [_handleCloudRecordingStateUpdatedDecs, 18, "_handleCloudRecordingStateUpdated"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_handleNewMessageEventDecs, 16, "_handleNewMessageEvent"]], []).e, 19);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ActionBarStore, [[_mobx.observable, 1, "users"], [_mobx.observable, 1, "newMessageTooltipVisible"], [_mobx.observable, 1, "newMessageCount"], [_mobx.observable, 1, "latestMessage"], [_mobx.observable, 1, "totalUser"], [_mobx.observable, 1, "totalWaitingRoomUser"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "currentMenuIs"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "localUserRole"], [_mobx.observable, 1, "localUser"], [_mobx.observable, 1, "connectionSettingVisible"], [_mobx.observable, 1, "connectType"], [_mobx.observable, 1, "folded"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "hasScreenShare"], [_mobx.observable, 1, "showArrow"], [_mobx.observable, 1, "phoneMicEnabled"], [_mobx.observable, 1, "isNewWaitingRoomUserEnter"], [_mobx.observable, 1, "chatTabIndex"], [_mobx.observable, 1, "popoverOpened"], [_mobx.observable, 1, "isPstnUser"], [_mobx.computed, 3, "remoteUsers"], [_mobx.computed, 3, "hasStartScreenSharePermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasEnableStartAudioPermission"], [_mobx.computed, 3, "hasEnableChangeNamePermission"], [_mobx.computed, 3, "hasEnableStartVideoPermission"], [_mobx.computed, 3, "hasLockRoomPermission"], [_mobx.computed, 3, "hasWaitingRoomPermission"], [_mobx.computed, 3, "hasWatermarkDisablePermission"], [_mobx.computed, 3, "hasEnableStartSharePermission"], [_mobx.computed, 3, "hasAllowWriteBoardPermission"], [_mobx.computed, 3, "hasCloseWriteBoardPermission"], [_mobx.computed, 3, "hasAllowScreenShareAndBoardPermission"], [_mobx.computed, 3, "hasAllowChatPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "isScreenShareAndBoardEnabled"], [_mobx.computed, 3, "isBoardWriteEnabled"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_mobx.computed, 3, "cameraId"], [_mobx.computed, 3, "cameraList"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "microphoneId"], [_mobx.computed, 3, "microphoneVolumeLevel"], [_mobx.computed, 3, "microphoneList"], [_mobx.computed, 3, "speakerId"], [_mobx.computed, 3, "speakerList"], [_mobx.computed, 3, "allNewMessage"], [_mobx.computed, 3, "isMainRoom"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_showNewMessageTooltipDecs, 18, "showNewMessageTooltip"], [_hideNewMessageTooltipDecs, 18, "hideNewMessageTooltip"], [_switchMenuDecs, 18, "switchMenu"], [_mobx.computed, 3, "isLocked"], [_decorator.bound, 2, "isWaitingRoomEnabled"], [_decorator.bound, 2, "enableCamera"], [_decorator.bound, 2, "setCameraId"], [_decorator.bound, 2, "enableMicrophone"], [_decorator.bound, 2, "setMicrophoneId"], [_decorator.bound, 2, "setSpeakerId"], [_decorator.bound, 2, "closeSpeaker"], [_decorator.bound, 2, "setAllowBoardWrite"], [_decorator.bound, 2, "setAllowScreenShare"], [_decorator.bound, 2, "closeBoard"], [_assignHostDecs, 18, "assignHost"], [_decorator.bound, 2, "leave"], [_decorator.bound, 2, "keepPhoneAudioConnection"], [_setPopoverOpenedDecs, 18, "setPopoverOpened"], [_decorator.bound, 2, "getRoomType"], [_decorator.bound, 2, "end"], [_decorator.bound, 2, "allowJoinWithMuteAudio"], [_decorator.bound, 2, "setAllowJoinWithMuteAudio"], [_decorator.bound, 2, "isLockRoomEnabled"], [_decorator.bound, 2, "setLockRoomEnabled"], [_decorator.bound, 2, "setAllowShareScreen"], [_decorator.bound, 2, "allowShareScreen"], [_decorator.bound, 2, "allowWriteBoard"], [_decorator.bound, 2, "allowChat"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "allowUnmuteSelfAudio"], [_decorator.bound, 2, "setAllowUnmuteSelfAudio"], [_decorator.bound, 2, "allowUnmuteSelfVideo"], [_decorator.bound, 2, "setAllowUnmuteSelfVideo"], [_decorator.bound, 2, "toggleChat"], [_decorator.bound, 2, "openChat"], [_decorator.bound, 2, "closeChat"], [_decorator.bound, 2, "toggleParticipants"], [_decorator.bound, 2, "openParticipants"], [_decorator.bound, 2, "closeParticipants"], [_decorator.bound, 2, "openDeviceSettingDialog"], [_decorator.bound, 2, "startScreenShare"], [_decorator.bound, 2, "openWhiteboard"], [_decorator.bound, 2, "closeWhiteboard"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_decorator.bound, 2, "closeLiveStreamingDialog"], [_decorator.bound, 2, "toggleConnection"], [_decorator.bound, 2, "openConnection"], [_decorator.bound, 2, "closeConnection"], [_toggleFoldDecs, 18, "toggleFold"], [_setShowArrowDecs, 18, "setShowArrow"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_kickOutWaitingRoomAllMemberDecs, 18, "kickOutWaitingRoomAllMember"], [_moveToMainRoomAllMemberDecs, 18, "moveToMainRoomAllMember"], [_decorator.bound, 2, "_interceptShareScreen"], [_decorator.bound, 2, "_interceptShareBoard"], [_handleRemoteUsersJoinedDecs, 18, "_handleRemoteUsersJoined"], [_handleRemoteUsersLeftDecs, 18, "_handleRemoteUsersLeft"], [_handleAllUserCountUpdatedDecs, 18, "_handleAllUserCountUpdated"], [_getWaitingRoomUserCountDecs, 18, "_getWaitingRoomUserCount"], [_handleRemoteWaitingUserLeftDecs, 18, "_handleRemoteWaitingUserLeft"], [_handleRemoteWaitingUserJoinedDecs, 18, "_handleRemoteWaitingUserJoined"], [_handleUserInfoUpdatedDecs, 18, "_handleUserInfoUpdated"], [_handleLiveStreamingStateUpdatedDecs, 18, "_handleLiveStreamingStateUpdated"], [_handleChatVisibleDecs, 18, "_handleChatVisible"], [_handlerTraceScreenCaptureStateUpdateDecs, 18, "_handlerTraceScreenCaptureStateUpdate"], [_decorator.bound, 2, "setAllowWaterMark"], [_decorator.bound, 2, "setWaterMarkLineType"], [_decorator.bound, 2, "_onEvent"], [_operateWaitingRoomDecs, 18, "_operateWaitingRoom"], [_handleCloudRecordingStateUpdatedDecs, 18, "_handleCloudRecordingStateUpdated"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_handleNewMessageEventDecs, 16, "_handleNewMessageEvent"]], []).e, 24);
 _init_users = _applyDecs$e[0];
 _init_newMessageTooltipVisible = _applyDecs$e[1];
 _init_newMessageCount = _applyDecs$e[2];
 _init_latestMessage = _applyDecs$e[3];
 _init_totalUser = _applyDecs$e[4];
-_init_liveStreamingState = _applyDecs$e[5];
-_init_currentMenuIs = _applyDecs$e[6];
-_init_cloudRecordingState = _applyDecs$e[7];
-_init_localUserRole = _applyDecs$e[8];
-_init_localUser = _applyDecs$e[9];
-_init_connectionSettingVisible = _applyDecs$e[10];
-_init_connectType = _applyDecs$e[11];
-_init_folded = _applyDecs$e[12];
-_init_boardOwnerUser = _applyDecs$e[13];
-_init_hasScreenShare = _applyDecs$e[14];
-_init_showArrow = _applyDecs$e[15];
-_init_phoneMicEnabled = _applyDecs$e[16];
-_init__handleNewMessageEvent = _applyDecs$e[17];
-_initProto = _applyDecs$e[18];
+_init_totalWaitingRoomUser = _applyDecs$e[5];
+_init_liveStreamingState = _applyDecs$e[6];
+_init_currentMenuIs = _applyDecs$e[7];
+_init_cloudRecordingState = _applyDecs$e[8];
+_init_localUserRole = _applyDecs$e[9];
+_init_localUser = _applyDecs$e[10];
+_init_connectionSettingVisible = _applyDecs$e[11];
+_init_connectType = _applyDecs$e[12];
+_init_folded = _applyDecs$e[13];
+_init_boardOwnerUser = _applyDecs$e[14];
+_init_hasScreenShare = _applyDecs$e[15];
+_init_showArrow = _applyDecs$e[16];
+_init_phoneMicEnabled = _applyDecs$e[17];
+_init_isNewWaitingRoomUserEnter = _applyDecs$e[18];
+_init_chatTabIndex = _applyDecs$e[19];
+_init_popoverOpened = _applyDecs$e[20];
+_init_isPstnUser = _applyDecs$e[21];
+_init__handleNewMessageEvent = _applyDecs$e[22];
+_initProto = _applyDecs$e[23];