fcr-ui-scene 3.2.0 → 3.3.0

package/lib/modules/action-bar/screen-share/submenu.js

@@ -21,6 +21,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _button = require("agora-ui-foundation/lib/components/button");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobxReact = require("mobx-react");
+var _truncate = _interopRequireDefault(require("lodash/truncate"));
 var _jsxRuntime = require("react/jsx-runtime");
 var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_context.ActionBarContext),
@@ -35,10 +36,11 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     isScreenShareAndBoardEnabled = _useContext.isScreenShareAndBoardEnabled,
     startScreenShare = _useContext.startScreenShare,
     hasScreenShare = _useContext.hasScreenShare,
-    hasCloseWriteBoardPermission = _useContext.hasCloseWriteBoardPermission;
+    hasCloseWriteBoardPermission = _useContext.hasCloseWriteBoardPermission,
+    hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission;
   var t = (0, _i18n.useI18n)();
   var hasHostPermission = [_agoraEduCore.FcrUserRole.HOST, _agoraEduCore.FcrUserRole.COHOST].includes(localUserRole);
-  var hasBoardControlPermission = boardOwnerUser && localUser.userId !== boardOwnerUser.userId && hasCloseWriteBoardPermission;
+  var hasBoardControlPermission = boardOwnerUser && localUser.userId !== boardOwnerUser.userId && hasCloseWriteBoardPermission && hasAllowWriteBoardPermission;
   // 需求变更，联席主持人也可以禁用主持人的白板，注释掉联席主持人不能禁用的逻辑
   // (FcrUserRole.HOST === localUserRole ||
   //   (FcrUserRole.COHOST === localUserRole && FcrUserRole.HOST !== boardOwnerUser?.userRole));
@@ -49,13 +51,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     key: 'allow_attendee_title',
     type: 'title'
   }, {
-    icon: boardOwnerUser && hasHostPermission ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-      type: _type.FcrIconType.FCR_WHITEBOARD,
-      size: 24,
-      colors: {
-        iconPrimary: '#FB584E'
-      }
-    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+    icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
       type: _type.FcrIconType.FCR_SCREENSHARING,
       size: 24,
       colors: {
@@ -70,16 +66,10 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
       //   ? setAllowScreenShare(FcrWhiteboardState.OFF)
       //   : startScreenShare();
       startScreenShare();
-    },
-    classNames: 'fcr-icon-green'
+    }
+    // classNames: 'fcr-icon-green',
   }, {
-    icon: boardOwnerUser && hasHostPermission ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-      type: _type.FcrIconType.FCR_WHITEBOARD,
-      size: 24,
-      colors: {
-        iconPrimary: '#FB584E'
-      }
-    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+    icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
       type: _type.FcrIconType.FCR_WHITEBOARD,
       size: 24,
       colors: {
@@ -89,14 +79,15 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     disabled: boardOwnerUser && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) !== localUser.userId,
     title: !boardOwnerUser ? t('fmt_screenshare_button_sharewhiteboard') : (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId ? t('fmt_screenshare_button_chosewhiteboard') : t('fmt_screenshare_options_alreadyopend'),
     key: 'allow_attendee_title',
+    type: boardOwnerUser && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId ? 'danger' : 'primary',
     onButtonClick: function onButtonClick() {
       if ((boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId) {
         closeWhiteboard();
       } else {
         openWhiteboard();
       }
-    },
-    classNames: 'fcr-icon-blue'
+    }
+    // classNames: 'fcr-icon-blue',
   }];
   var menusElectronOnly = [];
   var hostMenus = [{
@@ -106,7 +97,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
       checked: isScreenShareAndBoardEnabled,
-      label: t('fmt_screenshare_controlbar_security_list_participant_screenshare'),
+      label: t('fmt_screenshare_screen_and_board'),
       styleType: "white"
     }),
     key: 'enable_sharescreen',
@@ -135,7 +126,10 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
       shape: "rounded",
       block: true,
       children: t('fmt_screenshare_button_disableshare', {
-        reason1: boardOwnerUser ? boardOwnerUser.userName : t('fmt_actionbar_screenshare_labels_others')
+        reason1: boardOwnerUser ? (0, _truncate["default"])(boardOwnerUser.userName, {
+          length: 8,
+          separator: ' '
+        }) : t('fmt_actionbar_screenshare_labels_others')
       })
     }),
     key: 'enable_whiteboard',

