fcr-ui-scene 3.2.0 → 3.3.0

package/lib/modules/chat/store.js

@@ -22,7 +22,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.allToUser = exports.USER_NONE = exports.USER_ALL = void 0;
+exports["default"] = exports.allToUser = exports.USER_NONE = exports.USER_ALL = exports.ChatRoomStore = void 0;
 exports.isManager = isManager;
 exports.noUser = void 0;
 exports.sortUsers = sortUsers;
@@ -72,9 +72,9 @@ 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");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+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"));
@@ -88,8 +88,10 @@ var _reactVirtualized = require("react-virtualized");
 var _constant = require("../../utilities/constant");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type2 = require("agora-edu-core/lib/room-control/chatroom-control/type");
-var _ChatStore;
-var _initProto, _init__userInfo, _init_messageList, _init_readMsgIndex, _init_readIdx, _init_viewIdx, _init_historyUnreadCount, _init_hasHistoryMsg, _init_newMsgsUnReadCnt, _init_privateTargetUser, _init_chatLevel, _init_currentUserMap, _init_textMsg, _init_privateTargetList, _init_chatRoomState, _setLastScrollTopDecs, _setMessageListDecs, _sendMessageDecs, _handleTextMessageReceivedDecs, _onRemoteUserUpdateDecs, _refreshUserListDecs, _handleNewMsgDecs, _updateReadMsgIndexDecs, _initReadInfoDecs, _updateHistoryUnreadCntDecs, _updateHasHistoryMsgDecs, _updateScrollInfoDecs, _updateViewIdxDecs, _updateReadIdxDecs, _updateFirstMsgIdDecs, _updateHistoryUnReadCountDecs, _updateListDecs, _updateMostRecentHeightDecs, _updateMostRecentWidthDecs, _patchHandleMsgDecs, _forceNotifyMsgsDecs, _resetComponentCacheDecs, _resetTargetUserDecs, _initChatLevelDecs, _setTargetUserDecs, _updateChatLevelDecs, _updateChatTextMsgDecs, _permitPrivateChatDecs, _handleToastDecs, _handleConnectionUpdatedDecs, _ref;
+var _type3 = require("agora-edu-core/lib/room-control/type");
+var _observable = require("agora-foundation/lib/utilities/observable");
+var _ChatStore, _ChatRoomStore;
+var _initProto, _init_chatRoomStores, _init_activeTabIndex, _handleReceiveMessageDecs, _handlerActiveTabDecs, _handleEventDecs, _ref, _initProto2, _init__userInfo, _init_messageList, _init_readMsgIndex, _init_readIdx, _init_viewIdx, _init_historyUnreadCount, _init_hasHistoryMsg, _init_newMsgsUnReadCnt, _init_privateTargetUser, _init_chatLevel, _init_currentUserMap, _init_textMsg, _init_privateTargetList, _init_chatRoomState, _init_hasNewMsg, _init_userCount, _init_unReadMsgCount, _setLastScrollTopDecs, _setMessageListDecs, _sendMessageDecs, _setUnReadMsgCountDecs, _setHasNewMsgDecs, _handleTextMessageReceivedDecs, _getUserCountDecs, _onRemoteUserUpdateDecs, _refreshUserListDecs, _handleNewMsgDecs, _updateReadMsgIndexDecs, _initReadInfoDecs, _updateHistoryUnreadCntDecs, _updateHasHistoryMsgDecs, _updateScrollInfoDecs, _updateViewIdxDecs, _updateReadIdxDecs, _updateFirstMsgIdDecs, _updateHistoryUnReadCountDecs, _updateListDecs, _updateMostRecentHeightDecs, _updateMostRecentWidthDecs, _patchHandleMsgDecs, _forceNotifyMsgsDecs, _resetComponentCacheDecs, _resetTargetUserDecs, _initChatLevelDecs, _setTargetUserDecs, _updateChatLevelDecs, _updateChatTextMsgDecs, _filterChatMemberDecs, _hasSendMessagePermissionDecs, _permitPrivateChatDecs, _handleToastDecs, _handleConnectionUpdatedDecs, _ref3;
 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); }
