fcr-ui-scene 3.8.1 → 3.9.0-alpha

package/lib/providers/privilege-provider.d.ts

@@ -658,27 +658,27 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
      * 权限操作
      * @param enable
      */
-    allowStartTranscribe: (enable: boolean) => Promise<void>;
-    allowSetSourceLanguage: (enable: boolean) => Promise<void>;
-    allowStartCaption: (enable: boolean) => Promise<void>;
-    allowWriteAnnotation: (allow: boolean) => Promise<void>;
-    allowWriteBoard: (allow: boolean) => Promise<void>;
+    allowStartTranscribe: (enable: boolean) => Promise<number>;
+    allowSetSourceLanguage: (enable: boolean) => Promise<number>;
+    allowStartCaption: (enable: boolean) => Promise<number>;
+    allowWriteAnnotation: (allow: boolean) => Promise<number>;
+    allowWriteBoard: (allow: boolean) => Promise<number>;
     muteAll: () => Promise<void>;
     unmuteAll: () => Promise<void>;
     enableLockedRoom: (enable: boolean) => Promise<void>;
-    allowChangeUserName: (enable: boolean) => Promise<void>;
-    setAllowChat: (enable: boolean) => Promise<void>;
-    setAllowChatWithPayload: (enable: boolean, payload: FcrSecuritySendChatPayload) => Promise<void>;
-    setAllowedPublicChatAndDisallowedPrivateChat: () => Promise<void>;
-    setDisallowedPublicChatAndDisallowedPrivateChatToParticipant: () => Promise<void>;
+    allowChangeUserName: (enable: boolean) => Promise<number>;
+    setAllowChat: (enable: boolean) => Promise<number>;
+    setAllowChatWithPayload: (enable: boolean, payload: FcrSecuritySendChatPayload) => Promise<number>;
+    setAllowedPublicChatAndDisallowedPrivateChat: () => Promise<number>;
+    setDisallowedPublicChatAndDisallowedPrivateChatToParticipant: () => Promise<number>;
     allowJoinWithMutedAudio: (enable: boolean) => Promise<void>;
     allowJoinWithMutedVideo: (enable: boolean) => Promise<void>;
     allowShareAndWrite: (state: boolean) => Promise<void>;
-    allowStartVideo: (enable: boolean) => Promise<void>;
-    allowStartAudio: (enable: boolean) => Promise<void>;
-    allowWatermark(state: boolean, lineType?: FcrLineType): Promise<void>;
-    setAllowWaterMarkLine(state: boolean, lineType?: FcrLineType): Promise<void>;
-    allowJoinWithPromptSound(enable: boolean): Promise<void>;
+    allowStartVideo: (enable: boolean) => Promise<number>;
+    allowStartAudio: (enable: boolean) => Promise<number>;
+    allowWatermark(state: boolean, lineType?: FcrLineType): Promise<number>;
+    setAllowWaterMarkLine(state: boolean, lineType?: FcrLineType): Promise<number | undefined>;
+    allowJoinWithPromptSound(enable: boolean): Promise<number>;
     permitPrivateChat(userId: string): boolean;
     private _hasPermission;
     private _hasPermissionWithParams;

package/lib/providers/room-provider/room-provider.d.ts

@@ -1,7 +1,7 @@
 import { FcrCoreEngine } from 'fcr-core';
 import { FcrBaseRoomControl, FcrMainRoomControl, FcrRoomType, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrLiveStreamingConfig, FcrLiveStreamingState, FcrRecordingState, FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIExitReason, FcrUIRoomObserver, FcrUISceneConfig } from '../../type';
+import { FcrUIExitReason, FcrUIMainRoomControlObserver, FcrUIRoomObserver, FcrUISceneConfig } from '../../type';
 import { FcrUIMessageProvider } from '../message/type';
 import { FcrUISharedInterpreterDataSource } from '../../shared-data/interpreter';
 import { FcrUIManagedObject } from '../../object-manager';
