fcr-ui-scene 3.6.1 → 3.6.2

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

@@ -3,6 +3,7 @@ import { FcrUserRole, FcrUserInfo, FcrLineType } from 'fcr-core/lib/type';
 import { FcrSharePermissionState } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 import { FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecurityInfoUpdatedEvent, FcrSecuritySendChatPayload } from 'fcr-core/lib/room-control/privilege-control/type';
 import { FcrUISecuritySendChatOriginalPayload } from '../type';
+import { FcrUIEventProvider } from './event-provider';
 export interface FcrUIPrivilegeProviderObserver {
     /**
      * 安全信息变更
@@ -91,9 +92,13 @@ export interface FcrUIPrivilegeProvider {
      */
     allowScreenShareAndBoard(): boolean;
     /**
-     * 是否允许在白板上书写
+     * @state {checkbox} 是否允许在白板上书写
+     */
+    allowBoardWriteState(): boolean;
+    /**
+     * @state {checkbox} 是否允许标注书写
      */
-    allowBoardWrite(): boolean;
+    allowAnnotationWriteState(): boolean;
     /**
      * 是否允许用户自行开启视频
      */
@@ -295,6 +300,14 @@ export interface FcrUIPrivilegeProvider {
      * 是否允许在白板上书写
      */
     hasWriteBoardPermission(): boolean;
+    /**
+     * 是否允许标注
+     */
+    hasAnnotationStartPermission(): boolean;
+    /**
+     * 是否允许标注
+     */
+    hasAnnotationAllowWritePermission(): boolean;
     /**
      * 是否允许开启白板操作（仅限于允许他人开启）
      */
@@ -315,6 +328,10 @@ export interface FcrUIPrivilegeProvider {
      * 是否同时拥有屏幕共享和白板操作的权限
      */
     hasAllowScreenShareAndBoardPermission(): boolean;
+    /**
+     * 是否拥有标注的写权限
+     */
+    hasAnnotationWritePermission(): boolean;
     /**
      * 是否允许开启水印
      */
@@ -350,12 +367,17 @@ export interface FcrUIPrivilegeProvider {
      * 设置是否允许屏幕共享
      * @param state 共享状态
      */
-    allowShare(state: FcrSharePermissionState): void;
+    allowShareAndWrite(state: FcrSharePermissionState): void;
     /**
      * 设置是否允许白板书写
      * @param state 是否允许书写或传入状态
      */
     setAllowWriteBoard(state: FcrSharePermissionState | boolean): void;
+    /**
+     * 设置是否允许标注
+     * @param state 是否允许标注或传入状态
+     */
+    setAllowAnnotation(state: FcrSharePermissionState | boolean): void;
     /**
      * 设置是否允许白板书写是单行/多行
      * @param state
@@ -448,6 +470,7 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     private _privilegeControl;
     private _userControl;
     private _streamControl;
+    private _eventProvider;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
     private _localUser;
@@ -459,7 +482,7 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     accessor permissionInfos: FcrPermissionInfo[];
     accessor privilegeOperator: FcrUserInfo | undefined;
     get hasSecurityPermission(): boolean;
-    constructor(_privilegeControl: FcrPrivilegeControl, _userControl: FcrUserControl, _streamControl: FcrStreamControl);
+    constructor(_privilegeControl: FcrPrivilegeControl, _userControl: FcrUserControl, _streamControl: FcrStreamControl, _eventProvider: FcrUIEventProvider);
     addObserver(observer: FcrUIPrivilegeProviderObserver): void;
     removeObserver(observer: FcrUIPrivilegeProviderObserver): void;
     printAllPermissions(): void;
@@ -476,7 +499,8 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     allowJoinWithMuteAudio: () => boolean;
     allowShareScreen: () => boolean;
     allowScreenShareAndBoard: () => boolean;
-    allowBoardWrite: () => boolean;
+    allowBoardWriteState: () => boolean;
+    allowAnnotationWriteState: () => boolean;
     allowUnmuteSelfVideo: () => boolean;
     allowUnmuteSelfAudio: () => boolean;
     isLockRoomEnabled: () => boolean;
@@ -524,6 +548,9 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     hasStartBoardPermission: () => boolean;
     hasCloseBoardPermission: (targerRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasWriteBoardPermission: () => boolean;
+    hasAnnotationStartPermission: () => boolean;
+    hasAnnotationAllowWritePermission: () => boolean;
+    hasAnnotationWritePermission: () => boolean;
     hasAllowStartBoardPermission: () => boolean;
     hasDisallowStartBoardPermission: () => boolean;
     hasAllowWriteBoardPermission: () => boolean;
@@ -537,7 +564,8 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     hasChangeNamePermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     isMulti: () => boolean;
     getAllowedOperations: (targetUserRole: FcrUserRole, isSelf: boolean) => string[];
-    allowShare: (state: FcrSharePermissionState) => Promise<void>;
+    allowShareAndWrite: (state: FcrSharePermissionState) => Promise<void>;
+    setAllowAnnotation: (state: boolean) => Promise<void>;
     setAllowWriteBoard: (state: FcrSharePermissionState | boolean) => Promise<void>;
     muteAll: () => void;
     unmuteAll: () => void;
@@ -556,6 +584,7 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     private _hasPermission;
     private _hasPermissionWithParams;
     private _handlePermissionUpdated;
+    private _getCurrentSharingSecurity;
     private _handleSecurityUpdated;
     permitPrivateChat(userId: string): boolean;
     setAllowWaterMark(state: boolean, lineType?: FcrLineType): Promise<void>;

package/lib/providers/privilege-provider.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrUIPrivilegeProviderImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.array.filter.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");
@@ -53,10 +54,12 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.some.js");
@@ -102,7 +105,7 @@ var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
 _ref = (_handlePermissionUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], _setAllowWaterMarkDecs = [_mobx.action, _mobx.action.bound], _setAllowWaterMarkLineDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE__*/function () {
-  function FcrUIPrivilegeProviderImpl(_privilegeControl, _userControl, _streamControl) {
+  function FcrUIPrivilegeProviderImpl(_privilegeControl, _userControl, _streamControl, _eventProvider) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUIPrivilegeProviderImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
@@ -210,7 +213,7 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       var screenShareState = (shareState === null || shareState === void 0 ? void 0 : shareState.screen) === _enums.FcrSharePermissionState.ON;
       return screenShareState;
     }));
-    (0, _defineProperty2["default"])(this, "allowBoardWrite", (0, _mobxUtils.computedFn)(function () {
+    (0, _defineProperty2["default"])(this, "allowBoardWriteState", (0, _mobxUtils.computedFn)(function () {
       var _info$info2, _shareState$board;
       var info = _this.securityInfos.find(function (_ref12) {
         var info = _ref12.info;
@@ -220,37 +223,46 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       var boardWriteState = (shareState === null || shareState === void 0 || (_shareState$board = shareState.board) === null || _shareState$board === void 0 ? void 0 : _shareState$board.write) === _enums.FcrSharePermissionState.ON;
       return boardWriteState;
     }));
-    (0, _defineProperty2["default"])(this, "allowUnmuteSelfVideo", (0, _mobxUtils.computedFn)(function () {
+    (0, _defineProperty2["default"])(this, "allowAnnotationWriteState", (0, _mobxUtils.computedFn)(function () {
       var info = _this.securityInfos.find(function (_ref13) {
         var info = _ref13.info;
+        return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.Annotation;
+      });
+      var shareState = info === null || info === void 0 ? void 0 : info.payload;
+      var annotationWriteState = (shareState === null || shareState === void 0 ? void 0 : shareState.write) === _enums.FcrSharePermissionState.ON;
+      return annotationWriteState;
+    }));
+    (0, _defineProperty2["default"])(this, "allowUnmuteSelfVideo", (0, _mobxUtils.computedFn)(function () {
+      var info = _this.securityInfos.find(function (_ref14) {
+        var info = _ref14.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.StartVideo;
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
     (0, _defineProperty2["default"])(this, "allowUnmuteSelfAudio", (0, _mobxUtils.computedFn)(function () {
-      var info = _this.securityInfos.find(function (_ref14) {
-        var info = _ref14.info;
+      var info = _this.securityInfos.find(function (_ref15) {
+        var info = _ref15.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.StartAudio;
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
     (0, _defineProperty2["default"])(this, "isLockRoomEnabled", (0, _mobxUtils.computedFn)(function () {
-      var info = _this.securityInfos.find(function (_ref15) {
-        var info = _ref15.info;
+      var info = _this.securityInfos.find(function (_ref16) {
+        var info = _ref16.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.LockedRoom;
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
     (0, _defineProperty2["default"])(this, "isWaitingRoomEnabled", (0, _mobxUtils.computedFn)(function () {
-      var info = _this.securityInfos.find(function (_ref16) {
-        var info = _ref16.info;
+      var info = _this.securityInfos.find(function (_ref17) {
+        var info = _ref17.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.WaitingRoom;
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
     (0, _defineProperty2["default"])(this, "isWaterMarkEnabled", (0, _mobxUtils.computedFn)(function () {
-      var info = _this.securityInfos.find(function (_ref17) {
-        var info = _ref17.info;
+      var info = _this.securityInfos.find(function (_ref18) {
+        var info = _ref18.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.WaterMark;
       });
       return !!(info !== null && info !== void 0 && info.enable);
@@ -392,6 +404,21 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     (0, _defineProperty2["default"])(this, "hasWriteBoardPermission", function () {
       return _this._hasPermission(_type2.FcrPermissionAction.BoardWrite, _type2.FcrPrivilegeUserRole.SELF);
     });
+    (0, _defineProperty2["default"])(this, "hasAnnotationStartPermission", function () {
+      var info = _this.securityInfos.find(function (_ref19) {
+        var info = _ref19.info;
+        return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.Annotation;
+      });
+      var shareState = info === null || info === void 0 ? void 0 : info.payload;
+      var annotationWriteState = (shareState === null || shareState === void 0 ? void 0 : shareState.start) === _enums.FcrSharePermissionState.ON;
+      return annotationWriteState;
+    });
+    (0, _defineProperty2["default"])(this, "hasAnnotationAllowWritePermission", function () {
+      return _this._hasPermission(_type2.FcrPermissionAction.AnnotationAllowWrite, _type2.FcrPrivilegeUserRole.PARTICIPANT);
+    });
+    (0, _defineProperty2["default"])(this, "hasAnnotationWritePermission", function () {
+      return _this._hasPermission(_type2.FcrPermissionAction.AnnotationWrite, _type2.FcrPrivilegeUserRole.SELF);
+    });
     (0, _defineProperty2["default"])(this, "hasAllowStartBoardPermission", function () {
       return _this._hasPermission(_type2.FcrPermissionAction.BoardAllowStart, _type2.FcrPrivilegeUserRole.SELF);
     });
@@ -429,8 +456,8 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     });
     (0, _defineProperty2["default"])(this, "isMulti", (0, _mobxUtils.computedFn)(function () {
       var _info$info3;
-      var info = _this.securityInfos.find(function (_ref18) {
-        var info = _ref18.info;
+      var info = _this.securityInfos.find(function (_ref20) {
+        var info = _ref20.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.WaterMark;
       });
       return (info === null || info === void 0 || (_info$info3 = info.info) === null || _info$info3 === void 0 ? void 0 : _info$info3.payload.lineType) === _type.FcrLineType.MULTI_ROW;
@@ -480,15 +507,15 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       }
       return operations;
     });
-    (0, _defineProperty2["default"])(this, "allowShare", /*#__PURE__*/function () {
-      var _ref19 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(state) {
+    (0, _defineProperty2["default"])(this, "allowShareAndWrite", /*#__PURE__*/function () {
+      var _ref21 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(state) {
         var enable;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               enable = state === _enums.FcrSharePermissionState.ON;
               _context.next = 3;
-              return _this._privilegeControl.allowShare(enable, [_type2.FcrPrivilegeUserRole.PARTICIPANT]);
+              return _this._privilegeControl.allowShareAndWrite(enable, [_type2.FcrPrivilegeUserRole.PARTICIPANT]);
             case 3:
               return _context.abrupt("return", _context.sent);
             case 4:
@@ -498,28 +525,47 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
         }, _callee);
       }));
       return function (_x) {
-        return _ref19.apply(this, arguments);
+        return _ref21.apply(this, arguments);
       };
     }());
-    (0, _defineProperty2["default"])(this, "setAllowWriteBoard", /*#__PURE__*/function () {
-      var _ref20 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(state) {
-        var enable;
+    (0, _defineProperty2["default"])(this, "setAllowAnnotation", /*#__PURE__*/function () {
+      var _ref22 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(state) {
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              enable = typeof state === 'boolean' ? state : state === _enums.FcrSharePermissionState.ON;
-              _context2.next = 3;
-              return _this._privilegeControl.allowWriteBoard(enable, [_type2.FcrPrivilegeUserRole.PARTICIPANT]);
-            case 3:
+              _context2.next = 2;
+              return _this._privilegeControl.allowWriteAnnotation(state, [_type2.FcrPrivilegeUserRole.PARTICIPANT]);
+            case 2:
               return _context2.abrupt("return", _context2.sent);
-            case 4:
+            case 3:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       }));
       return function (_x2) {
-        return _ref20.apply(this, arguments);
+        return _ref22.apply(this, arguments);
+      };
+    }());
+    (0, _defineProperty2["default"])(this, "setAllowWriteBoard", /*#__PURE__*/function () {
+      var _ref23 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(state) {
+        var enable;
+        return _regenerator["default"].wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              enable = typeof state === 'boolean' ? state : state === _enums.FcrSharePermissionState.ON;
+              _context3.next = 3;
+              return _this._privilegeControl.allowWriteBoard(enable, [_type2.FcrPrivilegeUserRole.PARTICIPANT]);
+            case 3:
+              return _context3.abrupt("return", _context3.sent);
+            case 4:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      return function (_x3) {
+        return _ref23.apply(this, arguments);
       };
     }());
     //全体静音
@@ -597,7 +643,7 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     });
     //允许屏幕共享
     (0, _defineProperty2["default"])(this, "setAllowShareScreen", function (state) {
-      _this._privilegeControl.allowShare(state, [_type2.FcrPrivilegeUserRole.PARTICIPANT]);
+      _this._privilegeControl.allowShareAndWrite(state, [_type2.FcrPrivilegeUserRole.PARTICIPANT]);
     });
     //允许开启视频
     (0, _defineProperty2["default"])(this, "setAllowUnmuteSelfVideo", function (enable) {
@@ -610,9 +656,9 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     (0, _defineProperty2["default"])(this, "_hasPermission", (0, _mobxUtils.computedFn)(function (action, targetRole) {
       var _this$permissionInfos;
       var convertedRole = targetRole === _type2.FcrPrivilegeUserRole.SELF ? [_this._localUser.userRole, _type2.FcrPrivilegeUserRole.SELF] : [targetRole];
-      var info = (_this$permissionInfos = _this.permissionInfos) === null || _this$permissionInfos === void 0 ? void 0 : _this$permissionInfos.find(function (_ref21) {
+      var info = (_this$permissionInfos = _this.permissionInfos) === null || _this$permissionInfos === void 0 ? void 0 : _this$permissionInfos.find(function (_ref24) {
         var _info$targetRoles;
-        var info = _ref21.info;
+        var info = _ref24.info;
         return (info === null || info === void 0 ? void 0 : info.action) === action && ((info === null || info === void 0 || (_info$targetRoles = info.targetRoles) === null || _info$targetRoles === void 0 ? void 0 : _info$targetRoles.length) === 0 || convertedRole.some(function (role) {
           var _info$targetRoles2;
           return info === null || info === void 0 || (_info$targetRoles2 = info.targetRoles) === null || _info$targetRoles2 === void 0 ? void 0 : _info$targetRoles2.includes(role);
@@ -628,9 +674,9 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
           return _params && _params[key].includes(params[key]);
         });
       };
-      var info = (_this$permissionInfos2 = _this.permissionInfos) === null || _this$permissionInfos2 === void 0 ? void 0 : _this$permissionInfos2.find(function (_ref22) {
+      var info = (_this$permissionInfos2 = _this.permissionInfos) === null || _this$permissionInfos2 === void 0 ? void 0 : _this$permissionInfos2.find(function (_ref25) {
         var _info$targetRoles3, _info$params;
-        var info = _ref22.info;
+        var info = _ref25.info;
         return (info === null || info === void 0 ? void 0 : info.action) === action && ((info === null || info === void 0 || (_info$targetRoles3 = info.targetRoles) === null || _info$targetRoles3 === void 0 ? void 0 : _info$targetRoles3.length) === 0 || convertedRole.some(function (role) {
           var _info$targetRoles4;
           return info === null || info === void 0 || (_info$targetRoles4 = info.targetRoles) === null || _info$targetRoles4 === void 0 ? void 0 : _info$targetRoles4.includes(role);
@@ -641,6 +687,7 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     this._privilegeControl = _privilegeControl;
     this._userControl = _userControl;
     this._streamControl = _streamControl;
+    this._eventProvider = _eventProvider;
     this.securityInfos = this._privilegeControl.getAllSecurityInfo();
     this.permissionInfos = this._privilegeControl.getAllLocalUserPermissionInfo() || [];
     this._localUser = this._userControl.getLocalUser();
@@ -746,10 +793,19 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     value: function _handlePermissionUpdated() {
       this.permissionInfos = this._privilegeControl.getAllLocalUserPermissionInfo() || [];
     }
+  }, {
+    key: "_getCurrentSharingSecurity",
+    value: function _getCurrentSharingSecurity() {
+      return this.securityInfos.filter(function (securityInfo) {
+        var _securityInfo$info;
+        return ((_securityInfo$info = securityInfo.info) === null || _securityInfo$info === void 0 ? void 0 : _securityInfo$info.action) === _type2.FcrSecurityAction.Sharing;
+      })[0];
+    }
   }, {
     key: "_handleSecurityUpdated",
     value: function _handleSecurityUpdated(roomId, event) {
-      this.securityInfos = this._privilegeControl.getAllSecurityInfo();
+      var newSecurityInfos = this._privilegeControl.getAllSecurityInfo();
+      this.securityInfos = newSecurityInfos;
       this.privilegeOperator = event.operatorUser;
       this._observable.notifyObservers('onLocalUserSecurityInfosUpdated', event);
     }
@@ -799,21 +855,21 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
   }, {
     key: "setAllowWaterMark",
     value: function () {
-      var _setAllowWaterMark = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(state, lineType) {
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _setAllowWaterMark = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(state, lineType) {
+        return _regenerator["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return this._privilegeControl.allowWatermark(state, [_type2.FcrPrivilegeUserRole.PARTICIPANT], lineType);
             case 2:
-              return _context3.abrupt("return", _context3.sent);
+              return _context4.abrupt("return", _context4.sent);
             case 3:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function setAllowWaterMark(_x3, _x4) {
+      function setAllowWaterMark(_x4, _x5) {
         return _setAllowWaterMark.apply(this, arguments);
       }
       return setAllowWaterMark;
@@ -821,13 +877,13 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
   }, {
     key: "setAllowWaterMarkLine",
     value: function () {
-      var _setAllowWaterMarkLine = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(state, lineType) {
+      var _setAllowWaterMarkLine = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(state, lineType) {
         var _this2 = this;
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regenerator["default"].wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               if (this._watermarkLoadingTimber) {
-                _context4.next = 7;
+                _context5.next = 7;
                 break;
               }
               this.targetLoadingWatermarkLineTypeIsMulti = !this.targetLoadingWatermarkLineTypeIsMulti;
@@ -837,17 +893,17 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
                 _this2._watermarkLoadingTimber && clearTimeout(_this2._watermarkLoadingTimber);
                 _this2._watermarkLoadingTimber = null;
               }, 1000);
-              _context4.next = 6;
+              _context5.next = 6;
               return this._privilegeControl.allowWatermark(state, [_type2.FcrPrivilegeUserRole.PARTICIPANT], lineType);
             case 6:
-              return _context4.abrupt("return", _context4.sent);
+              return _context5.abrupt("return", _context5.sent);
             case 7:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function setAllowWaterMarkLine(_x5, _x6) {
+      function setAllowWaterMarkLine(_x6, _x7) {
         return _setAllowWaterMarkLine.apply(this, arguments);
       }
       return setAllowWaterMarkLine;

package/lib/providers/renderer-provider.js

@@ -53,11 +53,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _logger = require("agora-foundation/lib/logger");
 var _fcrCore = require("fcr-core");
 var _mobx = require("mobx");
 var _mobxUtils = require("mobx-utils");
 var _base = require("../base");
+var _logger = require("../utilities/logger");
+var _decorator = require("agora-foundation/lib/decorator");
 var _FcrUIRemoteVideoRenderProviderImpl, _FcrUILocalVideoRenderProviderImpl;
 var _initProto, _init__firstFrameState, _startRenderRemoteVideoDecs, _stopRenderRemoteVideoDecs, _ref, _initProto2, _startCameraPreviewDecs, _stopCameraPreviewDecs, _startScreenPreviewDecs, _stopScreenPreviewDecs, _ref2;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -71,7 +72,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var _A = /*#__PURE__*/new WeakMap();
-_ref = (_startRenderRemoteVideoDecs = [_mobx.action, _mobx.action.bound], _stopRenderRemoteVideoDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_startRenderRemoteVideoDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _stopRenderRemoteVideoDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], "logger");
 var FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderImpl = /*#__PURE__*/function () {
   function FcrUIRemoteVideoRenderProviderImpl(_streamControl) {
     var _this = this;
@@ -88,7 +89,6 @@ var FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderI
     this._streamControl = _streamControl;
     this._streamObserver = {
       onFirstRemoteVideoFrameRendered: function onFirstRemoteVideoFrameRendered(roomId, streamId) {
-        _this.logger.debug('onFirstRemoteVideoFrameRendered', roomId, streamId);
         (0, _mobx.runInAction)(function () {
           _this._firstFrameState.set(streamId, true);
         });
@@ -110,8 +110,6 @@ var FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderI
   }, {
     key: "release",
     value: function release() {
-      this._renderCount.clear();
-      this._firstFrameState.clear();
       this._disposers.forEach(function (disposer) {
         return disposer();
       });
@@ -120,7 +118,6 @@ var FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderI
   }, {
     key: "startRenderRemoteVideo",
     value: function startRenderRemoteVideo(streamId, streamType, config, el) {
-      this.logger.debug('startRenderRemoteVideo', streamId, streamType, config);
       var count = this._renderCount.get(streamId);
       if (count) {
         this._renderCount.set(streamId, count + 1);
@@ -134,7 +131,6 @@ var FcrUIRemoteVideoRenderProviderImpl = exports.FcrUIRemoteVideoRenderProviderI
   }, {
     key: "stopRenderRemoteVideo",
     value: function stopRenderRemoteVideo(streamId, el) {
-      this.logger.debug('stopRenderRemoteVideo', streamId);
       var count = this._renderCount.get(streamId) || 0;
       if (count - 1 > 0) {
         this._renderCount.set(streamId, count - 1);

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

@@ -59,6 +59,14 @@ export interface FcrUIRoomProvider {
      * 云录制状态
      */
     get cloudRecordingState(): FcrRecordingState;
+    /**
+     * 是不是自己结束会议的
+     */
+    get isSelfEndMeeting(): boolean;
+    /**
+     * 设置是不是自己结束会议的
+     */
+    setIsSelfEndMeeting(isSelfEndMeeting: boolean): void;
     getRoomDetailCopyText(): string;
     /**
      * 启动直播
@@ -109,6 +117,7 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     private _userControlObserver;
     private _currentRoomControl?;
     private _roomRouter;
+    private _isSelfEndMeeting;
     private _roomRouterObserver;
     accessor liveStreamingState: FcrLiveStreamingState;
     accessor liveStreamingConfig: FcrLiveStreamingConfig | undefined;
@@ -117,6 +126,8 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     getRoomDetailCopyText(): string;
     get currentRoomControl(): FcrBaseRoomControl;
     get waitingRoomManager(): FcrUIWaitingRoomControlManager;
+    setIsSelfEndMeeting(isSelfEndMeeting: boolean): void;
+    get isSelfEndMeeting(): boolean;
     release(): void;
     private _releaseWaitingRoomManager;
     handleJoinRoom(): Promise<void>;
@@ -165,7 +176,8 @@ export declare class FcrUIMainRoomControlProviderImpl implements FcrUIMainRoomCo
 export declare class FcrUIWaitingRoomControlProviderImpl implements FcrUIWaitingRoomControlProvider {
     private _waitingRoomControl?;
     private _privilegeProvider?;
-    constructor(roomProvider: FcrUIRoomProvider);
+    private _eventProvider?;
+    constructor(roomProvider: FcrUIRoomProvider, eventProvider: FcrUIEventProvider);
     get waitingRoomControl(): FcrWaitingRoomControl | undefined;
     get privilegeProvider(): FcrUIPrivilegeProviderImpl | undefined;
     private _setWaitingRoomControl;

package/lib/providers/room-provider.js

@@ -114,15 +114,14 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
         _this._messageProvider.closeNotification(_type5.FcrUINotificationContentType.WAITING_ROOM);
       }
     });
+    (0, _defineProperty2["default"])(this, "_isSelfEndMeeting", false);
     (0, _defineProperty2["default"])(this, "_roomRouterObserver", {
       onRoomRouteSwitched: function onRoomRouteSwitched() {
-        var _this$currentRoomCont, _this$currentRoomCont2, _this$currentRoomCont3;
+        var _this$currentRoomCont;
         if (((_this$currentRoomCont = _this.currentRoomControl.getRoomInfo()) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.roomType) === _type.FcrRoomType.Mainroom) {
           _this._observable.notifyObservers('onLeaveMainRoom');
-        } else if (((_this$currentRoomCont2 = _this.currentRoomControl.getRoomInfo()) === null || _this$currentRoomCont2 === void 0 ? void 0 : _this$currentRoomCont2.roomType) === _type.FcrRoomType.Waitingroom) {
+        } else {
           _this._observable.notifyObservers('onLeaveWaitingRoom');
-        } else if (((_this$currentRoomCont3 = _this.currentRoomControl.getRoomInfo()) === null || _this$currentRoomCont3 === void 0 ? void 0 : _this$currentRoomCont3.roomType) === _type.FcrRoomType.JoinBeforeHostWaitingRoom) {
-          _this._observable.notifyObservers('onLeaveJBH');
         }
         _this._roomRouter.joinRoom(_this._getJoinRoomOption());
       },
@@ -252,12 +251,23 @@ 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$_currentRoomCon = this._currentRoomControl) === null || _this$_currentRoomCon === void 0 || _this$_currentRoomCon.leave();
       this._currentRoomControl = undefined;
+      this.setIsSelfEndMeeting(false);
       this._releaseWaitingRoomManager();
     }
   }, {
@@ -523,7 +533,7 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
     this._eventProvider = eventProvider;
     this._privilegeControl = _mainRoomControl.getPrivilegeControl();
     this._userControl = _mainRoomControl.getUserControl();
-    this._privilegeProvider = new _privilegeProvider.FcrUIPrivilegeProviderImpl(_mainRoomControl.getPrivilegeControl(), _mainRoomControl.getUserControl(), _mainRoomControl.getStreamControl());
+    this._privilegeProvider = new _privilegeProvider.FcrUIPrivilegeProviderImpl(_mainRoomControl.getPrivilegeControl(), _mainRoomControl.getUserControl(), _mainRoomControl.getStreamControl(), eventProvider);
     this._privilegeObserver = {
       onSecurityInfoUpdated: this._handleSecurityUpdated.bind(this)
     };
@@ -738,6 +748,9 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
           }
         }
       }
+      // else if(event.securityInfo.info?.action == FcrSecurityAction.){
+
+      // }
     }
   }, {
     key: "_handleUserRoleChangeToast",
@@ -811,7 +824,7 @@ _init_privilegeOperator = _applyDecs$e2[0];
 _init_boardOwnerUser = _applyDecs$e2[1];
 _initProto2 = _applyDecs$e2[2];
 var FcrUIWaitingRoomControlProviderImpl = exports.FcrUIWaitingRoomControlProviderImpl = /*#__PURE__*/function () {
-  function FcrUIWaitingRoomControlProviderImpl(roomProvider) {
+  function FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider) {
     var _this4 = this;
     (0, _classCallCheck2["default"])(this, FcrUIWaitingRoomControlProviderImpl);
     roomProvider.addObserver({
@@ -828,6 +841,7 @@ var FcrUIWaitingRoomControlProviderImpl = exports.FcrUIWaitingRoomControlProvide
     if (roomProvider.currentRoomControl) {
       this._setWaitingRoomControl(roomProvider.currentRoomControl);
     }
+    this._eventProvider = eventProvider;
   }
   return (0, _createClass2["default"])(FcrUIWaitingRoomControlProviderImpl, [{
     key: "waitingRoomControl",
@@ -843,7 +857,7 @@ var FcrUIWaitingRoomControlProviderImpl = exports.FcrUIWaitingRoomControlProvide
     key: "_setWaitingRoomControl",
     value: function _setWaitingRoomControl(roomControl) {
       this._waitingRoomControl = roomControl;
-      this._privilegeProvider = new _privilegeProvider.FcrUIPrivilegeProviderImpl(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl());
+      this._privilegeProvider = new _privilegeProvider.FcrUIPrivilegeProviderImpl(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), this._eventProvider);
     }
   }]);
 }();