@@ -121,6 +123,136 @@ var noUser = exports.noUser = {
 };
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
+_ref = (_handleReceiveMessageDecs = [_mobx.action, _mobx.action.bound], _handlerActiveTabDecs = [_mobx.action, _mobx.action.bound], _handleEventDecs = [_mobx.action, _mobx.action.bound], "_observable");
+var ChatStore = exports["default"] = /*#__PURE__*/function () {
+  function ChatStore(_ref2) {
+    var _roomControl$getRoomI;
+    var chatRoomControl = _ref2.chatRoomControl,
+      userControl = _ref2.userControl,
+      uiEventStore = _ref2.uiEventStore,
+      securityStore = _ref2.securityStore,
+      roomControl = _ref2.roomControl;
+    (0, _classCallCheck2["default"])(this, ChatStore);
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), new _observable.AgoraObservable()));
+    (0, _defineProperty2["default"])(this, "_chatVisible", false);
+    (0, _defineProperty2["default"])(this, "_eventObserver", {
+      onEvent: this._handleEvent
+    });
+    (0, _defineProperty2["default"])(this, "_chatStoreObserver", {
+      onReceiveMessage: this._handleReceiveMessage.bind(this)
+    });
+    _classPrivateFieldInitSpec(this, _A, _init_chatRoomStores(this, {}));
+    _classPrivateFieldInitSpec(this, _B, _init_activeTabIndex(this, _constant.RoomType.MAIN_ROOM));
+    this._securityStore = securityStore;
+    this._uiEventStore = uiEventStore;
+    uiEventStore.addObserver(this._eventObserver);
+    this._observable.addObserver(this._chatStoreObserver);
+    var isMainroom = ((_roomControl$getRoomI = roomControl.getRoomInfo()) === null || _roomControl$getRoomI === void 0 ? void 0 : _roomControl$getRoomI.roomType) === _type3.FcrRoomType.Mainroom;
+    var type = isMainroom ? _constant.RoomType.MAIN_ROOM : _constant.RoomType.WAITING_ROOM;
+    this.activeTabIndex = isMainroom ? _constant.RoomType.MAIN_ROOM : _constant.RoomType.WAITING_ROOM;
+    this.chatRoomStores[type] = new ChatRoomStore({
+      chatRoomControl: chatRoomControl,
+      userControl: userControl,
+      uiEventStore: uiEventStore,
+      securityStore: securityStore,
+      type: type,
+      chatStoreObservable: this._observable
+    });
+  }
+  return (0, _createClass2["default"])(ChatStore, [{
+    key: "chatRoomStores",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "activeTabIndex",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "hasWaitingRoomPermission",
+    value: function hasWaitingRoomPermission() {
+      return this._securityStore.isWaitingRoomEnabled() && this._securityStore.hasWaitingRoomPermission();
+    }
+  }, {
+    key: "_handleReceiveMessage",
+    value: function _handleReceiveMessage(noitfyMsgs, type) {
+      if (this.activeTabIndex !== type || !this._chatVisible) {
+        var _this$chatRoomStores$, _this$chatRoomStores$2;
+        (_this$chatRoomStores$ = this.chatRoomStores[type]) === null || _this$chatRoomStores$ === void 0 || _this$chatRoomStores$.setUnReadMsgCount(noitfyMsgs.length + ((_this$chatRoomStores$2 = this.chatRoomStores[type]) === null || _this$chatRoomStores$2 === void 0 ? void 0 : _this$chatRoomStores$2.unReadMsgCount));
+        this._uiEventStore.receiveNewChatMessages({
+          latestMessage: noitfyMsgs[noitfyMsgs.length - 1],
+          count: noitfyMsgs.length,
+          type: type
+        });
+      }
+    }
+  }, {
+    key: "handlerActiveTab",
+    value: function handlerActiveTab(key) {
+      var _this$chatRoomStores$3, _this$chatRoomStores$4;
+      this.activeTabIndex = key;
+      (_this$chatRoomStores$3 = this.chatRoomStores[key]) === null || _this$chatRoomStores$3 === void 0 || _this$chatRoomStores$3.setUnReadMsgCount(0);
+      (_this$chatRoomStores$4 = this.chatRoomStores[_constant.RoomType.WAITING_ROOM]) === null || _this$chatRoomStores$4 === void 0 || _this$chatRoomStores$4.setHasNewMsg(false);
+      this._uiEventStore.sendEvent(_constant.UIAction.CHAT_ROOM_TAB_CHANGE, key);
+    }
+  }, {
+    key: "_handleEvent",
+    value: function _handleEvent(action, payload) {
+      if (action === _constant.UIAction.WAITING_ROOM_CREATED) {
+        var room = payload.room;
+        var userControl = room.getUserControl();
+        var chatRoomControl = room.getChatRoomControl();
+        this.chatRoomStores[_constant.RoomType.WAITING_ROOM] = new ChatRoomStore({
+          chatRoomControl: chatRoomControl,
+          userControl: userControl,
+          uiEventStore: this._uiEventStore,
+          securityStore: payload.securityStore,
+          type: _constant.RoomType.WAITING_ROOM,
+          chatStoreObservable: this._observable
+        });
+      }
+      if (action === _constant.UIAction.RECEIVE_NEW_CHAT_MESSAGES_FOR_RED) {
+        if (this.activeTabIndex !== payload) {
+          var _this$chatRoomStores;
+          (_this$chatRoomStores = this.chatRoomStores[payload]) === null || _this$chatRoomStores === void 0 || _this$chatRoomStores.setHasNewMsg(true);
+        } else {
+          var _this$chatRoomStores2;
+          (_this$chatRoomStores2 = this.chatRoomStores[payload]) === null || _this$chatRoomStores2 === void 0 || _this$chatRoomStores2.setHasNewMsg(false);
+        }
+      }
+      if (action === _constant.UIAction.CHAT_ROOM_CLOSED) {
+        this.handlerActiveTab(_constant.RoomType.MAIN_ROOM);
+      }
+      if (action === _constant.UIAction.CHAT_VISIBLE) {
+        if (payload === true) {
+          var _this$chatRoomStores$5;
+          (_this$chatRoomStores$5 = this.chatRoomStores[this.activeTabIndex]) === null || _this$chatRoomStores$5 === void 0 || _this$chatRoomStores$5.setUnReadMsgCount(0);
+        }
+        this._chatVisible = payload;
+      }
+      if (action === _constant.UIAction.WAITING_ROOM_DESTROYED) {
+        var _this$chatRoomStores$6;
+        (_this$chatRoomStores$6 = this.chatRoomStores[_constant.RoomType.WAITING_ROOM]) === null || _this$chatRoomStores$6 === void 0 || _this$chatRoomStores$6.release();
+        delete this.chatRoomStores[_constant.RoomType.WAITING_ROOM];
+        this.handlerActiveTab(_constant.RoomType.MAIN_ROOM);
+      }
+    }
+  }]);
+}();
+_ChatStore = ChatStore;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ChatStore, [[_mobx.observable, 1, "chatRoomStores"], [_mobx.observable, 1, "activeTabIndex"], [_decorator.bound, 2, "hasWaitingRoomPermission"], [_handleReceiveMessageDecs, 18, "_handleReceiveMessage"], [_handlerActiveTabDecs, 18, "handlerActiveTab"], [_handleEventDecs, 18, "_handleEvent"]], []).e, 3);
+_init_chatRoomStores = _applyDecs$e[0];
+_init_activeTabIndex = _applyDecs$e[1];
+_initProto = _applyDecs$e[2];
+var _A2 = /*#__PURE__*/new WeakMap();
+var _B2 = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
@@ -133,17 +265,22 @@ var _K = /*#__PURE__*/new WeakMap();
 var _L = /*#__PURE__*/new WeakMap();
 var _M = /*#__PURE__*/new WeakMap();
 var _N = /*#__PURE__*/new WeakMap();