@@ -10,6 +10,8 @@ import { FcrUIDialogProvider } from '../dialog/type';
 import { FcrUIEventProvider } from '../event-provider';
 import { FcrUIPrivilegeProvider, FcrUIPrivilegeProviderImpl } from '../privilege-provider';
 export interface FcrUIMainRoomControlProvider {
+    addObserver(observer: FcrUIMainRoomControlObserver): void;
+    removeObserver(observer: FcrUIMainRoomControlObserver): void;
     /**
      * 主房间 privilegeProvider
      */
@@ -18,6 +20,14 @@ export interface FcrUIMainRoomControlProvider {
      * 主房间
      */
     get mainRoomControl(): FcrMainRoomControl;
+    /**
+     * 主房间 boardOwnerUser
+     */
+    get boardOwnerUser(): FcrUserInfo | undefined;
+    /**
+     * 主房间 prevWaterMarkEnable
+     */
+    get prevWaterMarkEnable(): boolean | undefined;
 }
 export interface FcrUIWaitingRoomControlProvider {
     /**
@@ -60,18 +70,14 @@ export interface FcrUIRoomProvider {
      * 云录制状态
      */
     get cloudRecordingState(): FcrRecordingState;
-    /**
-     * 是不是自己结束会议的
-     */
-    get isSelfEndMeeting(): boolean;
-    /**
-     * 设置是不是自己结束会议的
-     */
-    setIsSelfEndMeeting(isSelfEndMeeting: boolean): void;
     /**
      * 退出房间
      */
     exitRoom(): void;
+    /**
+     * 关闭房间
+     */
+    closeRoom(): void;
     addObserver(observer: FcrUIRoomObserver): void;
     removeObserver(observer: FcrUIRoomObserver): void;
 }
@@ -90,6 +96,7 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     private _currentRoomControl?;
     private _roomRouter;
     private _isSelfEndMeeting;
+    private _engineObserver;
     private _roomRouterObserver;
     accessor liveStreamingState: FcrLiveStreamingState;
     accessor liveStreamingConfig: FcrLiveStreamingConfig | undefined;
@@ -97,20 +104,22 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     constructor(_sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _messageProvider: FcrUIMessageProvider);
     get currentRoomControl(): FcrBaseRoomControl;
     get waitingRoomManager(): FcrUIWaitingRoomControlManager;
-    setIsSelfEndMeeting(isSelfEndMeeting: boolean): void;
-    get isSelfEndMeeting(): boolean;
     release(): void;
+    private _releaseCurrentRoomControl;
     private _releaseWaitingRoomManager;
     handleJoinRoom(): Promise<void>;
+    closeRoom(): void;
     exitRoom(): void;
     addObserver(observer: FcrUIRoomObserver): void;
     removeObserver(observer: FcrUIRoomObserver): void;
+    private _setIsSelfEndMeeting;
     private _getJoinRoomOption;
     private _initBaseRoomState;
 }
 export declare class FcrUIMainRoomControlProviderImpl implements FcrUIMainRoomControlProvider, FcrUIManagedObject {
     private _mainRoomControl;
     private _sharedInterpreterDataSource;
+    private _observable;
     private _privilegeProvider;
     private _privilegeControl;
     private _userControl;
@@ -125,10 +134,13 @@ export declare class FcrUIMainRoomControlProviderImpl implements FcrUIMainRoomCo
     accessor privilegeOperator: FcrUserInfo | undefined;
     accessor boardOwnerUser: FcrUserInfo | undefined;
     constructor(_mainRoomControl: FcrMainRoomControl, eventProvider: FcrUIEventProvider, messageProvider: FcrUIMessageProvider, dialogProvider: FcrUIDialogProvider, _sharedInterpreterDataSource: FcrUISharedInterpreterDataSource);
+    get prevWaterMarkEnable(): boolean | undefined;
     get mainRoomControl(): FcrMainRoomControl;
     get privilegeProvider(): FcrUIPrivilegeProviderImpl;
     private get _localUser();
     release(): void;
+    addObserver(observer: FcrUIMainRoomControlObserver): void;
+    removeObserver(observer: FcrUIMainRoomControlObserver): void;
     private _initUserMap;
     private _handleSecurityUpdated;
     private _handleUserRoleChangeToast;

package/lib/providers/room-provider/room-provider.js

@@ -27,7 +27,6 @@ exports.FcrUIWaitingRoomControlProviderImpl = exports.FcrUIRoomProviderImpl = ex
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
-require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.includes.js");
@@ -67,7 +66,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 _fcrCore = require("fcr-core");
-var _logger = require("agora-foundation/lib/logger");
+var _logger = require("../../utilities/logger");
 var _type = require("fcr-core/lib/room-control/type");
 var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
 var _type3 = require("fcr-core/lib/type");
@@ -115,7 +114,36 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
         _this._messageProvider.closeNotification(_type4.FcrUINotificationContentType.WAITING_ROOM);
       }
     });
