fcr-ui-scene 3.2.0 → 3.3.0

package/installer/mac/entitlements.mac.plist

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+    <key>com.apple.security.device.audio-input</key>
+    <true/>
+    <key>com.apple.security.device.camera</key>
+    <true/>
+  </dict>
+</plist>

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

@@ -8,7 +8,7 @@ export interface FcrDeviceObserver {
     onCameraChanged?(cameraId: string): void;
     onMicrophoneChanged?(microphoneId: string): void;
     onSpeakerChanged?(speakerId: string): void;
-    onCameraListUpdated?(cameraList: FcrDeviceInfo[], currentDeviceExist: boolean): void;
+    onCameraListUpdated?(cameraList: FcrDeviceInfo[]): void;
     onMicrophoneListUpdated?(microphoneList: FcrDeviceInfo[]): void;
     onSpeakerListUpdated?(speakerList: FcrDeviceInfo[]): void;
 }

package/lib/common/device-store.js

@@ -1214,7 +1214,7 @@ var FcrDeviceStore = exports.FcrDeviceStore = /*#__PURE__*/function () {
     value: function () {
       var _handleCameraListUpdated2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6() {
         var _this12 = this;
-        var currentDeviceExist, cameraEnabled, deviceId;
+        var currentDeviceExist, cameraEnabled, deviceId, _deviceId;
         return _regenerator["default"].wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -1242,8 +1242,16 @@ var FcrDeviceStore = exports.FcrDeviceStore = /*#__PURE__*/function () {
                   }
                 }
               }
-              this._observable.notifyObservers('onCameraListUpdated', this.cameraList, currentDeviceExist);
-            case 6:
+
+              // select the first camera in the list as default
+              if (!currentDeviceExist) {
+                if (this.cameraList.length > 0) {
+                  _deviceId = this.cameraList[0].deviceId;
+                  this.setCameraId(_deviceId);
+                }
+              }
+              this._observable.notifyObservers('onCameraListUpdated', this.cameraList);
+            case 7:
             case "end":
               return _context6.stop();
           }

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