-_ref = (_setLastScrollTopDecs = [_mobx.action, _mobx.action.bound], _setMessageListDecs = [_mobx.action, _mobx.action.bound], _sendMessageDecs = [_mobx.action, _mobx.action.bound], _handleTextMessageReceivedDecs = [_mobx.action, _mobx.action.bound], _onRemoteUserUpdateDecs = [_mobx.action, _mobx.action.bound], _refreshUserListDecs = [_mobx.action, _mobx.action.bound], _handleNewMsgDecs = [_mobx.action, _mobx.action.bound], _updateReadMsgIndexDecs = [_mobx.action, _mobx.action.bound], _initReadInfoDecs = [_mobx.action, _mobx.action.bound], _updateHistoryUnreadCntDecs = [_mobx.action, _mobx.action.bound], _updateHasHistoryMsgDecs = [_mobx.action, _mobx.action.bound], _updateScrollInfoDecs = [_mobx.action, _mobx.action.bound], _updateViewIdxDecs = [_mobx.action, _mobx.action.bound], _updateReadIdxDecs = [_mobx.action, _mobx.action.bound], _updateFirstMsgIdDecs = [_mobx.action, _mobx.action.bound], _updateHistoryUnReadCountDecs = [_mobx.action, _mobx.action.bound], _updateListDecs = [_mobx.action, _mobx.action.bound], _updateMostRecentHeightDecs = [_mobx.action, _mobx.action.bound], _updateMostRecentWidthDecs = [_mobx.action, _mobx.action.bound], _patchHandleMsgDecs = [_mobx.action, _mobx.action.bound], _forceNotifyMsgsDecs = [_mobx.action, _mobx.action.bound], _resetComponentCacheDecs = [_mobx.action, _mobx.action.bound], _resetTargetUserDecs = [_mobx.action, _mobx.action.bound], _initChatLevelDecs = [_mobx.action, _mobx.action.bound], _setTargetUserDecs = [_mobx.action, _mobx.action.bound], _updateChatLevelDecs = [_mobx.action, _mobx.action.bound], _updateChatTextMsgDecs = [_mobx.action, _mobx.action.bound], _permitPrivateChatDecs = [_mobx.action, _mobx.action.bound], _handleToastDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_mobx.action, _mobx.action.bound], "needCbBottomCount");
-var ChatStore = exports["default"] = /*#__PURE__*/function () {
-  function ChatStore(_ref2) {
+var _O = /*#__PURE__*/new WeakMap();
+var _P = /*#__PURE__*/new WeakMap();
+var _Q = /*#__PURE__*/new WeakMap();
+_ref3 = (_setLastScrollTopDecs = [_mobx.action, _mobx.action.bound], _setMessageListDecs = [_mobx.action, _mobx.action.bound], _sendMessageDecs = [_mobx.action, _mobx.action.bound], _setUnReadMsgCountDecs = [_mobx.action, _mobx.action.bound], _setHasNewMsgDecs = [_mobx.action, _mobx.action.bound], _handleTextMessageReceivedDecs = [_mobx.action, _mobx.action.bound], _getUserCountDecs = [_mobx.action, _mobx.action.bound], _onRemoteUserUpdateDecs = [_mobx.action, _mobx.action.bound], _refreshUserListDecs = [_mobx.action, _mobx.action.bound], _handleNewMsgDecs = [_mobx.action, _mobx.action.bound], _updateReadMsgIndexDecs = [_mobx.action, _mobx.action.bound], _initReadInfoDecs = [_mobx.action, _mobx.action.bound], _updateHistoryUnreadCntDecs = [_mobx.action, _mobx.action.bound], _updateHasHistoryMsgDecs = [_mobx.action, _mobx.action.bound], _updateScrollInfoDecs = [_mobx.action, _mobx.action.bound], _updateViewIdxDecs = [_mobx.action, _mobx.action.bound], _updateReadIdxDecs = [_mobx.action, _mobx.action.bound], _updateFirstMsgIdDecs = [_mobx.action, _mobx.action.bound], _updateHistoryUnReadCountDecs = [_mobx.action, _mobx.action.bound], _updateListDecs = [_mobx.action, _mobx.action.bound], _updateMostRecentHeightDecs = [_mobx.action, _mobx.action.bound], _updateMostRecentWidthDecs = [_mobx.action, _mobx.action.bound], _patchHandleMsgDecs = [_mobx.action, _mobx.action.bound], _forceNotifyMsgsDecs = [_mobx.action, _mobx.action.bound], _resetComponentCacheDecs = [_mobx.action, _mobx.action.bound], _resetTargetUserDecs = [_mobx.action, _mobx.action.bound], _initChatLevelDecs = [_mobx.action, _mobx.action.bound], _setTargetUserDecs = [_mobx.action, _mobx.action.bound], _updateChatLevelDecs = [_mobx.action, _mobx.action.bound], _updateChatTextMsgDecs = [_mobx.action, _mobx.action.bound], _filterChatMemberDecs = [_mobx.action, _mobx.action.bound], _hasSendMessagePermissionDecs = [_mobx.action, _mobx.action.bound], _permitPrivateChatDecs = [_mobx.action, _mobx.action.bound], _handleToastDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_mobx.action, _mobx.action.bound], "needCbBottomCount");
+var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
+  function ChatRoomStore(_ref4) {
     var _this$_chatRoomContro,
       _this = this;
-    var chatRoomControl = _ref2.chatRoomControl,
-      userControl = _ref2.userControl,
-      uiEventStore = _ref2.uiEventStore,
-      securityStore = _ref2.securityStore;
-    (0, _classCallCheck2["default"])(this, ChatStore);
-    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), 40));
+    var chatRoomControl = _ref4.chatRoomControl,
+      userControl = _ref4.userControl,
+      uiEventStore = _ref4.uiEventStore,
+      securityStore = _ref4.securityStore,
+      type = _ref4.type,
+      chatStoreObservable = _ref4.chatStoreObservable;
+    (0, _classCallCheck2["default"])(this, ChatRoomStore);
+    (0, _defineProperty2["default"])(this, _ref3, (_initProto2(this), 40));
     (0, _defineProperty2["default"])(this, "mostRecentHeight", 0);
     (0, _defineProperty2["default"])(this, "mostRecentWidth", 0);
     (0, _defineProperty2["default"])(this, "cache", new _reactVirtualized.CellMeasurerCache({}));