+    (0, _defineProperty2["default"])(this, "_baseRoomControlObserver", {
+      onRoomStateUpdated: function onRoomStateUpdated(roomId, state) {
+        if (state === _type3.FcrRoomState.Closed) {
+          // this._observable.notifyObservers('onRoomClosed');
+          var reason = _this._isSelfEndMeeting ? _type4.FcrUIMeetingExitReason.USER_INITIATED_END : _type4.FcrUIMeetingExitReason.SYSTEM_MEETING_ENDED;
+          _this._observable.notifyObservers('onExitMeeting', reason);
+        }
+      },
+      onCloudRecordingStateUpdated: (0, _mobx.action)(function (roomId, state) {
+        _this.cloudRecordingState = state;
+      }),
+      onLiveStreamingStateUpdated: (0, _mobx.action)(function (roomId, state) {
+        _this.liveStreamingState = state;
+        _this.liveStreamingConfig = _this.currentRoomControl.getLiveStreamingConfig();
+      })
+    });
+    (0, _defineProperty2["default"])(this, "_userControlObserver", {
+      onLocalUserKickedOut: function onLocalUserKickedOut() {
+        _this._observable.notifyObservers('onExitMeeting', _type4.FcrUIMeetingExitReason.ADMIN_KICKED);
+        // this._observable.notifyObservers('onLocalUserKickedOut');
+      }
+    });
     (0, _defineProperty2["default"])(this, "_isSelfEndMeeting", false);
+    (0, _defineProperty2["default"])(this, "_engineObserver", {
+      onConnectionStateUpdated: function onConnectionStateUpdated(state) {
+        if (state === _type3.FcrConnectionState.ABORTED) {
+          _this._observable.notifyObservers('onExitMeeting', _type4.FcrUIMeetingExitReason.SYSTEM_NETWORK_ERROR);
+        }
+      }
+    });
     (0, _defineProperty2["default"])(this, "_roomRouterObserver", {
       onRoomRouteSwitched: function onRoomRouteSwitched() {
         var _this$currentRoomCont, _this$currentRoomCont2;
@@ -139,6 +167,8 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
       onRoomJoined: function onRoomJoined(roomControl) {
         var _roomControl$getRoomI;
         // nextStep: FcrRoomControlType
+
+        _this._releaseCurrentRoomControl();
         _this._currentRoomControl = roomControl;
         _this._currentRoomControl.addObserver(_this._baseRoomControlObserver);
         _this._currentRoomControl.getUserControl().addObserver(_this._userControlObserver);
@@ -157,9 +187,9 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
         _this._observable.notifyObservers('onRoutingChanged', roomControl);
       },
       onErrorOccurred: function onErrorOccurred(error) {
-        // 如果是自己点击加入房间 会触发onLunchFailure 不应该直接onExited
+        // 如果是自己点击加入房间 会触发onLaunchFailure 不应该直接onExited
         if (!_this._isSelfJoinRoom) {
-          _this._observable.notifyObservers('onExitRoom');
+          _this._observable.notifyObservers('onExitMeeting', _type4.FcrUIMeetingExitReason.SYSTEM_JOIN_ROOM_FAILED);
         }
       }
     });
@@ -169,25 +199,7 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     this._sceneConfig = _sceneConfig;
     this._engine = _engine;
     this._messageProvider = _messageProvider;
-    this._baseRoomControlObserver = {
-      onRoomStateUpdated: function onRoomStateUpdated(roomId, state) {
-        if (state === _type3.FcrRoomState.Closed) {
-          _this._observable.notifyObservers('onRoomClosed');
-        }
-      },
-      onCloudRecordingStateUpdated: (0, _mobx.action)(function (roomId, state) {
-        _this.cloudRecordingState = state;
-      }),
-      onLiveStreamingStateUpdated: (0, _mobx.action)(function (roomId, state) {
-        _this.liveStreamingState = state;
-        _this.liveStreamingConfig = _this.currentRoomControl.getLiveStreamingConfig();
-      })
-    };
-    this._userControlObserver = {
-      onLocalUserKickedOut: function onLocalUserKickedOut() {
-        _this._observable.notifyObservers('onLocalUserKickedOut');
-      }
-    };
+    this._engine.addObserver(this._engineObserver);
     this._roomRouter = this._engine.createRoomRouter(this._sceneConfig.roomId);
     this._roomRouter.addObserver(this._roomRouterObserver);
   }