@@ -7,6 +7,7 @@ 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,6 +55,7 @@ export interface FcrUIUpdateAsideParams {
 export interface FcrUINewChatMessagesParams {
     latestMessage: FcrChatRoomReceiveBaseMessage;
     count: number;
+    type: string;
 }
 export interface FcrUIToggleLayoutParams {
     layout: 'speaker' | 'gallery';
@@ -82,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;
@@ -106,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

@@ -20,7 +20,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 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"));
@@ -32,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);
@@ -41,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) {
@@ -184,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() {
@@ -191,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 { 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 { FcrRoomSessionControl } from 'agora-edu-core/lib/room-control/room-session/type';
-import { FcrPermissionAction, FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload, FcrSecuritySharePayload, FcrSecurityWriteBoardPayload } from 'agora-edu-core/lib/room-control/privilege-control/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,6 +20,7 @@ export declare class FcrSecurityStore {
     private _uiEventStore;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
+    private _prevWaterMarkEnable;
     accessor securityInfos: FcrSecurityInfo[];
     accessor permissionInfos: FcrPermissionInfo[] | undefined;
     accessor privilegeOperator: FcrUserInfo | undefined;
@@ -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,9 +91,11 @@ export declare class FcrSecurityStore {
     hasAllowWriteBoardPermission(): boolean;
     hasDisallowWriteBoardPermission(): boolean;
     hasAllowScreenShareAndBoardPermission(): boolean;
+    hasAllowWaterMarkPermission(): boolean;
+    isMulti: () => boolean;
     getAllowedOperations(targetUserRole: FcrUserRole, isSelf: boolean): string[];
-    allowShare(state: FcrSharePermissionState, payload: FcrSecuritySharePayload): Promise<void>;
-    setAllowWriteBoard(state: FcrSharePermissionState, payload: FcrSecurityWriteBoardPayload): Promise<void>;
+    allowShare(state: FcrSharePermissionState): Promise<void>;
+    setAllowWriteBoard(state: FcrSharePermissionState): Promise<void>;
     muteAll: () => void;
     unmuteAll: () => void;
     setLockRoomEnabled: (enable: boolean) => void;
@@ -110,4 +119,5 @@ export declare class FcrSecurityStore {
     private _handleProcessEvent;
     private _addReactions;
     private _removeReactions;
+    setAllowWaterMark(state: boolean, lineType?: FcrLineType): Promise<void>;
 }

package/lib/common/security-store.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrSecurityStore = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+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");
@@ -127,6 +128,9 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
+    (0, _defineProperty2["default"])(this, "getWaterMarkContent", function () {
+      return _this._userControl.getWaterMarkContent() || 'Watermark';
+    });
     (0, _defineProperty2["default"])(this, "convertSendChatPayload", function (payload) {
       return {
         "public": !!payload["public"],
@@ -194,7 +198,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         return (info === null || info === void 0 ? void 0 : info.action) === _type4.FcrSecurityAction.Sharing;
       });
       var shareState = info === null || info === void 0 || (_info$info = info.info) === null || _info$info === void 0 ? void 0 : _info$info.payload;
-      var screenShareState = shareState.screen === _enums.FcrSharePermissionState.ON;
+      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 () {
@@ -204,7 +208,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         return (info === null || info === void 0 ? void 0 : info.action) === _type4.FcrSecurityAction.Sharing;
       });
       var shareState = info === null || info === void 0 || (_info$info2 = info.info) === null || _info$info2 === void 0 ? void 0 : _info$info2.payload;
-      var boardWriteState = ((_shareState$board = shareState.board) === null || _shareState$board === void 0 ? void 0 : _shareState$board.write) === _enums.FcrSharePermissionState.ON;
+      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 () {
@@ -235,6 +239,17 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
+    (0, _defineProperty2["default"])(this, "isWaterMarkEnabled", (0, _mobxUtils.computedFn)(function () {
+      var info = _this.securityInfos.find(function (_ref16) {
+        var info = _ref16.info;
+        return (info === null || info === void 0 ? void 0 : info.action) === _type4.FcrSecurityAction.WaterMark;
+      });
+      return !!(info !== null && info !== void 0 && info.enable);
+    }));
+    (0, _defineProperty2["default"])(this, "hasWaitingRoomPermission", function () {
+      var role = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _type4.FcrPrivilegeUserRole.PARTICIPANT;
+      return _this._hasPermission(_type4.FcrPermissionAction.WaitingRoomOpen, role);
+    });
     (0, _defineProperty2["default"])(this, "hasMutePermission", function (targetRole) {
       return _this._hasPermission(_type4.FcrPermissionAction.StreamMuteAudio, targetRole);
     });
@@ -277,6 +292,9 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "hasChatSendPublicPermission", function () {
       return _this._hasPermission(_type4.FcrPermissionAction.ChatSendPublic, _type4.FcrPrivilegeUserRole.SELF);
     });
+    (0, _defineProperty2["default"])(this, "hasChatSendPublicPermissionByTargetRole", function (targetRole) {
+      return _this._hasPermission(_type4.FcrPermissionAction.ChatSendPublic, targetRole);
+    });
     // 是否有权限发送私信息
     (0, _defineProperty2["default"])(this, "hasPermissionToSendPrivateMessage", function (targetRole) {
       return _this._hasPermission(_type4.FcrPermissionAction.ChatSendPrivate, targetRole);
@@ -327,6 +345,20 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "hasLockRoomPermission", function () {
       return _this._hasPermission(_type4.FcrPermissionAction.RoomLock, _type4.FcrPrivilegeUserRole.PARTICIPANT);
     });
+    (0, _defineProperty2["default"])(this, "hasWatermarkEnablePermission", function () {
+      return _this._hasPermission(_type4.FcrPermissionAction.RoomEnableWatermark, _type4.FcrPrivilegeUserRole.PARTICIPANT);
+    });
+    (0, _defineProperty2["default"])(this, "hasWatermarkDisablePermission", function () {
+      return _this._hasPermission(_type4.FcrPermissionAction.RoomDisableWatermark, _type4.FcrPrivilegeUserRole.PARTICIPANT);
+    });
+    (0, _defineProperty2["default"])(this, "isMulti", (0, _mobxUtils.computedFn)(function () {
+      var _info$info3;
+      var info = _this.securityInfos.find(function (_ref17) {
+        var info = _ref17.info;
+        return (info === null || info === void 0 ? void 0 : info.action) === _type4.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;
+    }));
     //全体静音
     (0, _defineProperty2["default"])(this, "muteAll", function () {
       _this._streamControl.updatePublishPrivilegeOfStreams({
@@ -399,14 +431,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
     });
     //允许屏幕共享
     (0, _defineProperty2["default"])(this, "setAllowShareScreen", function (state) {
-      var enable = state ? _enums.FcrSharePermissionState.ON : _enums.FcrSharePermissionState.OFF;
-      var payload = {
-        screen: enable,
-        board: {
-          start: enable
-        }
-      };
-      _this._privilegeControl.allowShare(state, [_type4.FcrPrivilegeUserRole.PARTICIPANT], payload);
+      _this._privilegeControl.allowShare(state, [_type4.FcrPrivilegeUserRole.PARTICIPANT]);
     });
     //允许开启视频
     (0, _defineProperty2["default"])(this, "setAllowUnmuteSelfVideo", function (enable) {
@@ -419,9 +444,9 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_hasPermission", (0, _mobxUtils.computedFn)(function (action, targetRole) {
       var _this$permissionInfos;
       var convertedRole = targetRole === _type4.FcrPrivilegeUserRole.SELF ? [_this.localUser.userRole, _type4.FcrPrivilegeUserRole.SELF] : [targetRole];
-      var info = (_this$permissionInfos = _this.permissionInfos) === null || _this$permissionInfos === void 0 ? void 0 : _this$permissionInfos.find(function (_ref16) {
+      var info = (_this$permissionInfos = _this.permissionInfos) === null || _this$permissionInfos === void 0 ? void 0 : _this$permissionInfos.find(function (_ref18) {
         var _info$targetRoles;
-        var info = _ref16.info;
+        var info = _ref18.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);
@@ -437,9 +462,9 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
           return _params && _params[key].includes(params[key]);
         });
       };
-      var info = (_this$permissionInfos2 = _this.permissionInfos) === null || _this$permissionInfos2 === void 0 ? void 0 : _this$permissionInfos2.find(function (_ref17) {
+      var info = (_this$permissionInfos2 = _this.permissionInfos) === null || _this$permissionInfos2 === void 0 ? void 0 : _this$permissionInfos2.find(function (_ref19) {
         var _info$targetRoles3, _info$params;
-        var info = _ref17.info;
+        var info = _ref19.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);
@@ -593,6 +618,12 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
       var _this$_privilegeContr;
       return (_this$_privilegeContr = this._privilegeControl.getSecurityInfo(_type4.FcrSecurityAction.Sharing)) === null || _this$_privilegeContr === void 0 ? void 0 : _this$_privilegeContr.enable;
     }
+  }, {
+    key: "hasAllowWaterMarkPermission",
+    value: function hasAllowWaterMarkPermission() {
+      var _this$_privilegeContr2;
+      return (_this$_privilegeContr2 = this._privilegeControl.getSecurityInfo(_type4.FcrSecurityAction.WaterMark)) === null || _this$_privilegeContr2 === void 0 ? void 0 : _this$_privilegeContr2.enable;
+    }
   }, {
     key: "getAllowedOperations",
     value: function getAllowedOperations(targetUserRole, isSelf) {
@@ -634,19 +665,22 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         //移除房间权限
         operations.push('kick_out');
       }
+      if (this.hasWaitingRoomPermission(targetUserRole)) {
+        operations.push('put_into_waiting_room');
+      }
       return operations;
     }
   }, {
     key: "allowShare",
     value: function () {
-      var _allowShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(state, payload) {
+      var _allowShare = (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, [_type4.FcrPrivilegeUserRole.PARTICIPANT], payload);
+              return this._privilegeControl.allowShare(enable, [_type4.FcrPrivilegeUserRole.PARTICIPANT]);
             case 3:
               return _context.abrupt("return", _context.sent);
             case 4:
@@ -655,7 +689,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
           }
         }, _callee, this);
       }));
-      function allowShare(_x, _x2) {
+      function allowShare(_x) {
         return _allowShare.apply(this, arguments);
       }
       return allowShare;
@@ -663,7 +697,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
   }, {
     key: "setAllowWriteBoard",
     value: function () {
-      var _setAllowWriteBoard = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(state, payload) {
+      var _setAllowWriteBoard = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(state) {
         var enable;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -671,7 +705,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
               this.logger.info('setAllowWriteBoard', state);
               enable = state === _enums.FcrSharePermissionState.ON;
               _context2.next = 4;
-              return this._privilegeControl.allowWriteBoard(enable, [], payload);
+              return this._privilegeControl.allowWriteBoard(enable, [_type4.FcrPrivilegeUserRole.PARTICIPANT]);
             case 4:
               return _context2.abrupt("return", _context2.sent);
             case 5:
@@ -680,7 +714,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
           }
         }, _callee2, this);
       }));
-      function setAllowWriteBoard(_x3, _x4) {
+      function setAllowWriteBoard(_x2) {
         return _setAllowWriteBoard.apply(this, arguments);
       }
       return setAllowWriteBoard;
@@ -693,18 +727,23 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
   }, {
     key: "_handleSecurityUpdated",
     value: function _handleSecurityUpdated(roomId, event) {
-      var _securityInfo$info,
+      var _event$operatorUser,
+        _event$operatorUser2,
+        _this$privilegeOperat,
+        _securityInfo$info,
         _securityInfo$info2,
         _securityInfo$info3,
         _securityInfo$info4,
         _securityInfo$info5,
         _securityInfo$info6,
-        _this2 = this;
+        _this2 = this,
+        _event$securityInfo$i,
+        _event$securityInfo$i2;
       this.securityInfos = this._privilegeControl.getAllSecurityInfo();
       this.privilegeOperator = event.operatorUser;
       var securityInfo = event.securityInfo;
       var enable = securityInfo.enable;
-      var operator = this.localUser.userRole === _type.FcrUserRole.HOST ? (0, _i18n.transI18n)('fmt_settings_labels_you') : (0, _i18n.transI18n)('fmt_role_host');
+      var operator = this.localUser.userId === ((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId) ? (0, _i18n.transI18n)('fmt_settings_labels_you') : (((_event$operatorUser2 = event.operatorUser) === null || _event$operatorUser2 === void 0 ? void 0 : _event$operatorUser2.userRole) === _type.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) === _type4.FcrSecurityAction.JoinWithMuteAudio) {
         if (enable) {
           this._uiEventStore.showToast({
@@ -785,6 +824,54 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
             }
           });
         }
+      } else if (((_event$securityInfo$i = event.securityInfo.info) === null || _event$securityInfo$i === void 0 ? void 0 : _event$securityInfo$i.action) === _type4.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._uiEventStore.showToast({
+              type: 'normal',
+              message: "".concat(userName).concat((0, _i18n.transI18n)('fmt_waitingroom_setting_tips_enable'))
+            });
+          } else {
+            this._uiEventStore.showToast({
+              type: 'normal',
+              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) == _type4.FcrSecurityAction.WaterMark) {
+        var _event$securityInfo$i3;
+        var _enable = event.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 canTriggerToast = roleValue === _type.FcrUserRole.HOST || roleValue === _type.FcrUserRole.COHOST;
+          if (canTriggerToast) {
+            if (_enable) {
+              if (roleValue === _type.FcrUserRole.HOST) {
+                toastText = (0, _i18n.transI18n)('fmt_security_setting_popup_toast_facilitator_watermark');
+              } else if (roleValue === _type.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._prevWaterMarkEnable = _enable;
+            if (toastText) {
+              this._uiEventStore.showToast({
+                type: 'normal',
+                message: toastText
+              });
+            }
+          }
+        }
+        this._uiEventStore.sendEvent(_constant.UIAction.WATERMARK_INFO_UPDATE, {
+          enable: _enable,
+          lineType: (_event$securityInfo$i3 = event.securityInfo.info) === null || _event$securityInfo$i3 === void 0 ? void 0 : _event$securityInfo$i3.payload.lineType
+        });
       }
     }
   }, {
@@ -840,9 +927,9 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
   }, {
     key: "_handleProcessEvent",
     value: function _handleProcessEvent(event) {
-      var _ref18 = event,
-        action = _ref18.action,
-        payload = _ref18.payload;
+      var _ref20 = event,
+        action = _ref20.action,
+        payload = _ref20.payload;
       switch (action) {
         case _constant.RendererEventAction.FRAGMENT_SET_ALLOW_CHANGE_SELF_NAME:
           // this.setAllowChangeSelfName(payload.allow);
@@ -856,6 +943,11 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         case _constant.RendererEventAction.FRAGMENT_SET_ALLOW_SHARE_SCREEN:
           this.setAllowShareScreen(payload.allow);
           break;
+        case _constant.RendererEventAction.FRAGMENT_SET_ALLOW_BOARD_WRITE:
+          {
+            this.setAllowWriteBoard(_enums.FcrSharePermissionState.ON);
+            break;
+          }
         case _constant.RendererEventAction.FRAGMENT_SET_ALLOW_UNMUTE_SELF_VIDEO:
           this.setAllowUnmuteSelfVideo(payload.allow);
           break;
@@ -896,6 +988,11 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
           return _this3.allowScreenShareAndBoard();
         },
         action: _constant.RendererEventAction.MAIN_SET_ALLOW_SHARE_SCREEN
+      }, {
+        observable: function observable() {
+          return _this3.allowBoardWrite();
+        },
+        action: _constant.RendererEventAction.MAIN_SET_ALLOW_BOARD_WRITE
       }, {
         observable: function observable() {
           return _this3.allowUnmuteSelfVideo();
@@ -979,9 +1076,9 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         },
         action: _constant.RendererEventAction.LOCK_ROOM_PERMISSION
       }];
-      securityReactions.forEach(function (_ref19) {
-        var observable = _ref19.observable,
-          action = _ref19.action;
+      securityReactions.forEach(function (_ref21) {
+        var observable = _ref21.observable,
+          action = _ref21.action;
         _this3._disposers.push((0, _mobx.reaction)(observable, function (allow) {
           window.runtime.sendEvent({
             action: action,
@@ -1000,10 +1097,32 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
       });
       this._disposers = [];
     }
+  }, {
+    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) {
+            case 0:
+              _context3.next = 2;
+              return this._privilegeControl.allowWatermark(state, [_type4.FcrPrivilegeUserRole.PARTICIPANT], lineType);
+            case 2:
+              return _context3.abrupt("return", _context3.sent);
+            case 3:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function setAllowWaterMark(_x3, _x4) {
+        return _setAllowWaterMark.apply(this, arguments);
+      }
+      return setAllowWaterMark;
+    }()
   }]);
 }();
 _FcrSecurityStore = FcrSecurityStore;
-var _applyDecs$e = _applyDecs(_FcrSecurityStore, [[_mobx.observable, 1, "securityInfos"], [_mobx.observable, 1, "permissionInfos"], [_mobx.observable, 1, "privilegeOperator"], [_mobx.observable, 1, "boardOwnerUser"], [_handlePermissionUpdatedDecs, 18, "_handlePermissionUpdated"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"], [_decorator.bound, 2, "_handleProcessEvent"], [_decorator.bound, 2, "_addReactions"], [_decorator.bound, 2, "_removeReactions"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrSecurityStore, [[_mobx.observable, 1, "securityInfos"], [_mobx.observable, 1, "permissionInfos"], [_mobx.observable, 1, "privilegeOperator"], [_mobx.observable, 1, "boardOwnerUser"], [_handlePermissionUpdatedDecs, 18, "_handlePermissionUpdated"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"], [_decorator.bound, 2, "_handleProcessEvent"], [_decorator.bound, 2, "_addReactions"], [_decorator.bound, 2, "_removeReactions"], [_decorator.bound, 2, "setAllowWaterMark"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 5);
 _init_securityInfos = _applyDecs$e2[0];
 _init_permissionInfos = _applyDecs$e2[1];

package/lib/electron/bootstrap-dev.d.ts

@@ -0,0 +1 @@
+export {};