@@ -160,8 +297,8 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_maxMsgCount", 500);
     (0, _defineProperty2["default"])(this, "_originalMessages", []);
     (0, _defineProperty2["default"])(this, "_disposers", []);
-    _classPrivateFieldInitSpec(this, _A, _init__userInfo(this));
-    _classPrivateFieldInitSpec(this, _B, _init_messageList(this, []));
+    _classPrivateFieldInitSpec(this, _A2, _init__userInfo(this));
+    _classPrivateFieldInitSpec(this, _B2, _init_messageList(this, []));
     _classPrivateFieldInitSpec(this, _C, _init_readMsgIndex(this, {
       index: -1,
       msgId: ''
@@ -179,6 +316,9 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _L, _init_textMsg(this, ''));
     _classPrivateFieldInitSpec(this, _M, _init_privateTargetList(this, []));
     _classPrivateFieldInitSpec(this, _N, _init_chatRoomState(this, _type2.FcrChatRoomConnectionState.Disconnected));
+    _classPrivateFieldInitSpec(this, _O, _init_hasNewMsg(this, false));
+    _classPrivateFieldInitSpec(this, _P, _init_userCount(this, 0));
+    _classPrivateFieldInitSpec(this, _Q, _init_unReadMsgCount(this, 0));
     (0, _defineProperty2["default"])(this, "_chatRoomObserver", {
       onTextMessageReceived: this.messageReceived.bind(this),
       onConnectionStateUpdated: this._handleConnectionUpdated.bind(this),
@@ -191,12 +331,15 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
       onUserPropertiesDeleted: function onUserPropertiesDeleted(roomId, event) {},
       onUserInfoUpdated: this._onUserInfoUpdated.bind(this)
     });
+    this._type = type;
     this._uiEventStore = uiEventStore;
     this._securityStore = securityStore;
+    this._chatStoreObservable = chatStoreObservable;
     // TODO: 需要查询房间历史消息, 一期预留
     this.messageList = [];
     this._chatRoomControl = chatRoomControl;
     this._userControl = userControl;
+    this.userCount = this.getUserCount();
     this._userInfo = userControl.getLocalUser();
     (_this$_chatRoomContro = this._chatRoomControl) === null || _this$_chatRoomContro === void 0 || _this$_chatRoomContro.addObserver(this._chatRoomObserver);
     this._userControl.addObserver(this._userObserver);
@@ -217,21 +360,21 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     this.initChatLevel();
     this.resetTargetUser();
   }
-  return (0, _createClass2["default"])(ChatStore, [{
+  return (0, _createClass2["default"])(ChatRoomStore, [{
     key: "_userInfo",
     get: function get() {
-      return _classPrivateFieldGet(_A, this);
+      return _classPrivateFieldGet(_A2, this);
     },
     set: function set(v) {
-      _classPrivateFieldSet(_A, this, v);
+      _classPrivateFieldSet(_A2, this, v);
     }
   }, {
     key: "messageList",
     get: function get() {
-      return _classPrivateFieldGet(_B, this);
+      return _classPrivateFieldGet(_B2, this);
     },
     set: function set(v) {
-      _classPrivateFieldSet(_B, this, v);
+      _classPrivateFieldSet(_B2, this, v);
     }
   }, {
     key: "readMsgIndex",
@@ -329,6 +472,30 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_N, this, v);
     }
+  }, {
+    key: "hasNewMsg",
+    get: function get() {
+      return _classPrivateFieldGet(_O, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_O, this, v);
+    }
+  }, {
+    key: "userCount",
+    get: function get() {
+      return _classPrivateFieldGet(_P, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_P, this, v);
+    }
+  }, {
+    key: "unReadMsgCount",
+    get: function get() {
+      return _classPrivateFieldGet(_Q, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_Q, this, v);
+    }
   }, {
     key: "release",
     value: function release() {
@@ -407,6 +574,17 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     key: "messageReceived",
     value: function messageReceived(_roomId, msg) {
       this._originalMessages.push(msg);
+      this._uiEventStore.sendEvent(_constant.UIAction.RECEIVE_NEW_CHAT_MESSAGES_FOR_RED, this._type);
+    }
+  }, {
+    key: "setUnReadMsgCount",
+    value: function setUnReadMsgCount(count) {
+      this.unReadMsgCount = count;
+    }
+  }, {
+    key: "setHasNewMsg",
+    value: function setHasNewMsg(value) {
+      this.hasNewMsg = value;
     }
   }, {
     key: "_handleTextMessageReceived",
@@ -454,12 +632,25 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
         img: message.file
       }));
     }
+  }, {
+    key: "getUserCount",
+    value: function getUserCount() {
+      return this._userControl.getUserList().filter(function (user) {
+        return user.userRole === _type.FcrUserRole.PARTICIPANT;
+      }).length;
+    }
   }, {
     key: "_onRemoteUserUpdate",
     value: function _onRemoteUserUpdate(roomId, events) {
       console.log({
         events: events
       }, 'remoteUser update');
+      if (this._type === _constant.RoomType.WAITING_ROOM) {
+        this.userCount = this.getUserCount();
+        if (this.userCount === 0) {
+          this._uiEventStore.sendEvent(_constant.UIAction.CHAT_ROOM_CLOSED, this._type);
+        }
+      }
       this._refreshUserList();
     }
   }, {
@@ -547,6 +738,11 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._securityStore.hasChatSendPublicPermission();
     }
+  }, {
+    key: "hasChatSendPrivatePermission",
+    get: function get() {
+      return this._securityStore.hasPermissionToSendPrivateMessage(_type.FcrUserRole.HOST) || this._securityStore.hasPermissionToSendPrivateMessage(_type.FcrUserRole.COHOST);
+    }
   }, {
     key: "isHost",
     get: function get() {
@@ -682,10 +878,7 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
       notifyMsgs.forEach(function (msg) {
         _this3._handleTextMessageReceived(msg);
       });
-      notifyMsgs.length > 0 && this._uiEventStore.receiveNewChatMessages({
-        latestMessage: notifyMsgs[notifyMsgs.length - 1],
-        count: notifyMsgs.length
-      });
+      notifyMsgs.length > 0 && this._chatStoreObservable.notifyObservers('onReceiveMessage', notifyMsgs, this._type);
 
       // TODO: 消息批量更新, 优化
     }
@@ -765,10 +958,10 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     key: "handleChatPermissionUpdate",
     value: function handleChatPermissionUpdate(chatLevel) {
       var _this$privilegeOperat;
-      var _ref3 = (_this$privilegeOperat = this.privilegeOperator) !== null && _this$privilegeOperat !== void 0 ? _this$privilegeOperat : {},
-        userId = _ref3.userId,
-        userName = _ref3.userName,
-        userRole = _ref3.userRole;
+      var _ref5 = (_this$privilegeOperat = this.privilegeOperator) !== null && _this$privilegeOperat !== void 0 ? _this$privilegeOperat : {},
+        userId = _ref5.userId,
+        userName = _ref5.userName,
+        userRole = _ref5.userRole;
       var msg = {
         id: String(new Date().getTime()),
         role: userRole === _type.FcrUserRole.PARTICIPANT ? 'participant' : userRole === _type.FcrUserRole.COHOST ? 'union-host' : 'host',
@@ -800,6 +993,23 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     value: function updateChatTextMsg(txt) {
       this.textMsg = txt;
     }
+  }, {
+    key: "filterChatMember",
+    value: function filterChatMember(list) {
+      var _this6 = this;
+      var res = list.filter(function (user) {
+        return _this6._securityStore.hasChatSendPublicPermissionByTargetRole(user.userRole) || _this6._securityStore.hasPermissionToSendPrivateMessage(user.userRole) || user.userId === USER_ALL;
+      });
+      if (res.length && _constant.RoomType.WAITING_ROOM === this._type && !this.localIsManager) {
+        this.setTargetUser(res[0]);
+      }
+      return res;
+    }
+  }, {
+    key: "hasSendMessagePermission",
+    value: function hasSendMessagePermission() {
+      return this._securityStore.hasPermissionToSendPrivateMessage(_type.FcrUserRole.HOST) || this._securityStore.hasPermissionToSendPrivateMessage(_type.FcrUserRole.COHOST) || this._securityStore.hasChatSendPublicPermissionByTargetRole(_type.FcrUserRole.PARTICIPANT) || this._securityStore.hasChatSendPublicPermissionByTargetRole(_type.FcrUserRole.HOST) || this._securityStore.hasChatSendPublicPermissionByTargetRole(_type.FcrUserRole.COHOST);
+    }
   }, {
     key: "permitPrivateChat",
     value: function permitPrivateChat(userId) {
@@ -852,23 +1062,26 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     }
   }]);
 }();