@@ -231,25 +243,26 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
       }
       return this._waitingRoomManager;
     }
-  }, {
-    key: "setIsSelfEndMeeting",
-    value: function setIsSelfEndMeeting(isSelfEndMeeting) {
-      this._isSelfEndMeeting = isSelfEndMeeting;
-    }
-  }, {
-    key: "isSelfEndMeeting",
-    get: function get() {
-      return this._isSelfEndMeeting;
-    }
   }, {
     key: "release",
     value: function release() {
       var _this$_currentRoomCon;
       this._roomRouter.leaveRoom();
       (_this$_currentRoomCon = this._currentRoomControl) === null || _this$_currentRoomCon === void 0 || _this$_currentRoomCon.leave();
-      this._currentRoomControl = undefined;
-      this.setIsSelfEndMeeting(false);
+      this._releaseCurrentRoomControl();
+      this._setIsSelfEndMeeting(false);
       this._releaseWaitingRoomManager();
+      this._engine.removeObserver(this._engineObserver);
+      this._roomRouter.removeObserver(this._roomRouterObserver);
+    }
+  }, {
+    key: "_releaseCurrentRoomControl",
+    value: function _releaseCurrentRoomControl() {
+      if (this._currentRoomControl) {
+        this._currentRoomControl.removeObserver(this._baseRoomControlObserver);
+        this._currentRoomControl.getUserControl().removeObserver(this._userControlObserver);
+        this._currentRoomControl = undefined;
+      }
     }
   }, {
     key: "_releaseWaitingRoomManager",
@@ -291,10 +304,16 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
       }
       return handleJoinRoom;
     }()