package/lib/modules/action-bar/security/drop-menu.js

@@ -31,6 +31,10 @@ var _react = require("react");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _mobxReact = require("mobx-react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _icon = require("agora-ui-foundation/lib/components/icon");
+var _type = require("agora-ui-foundation/lib/components/icon/type");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
+var _type2 = require("agora-edu-core/lib/type");
 var _jsxRuntime = require("react/jsx-runtime");
 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; }
@@ -54,9 +58,24 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
     hasEnableStartVideoPermission = _useContext.hasEnableStartVideoPermission,
     hasEnableChangeNamePermission = _useContext.hasEnableChangeNamePermission,
     hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission,
-    isScreenShareAndBoardEnabled = _useContext.isScreenShareAndBoardEnabled;
+    isScreenShareAndBoardEnabled = _useContext.isScreenShareAndBoardEnabled,
+    setEnableWaitingRoom = _useContext.setEnableWaitingRoom,
+    isWaitingRoomEnabled = _useContext.isWaitingRoomEnabled,
+    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
+    localUserRole = _useContext.localUserRole,
+    isWaterMarkEnabled = _useContext.isWaterMarkEnabled,
+    isMulti = _useContext.isMulti,
+    setAllowWaterMark = _useContext.setAllowWaterMark,
+    setWaterMarkLineType = _useContext.setWaterMarkLineType,
+    hasWatermarkEnablePermission = _useContext.hasWatermarkEnablePermission,
+    hasWatermarkDisablePermission = _useContext.hasWatermarkDisablePermission;
   var transI18n = (0, _i18n.useI18n)();
   var allActions = [];
+  allActions.push({
+    title: transI18n('fmt_security_setting_label_security_setting'),
+    key: 'meeting_security_title',
+    type: 'title'
+  });
   if (hasLockRoomPermission) {
     allActions.push({
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
@@ -71,17 +90,75 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
       }
     });
   }