-_ChatStore = ChatStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ChatStore, [[_mobx.observable, 1, "_userInfo"], [_mobx.observable, 1, "messageList"], [_mobx.observable, 1, "readMsgIndex"], [_mobx.observable, 1, "readIdx"], [_mobx.observable, 1, "viewIdx"], [_mobx.observable, 1, "historyUnreadCount"], [_mobx.observable, 1, "hasHistoryMsg"], [_mobx.observable, 1, "newMsgsUnReadCnt"], [_mobx.observable, 1, "privateTargetUser"], [_mobx.observable, 1, "chatLevel"], [_mobx.observable, 1, "currentUserMap"], [_mobx.observable, 1, "textMsg"], [_mobx.observable, 1, "privateTargetList"], [_mobx.observable, 1, "chatRoomState"], [_setLastScrollTopDecs, 18, "setLastScrollTop"], [_setMessageListDecs, 18, "setMessageList"], [_sendMessageDecs, 18, "sendMessage"], [_handleTextMessageReceivedDecs, 18, "_handleTextMessageReceived"], [_onRemoteUserUpdateDecs, 18, "_onRemoteUserUpdate"], [_refreshUserListDecs, 18, "_refreshUserList"], [_handleNewMsgDecs, 18, "handleNewMsg"], [_updateReadMsgIndexDecs, 18, "updateReadMsgIndex"], [_mobx.computed, 3, "isHost"], [_mobx.computed, 3, "isCohost"], [_mobx.computed, 3, "localIsManager"], [_initReadInfoDecs, 18, "initReadInfo"], [_updateHistoryUnreadCntDecs, 18, "updateHistoryUnreadCnt"], [_updateHasHistoryMsgDecs, 18, "updateHasHistoryMsg"], [_updateScrollInfoDecs, 18, "updateScrollInfo"], [_updateViewIdxDecs, 18, "updateViewIdx"], [_updateReadIdxDecs, 18, "updateReadIdx"], [_updateFirstMsgIdDecs, 18, "updateFirstMsgId"], [_updateHistoryUnReadCountDecs, 18, "updateHistoryUnReadCount"], [_updateListDecs, 18, "updateList"], [_updateMostRecentHeightDecs, 18, "updateMostRecentHeight"], [_updateMostRecentWidthDecs, 18, "updateMostRecentWidth"], [_patchHandleMsgDecs, 18, "patchHandleMsg"], [_forceNotifyMsgsDecs, 18, "forceNotifyMsgs"], [_resetComponentCacheDecs, 18, "resetComponentCache"], [_resetTargetUserDecs, 18, "resetTargetUser"], [_initChatLevelDecs, 18, "initChatLevel"], [_setTargetUserDecs, 18, "setTargetUser"], [_mobx.computed, 3, "targetUserIsOnline"], [_mobx.computed, 3, "remoteUsers"], [_decorator.bound, 2, "handleChatPermissionUpdate"], [_updateChatLevelDecs, 18, "updateChatLevel"], [_updateChatTextMsgDecs, 18, "updateChatTextMsg"], [_permitPrivateChatDecs, 18, "permitPrivateChat"], [_handleToastDecs, 18, "handleToast"], [_mobx.computed, 3, "isHostOrCoHost"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "setAllowChatWithPayload"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"]], []).e, 15);
-_init__userInfo = _applyDecs$e[0];
-_init_messageList = _applyDecs$e[1];
-_init_readMsgIndex = _applyDecs$e[2];
-_init_readIdx = _applyDecs$e[3];
-_init_viewIdx = _applyDecs$e[4];
-_init_historyUnreadCount = _applyDecs$e[5];
-_init_hasHistoryMsg = _applyDecs$e[6];
-_init_newMsgsUnReadCnt = _applyDecs$e[7];
-_init_privateTargetUser = _applyDecs$e[8];
-_init_chatLevel = _applyDecs$e[9];
-_init_currentUserMap = _applyDecs$e[10];
-_init_textMsg = _applyDecs$e[11];
-_init_privateTargetList = _applyDecs$e[12];
-_init_chatRoomState = _applyDecs$e[13];
-_initProto = _applyDecs$e[14];
+_ChatRoomStore = ChatRoomStore;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_ChatRoomStore, [[_mobx.observable, 1, "_userInfo"], [_mobx.observable, 1, "messageList"], [_mobx.observable, 1, "readMsgIndex"], [_mobx.observable, 1, "readIdx"], [_mobx.observable, 1, "viewIdx"], [_mobx.observable, 1, "historyUnreadCount"], [_mobx.observable, 1, "hasHistoryMsg"], [_mobx.observable, 1, "newMsgsUnReadCnt"], [_mobx.observable, 1, "privateTargetUser"], [_mobx.observable, 1, "chatLevel"], [_mobx.observable, 1, "currentUserMap"], [_mobx.observable, 1, "textMsg"], [_mobx.observable, 1, "privateTargetList"], [_mobx.observable, 1, "chatRoomState"], [_mobx.observable, 1, "hasNewMsg"], [_mobx.observable, 1, "userCount"], [_mobx.observable, 1, "unReadMsgCount"], [_setLastScrollTopDecs, 18, "setLastScrollTop"], [_setMessageListDecs, 18, "setMessageList"], [_sendMessageDecs, 18, "sendMessage"], [_setUnReadMsgCountDecs, 18, "setUnReadMsgCount"], [_setHasNewMsgDecs, 18, "setHasNewMsg"], [_handleTextMessageReceivedDecs, 18, "_handleTextMessageReceived"], [_getUserCountDecs, 18, "getUserCount"], [_onRemoteUserUpdateDecs, 18, "_onRemoteUserUpdate"], [_refreshUserListDecs, 18, "_refreshUserList"], [_handleNewMsgDecs, 18, "handleNewMsg"], [_updateReadMsgIndexDecs, 18, "updateReadMsgIndex"], [_mobx.computed, 3, "isHost"], [_mobx.computed, 3, "isCohost"], [_mobx.computed, 3, "localIsManager"], [_initReadInfoDecs, 18, "initReadInfo"], [_updateHistoryUnreadCntDecs, 18, "updateHistoryUnreadCnt"], [_updateHasHistoryMsgDecs, 18, "updateHasHistoryMsg"], [_updateScrollInfoDecs, 18, "updateScrollInfo"], [_updateViewIdxDecs, 18, "updateViewIdx"], [_updateReadIdxDecs, 18, "updateReadIdx"], [_updateFirstMsgIdDecs, 18, "updateFirstMsgId"], [_updateHistoryUnReadCountDecs, 18, "updateHistoryUnReadCount"], [_updateListDecs, 18, "updateList"], [_updateMostRecentHeightDecs, 18, "updateMostRecentHeight"], [_updateMostRecentWidthDecs, 18, "updateMostRecentWidth"], [_patchHandleMsgDecs, 18, "patchHandleMsg"], [_forceNotifyMsgsDecs, 18, "forceNotifyMsgs"], [_resetComponentCacheDecs, 18, "resetComponentCache"], [_resetTargetUserDecs, 18, "resetTargetUser"], [_initChatLevelDecs, 18, "initChatLevel"], [_setTargetUserDecs, 18, "setTargetUser"], [_mobx.computed, 3, "targetUserIsOnline"], [_mobx.computed, 3, "remoteUsers"], [_decorator.bound, 2, "handleChatPermissionUpdate"], [_updateChatLevelDecs, 18, "updateChatLevel"], [_updateChatTextMsgDecs, 18, "updateChatTextMsg"], [_filterChatMemberDecs, 18, "filterChatMember"], [_hasSendMessagePermissionDecs, 18, "hasSendMessagePermission"], [_permitPrivateChatDecs, 18, "permitPrivateChat"], [_handleToastDecs, 18, "handleToast"], [_mobx.computed, 3, "isHostOrCoHost"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "setAllowChatWithPayload"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"]], []).e, 18);
+_init__userInfo = _applyDecs$e2[0];
+_init_messageList = _applyDecs$e2[1];
+_init_readMsgIndex = _applyDecs$e2[2];
+_init_readIdx = _applyDecs$e2[3];
+_init_viewIdx = _applyDecs$e2[4];
+_init_historyUnreadCount = _applyDecs$e2[5];
+_init_hasHistoryMsg = _applyDecs$e2[6];
+_init_newMsgsUnReadCnt = _applyDecs$e2[7];
+_init_privateTargetUser = _applyDecs$e2[8];
+_init_chatLevel = _applyDecs$e2[9];
+_init_currentUserMap = _applyDecs$e2[10];
+_init_textMsg = _applyDecs$e2[11];
+_init_privateTargetList = _applyDecs$e2[12];
+_init_chatRoomState = _applyDecs$e2[13];
+_init_hasNewMsg = _applyDecs$e2[14];
+_init_userCount = _applyDecs$e2[15];
+_init_unReadMsgCount = _applyDecs$e2[16];
+_initProto2 = _applyDecs$e2[17];
 function isManager(role) {
   return role === _type.FcrUserRole.HOST || role === _type.FcrUserRole.COHOST;
 }

package/lib/modules/connection-gateway/index.d.ts

@@ -1,4 +1,4 @@
-import { FcrBaseRoomControl } from 'agora-edu-core';
+import { FcrBaseRoomControl, FcrDesktopMediaControl } from 'agora-edu-core';
 import { UIModule } from '../../base';
 import { FcrUIEventStore } from '../../common/event-store';
 import './index.css';
@@ -9,6 +9,7 @@ export declare class ConnectionGatewayUIModule extends UIModule {
         roomControl: FcrBaseRoomControl;
         uiEventStore: FcrUIEventStore;
         deviceStore: FcrDeviceStore;
+        mediaControl: FcrDesktopMediaControl;
     });
     getComponent(): import("react/jsx-runtime").JSX.Element;
     protected onUnload(): void;

package/lib/modules/connection-gateway/store.d.ts

@@ -1,7 +1,8 @@
+import { FcrDesktopMediaControl } from 'agora-edu-core';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrPhoneConnectorSession, FcrRoomConnectorPhoneInfo, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'agora-edu-core/lib/room-control/room-connector-control/type';
 import { FcrDeviceStore } from '../../common/device-store';
-import { FcrMainRoomControl } from 'agora-edu-core/lib/room-control/type';
+import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
 export declare enum ConnectorRegion {
     CHINA = 1,
     AMERICA = 2
@@ -22,6 +23,7 @@ export default class ConnectionGatewayStore {
     private _uiEventStore;
     private _deviceStore;
     private _streamControl;
+    private _mediaControl;
     private _roomOberver;
     private _streamObserver;
     private _failureTimer;
@@ -44,10 +46,11 @@ export default class ConnectionGatewayStore {
     accessor hasPstnStream: boolean;
     accessor hasOwnPstnStream: boolean;
     accessor hasNeedMergedStream: boolean;
-    constructor({ roomControl, uiEventStore, deviceStore, }: {
-        roomControl: FcrMainRoomControl;
+    constructor({ roomControl, uiEventStore, deviceStore, mediaControl, }: {
+        roomControl: FcrBaseRoomControl;
         uiEventStore: FcrUIEventStore;
         deviceStore: FcrDeviceStore;
+        mediaControl: FcrDesktopMediaControl;
     });
     joinAudioByComputer(): void;
     stopAudioByComputer(): void;

package/lib/modules/connection-gateway/store.js

@@ -137,7 +137,8 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     var _this = this;
     var roomControl = _ref2.roomControl,
       uiEventStore = _ref2.uiEventStore,
-      deviceStore = _ref2.deviceStore;
+      deviceStore = _ref2.deviceStore,
+      mediaControl = _ref2.mediaControl;
     (0, _classCallCheck2["default"])(this, ConnectionGatewayStore);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
     (0, _defineProperty2["default"])(this, "_disposers", []);
@@ -173,6 +174,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _P, _init_hasOwnPstnStream(this, false));
     _classPrivateFieldInitSpec(this, _Q, _init_hasNeedMergedStream(this, false));
     this._roomControl = roomControl;
+    this._mediaControl = mediaControl;
     this._uiEventStore = uiEventStore;
     this._streamControl = roomControl.getStreamControl();
     this._userControl = roomControl.getUserControl();
@@ -335,6 +337,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       var list = this._deviceStore.microphoneList;
       if (list.length > 0) {
         this._deviceStore.setMicrophoneId('default');
+        this._mediaControl.setSelectedSpeakerVolume(100);
         this.closeConnectionDialog();
         this._uiEventStore.showToast({
           type: 'normal',
@@ -351,6 +354,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "stopAudioByComputer",
     value: function stopAudioByComputer() {
+      this._mediaControl.setSelectedSpeakerVolume(0);
       this._deviceStore.setMicrophoneId('');
     }
   }, {

package/lib/modules/device-pretest/audio-preview/speaker-control.js

@@ -43,7 +43,7 @@ var SpeakerControl = exports.SpeakerControl = (0, _mobxReact.observer)(function
       onClick: handleLouderClick,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
         type: speakerVolume === 0 ? _type.FcrIconType.FCR_V2_QUITE : _type.FcrIconType.FCR_V2_LOUDER_MIN,
-        size: 20,
+        size: 30,
         colors: {
           iconPrimary: speakerVolume === 0 ? 'var(--fcr_ui_scene_ramp_red6)' : 'var(--fcr_web_ui_scene_mainicon1)'
         }

package/lib/modules/device-pretest/index.css

@@ -31,10 +31,6 @@
   fill: #ffffff;
 }
 
-.fcr-meeting-preview__wrapper .fcr-device-settings-video__active-tab-wrapper {
-  margin-top: 20px;
-}
-
 .fcr-speaker-control-wrapper {
   display: flex;
   align-items: center;

package/lib/modules/device-pretest/settings/beauty.js

@@ -15,16 +15,17 @@ var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _switch = require("agora-ui-foundation/lib/components/switch");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _mobxReact = require("mobx-react");
+var _react = require("react");
 var _useNamespace = require("../../setting/common/useNamespace");
 var _store = require("../../setting/store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _jsxRuntime = require("react/jsx-runtime");
 var BeautyOptionsCard = function BeautyOptionsCard(props) {
   var ns = (0, _useNamespace.useNamespace)('beauty-setting');
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: (0, _classnames["default"])(ns.e('card'), (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, ns.e('card__content-active'), props.isActive), ns.e('card__content-disable'), props.isDisabled)),
-    onClick: props.onCardClick,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+  var transI18n = (0, _i18n.useI18n)();
+  var cardContainerEl = (0, _react.useMemo)(function () {
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: ns.e('card-container'),
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: (0, _classnames["default"])(ns.e('card-container__wrapper'), (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, ns.e('card-container__wrapper-highlight'), props.isHightLight), ns.e('card-container__wrapper-disable'), props.isDisabled)),
@@ -33,7 +34,16 @@ var BeautyOptionsCard = function BeautyOptionsCard(props) {
         className: (0, _classnames["default"])(ns.e('card-title'), (0, _defineProperty2["default"])({}, ns.e('card-title-disable'), props.isDisabled)),
         children: props.title
       })]
-    })
+    });
+  }, [props.title, props.isHightLight, props.isDisabled]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: (0, _classnames["default"])(ns.e('card'), (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, ns.e('card__content-active'), props.isActive), ns.e('card__content-disable'), props.isDisabled)),
+    onClick: props.onCardClick,
+    children: props.cardKey === 'none' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+      mouseEnterDelay: 0,
+      content: props.isDisabled ? transI18n('fmt_device_options_effects_enable') : transI18n('fmt_device_options_effects_disable'),
+      children: cardContainerEl
+    }) : cardContainerEl
   });
 };
 var Beauty = exports.Beauty = (0, _mobxReact.observer)(function (_ref) {
@@ -88,9 +98,10 @@ var Beauty = exports.Beauty = (0, _mobxReact.observer)(function (_ref) {
       children: transI18n('fmt_device_tips_videoeffectson')
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: ns.e('beauty-options'),
-      children: beautyOptions.map(function (item, index) {
+      children: beautyOptions.map(function (item) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(BeautyOptionsCard, {
           title: item.title,
+          cardKey: item.key,
           isDisabled: !enableBeauty,
           card: item.card,
           isActive: item.key === currentBeautyKey,