+  }, {
+    key: "closeRoom",
+    value: function closeRoom() {
+      this._setIsSelfEndMeeting(true);
+      this.currentRoomControl.close();
+    }
   }, {
     key: "exitRoom",
     value: function exitRoom() {
-      this._observable.notifyObservers('onExitRoom');
+      this._observable.notifyObservers('onExitMeeting', _type4.FcrUIMeetingExitReason.USER_INITIATED_LEAVE);
     }
   }, {
     key: "addObserver",
@@ -306,6 +325,11 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     value: function removeObserver(observer) {
       this._observable.removeObserver(observer);
     }
+  }, {
+    key: "_setIsSelfEndMeeting",
+    value: function _setIsSelfEndMeeting(isSelfEndMeeting) {
+      this._isSelfEndMeeting = isSelfEndMeeting;
+    }
   }, {
     key: "_getJoinRoomOption",
     value: function _getJoinRoomOption() {
@@ -349,12 +373,12 @@ _init_cloudRecordingState = _applyDecs$e[2];
 _initProto = _applyDecs$e[3];
 var _A2 = /*#__PURE__*/new WeakMap();
 var _B2 = /*#__PURE__*/new WeakMap();
-_ref2 = (_initUserMapDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], "_privilegeProvider");
+_ref2 = (_initUserMapDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], "_observable");
 var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl = /*#__PURE__*/function () {
   function FcrUIMainRoomControlProviderImpl(_mainRoomControl, eventProvider, messageProvider, dialogProvider, _sharedInterpreterDataSource) {
     var _this2 = this;
     (0, _classCallCheck2["default"])(this, FcrUIMainRoomControlProviderImpl);
-    (0, _defineProperty2["default"])(this, _ref2, void _initProto2(this));
+    (0, _defineProperty2["default"])(this, _ref2, (_initProto2(this), new _observable.AgoraObservable()));
     (0, _defineProperty2["default"])(this, "_userMap", new Map());
     _classPrivateFieldInitSpec(this, _A2, _init_privilegeOperator(this));
     _classPrivateFieldInitSpec(this, _B2, _init_boardOwnerUser(this));
@@ -422,6 +446,11 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
     set: function set(v) {
       _classPrivateFieldSet(_B2, this, v);
     }
+  }, {
+    key: "prevWaterMarkEnable",
+    get: function get() {
+      return this._prevWaterMarkEnable;
+    }
   }, {
     key: "mainRoomControl",
     get: function get() {
@@ -445,6 +474,16 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
       this._userControl.removeObserver(this._userObserver);
       this._privilegeProvider.release();
     }
+  }, {
+    key: "addObserver",
+    value: function addObserver(observer) {
+      this._observable.addObserver(observer);
+    }
+  }, {
+    key: "removeObserver",
+    value: function removeObserver(observer) {
+      this._observable.removeObserver(observer);
+    }
   }, {
     key: "_initUserMap",
     value: function _initUserMap() {
@@ -457,76 +496,21 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
   }, {
     key: "_handleSecurityUpdated",
     value: function _handleSecurityUpdated(roomId, event) {
-      var _event$operatorUser,
-        _event$operatorUser2,
-        _this$privilegeOperat,
+      var _this$privilegeOperat,
         _securityInfo$info,
-        _securityInfo$info2,
-        _securityInfo$info3,
-        _securityInfo$info4,
-        _securityInfo$info5,
-        _securityInfo$info6,
         _this4 = this,
-        _event$securityInfo$i,
-        _event$securityInfo$i2;
-      this.privilegeOperator = event.operatorUser;
-      var securityInfo = event.securityInfo;
+        _securityInfo$info2;
+      var securityInfo = event.securityInfo,
+        operatorUser = event.operatorUser;
+      this.privilegeOperator = operatorUser;
       var enable = securityInfo.enable;
-      var isPersonalOperation = this._localUser.userId === ((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId);
-      var toastType = isPersonalOperation ? 'normal' : enable ? 'info' : 'error';
-      var operator = isPersonalOperation ? (0, _i18n.transI18n)('fmt_settings_labels_you') : (((_event$operatorUser2 = event.operatorUser) === null || _event$operatorUser2 === void 0 ? void 0 : _event$operatorUser2.userRole) === _type3.FcrUserRole.HOST ? (0, _i18n.transI18n)('fmt_role_host') : (0, _i18n.transI18n)('fmt_role_cohost')) + " ".concat((_this$privilegeOperat = this.privilegeOperator) === null || _this$privilegeOperat === void 0 ? void 0 : _this$privilegeOperat.userName, " ");
-      if (((_securityInfo$info = securityInfo.info) === null || _securityInfo$info === void 0 ? void 0 : _securityInfo$info.action) === _type2.FcrSecurityAction.JoinWithMuteAudio) {
-        if (enable) {
-          this._messageProvider.showToast({
-            type: toastType,
-            message: (0, _i18n.transI18n)('fmt_settings_tips_muteallwhilejoin', {
-              reason1: operator
-            })
-          });
-        }
-      } else if (((_securityInfo$info2 = securityInfo.info) === null || _securityInfo$info2 === void 0 ? void 0 : _securityInfo$info2.action) === _type2.FcrSecurityAction.StartAudio) {
-        var toastMessage = enable ? (0, _i18n.transI18n)('fmt_settings_tips_allowedselfunmuting') : (0, _i18n.transI18n)('fmt_settings_tips_disabledselfunmuting');
-        if (!this._sharedInterpreterDataSource.localInterpreterUserInfo) {
-          this._messageProvider.showToast({
-            type: enable ? 'normal' : 'error',
-            message: toastMessage
-          });
-        }
-      } else if (((_securityInfo$info3 = securityInfo.info) === null || _securityInfo$info3 === void 0 ? void 0 : _securityInfo$info3.action) === _type2.FcrSecurityAction.StartVideo) {
-        var _toastMessage = enable ? (0, _i18n.transI18n)('fmt_settings_tips_videoenabled') : (0, _i18n.transI18n)('fmt_settings_tips_disabledvideo');
-        this._messageProvider.showToast({
-          type: enable ? 'normal' : 'error',
-          message: _toastMessage
-        });
-      } else if (((_securityInfo$info4 = securityInfo.info) === null || _securityInfo$info4 === void 0 ? void 0 : _securityInfo$info4.action) === _type2.FcrSecurityAction.ShareScreen) {
-        var _toastMessage2 = enable ? (0, _i18n.transI18n)('fmt_settings_tips_allowedScreensharing', {
-          reason1: operator
-        }) : (0, _i18n.transI18n)('fmt_settings_tips_disabledScreensharing', {
-          reason1: operator
-        });
-        this._messageProvider.showToast({
-          type: toastType,
-          message: _toastMessage2
-        });
-      } else if (((_securityInfo$info5 = securityInfo.info) === null || _securityInfo$info5 === void 0 ? void 0 : _securityInfo$info5.action) === _type2.FcrSecurityAction.SendChat) {
-        var _toastMessage3 = enable ? (0, _i18n.transI18n)('fmt_settings_tips_allowedchat', {
-          reason1: operator
-        }) : (0, _i18n.transI18n)('fmt_settings_tips_banedchat', {
-          reason1: operator
-        });
-        this._messageProvider.showToast({
-          type: enable ? 'normal' : 'error',
-          message: _toastMessage3
-        });
-      } else if (((_securityInfo$info6 = securityInfo.info) === null || _securityInfo$info6 === void 0 ? void 0 : _securityInfo$info6.action) === _type2.FcrSecurityAction.Sharing && !enable) {
+      var isPersonalOperation = this._localUser.userId === (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId);
+      var operator = isPersonalOperation ? (0, _i18n.transI18n)('fmt_settings_labels_you') : ((operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userRole) === _type3.FcrUserRole.HOST ? (0, _i18n.transI18n)('fmt_role_host') : (0, _i18n.transI18n)('fmt_role_cohost')) + " ".concat((_this$privilegeOperat = this.privilegeOperator) === null || _this$privilegeOperat === void 0 ? void 0 : _this$privilegeOperat.userName, " ");
+      if (((_securityInfo$info = securityInfo.info) === null || _securityInfo$info === void 0 ? void 0 : _securityInfo$info.action) === _type2.FcrSecurityAction.Sharing && !enable) {
         var _this$boardOwnerUser, _this$boardOwnerUser2;
         if (!this.boardOwnerUser) return;
         var isHost = [_type3.FcrUserRole.HOST, _type3.FcrUserRole.COHOST].includes((_this$boardOwnerUser = this.boardOwnerUser) === null || _this$boardOwnerUser === void 0 ? void 0 : _this$boardOwnerUser.userRole);
         if (((_this$boardOwnerUser2 = this.boardOwnerUser) === null || _this$boardOwnerUser2 === void 0 ? void 0 : _this$boardOwnerUser2.userId) !== this._localUser.userId) {
-          this._messageProvider.showToast({
-            type: toastType,
-            message: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_alreadyopend')
-          });
           if (!isHost) {
             this._eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_WHITEBOARD);
           }
@@ -548,119 +532,29 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
             height: 160
           });
         }
-      } else if (((_event$securityInfo$i = event.securityInfo.info) === null || _event$securityInfo$i === void 0 ? void 0 : _event$securityInfo$i.action) === _type2.FcrSecurityAction.WaitingRoom) {
-        var _event$operatorUser3, _event$operatorUser4;
-        var isSelf = this._localUser.userId === ((_event$operatorUser3 = event.operatorUser) === null || _event$operatorUser3 === void 0 ? void 0 : _event$operatorUser3.userId);
-        var userName = (_event$operatorUser4 = event.operatorUser) === null || _event$operatorUser4 === void 0 ? void 0 : _event$operatorUser4.userName;
-        if (!isSelf) {
-          if (enable) {
-            this._messageProvider.showToast({
-              type: toastType,
-              message: "".concat(userName).concat((0, _i18n.transI18n)('fmt_waitingroom_setting_tips_enable'))
-            });
-          } else {
-            this._messageProvider.showToast({
-              type: toastType,
-              message: "".concat(userName).concat((0, _i18n.transI18n)('fmt_waitingroom_mobile_setting_label_disable'))
-            });
-          }
-        }
-      } else if (((_event$securityInfo$i2 = event.securityInfo.info) === null || _event$securityInfo$i2 === void 0 ? void 0 : _event$securityInfo$i2.action) == _type2.FcrSecurityAction.WaterMark) {
-        var _enable = event.securityInfo.enable;
+      } else if (((_securityInfo$info2 = securityInfo.info) === null || _securityInfo$info2 === void 0 ? void 0 : _securityInfo$info2.action) == _type2.FcrSecurityAction.WaterMark) {
+        var _enable = securityInfo.enable;
         if (this._prevWaterMarkEnable !== _enable) {
-          var _event$operatorUser5;
-          var toastText = '';
-          var roleValue = (_event$operatorUser5 = event.operatorUser) === null || _event$operatorUser5 === void 0 ? void 0 : _event$operatorUser5.userRole;
+          var roleValue = operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userRole;
           var canTriggerToast = roleValue === _type3.FcrUserRole.HOST || roleValue === _type3.FcrUserRole.COHOST;
           if (canTriggerToast) {
-            if (_enable) {
-              if (roleValue === _type3.FcrUserRole.HOST) {
-                toastText = (0, _i18n.transI18n)('fmt_security_setting_popup_toast_facilitator_watermark');
-              } else if (roleValue === _type3.FcrUserRole.COHOST) {
-                toastText = (0, _i18n.transI18n)('fmt_security_setting_popup_toast_co_facilitator_watermark');
-              }
-            } else {
-              toastText = (0, _i18n.transI18n)('fmt_security_setting_popup_toast_turn_off_watermark');
-            }
+            this._observable.notifyObservers('onWaterMarkEnableUpdated', _enable, operatorUser);
             this._prevWaterMarkEnable = _enable;
-            if (toastText) {
-              this._messageProvider.showToast({
-                type: toastType,
-                message: toastText
-              });
-            }
           }
         }
       }
-      // else if(event.securityInfo.info?.action == FcrSecurityAction.){
-
-      // }
     }
   }, {
     key: "_handleUserRoleChangeToast",
     value: function _handleUserRoleChangeToast(targetUser) {
-      var _this$_mainRoomContro;
-      var localUser = (_this$_mainRoomContro = this._mainRoomControl) === null || _this$_mainRoomContro === void 0 ? void 0 : _this$_mainRoomContro.getUserControl().getLocalUser();
       var oldUser = this._userMap.get(targetUser.userId);
-      var isSelf = targetUser.userId === localUser.userId;
       var hasHost = this._userMap.values().some(function (user) {
         return user.userRole === _type3.FcrUserRole.HOST;
       });
-      // 被设置为主持人
-      //  本人：
-      //  xxx(我)成为新主持人
-      //  其他人：
-      //   xxx成为新主持人
-      // 被收回主持人
-      //  本人：
-      //    xxx成为新主持人
-      //  其他人：
-      //    xxx成为新主持人
-      // 被设置为联席
-      //  本人：
-      //    你被设置为联席主持人
-      //  其他人：
-      //    xxx现在成为联席主持人
-      //
-      // 被收回联席
-      //  本人：
-      //     你的联席主持人身份已被收回
-      //  其他人：
-      //    xxx不再是联席主持人
-      // 当会议没有主持人的时候，我通过 hostkey 成为主持人，不需要提醒，如果会议有主持人，代表是移交主持人，走原有逻辑
-      if (!hasHost && !isSelf || hasHost && targetUser.userRole === _type3.FcrUserRole.HOST) {
-        this._messageProvider.showToast({
-          type: isSelf ? 'info' : 'normal',
-          message: (0, _i18n.transI18n)(isSelf ? 'fmt_attendies_tips_mine_new_host' : 'fmt_attendies_tips_new_host', {
-            reason1: targetUser.userName
-          })
-        });
-      } else if (targetUser.userRole === _type3.FcrUserRole.COHOST) {
-        this._messageProvider.showToast({
-          type: isSelf ? 'info' : 'normal',
-          message: (0, _i18n.transI18n)(isSelf ? 'fmt_attendies_tips_mine_new_co_host' : 'fmt_attendies_tips_new_co_host', {
-            reason1: targetUser.userName
-          })
-        });
-      } else if (targetUser.userRole === _type3.FcrUserRole.PARTICIPANT) {
-        if ((oldUser === null || oldUser === void 0 ? void 0 : oldUser.userRole) === _type3.FcrUserRole.COHOST) {
-          if (isSelf) {
-            this._messageProvider.showToast({
-              type: 'error',
-              message: (0, _i18n.transI18n)('fmt_pairicipant_tips_cohostbeenrevoke'),
-              duration: 3000
-            });
-          } else {
-            this._messageProvider.showToast({
-              type: 'normal',
-              message: (0, _i18n.transI18n)('fmt_pairicipant_tips_nolongercohost', {
-                reason1: targetUser.userName
-              }),
-              duration: 3000
-            });
-          }
-        }
-      }
+      this._observable.notifyObservers('onUserRoleChanged', targetUser, {
+        oldUser: oldUser,
+        hasHost: hasHost
+      });
     }
   }]);
 }();