-  allActions.push({
-    title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-      checked: false,
-      label: transI18n('fmt_security_options_activatewaitingroom'),
-      styleType: "white"
-    }),
-    key: 'enable_waiting_room',
-    type: 'disabled',
-    onButtonClick: function onButtonClick() {},
-    classNames: 'room-control-drop-with-under-line'
-  });
+  if (hasWaitingRoomPermission) {
+    allActions.push({
+      title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+        checked: isWaitingRoomEnabled(),
+        label: transI18n('fmt_security_options_activatewaitingroom'),
+        styleType: "white"
+      }),
+      key: 'enable_waiting_room',
+      type: 'primary',
+      onButtonClick: function onButtonClick() {
+        setEnableWaitingRoom(!isWaitingRoomEnabled(), true);
+      },
+      classNames: 'room-control-drop-with-under-line'
+    });
+  }
+
+  /** 主持人和联席主持人 可以进行开启单行双行水印 */
+  if (hasWatermarkEnablePermission && hasWatermarkDisablePermission) {
+    allActions.push({
+      title: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "room-control-options-box",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "room-control-options-watermark-title-box",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+            checked: isWaterMarkEnabled,
+            label: transI18n('fmt_security_setting_mobile_label_watermark'),
+            styleType: "white"
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+            mouseEnterDelay: 0,
+            trigger: "hover",
+            placement: "top",
+            content: transI18n('fmt_security_setting_popup_tip_watermark_voice_active_prioritized'),
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
+              style: {
+                marginLeft: '6px'
+              },
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+                type: _type.FcrIconType.FCR_HELPQUESTION,
+                size: 16
+              })
+            })
+          })]
+        }), isWaterMarkEnabled && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "room-control-options-watermark-btns",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "room-control-options-watermark-btn ".concat(isMulti ? '' : 'room-control-options-watermark-btn--active'),
+            onClick: function onClick(e) {
+              e.stopPropagation();
+              setWaterMarkLineType(_type2.FcrLineType.SINGLE_ROW);
+            },
+            children: transI18n('fmt_security_setting_mobile_option_watermark_style_single')
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "room-control-options-watermark-btn ".concat(isMulti ? 'room-control-options-watermark-btn--active' : ''),
+            onClick: function onClick(e) {
+              e.stopPropagation();
+              setWaterMarkLineType(_type2.FcrLineType.MULTI_ROW);
+            },
+            children: transI18n('fmt_security_setting_mobile_option_watermark_style_multi')
+          })]
+        })]
+      }),
+      key: 'enable_watermark',
+      type: 'primary',
+      onButtonClick: function onButtonClick() {
+        setAllowWaterMark();
+      },
+      classNames: 'room-control-drop-with-under-line'
+    });
+  }
   allActions.push({
     title: transI18n('fmt_screenshare_options_allow'),
     key: 'allow_attendee_title',
@@ -91,7 +168,7 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
     allActions.push({
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
         checked: isScreenShareAndBoardEnabled,
-        label: transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare'),
+        label: transI18n('fmt_screenshare_screen_and_board'),
         styleType: "white"
       }),
       key: 'share_screen',

package/lib/modules/action-bar/store.d.ts

@@ -1,13 +1,14 @@
 import { FcrBaseRoomControl, FcrDesktopMediaControl, FcrStreamControl, FcrUserControl } from 'agora-edu-core';
-import { FcrLiveStreamingState, FcrRecordingState, FcrUserInfo, FcrUserRole } from 'agora-edu-core/lib/type';
+import { FcrLiveStreamingState, FcrRecordingState, FcrUserInfo, FcrUserRole, FcrLineType } from 'agora-edu-core/lib/type';
 import { FcrUIEventStore } from '../../common/event-store';
 import { DeviceSettingDialogConfig } from '../setting/store';
+import { RoomType } from '../../utilities/constant';
 import { FcrSecurityStore } from '../../common/security-store';
 import { FcrDeviceStore } from '../../common/device-store';
 import { ConnectType, ConnectionTabType } from './type';
 import { FcrDeviceStreamStore } from '../../common/device-stream-store';
-import { FcrSharePermissionState } from 'agora-edu-core/lib/room-control/whiteboard-control/enums';
 import { FcrChatRoomReceiveBaseMessage } from 'agora-edu-core/lib/room-control/chatroom-control/type';
+import { FcrRoomType, FcrUserKickOutType } from 'agora-edu-core/lib/room-control/type';
 interface ActionBarStoreArgs {
     roomControl: FcrBaseRoomControl;
     userControl: FcrUserControl;
@@ -27,12 +28,16 @@ export declare enum AudioConnectType {
     COMPUTER = 1,
     PHONE = 2
 }
+type ChatRoomStoreMap = {
+    [K in RoomType]?: number;
+};
 export default class ActionBarStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
     private _chatRenderAt;
     private _participantsRenderAt;
     private _roomControl;
+    private _waitingRoomControl?;
     private _userControl;
     private _streamControl;
     private _mediaControl;
@@ -42,6 +47,7 @@ export default class ActionBarStore {
     private _securityStore;
     private _screenVideoTrack;
     private _userObserver;
+    private _waitingRoomUserObserver;
     private _roomObserver;
     private _uiEventObserver;
     private _observer;
@@ -55,11 +61,13 @@ export default class ActionBarStore {
     private _isSharingScreen;
     private _microponeInitCount;
     private _speakerInitCount;
+    private _participantTab;
     accessor users: FcrUserInfo[];
     accessor newMessageTooltipVisible: boolean;
-    accessor newMessageCount: number;
+    accessor newMessageCount: ChatRoomStoreMap;
     accessor latestMessage: FcrChatRoomReceiveBaseMessage | undefined;
     accessor totalUser: number;
+    accessor totalWaitingRoomUser: number;
     accessor liveStreamingState: FcrLiveStreamingState;
     accessor currentMenuIs: MoreMenuType;
     accessor cloudRecordingState: FcrRecordingState;
@@ -72,7 +80,12 @@ export default class ActionBarStore {
     accessor hasScreenShare: boolean;
     accessor showArrow: boolean;
     accessor phoneMicEnabled: boolean;
+    accessor isNewWaitingRoomUserEnter: boolean;
+    accessor chatTabIndex: string;
+    accessor popoverOpened: boolean;
+    accessor isPstnUser: boolean;
     constructor(args: ActionBarStoreArgs);
+    fetchNewestLeavingRoomCompProps(): void;
     get remoteUsers(): FcrUserInfo[];
     get hasStartScreenSharePermission(): boolean;
     get hasStartLiveStreamingPermission(): boolean;
@@ -80,6 +93,9 @@ export default class ActionBarStore {
     get hasEnableChangeNamePermission(): boolean;
     get hasEnableStartVideoPermission(): boolean;
     get hasLockRoomPermission(): boolean;
+    get hasWaitingRoomPermission(): boolean;
+    get hasWatermarkEnablePermission(): boolean;
+    get hasWatermarkDisablePermission(): boolean;
     get hasEnableStartSharePermission(): boolean;
     get hasAllowWriteBoardPermission(): boolean;
     get hasCloseWriteBoardPermission(): boolean;
@@ -90,7 +106,8 @@ export default class ActionBarStore {
     get hasEndRoomPermission(): boolean;
     get isScreenShareAndBoardEnabled(): boolean;
     get isBoardWriteEnabled(): boolean;
-    get isPstnUser(): boolean;
+    get isWaterMarkEnabled(): boolean;
+    get isMulti(): boolean;
     get cameraEnabled(): boolean;
     get cameraId(): string;
     get cameraList(): import("agora-rte-sdk").AgoraRtcDeviceInfo[];
@@ -100,6 +117,8 @@ export default class ActionBarStore {
     get microphoneList(): import("agora-rte-sdk").AgoraRtcDeviceInfo[];
     get speakerId(): string;
     get speakerList(): import("agora-rte-sdk").AgoraRtcDeviceInfo[];
+    get allNewMessage(): number;
+    get isMainRoom(): boolean;
     pauseCloudRecording(): void;
     resumeCloudRecording(): void;
     stopCloudRecording(): void;
@@ -108,18 +127,22 @@ export default class ActionBarStore {
     showNewMessageTooltip(): void;
     hideNewMessageTooltip(): void;
     switchMenu(value?: MoreMenuType): void;
-    isLocked(): boolean;
+    get isLocked(): boolean;
+    isWaitingRoomEnabled(): boolean;
     enableCamera(enable: boolean): void;
     setCameraId(cameraId: string): void;
     enableMicrophone(enable: boolean): void;
     setMicrophoneId(microphoneId: string): void;
     setSpeakerId(speakerId: string): void;
+    closeSpeaker(): void;
     setAllowBoardWrite(): Promise<void>;
-    setAllowScreenShare(state?: FcrSharePermissionState): Promise<void>;
+    setAllowScreenShare(): Promise<void>;
     closeBoard(): void;
     assignHost(user: FcrUserInfo): void;
     leave(): void;
     keepPhoneAudioConnection(): void;
+    setPopoverOpened(isShow: boolean): void;
+    getRoomType(): FcrRoomType | undefined;
     end(): void;
     release(): void;
     allowJoinWithMuteAudio(): boolean;
@@ -152,17 +175,26 @@ export default class ActionBarStore {
     closeConnection(): void;
     toggleFold(): void;
     setShowArrow(show: boolean): void;
+    setEnableWaitingRoom(enable: boolean, isNeedShowDialog: boolean): Promise<void>;
+    kickOutWaitingRoomAllMember(type: FcrUserKickOutType): Promise<void>;
+    moveToMainRoomAllMember(): Promise<void>;
     private _interceptShareScreen;
     private _interceptShareBoard;
     private _handleRemoteUsersJoined;
     private _handleRemoteUsersLeft;
     private _handleAllUserCountUpdated;
+    private _getWaitingRoomUserCount;
+    private _handleRemoteWaitingUserLeft;
+    private _handleRemoteWaitingUserJoined;
     private _handleUserInfoUpdated;
     private _handleLiveStreamingStateUpdated;
     private _handleNewMessageEvent;
     private _handleChatVisible;
     private _handlerTraceScreenCaptureStateUpdate;
+    setAllowWaterMark(): void;
+    setWaterMarkLineType(lineType: FcrLineType): void;
     private _onEvent;
+    private _operateWaitingRoom;
     private _handleCloudRecordingStateUpdated;
     private _handleStreamsAddedOrUpdated;
 }