fcr-ui-scene 3.1.1 → 3.3.0

package/lib/common/device-stream-store.d.ts

@@ -1,8 +1,8 @@
 import { FcrDesktopMediaControl } from 'agora-edu-core';
-import { FcrRoomControl } from 'agora-edu-core/lib/room-control';
 import { FcrSecurityStore } from './security-store';
 import { FcrDeviceStore } from './device-store';
 import { FcrUIEventStore } from './event-store';
+import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
 export declare class FcrDeviceStreamStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _mediaControl;
@@ -19,13 +19,14 @@ export declare class FcrDeviceStreamStore {
     private get _canStartLocalAudio();
     constructor({ mediaControl, roomControl, securityStore, deviceStore, uiEventStore, }: {
         mediaControl: FcrDesktopMediaControl;
-        roomControl: FcrRoomControl;
+        roomControl: FcrBaseRoomControl;
         securityStore: FcrSecurityStore;
         deviceStore: FcrDeviceStore;
         uiEventStore: FcrUIEventStore;
     });
     enableCameraWithStream(enable: boolean): Promise<void>;
     enableMicrophoneWithStream(enable: boolean, confirmAudioShareWhileMicOff?: boolean): Promise<void>;
+    private _setMicrophoneEnabled;
     release(): void;
     private _initLocalStream;
     private _handleCameraChanged;

package/lib/common/device-stream-store.js

@@ -17,6 +17,22 @@ require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -27,17 +43,20 @@ exports.FcrDeviceStreamStore = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.find.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.find.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _type = require("agora-edu-core/lib/type");
+var _agoraEduCore = require("agora-edu-core");
 var _decorator = require("agora-foundation/lib/decorator");
 var _mobx = require("mobx");
 var _toast = require("agora-ui-foundation/lib/components/toast");
-var _type2 = require("agora-rte-sdk/lib/core/scene/type");
-var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
+var _type = require("agora-rte-sdk/lib/core/scene/type");
+var _type2 = require("agora-rte-sdk/lib/core/rtc/type");
 var _logger = require("agora-foundation/lib/logger");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _rendererEvent = require("../utilities/renderer-event");
@@ -76,7 +95,7 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
       onStreamsAdded: function onStreamsAdded(_, e) {
         var _e$find;
         var localCameraStream = (_e$find = e.find(function (event) {
-          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type3.AgoraRtcVideoSourceType.CAMERA;
+          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type2.AgoraRtcVideoSourceType.CAMERA;
         })) === null || _e$find === void 0 ? void 0 : _e$find.modifiedStream;
         if (localCameraStream) {
           _this._bindLocalAudioStream();
@@ -86,10 +105,10 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
       onStreamsUpdated: function onStreamsUpdated(_, e) {
         var _e$find2;
         var localCameraStream = (_e$find2 = e.find(function (event) {
-          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type3.AgoraRtcVideoSourceType.CAMERA;
+          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type2.AgoraRtcVideoSourceType.CAMERA;
         })) === null || _e$find2 === void 0 ? void 0 : _e$find2.modifiedStream;
         if (localCameraStream) {
-          if (localCameraStream.streamType === _type2.AgoraRteMediaStreamType.AUDIO || localCameraStream.streamType === _type2.AgoraRteMediaStreamType.NONE) {
+          if (localCameraStream.streamType === _type.AgoraRteMediaStreamType.AUDIO || localCameraStream.streamType === _type.AgoraRteMediaStreamType.NONE) {
             if (_this._deviceStore.cameraEnabled) {
               _this._deviceStore.setCameraEnabled(false);
               _toast.FcrToastApi.open({
@@ -100,7 +119,7 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
               });
             }
           }
-          if (localCameraStream.streamType === _type2.AgoraRteMediaStreamType.VIDEO || localCameraStream.streamType === _type2.AgoraRteMediaStreamType.NONE) {
+          if (localCameraStream.streamType === _type.AgoraRteMediaStreamType.VIDEO || localCameraStream.streamType === _type.AgoraRteMediaStreamType.NONE) {
             if (_this._deviceStore.microphoneEnabled) {
               _this._deviceStore.setMicrophoneEnabled(false);
               _toast.FcrToastApi.open({
@@ -135,7 +154,7 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
     get: function get() {
       var localStreams = this._roomControl.getStreamControl().getStreamsByUserId(this._localUser.userId);
       return localStreams.find(function (stream) {
-        return stream.videoSourceType === _type3.AgoraRtcVideoSourceType.CAMERA;
+        return stream.videoSourceType === _type2.AgoraRtcVideoSourceType.CAMERA;
       });
     }
   }, {
@@ -143,23 +162,23 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
     get: function get() {
       var localStreams = this._roomControl.getStreamControl().getStreamsByUserId(this._localUser.userId);
       return localStreams.find(function (stream) {
-        return stream.audioSourceType === _type3.AgoraRtcAudioSourceType.LOOPBACK;
+        return stream.audioSourceType === _type2.AgoraRtcAudioSourceType.LOOPBACK;
       });
     }
   }, {
     key: "_canStartLocalVideo",
     get: function get() {
-      return this._securityStore.hasStartVideoPermission(_type.FcrPrivilegeUserRole.SELF);
+      return this._securityStore.hasStartVideoPermission(_agoraEduCore.FcrPrivilegeUserRole.SELF);
     }
   }, {
     key: "_canStartLocalAudio",
     get: function get() {
-      return this._securityStore.hasUnmutePermission(_type.FcrPrivilegeUserRole.SELF);
+      return this._securityStore.hasUnmutePermission(_agoraEduCore.FcrPrivilegeUserRole.SELF);
     }
   }, {
     key: "enableCameraWithStream",
     value: function () {
-      var _enableCameraWithStream = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(enable) {
+      var _enableCameraWithStream = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(enable) {
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -185,14 +204,14 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
                 _context.next = 9;
                 break;
               }
-              if (!(this._localCameraStream.streamType === _type.FcrStreamType.NONE || this._localCameraStream.streamType === _type.FcrStreamType.AUDIO)) {
+              if (!(this._localCameraStream.streamType === _agoraEduCore.FcrStreamType.NONE || this._localCameraStream.streamType === _agoraEduCore.FcrStreamType.AUDIO)) {
                 _context.next = 9;
                 break;
               }
               _context.next = 9;
               return this._roomControl.getStreamControl().updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, this._localCameraStream.streamId, {
-                videoPrivilege: _type.FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
-                audioPrivilege: _type.FcrStreamPrivilegeOperation.NOOPERATION
+                videoPrivilege: _agoraEduCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
+                audioPrivilege: _agoraEduCore.FcrStreamPrivilegeOperation.NOOPERATION
               }));
             case 9:
               this._deviceStore.setCameraEnabled(enable);
@@ -210,7 +229,7 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
   }, {
     key: "enableMicrophoneWithStream",
     value: function () {
-      var _enableMicrophoneWithStream = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(enable) {
+      var _enableMicrophoneWithStream = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(enable) {
         var _this2 = this;
         var confirmAudioShareWhileMicOff,
           dialogKey,
@@ -218,86 +237,89 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              confirmAudioShareWhileMicOff = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : true;
-              if (this._deviceStore.microphoneId) {
-                _context2.next = 3;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 3:
-              if (!(enable && !this._canStartLocalAudio)) {
-                _context2.next = 6;
-                break;
-              }
-              _toast.FcrToastApi.open({
-                toastProps: {
-                  type: 'warn',
-                  content: (0, _i18n.transI18n)('fmt_uimanager_tips_norightsaudio')
-                }
-              });
-              return _context2.abrupt("return");
-            case 6:
-              if (!(confirmAudioShareWhileMicOff && !enable && this._localLoopbackStream)) {
-                _context2.next = 9;
-                break;
-              }
-              dialogKey = this._uiEventStore.openConfirmDialog({
+              confirmAudioShareWhileMicOff = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : false;
+              dialogKey = !enable && confirmAudioShareWhileMicOff && this._uiEventStore.openConfirmDialog({
                 title: (0, _i18n.transI18n)('fmt_screenshare_tips_share_audio_micon'),
-                content: (0, _i18n.transI18n)('fmt_screenshare_tips_sharing_audio_keep_on'),
-                cancelText: (0, _i18n.transI18n)('fmt_screenshare_tips_sharing_audio_cancel'),
-                okText: (0, _i18n.transI18n)('fmt_screenshare_tips_sharing_audio_confirm'),
-                closable: false,
-                cancelButtonProps: {
-                  type: 'primary',
-                  shape: 'rounded',
-                  styleType: 'danger'
-                },
-                okButtonProps: {
-                  type: 'primary',
-                  shape: 'rounded'
-                },
-                closeIcon: null,
+                content: (0, _i18n.transI18n)('fmt_screenshare_tips_share_audio_turnonmic'),
                 onOk: function onOk() {
-                  _this2._uiEventStore.closeDialog(dialogKey);
+                  _this2._setMicrophoneEnabled(true);
+                  dialogKey && _this2._uiEventStore.closeDialog(dialogKey);
                 },
                 onCancel: function onCancel() {
-                  _this2.enableMicrophoneWithStream(false, false);
+                  _this2._setMicrophoneEnabled(false);
                   (0, _rendererEvent.sendEvent)({
                     action: _constant.RendererEventAction.SET_SHARE_WITH_AUDIO_CONTROL_BAR,
                     payload: {
                       withAudio: false
                     }
                   });
-                  _this2._uiEventStore.closeDialog(dialogKey);
-                }
+                  dialogKey && _this2._uiEventStore.closeDialog(dialogKey);
+                },
+                okText: (0, _i18n.transI18n)('fmt_screenshare_button_confirm_shareaudio'),
+                cancelText: (0, _i18n.transI18n)('fmt_screenshare_button_giveup_shareaudio')
               });
+              if (!(!this._deviceStore.microphoneId || dialogKey)) {
+                _context2.next = 4;
+                break;
+              }
               return _context2.abrupt("return");
-            case 9:
+            case 4:
+              this._setMicrophoneEnabled(enable);
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function enableMicrophoneWithStream(_x2) {
+        return _enableMicrophoneWithStream.apply(this, arguments);
+      }
+      return enableMicrophoneWithStream;
+    }()
+  }, {
+    key: "_setMicrophoneEnabled",
+    value: function () {
+      var _setMicrophoneEnabled2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(enable) {
+        return _regenerator["default"].wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              if (!(enable && !this._canStartLocalAudio)) {
+                _context3.next = 3;
+                break;
+              }
+              _toast.FcrToastApi.open({
+                toastProps: {
+                  type: 'warn',
+                  content: (0, _i18n.transI18n)('fmt_uimanager_tips_norightsaudio')
+                }
+              });
+              return _context3.abrupt("return");
+            case 3:
               if (!(this._localCameraStream && enable)) {
-                _context2.next = 13;
+                _context3.next = 7;
                 break;
               }
-              if (!(this._localCameraStream.streamType === _type.FcrStreamType.NONE || this._localCameraStream.streamType === _type.FcrStreamType.VIDEO)) {
-                _context2.next = 13;
+              if (!(this._localCameraStream.streamType === _agoraEduCore.FcrStreamType.NONE || this._localCameraStream.streamType === _agoraEduCore.FcrStreamType.VIDEO)) {
+                _context3.next = 7;
                 break;
               }
-              _context2.next = 13;
+              _context3.next = 7;
               return this._roomControl.getStreamControl().updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, this._localCameraStream.streamId, {
-                videoPrivilege: _type.FcrStreamPrivilegeOperation.NOOPERATION,
-                audioPrivilege: _type.FcrStreamPrivilegeOperation.HAS_PRIVILEGE
+                videoPrivilege: _agoraEduCore.FcrStreamPrivilegeOperation.NOOPERATION,
+                audioPrivilege: _agoraEduCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE
               }));
-            case 13:
+            case 7:
               this._deviceStore.setMicrophoneEnabled(enable);
-            case 14:
+            case 8:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
-      function enableMicrophoneWithStream(_x2) {
-        return _enableMicrophoneWithStream.apply(this, arguments);
+      function _setMicrophoneEnabled(_x3) {
+        return _setMicrophoneEnabled2.apply(this, arguments);
       }
-      return enableMicrophoneWithStream;
+      return _setMicrophoneEnabled;
     }()
   }, {
     key: "release",

package/lib/common/event-store.d.ts

@@ -1,12 +1,13 @@
-/// <reference types="react" />
 import { DialogKey, UIAction } from '../utilities/constant';
-import { FcrChatRoomReceiveBaseMessage, FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrUserInfo } from 'agora-edu-core/lib/type';
 import { DeviceSettingDialogConfig, CustomSetting } from '../modules/setting/store';
 import { FcrUIExitReason } from '../type';
 import { ToastSize } from 'agora-ui-foundation/lib/components/toast';
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
 import { ButtonType } from 'agora-ui-foundation/lib/components/button';
 import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
+import { FcrChatRoomReceiveBaseMessage } from 'agora-edu-core/lib/room-control/chatroom-control/type';
+import React from 'react';
 export interface FcrUIDialogParams {
     dialogKey: DialogKey;
     dialogId: string;
@@ -20,6 +21,16 @@ export interface FcrUIToastParams {
     size?: ToastSize;
     customRootClass?: string;
 }
+export declare enum NotificationContentType {
+    WAITING_ROOM = "WAITING_ROOM"
+}
+export interface FcrNotificationParams {
+    duration?: number;
+    placement: 'top' | 'topLeft' | 'topRight' | 'bottom' | 'bottomLeft' | 'bottomRight';
+    type: NotificationContentType;
+    onOk?: () => void;
+    onClose?: () => void;
+}
 export interface FcrUIConfirmDialogParams {
     title: string;
     content: React.ReactNode;
@@ -44,9 +55,11 @@ export interface FcrUIUpdateAsideParams {
 export interface FcrUINewChatMessagesParams {
     latestMessage: FcrChatRoomReceiveBaseMessage;
     count: number;
+    type: string;
 }
 export interface FcrUIToggleLayoutParams {
     layout: 'speaker' | 'gallery';
+    manual?: boolean;
 }
 export interface FcrUIToggleLayoutSizeParams {
     size: 16 | 25;
@@ -81,6 +94,8 @@ export declare class FcrUIEventStore {
     private _observable;
     sendEvent(action: UIAction, payload?: unknown): void;
     showToast(params: FcrUIToastParams): void;
+    showNotification(params: FcrNotificationParams): void;
+    closeNotification(key: NotificationContentType): void;
     showChatToast(params: FcrUIToastParams): void;
     openConfirmDialog(params: ConfirmContentProps & {
         height?: number;
@@ -105,8 +120,10 @@ export declare class FcrUIEventStore {
     stopLiveStreaming(): void;
     openInviteDialog(): void;
     closeInviteDialog(): void;
+    closeWaitingRoomDialog(): void;
+    closeRemoveAdmitWaitingRoomDialog(dialogKey: DialogKey): void;
     closeConfirmDialog(): void;
-    exitRoom(reason: FcrUIExitReason): void;
+    exitRoom(reason: FcrUIExitReason, roomType: number): void;
     cloudRecording(action: FcrCloudRecordingParams['action']): void;
     notifySpotlightStreamChanged(params: FcrSpotlightStreamChangedParams): void;
     notifyCustomSettingsChanged(settings: CustomSetting): void;

package/lib/common/event-store.js

@@ -10,12 +10,17 @@ 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/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUIEventStore = void 0;
+exports.NotificationContentType = exports.FcrUIEventStore = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.date.now.js");
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -27,6 +32,10 @@ var _logger = require("agora-foundation/lib/logger");
 var _chat = require("../modules/chat");
 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; }
+var NotificationContentType = exports.NotificationContentType = /*#__PURE__*/function (NotificationContentType) {
+  NotificationContentType["WAITING_ROOM"] = "WAITING_ROOM";
+  return NotificationContentType;
+}({});
 var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
   function FcrUIEventStore() {
     (0, _classCallCheck2["default"])(this, FcrUIEventStore);
@@ -36,14 +45,32 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
   return (0, _createClass2["default"])(FcrUIEventStore, [{
     key: "sendEvent",
     value: function sendEvent(action, payload) {
-      this.logger.debug('[FcrUIEventStore] sendEvent', _constant.UIAction[action], payload);
-      this._observable.notifyObservers('onEvent', action, payload);
+      var start = Date.now();
+      try {
+        this._observable.notifyObservers('onEvent', action, payload);
+      } finally {
+        var end = Date.now();
+        var time = end - start;
+        if (time >= 10) {
+          this.logger.warn("[FcrUIEventStore] sendEvent ".concat(_constant.UIAction[action], ", payload: ").concat(payload, ", handlers took: ").concat(end - start, "ms"));
+        }
+      }
     }
   }, {
     key: "showToast",
     value: function showToast(params) {
       this.sendEvent(_constant.UIAction.SHOW_TOAST, params);
     }
+  }, {
+    key: "showNotification",
+    value: function showNotification(params) {
+      this.sendEvent(_constant.UIAction.SHOW_NOTIFICATION, params);
+    }
+  }, {
+    key: "closeNotification",
+    value: function closeNotification(key) {
+      this.sendEvent(_constant.UIAction.COLSE_NOTIFICATION, key);
+    }
   }, {
     key: "showChatToast",
     value: function showChatToast(params) {
@@ -179,6 +206,16 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
     value: function closeInviteDialog() {
       this.sendEvent(_constant.UIAction.CLOSE_INVITE_DIALOG);
     }
+  }, {
+    key: "closeWaitingRoomDialog",
+    value: function closeWaitingRoomDialog() {
+      this.sendEvent(_constant.UIAction.CLOSE_WAITING_ROOM_DIALOG);
+    }
+  }, {
+    key: "closeRemoveAdmitWaitingRoomDialog",
+    value: function closeRemoveAdmitWaitingRoomDialog(dialogKey) {
+      this.sendEvent(_constant.UIAction.CLOSE_REMOVE_ADMIT_WAITING_ROOM_DIALOG, dialogKey);
+    }
   }, {
     key: "closeConfirmDialog",
     value: function closeConfirmDialog() {
@@ -186,9 +223,10 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
     }
   }, {
     key: "exitRoom",
-    value: function exitRoom(reason) {
+    value: function exitRoom(reason, roomType) {
       this.sendEvent(_constant.UIAction.EXIT_ROOM, {
-        reason: reason
+        reason: reason,
+        roomType: roomType
       });
     }
   }, {

package/lib/common/security-store.d.ts

@@ -1,9 +1,9 @@
 import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'agora-edu-core';
-import { FcrRoomSessionControl } from 'agora-edu-core/lib/room-control/room-session';
-import { FcrPermissionAction, FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload, FcrUserRole, FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrUserRole, FcrUserInfo, FcrLineType } from 'agora-edu-core/lib/type';
 import { FcrUIEventStore } from './event-store';
 import { FcrSharePermissionState } from 'agora-edu-core/lib/room-control/whiteboard-control/enums';
-import { FcrSharePermissionProps } from 'agora-edu-core/lib/type';
+import { FcrRoomSessionControl } from 'agora-edu-core/lib/room-control/room-session/type';
+import { FcrPermissionAction, FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload } from 'agora-edu-core/lib/room-control/privilege-control/type';
 export type FcrSecuritySendChatOriginalPayload = {
     public: 0 | 1;
     private: {
@@ -20,8 +20,9 @@ export declare class FcrSecurityStore {
     private _uiEventStore;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
+    private _prevWaterMarkEnable;
     accessor securityInfos: FcrSecurityInfo[];
-    accessor permissionInfos: FcrPermissionInfo[];
+    accessor permissionInfos: FcrPermissionInfo[] | undefined;
     accessor privilegeOperator: FcrUserInfo | undefined;
     accessor boardOwnerUser: FcrUserInfo | undefined;
     constructor(_privilegeControl: FcrPrivilegeControl, _userControl: FcrUserControl, _streamControl: FcrStreamControl, _roomSessionControl: FcrRoomSessionControl, _uiEventStore: FcrUIEventStore);
@@ -29,6 +30,7 @@ export declare class FcrSecurityStore {
     get localUser(): FcrUserInfo;
     allowChangeSelfName: () => boolean;
     allowChat: () => boolean;
+    getWaterMarkContent: () => string;
     convertSendChatPayload: (payload: FcrSecuritySendChatOriginalPayload) => FcrSecuritySendChatPayload;
     allowedAllChat: () => boolean | undefined;
     allowedPublicChatAndDisallowedPrivateChat: () => boolean | undefined;
@@ -42,6 +44,8 @@ export declare class FcrSecurityStore {
     allowUnmuteSelfAudio: () => boolean;
     isLockRoomEnabled: () => boolean;
     isWaitingRoomEnabled: () => boolean;
+    isWaterMarkEnabled: () => boolean;
+    hasWaitingRoomPermission: (role?: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasMutePermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasUnmutePermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasRequestStartAudioPermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
@@ -58,6 +62,7 @@ export declare class FcrSecurityStore {
     hasCallSplitPermission(): boolean;
     hasStartScreenSharePermission: () => boolean;
     hasChatSendPublicPermission: () => boolean;
+    hasChatSendPublicPermissionByTargetRole: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasPermissionToSendPrivateMessage: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasPermissionToControlAllowSendAll: () => boolean;
     hasPermissionToControlDisallowSendAll: () => boolean;
@@ -74,6 +79,8 @@ export declare class FcrSecurityStore {
     hasEnableJoinWithAudioPermission: () => boolean;
     hasEnableStartScreenSharePermission: () => boolean;
     hasLockRoomPermission: () => boolean;
+    hasWatermarkEnablePermission: () => boolean;
+    hasWatermarkDisablePermission: () => boolean;
     hasEndRoomPermission(): boolean;
     hasAssignHostBeforeLeavingPermission(role: FcrPrivilegeUserRole | FcrUserRole): boolean;
     hasStartBoardPermission(): boolean;
@@ -84,19 +91,11 @@ export declare class FcrSecurityStore {
     hasAllowWriteBoardPermission(): boolean;
     hasDisallowWriteBoardPermission(): boolean;
     hasAllowScreenShareAndBoardPermission(): boolean;
+    hasAllowWaterMarkPermission(): boolean;
+    isMulti: () => boolean;
     getAllowedOperations(targetUserRole: FcrUserRole, isSelf: boolean): string[];
-    allowShare(enable: FcrSharePermissionState, payload?: Pick<FcrSharePermissionProps, 'screen'>): Promise<{
-        msg: string;
-        data: Record<string, FcrSharePermissionProps>;
-        code: number;
-        ts: number;
-    }>;
-    setAllowWriteBoard(state: FcrSharePermissionState, payload?: Pick<FcrSharePermissionProps, 'board'>): Promise<{
-        msg: string;
-        data: Record<string, FcrSharePermissionProps>;
-        code: number;
-        ts: number;
-    }>;
+    allowShare(state: FcrSharePermissionState): Promise<void>;
+    setAllowWriteBoard(state: FcrSharePermissionState): Promise<void>;
     muteAll: () => void;
     unmuteAll: () => void;
     setLockRoomEnabled: (enable: boolean) => void;
@@ -120,4 +119,5 @@ export declare class FcrSecurityStore {
     private _handleProcessEvent;
     private _addReactions;
     private _removeReactions;
+    setAllowWaterMark(state: boolean, lineType?: FcrLineType): Promise<void>;
 }