package/lib/providers/room-provider/waiting-room-control-manager.d.ts

@@ -1,5 +1,5 @@
+import { FcrCoreEngine } from 'fcr-core';
 import { FcrMainRoomControl, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
-import { FcrCoreEngine } from 'fcr-core/lib/imports';
 import { FcrUISceneConfig } from '../../type';
 export interface FcrUIWaitingRoomControlManagerObserver {
     onWaitingRoomControlCreated?: (roomControl: FcrWaitingRoomControl) => void;
@@ -9,7 +9,7 @@ export default class FcrUIWaitingRoomControlManager {
     private _sceneConfig;
     private _engine;
     private _mainRoomControl;
-    protected logger: import("fcr-core/lib/imports").Logger;
+    protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _waitingRoomControl;
     private _isJoining;

package/lib/providers/room-provider/waiting-room-control-manager.js

@@ -28,9 +28,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _fcrCore = require("fcr-core");
 var _type = require("fcr-core/lib/room-control/user-control/type");
 var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
-var _imports = require("fcr-core/lib/imports");
 var _logger = require("../../utilities/logger");
 var _type3 = require("fcr-core/lib/type");
+var _observable = require("agora-foundation/lib/utilities/observable");
 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 FcrUIWaitingRoomControlManager = exports["default"] = /*#__PURE__*/function () {
@@ -40,7 +40,7 @@ var FcrUIWaitingRoomControlManager = exports["default"] = /*#__PURE__*/function
     (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
       prefix: 'FcrUIWaitingRoomControlManagerObserver'
     }));
-    (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
+    (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_waitingRoomControl", null);
     (0, _defineProperty2["default"])(this, "_isJoining", false);
     (0, _defineProperty2["default"])(this, "_mainRoomUserObserver", {

package/lib/providers/screen-share/provider.base.d.ts

@@ -70,6 +70,7 @@ export declare abstract class FcrUIScreenShareProviderBase implements FcrUIManag
     get shareStreamId(): string;
     get isRemoteUserScreenSharing(): boolean;
     get isLocalUserScreenSharing(): boolean;
+    get isScreenShareStarted(): boolean;
     constructor(objectManager: FcrUIObjectManager);
     abstract startShare(params: FcrUIScreenShareStartParams): Promise<void>;
     abstract stopShare(): Promise<void>;

package/lib/providers/screen-share/provider.base.js

@@ -131,7 +131,7 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
     _classPrivateFieldInitSpec(this, _B, _init__isRemoteUserScreenSharing(this, false));
     _classPrivateFieldInitSpec(this, _C, _init__isSharingWithAudio(this, false));
     _classPrivateFieldInitSpec(this, _D, _init__isSharingInSmoothMode(this, false));
-    _classPrivateFieldInitSpec(this, _E, _init__isSharingInStereoAudioMode(this, true));
+    _classPrivateFieldInitSpec(this, _E, _init__isSharingInStereoAudioMode(this, false));
     _classPrivateFieldInitSpec(this, _F, _init__shareStreamId(this, null));
     _classPrivateFieldInitSpec(this, _G, _init__sharingUser(this, null));
     this.objectManager = objectManager;
@@ -295,6 +295,11 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
     get: function get() {
       return this._isLocalUserScreenSharing;
     }
+  }, {
+    key: "isScreenShareStarted",
+    get: function get() {
+      return this._isScreenShareStarted;
+    }
   }, {
     key: "addObserver",
     value: function addObserver(observer) {