fcr-ui-scene 3.7.9-alpha → 3.8.0-alpha

package/lib/modules/action-bar/components/collapse/index.js

@@ -84,7 +84,8 @@ var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.obs
   var appItemOptions = _ref.appItemOptions;
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     isInterpreterEnabled = _useContext.isInterpreterEnabled,
-    hasSecurityPermissions = _useContext.hasSecurityPermissions;
+    hasSecurityPermissions = _useContext.hasSecurityPermissions,
+    isRecordingSupported = _useContext.isRecordingSupported;
   var _useState = (0, _react.useState)(function () {
       return _mobx.observable.map();
     }),
@@ -184,6 +185,14 @@ var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.obs
       });
     };
   };
+  var middleActions = (0, _react.useMemo)(function () {
+    return midActionOrderMap.filter(function (item) {
+      if (item.props.id === 'Record' && !isRecordingSupported) {
+        return false;
+      }
+      return true;
+    });
+  }, [midActionOrderMap, isRecordingSupported]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     ref: ref,
     className: "fcr-action-bar-collapse",
@@ -196,7 +205,7 @@ var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.obs
         collapseList: collapseList,
         setItem: setItem
       },
-      children: midActionOrderMap
+      children: middleActions
     })
   });
 });

package/lib/modules/action-bar/components/item/index.js

@@ -113,8 +113,8 @@ var ActionBarItem = exports.ActionBarItem = function ActionBarItem(props) {
       trigger: "click",
       content: props.submenu.children,
       overlayInnerStyle: {
-        minWidth: '210px',
-        maxWidth: '370px',
+        minWidth: '200px',
+        maxWidth: '280px',
         width: 'fit-content'
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/modules/action-bar/components/screen-share/index.browser.js

@@ -15,6 +15,7 @@ var _store = require("../../main-scene/store.base");
 var _mobxReact = require("mobx-react");
 var _submenu = require("./submenu");
 var _popover = require("agora-ui-foundation/lib/components/popover");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _jsxRuntime = require("react/jsx-runtime");
 var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
@@ -38,25 +39,31 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
     trigger: "click",
     overlayInnerStyle: {
       minWidth: '210px',
-      maxWidth: '370px',
+      maxWidth: '230px',
       width: 'fit-content'
     },
     content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {
       setMenuVisible: setMenuVisible
     }),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
-      active: visibleMenu,
-      disabled: !hasStartScreenSharePermission,
-      id: id,
-      order: order,
-      icon: _type.FcrIconType.FCR_SCREENSHARING,
-      onClick: function onClick() {
-        return setMenuVisible(!visibleMenu);
-      },
-      title: title,
-      iconColors: {
-        iconPrimary: 'var(--fcr_ui_scene_ramp_green6)'
-      }
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+      content: transI18n('fmt_screenshare_only_host_sharing'),
+      mouseEnterDelay: 0,
+      trigger: "hover",
+      disable: hasStartScreenSharePermission,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
+        active: visibleMenu,
+        disabled: !hasStartScreenSharePermission,
+        id: id,
+        order: order,
+        icon: _type.FcrIconType.FCR_SCREENSHARING,
+        onClick: function onClick() {
+          return setMenuVisible(!visibleMenu);
+        },
+        title: title,
+        iconColors: {
+          iconPrimary: 'var(--fcr_ui_scene_ramp_green6)'
+        }
+      })
     })
   });
 });

package/lib/modules/action-bar/components/screen-share/index.electron.js

@@ -16,6 +16,7 @@ var _store = require("../../main-scene/store.base");
 var _mobxReact = require("mobx-react");
 var _fcrCore = require("fcr-core");
 var _submenu = require("./submenu");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _jsxRuntime = require("react/jsx-runtime");
 var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
@@ -23,12 +24,21 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     startScreenShare = _useContext.startScreenShare,
     localUserRole = _useContext.localUserRole,
+    hasEnableStartScreenSharePermission = _useContext.hasEnableStartScreenSharePermission,
     hasStartScreenSharePermission = _useContext.hasStartScreenSharePermission;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     visibleMenu = _useState2[0],
     setMenuVisible = _useState2[1];
   var transI18n = (0, _i18n.useI18n)();
+  var onClick = (0, _react.useCallback)(function () {
+    setMenuVisible(true);
+  }, [setMenuVisible]);
+  var onVisibleChange = (0, _react.useCallback)(function (visible) {
+    if (!visible) {
+      setMenuVisible(false);
+    }
+  }, [setMenuVisible]);
   var submenu = (0, _react.useMemo)(function () {
     if ([_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole)) {
       return {
@@ -36,37 +46,41 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {
           setMenuVisible: setMenuVisible
         }),
-        onClick: function onClick() {
-          setMenuVisible(true);
-        },
-        onVisibleChange: function onVisibleChange(visible) {
-          if (!visible) {
-            setMenuVisible(false);
-          }
-        }
+        onClick: onClick,
+        onVisibleChange: onVisibleChange
       };
     } else {
       return undefined;
     }
-  }, [localUserRole, visibleMenu]);
+  }, [localUserRole, visibleMenu, onClick, onVisibleChange]);
+  var onActionBarClick = (0, _react.useCallback)(function () {
+    return startScreenShare();
+  }, [startScreenShare]);
   var title = transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare');
   (0, _react.useEffect)(function () {
     setMenuVisible(false);
-  }, [hasStartScreenSharePermission]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
-    active: visibleMenu,
-    disabled: !hasStartScreenSharePermission,
-    id: id,
-    order: order,
-    onClick: function onClick() {
-      return startScreenShare();
-    },
-    icon: _type.FcrIconType.FCR_SCREENSHARING,
-    title: title,
-    iconColors: {
+  }, [hasEnableStartScreenSharePermission]);
+  var iconProps = (0, _react.useMemo)(function () {
+    return {
       iconPrimary: 'var(--fcr_ui_scene_ramp_green6)'
-    },
-    moreVisible: visibleMenu,
-    submenu: submenu
+    };
+  }, []);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+    content: transI18n('fmt_screenshare_only_host_sharing'),
+    mouseEnterDelay: 0,
+    trigger: "hover",
+    disable: hasStartScreenSharePermission,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
+      active: visibleMenu,
+      disabled: !hasStartScreenSharePermission,
+      id: id,
+      order: order,
+      onClick: onActionBarClick,
+      icon: _type.FcrIconType.FCR_SCREENSHARING,
+      title: title,
+      iconColors: iconProps,
+      moreVisible: visibleMenu,
+      submenu: submenu
+    })
   });
 });

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

@@ -44,7 +44,6 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function (_ref) {
     openWhiteboard = store.openWhiteboard,
     closeWhiteboard = store.closeWhiteboard,
     startScreenShare = store.startScreenShare,
-    hasStopScreenSharePermission = store.hasStopScreenSharePermission,
     closeShareScreen = store.closeShareScreen,
     checkedStateMap = store.checkedStateMap,
     setCheckedStateMap = store.setCheckedStateMap,
@@ -205,7 +204,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function (_ref) {
   if (hasHostPermission) {
     menus.push.apply(menus, hostMenus);
   }
-  if (canStopOtherBoard || hasStopScreenSharePermission) {
+  if (canStopOtherBoard) {
     menus.push({
       title: '',
       key: '',
@@ -215,9 +214,11 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function (_ref) {
   if (canStopOtherBoard) {
     menus.push.apply(menus, boardControlMenus);
   }
-  if (hasStopScreenSharePermission) {
-    menus.push.apply(menus, shareScreenControlMenus);
-  }
+
+  // if (hasStopScreenSharePermission) {
+  //   menus.push(...shareScreenControlMenus);
+  // }
+
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.FcrDropMenu, {
     className: "share-screen-menu",
     options: menus

package/lib/modules/action-bar/components/security/index.js

@@ -30,8 +30,8 @@ var Security = exports.Security = (0, _mobxReact.observer)(function (_ref) {
         boxShadow: 'var(--fcr_web_light_dropup_m)',
         border: 'none',
         width: 'fit-content',
-        minWidth: 230,
-        maxWidth: 370
+        minWidth: 200,
+        maxWidth: 280
       },
       overlayClassName: 'fcr-secuirty-tooltip',
       onVisibleChange: function onVisibleChange(visible) {

package/lib/modules/action-bar/index.css

@@ -299,9 +299,29 @@ html {
   background: none;
 }
 
+.security-menu .fcr-drop-menu-title {
+  line-height: 32px;
+  display: block;
+}
+
+.security-drop-menu-checkbox .fcr-checkbox {
+  width: 100%;
+  flex-direction: row-reverse;
+  justify-content: space-between;
+}
+
 .security-drop-menu-checkbox .fcr-checkbox-label {
   color: inherit;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
+
+.room-control-options-watermark-title-box .fcr-checkbox-label {
+  display: flex;
+  align-items: center;
+}
+
 .fcr-action-bar-small-end {
   width: 1px;
   height: 1px;
@@ -320,6 +340,12 @@ html {
   font-weight: 700;
 }
 
+.share-screen-menu .fcr-checkbox {
+  width: 100%;
+  flex-direction: row-reverse;
+  justify-content: space-between;
+}
+
 .fcr-drop-menu-option-primary-no-hover:hover {
   background: transparent;
 }

package/lib/modules/action-bar/main-scene/store.base.d.ts

@@ -30,6 +30,7 @@ import { ConnectionTabType } from '../../video-window/type';
 import { FcrUISharedLayoutDataSource } from '../../../shared-data/layout-data';
 import { FcrUIFacilityProvider } from '../../../providers/facility/type';
 import { FcrUIBoardShareProvider } from '../../../providers/board-share/type';
+import { FcrUISharedSettingDataSource } from '../../../shared-data/setting';
 export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManagedObject {
     protected logger: import("agora-foundation/lib/logger").Logger;
     protected _roomProvider: FcrUIRoomProvider;
@@ -58,6 +59,7 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     protected _sharedLayoutDataSource: FcrUISharedLayoutDataSource;
     protected _eventProvider: FcrUIEventProvider;
     protected _facilityProvider: FcrUIFacilityProvider;
+    protected _sharedSettingDataSource: FcrUISharedSettingDataSource;
     private _userObserver;
     private _roomObserver;
     private _mainRoomObserver;
@@ -86,7 +88,7 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     get checkedStateMap(): FcrSecurityCheckedStateType;
     setCheckedStateMap(val: FcrSecurityCheckedStateType): void;
     get registeredWidgetConfigs(): FcrUIWebWidgetConfig[];
-    get appItemOptions(): import("../type").AppItemProps[];
+    get appItemOptions(): import("../../components/apps/types").AppItemProps[];
     get supportedLanguages(): FcrLanguage[];
     get users(): FcrUserInfo[];
     get localUserRole(): FcrUserRole;
@@ -107,9 +109,10 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     get participantsRenderAt(): "aside" | "dialog";
     get participantVisible(): boolean | undefined;
     get chatVisible(): boolean | undefined;
+    get subtitlesHistoryRenderAt(): "aside" | "dialog";
+    get subtitlesHistoryVisible(): boolean | undefined;
     get remoteUsers(): FcrUserInfo[];
     get hasStartScreenSharePermission(): boolean;
-    get hasStopScreenSharePermission(): boolean;
     get hasEnableStartScreenSharePermission(): boolean;
     get hasStartLiveStreamingPermission(): boolean;
     get hasEnableStartAudioPermission(): boolean;
@@ -141,6 +144,7 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     get newMessageCount(): import("../type").ChatRoomStoreMap;
     set newMessageCount(value: import("../type").ChatRoomStoreMap);
     get latestMessage(): import("../../../providers/chat-provider").FcrChatRoomReceiveMessage | undefined;
+    get isRecordingSupported(): boolean;
     get hasSecurityPermissions(): boolean;
     get isMeSharingScreen(): boolean;
     get isBoardActive(): boolean;
@@ -169,12 +173,10 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     setAllowAnnotation(state: boolean): void;
     setAllowScreenShare(state: boolean): void;
     release(): void;
-    allowJoinWithMuteAudio(): boolean;
     setAllowJoinWithMuteAudio(enable: boolean): void;
     isLockRoomEnabled(): boolean;
     setLockRoomEnabled(enable: boolean): void;
     setAllowShareScreen(enable: boolean): void;
-    allowShareScreen(): boolean;
     allowWriteBoard(): boolean;
     allowChat(): boolean;
     setAllowChat(enable: boolean): void;

package/lib/modules/action-bar/main-scene/store.base.js

@@ -189,6 +189,7 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
     this._widgetProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
     this._sharedSecurityDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SECURITY_DATA_SOURCE);
     this._sharedScreenShareSharedDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SCREEN_SHARE_DATA_SOURCE);
+    this._sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
     this._abilityProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ABILITY_PROVIDER);
     this._applistProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_APPLIST_PROVIDER);
     this._facilityProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_FACILITY_PROVIDER);
@@ -484,6 +485,16 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
     get: function get() {
       return this._sharedLayoutDataSource.asideLayout.chat;
     }
+  }, {
+    key: "subtitlesHistoryRenderAt",
+    get: function get() {
+      return this._sharedLayoutDataSource.subtitlesHistoryRenderAt;
+    }
+  }, {
+    key: "subtitlesHistoryVisible",
+    get: function get() {
+      return this._sharedLayoutDataSource.asideLayout.subtitlesHistory;
+    }
   }, {
     key: "remoteUsers",
     get: function get() {
@@ -494,22 +505,10 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
     get: function get() {
       return this._privilegeProvider.hasStartScreenSharePermission();
     }
-  }, {
-    key: "hasStopScreenSharePermission",
-    get: function get() {
-      return false;
-      // this.hasScreenShare && this.hasEnableStartScreenSharePermission
-      // &&
-      // this.sharingOwnerUser &&
-      // this.localUserId !== this.sharingOwnerUser?.userId
-    }
   }, {
     key: "hasEnableStartScreenSharePermission",
     get: function get() {
-      // return this._privilegeProvider.hasStopScreenSharePermission(
-      //   this.sharingOwnerUser?.userRole as FcrUserRole,
-      // );
-      return false;
+      return this.privilegeProvider.hasEnableStartScreenSharePermission();
     }
   }, {
     key: "hasStartLiveStreamingPermission",
@@ -544,7 +543,7 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
   }, {
     key: "hasWaitingRoomPermission",
     get: function get() {
-      return this._privilegeProvider.hasWaitingRoomPermission();
+      return this._privilegeProvider.hasEnableWaitingRoomPermission();
     }
   }, {
     key: "hasWatermarkEnablePermission",
@@ -594,12 +593,12 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
   }, {
     key: "isScreenShareAndBoardEnabled",
     get: function get() {
-      return this._privilegeProvider.allowScreenShareAndBoard();
+      return this._privilegeProvider.isShareScreenAllowed();
     }
   }, {
     key: "isBoardWriteEnabled",
     get: function get() {
-      return this._privilegeProvider.allowBoardWriteState();
+      return this._privilegeProvider.isBoardWriteAllowed();
     }
   }, {
     key: "isWaterMarkEnabled",
@@ -609,7 +608,7 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
   }, {
     key: "isMulti",
     get: function get() {
-      return this._privilegeProvider.isMulti();
+      return this._privilegeProvider.isMultiWaterMarkEnabled();
     }
   }, {
     key: "hasEnableInterpreterPermission",
@@ -661,6 +660,11 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
     get: function get() {
       return this._sharedChatDataSource.latestMessage;
     }
+  }, {
+    key: "isRecordingSupported",
+    get: function get() {
+      return this._abilityProvider.isRecordingSupported();
+    }
   }, {
     key: "hasSecurityPermissions",
     get: function get() {
@@ -776,7 +780,7 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
   }, {
     key: "isAllowJoinWithAudioEnabled",
     value: function isAllowJoinWithAudioEnabled() {
-      return this._privilegeProvider.allowJoinWithMuteAudio();
+      return this._privilegeProvider.isJoinWithMutedAudioEnabled();
     }
   }, {
     key: "enableMicrophone",
@@ -787,17 +791,17 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
   }, {
     key: "setAllowWriteBoard",
     value: function setAllowWriteBoard(state) {
-      this._privilegeProvider.setAllowWriteBoard(state);
+      this._privilegeProvider.allowWriteBoard(state);
     }
   }, {
     key: "setAllowAnnotation",
     value: function setAllowAnnotation(state) {
-      this._privilegeProvider.setAllowWriteBoard(state);
+      this._privilegeProvider.allowWriteBoard(state);
     }
   }, {
     key: "setAllowScreenShare",
     value: function setAllowScreenShare(state) {
-      this._privilegeProvider.setAllowShareScreen(state);
+      this._privilegeProvider.allowShareAndWrite(state);
     }
   }, {
     key: "release",
@@ -818,15 +822,10 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
         (_this$_interpreterPro = this._interpreterProvider) === null || _this$_interpreterPro === void 0 || _this$_interpreterPro.removeObserver(this._interpreterProviderObserver);
       }
     }
-  }, {
-    key: "allowJoinWithMuteAudio",
-    value: function allowJoinWithMuteAudio() {
-      return this._privilegeProvider.allowJoinWithMuteAudio();
-    }
   }, {
     key: "setAllowJoinWithMuteAudio",
     value: function setAllowJoinWithMuteAudio(enable) {
-      return this._privilegeProvider.setAllowJoinWithMuteAudio(enable);
+      return this._privilegeProvider.allowJoinWithMutedAudio(enable);
     }
   }, {
     key: "isLockRoomEnabled",
@@ -836,27 +835,22 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
   }, {
     key: "setLockRoomEnabled",
     value: function setLockRoomEnabled(enable) {
-      return this._privilegeProvider.setLockRoomEnabled(enable);
+      return this._privilegeProvider.enableLockedRoom(enable);
     }
   }, {
     key: "setAllowShareScreen",
     value: function setAllowShareScreen(enable) {
-      return this._privilegeProvider.setAllowShareScreen(enable);
-    }
-  }, {
-    key: "allowShareScreen",
-    value: function allowShareScreen() {
-      return this._privilegeProvider.allowShareScreen();
+      return this._privilegeProvider.allowShareAndWrite(enable);
     }
   }, {
     key: "allowWriteBoard",
     value: function allowWriteBoard() {
-      return this._privilegeProvider.hasAllowWriteBoardPermission();
+      return this._privilegeProvider.isBoardWriteAllowed();
     }
   }, {
     key: "allowChat",
     value: function allowChat() {
-      return this._privilegeProvider.allowChat();
+      return this._privilegeProvider.isChatAllowed();
     }
   }, {
     key: "setAllowChat",
@@ -866,32 +860,32 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
   }, {
     key: "allowUnmuteSelfAudio",
     value: function allowUnmuteSelfAudio() {
-      return this._privilegeProvider.allowUnmuteSelfAudio();
+      return this._privilegeProvider.isUnmuteSelfAudioAllowed();
     }
   }, {
     key: "setAllowUnmuteSelfAudio",
     value: function setAllowUnmuteSelfAudio(enable) {
-      return this._privilegeProvider.setAllowUnmuteSelfAudio(enable);
+      return this._privilegeProvider.allowStartAudio(enable);
     }
   }, {
     key: "allowUnmuteSelfVideo",
     value: function allowUnmuteSelfVideo() {
-      return this._privilegeProvider.allowUnmuteSelfVideo();
+      return this._privilegeProvider.isUnmuteSelfVideoAllowed();
     }
   }, {
     key: "setAllowUnmuteSelfVideo",
     value: function setAllowUnmuteSelfVideo(enable) {
-      return this._privilegeProvider.setAllowUnmuteSelfVideo(enable);
+      return this._privilegeProvider.allowStartVideo(enable);
     }
   }, {
     key: "allowChangeName",
     value: function allowChangeName() {
-      return this._privilegeProvider.allowChangeSelfName();
+      return this._privilegeProvider.isChangeSelfNameAllowed();
     }
   }, {
     key: "setAllowChangeName",
     value: function setAllowChangeName(enable) {
-      return this._privilegeProvider.setAllowChangeSelfName(enable);
+      return this._privilegeProvider.allowChangeUserName(enable);
     }
   }, {
     key: "toggleChat",
@@ -956,6 +950,7 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
     key: "openDeviceSettingDialog",
     value: function openDeviceSettingDialog(config) {
       this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SETTINGS, config);
+      this._sharedSettingDataSource.setDialogConfig(config);
     }
   }, {
     key: "startScreenShare",
@@ -1290,17 +1285,17 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
     value: function setAllowWaterMark() {
       var allowState = !this.isWaterMarkEnabled;
       // 开启关闭前,进行权限判断
-      this._privilegeProvider.setAllowWaterMark(allowState, void 0);
+      this._privilegeProvider.allowWatermark(allowState, void 0);
     }
   }, {
     key: "setWaterMarkLineType",
     value: function setWaterMarkLineType(lineType) {
-      this._privilegeProvider.setAllowWaterMark(this.isWaterMarkEnabled, lineType);
+      this._privilegeProvider.allowWatermark(this.isWaterMarkEnabled, lineType);
     }
   }, {
     key: "setAlllowChangeName",
     value: function setAlllowChangeName(enable) {
-      this._privilegeProvider.setAllowChangeSelfName(enable);
+      this._privilegeProvider.allowChangeUserName(enable);
     }
   }, {
     key: "_handleDialogOpen",
@@ -1507,7 +1502,7 @@ var ActionBarMainSceneStoreBase = exports.ActionBarMainSceneStoreBase = /*#__PUR
   }]);
 }();
 _ActionBarMainSceneStoreBase = ActionBarMainSceneStoreBase;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ActionBarMainSceneStoreBase, [[_mobx.observable, 1, "newMessageTooltipVisible"], [_mobx.observable, 1, "totalWaitingRoomUser"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "currentMenuIs"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "connectionSettingVisible"], [_mobx.observable, 1, "folded"], [_mobx.observable, 1, "showArrow"], [_mobx.observable, 1, "phoneMicEnabled"], [_mobx.observable, 1, "chatTabIndex"], [_mobx.observable, 1, "hasOfflineUserExistence"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "appActionbarPopoverVisible"], [_mobx.observable, 1, "stateBarLeaveMeeting"], [_mobx.computed, 3, "endMeetingPopoverOpened"], [_mobx.computed, 3, "checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"], [_mobx.computed, 3, "registeredWidgetConfigs"], [_mobx.computed, 3, "asideLayout"], [_mobx.computed, 3, "chatRenderAt"], [_mobx.computed, 3, "participantsRenderAt"], [_mobx.computed, 3, "participantVisible"], [_mobx.computed, 3, "chatVisible"], [_mobx.computed, 3, "hasStartScreenSharePermission"], [_mobx.computed, 3, "hasStopScreenSharePermission"], [_mobx.computed, 3, "hasEnableStartScreenSharePermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasEnableStartAudioPermission"], [_mobx.computed, 3, "hasEnableChangeNamePermission"], [_mobx.computed, 3, "hasEnableStartVideoPermission"], [_mobx.computed, 3, "hasLockRoomPermission"], [_mobx.computed, 3, "hasEnableJoinWithAudioPermission"], [_mobx.computed, 3, "hasWaitingRoomPermission"], [_mobx.computed, 3, "hasWatermarkDisablePermission"], [_mobx.computed, 3, "hasEnableStartSharePermission"], [_mobx.computed, 3, "hasAllowWriteBoardPermission"], [_mobx.computed, 3, "hasAllowScreenShareAndBoardPermission"], [_mobx.computed, 3, "hasAllowChatPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "isScreenShareAndBoardEnabled"], [_mobx.computed, 3, "isBoardWriteEnabled"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_mobx.computed, 3, "hasEnableInterpreterPermission"], [_mobx.computed, 3, "hasDisableInterpreterPermission"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "allNewMessage"], [_mobx.computed, 3, "isMainRoom"], [_mobx.computed, 3, "hasAllowChangeNamePromission"], [_mobx.computed, 3, "hasDisallowChangeNamePromission"], [_mobx.computed, 3, "newMessageCount"], [_mobx.computed, 3, "isRemoteUserScreenSharing"], [_mobx.computed, 3, "isLocalUserScreenSharing"], [_setStateBarLeaveMeetingDecs, 18, "setStateBarLeaveMeeting"], [_setPopoverOpenedDecs, 18, "setPopoverOpened"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_showLockedRoomToastDecs, 18, "showLockedRoomToast"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_showNewMessageTooltipDecs, 18, "showNewMessageTooltip"], [_hideNewMessageTooltipDecs, 18, "hideNewMessageTooltip"], [_switchMenuDecs, 18, "switchMenu"], [_mobx.computed, 3, "isLocked"], [_decorator.bound, 2, "isWaitingRoomEnabled"], [_decorator.bound, 2, "isAllowJoinWithAudioEnabled"], [_decorator.bound, 2, "enableMicrophone"], [_decorator.bound, 2, "setAllowWriteBoard"], [_decorator.bound, 2, "setAllowAnnotation"], [_decorator.bound, 2, "setAllowScreenShare"], [_decorator.bound, 2, "allowJoinWithMuteAudio"], [_decorator.bound, 2, "setAllowJoinWithMuteAudio"], [_decorator.bound, 2, "isLockRoomEnabled"], [_decorator.bound, 2, "setLockRoomEnabled"], [_decorator.bound, 2, "setAllowShareScreen"], [_decorator.bound, 2, "allowShareScreen"], [_decorator.bound, 2, "allowWriteBoard"], [_decorator.bound, 2, "allowChat"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "allowUnmuteSelfAudio"], [_decorator.bound, 2, "setAllowUnmuteSelfAudio"], [_decorator.bound, 2, "allowUnmuteSelfVideo"], [_decorator.bound, 2, "setAllowUnmuteSelfVideo"], [_decorator.bound, 2, "allowChangeName"], [_decorator.bound, 2, "toggleChat"], [_decorator.bound, 2, "openChat"], [_decorator.bound, 2, "closeChat"], [_decorator.bound, 2, "toggleParticipants"], [_decorator.bound, 2, "openParticipants"], [_decorator.bound, 2, "closeParticipants"], [_decorator.bound, 2, "openDeviceSettingDialog"], [_decorator.bound, 2, "startScreenShare"], [_decorator.bound, 2, "openInterpreterDialog"], [_decorator.bound, 2, "openWhiteboard"], [_decorator.bound, 2, "closeWhiteboard"], [_decorator.bound, 2, "closeShareScreen"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_decorator.bound, 2, "toggleConnection"], [_decorator.bound, 2, "openConnection"], [_decorator.bound, 2, "closeConnection"], [_handleJoinWaitingRoomDecs, 18, "_handleJoinWaitingRoom"], [_toggleFoldDecs, 18, "toggleFold"], [_setShowArrowDecs, 18, "setShowArrow"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_kickOutWaitingRoomAllMemberDecs, 18, "kickOutWaitingRoomAllMember"], [_moveToMainRoomAllMemberDecs, 18, "moveToMainRoomAllMember"], [_decorator.bound, 2, "_interceptShareScreen"], [_decorator.bound, 2, "_interceptShareBoard"], [_handleRemoteUsersJoinedDecs, 18, "_handleRemoteUsersJoined"], [_handleRemoteUsersLeftDecs, 18, "_handleRemoteUsersLeft"], [_handleLiveStreamingStateUpdatedDecs, 18, "_handleLiveStreamingStateUpdated"], [_handleChatVisibleDecs, 18, "_handleChatVisible"], [_setAppActionbarPopoverVisibleDecs, 18, "setAppActionbarPopoverVisible"], [_decorator.bound, 2, "setAllowWaterMark"], [_decorator.bound, 2, "setWaterMarkLineType"], [_decorator.bound, 2, "setAlllowChangeName"], [_decorator.bound, 2, "_handleDialogOpen"], [_decorator.bound, 2, "_handleDialogClose"], [_decorator.bound, 2, "_onEvent"], [_operateWaitingRoomDecs, 18, "_operateWaitingRoom"], [_handleCloudRecordingStateUpdatedDecs, 18, "_handleCloudRecordingStateUpdated"], [_setOutputLanguageDecs, 18, "setOutputLanguage"], [_setEndMeetingPopoverOpenedDecs, 18, "setEndMeetingPopoverOpened"], [_subscribeLanguageDecs, 18, "subscribeLanguage"], [_subscribeExtraOriginLanguageDecs, 18, "subscribeExtraOriginLanguage"], [_getOfflineUserExistenceStateDecs, 18, "getOfflineUserExistenceState"], [_clickWidgetDecs, 18, "clickWidget"], [_closeWidgetDecs, 18, "closeWidget"]], []).e, 15);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ActionBarMainSceneStoreBase, [[_mobx.observable, 1, "newMessageTooltipVisible"], [_mobx.observable, 1, "totalWaitingRoomUser"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "currentMenuIs"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "connectionSettingVisible"], [_mobx.observable, 1, "folded"], [_mobx.observable, 1, "showArrow"], [_mobx.observable, 1, "phoneMicEnabled"], [_mobx.observable, 1, "chatTabIndex"], [_mobx.observable, 1, "hasOfflineUserExistence"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "appActionbarPopoverVisible"], [_mobx.observable, 1, "stateBarLeaveMeeting"], [_mobx.computed, 3, "endMeetingPopoverOpened"], [_mobx.computed, 3, "checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"], [_mobx.computed, 3, "registeredWidgetConfigs"], [_mobx.computed, 3, "asideLayout"], [_mobx.computed, 3, "chatRenderAt"], [_mobx.computed, 3, "participantsRenderAt"], [_mobx.computed, 3, "participantVisible"], [_mobx.computed, 3, "chatVisible"], [_mobx.computed, 3, "subtitlesHistoryRenderAt"], [_mobx.computed, 3, "subtitlesHistoryVisible"], [_mobx.computed, 3, "hasStartScreenSharePermission"], [_mobx.computed, 3, "hasEnableStartScreenSharePermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasEnableStartAudioPermission"], [_mobx.computed, 3, "hasEnableChangeNamePermission"], [_mobx.computed, 3, "hasEnableStartVideoPermission"], [_mobx.computed, 3, "hasLockRoomPermission"], [_mobx.computed, 3, "hasEnableJoinWithAudioPermission"], [_mobx.computed, 3, "hasWaitingRoomPermission"], [_mobx.computed, 3, "hasWatermarkDisablePermission"], [_mobx.computed, 3, "hasEnableStartSharePermission"], [_mobx.computed, 3, "hasAllowWriteBoardPermission"], [_mobx.computed, 3, "hasAllowScreenShareAndBoardPermission"], [_mobx.computed, 3, "hasAllowChatPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "isScreenShareAndBoardEnabled"], [_mobx.computed, 3, "isBoardWriteEnabled"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_mobx.computed, 3, "hasEnableInterpreterPermission"], [_mobx.computed, 3, "hasDisableInterpreterPermission"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "allNewMessage"], [_mobx.computed, 3, "isMainRoom"], [_mobx.computed, 3, "hasAllowChangeNamePromission"], [_mobx.computed, 3, "hasDisallowChangeNamePromission"], [_mobx.computed, 3, "newMessageCount"], [_mobx.computed, 3, "isRemoteUserScreenSharing"], [_mobx.computed, 3, "isLocalUserScreenSharing"], [_setStateBarLeaveMeetingDecs, 18, "setStateBarLeaveMeeting"], [_setPopoverOpenedDecs, 18, "setPopoverOpened"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_showLockedRoomToastDecs, 18, "showLockedRoomToast"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_showNewMessageTooltipDecs, 18, "showNewMessageTooltip"], [_hideNewMessageTooltipDecs, 18, "hideNewMessageTooltip"], [_switchMenuDecs, 18, "switchMenu"], [_mobx.computed, 3, "isLocked"], [_decorator.bound, 2, "isWaitingRoomEnabled"], [_decorator.bound, 2, "isAllowJoinWithAudioEnabled"], [_decorator.bound, 2, "enableMicrophone"], [_decorator.bound, 2, "setAllowWriteBoard"], [_decorator.bound, 2, "setAllowAnnotation"], [_decorator.bound, 2, "setAllowScreenShare"], [_decorator.bound, 2, "setAllowJoinWithMuteAudio"], [_decorator.bound, 2, "isLockRoomEnabled"], [_decorator.bound, 2, "setLockRoomEnabled"], [_decorator.bound, 2, "setAllowShareScreen"], [_decorator.bound, 2, "allowWriteBoard"], [_decorator.bound, 2, "allowChat"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "allowUnmuteSelfAudio"], [_decorator.bound, 2, "setAllowUnmuteSelfAudio"], [_decorator.bound, 2, "allowUnmuteSelfVideo"], [_decorator.bound, 2, "setAllowUnmuteSelfVideo"], [_decorator.bound, 2, "allowChangeName"], [_decorator.bound, 2, "toggleChat"], [_decorator.bound, 2, "openChat"], [_decorator.bound, 2, "closeChat"], [_decorator.bound, 2, "toggleParticipants"], [_decorator.bound, 2, "openParticipants"], [_decorator.bound, 2, "closeParticipants"], [_decorator.bound, 2, "openDeviceSettingDialog"], [_decorator.bound, 2, "startScreenShare"], [_decorator.bound, 2, "openInterpreterDialog"], [_decorator.bound, 2, "openWhiteboard"], [_decorator.bound, 2, "closeWhiteboard"], [_decorator.bound, 2, "closeShareScreen"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_decorator.bound, 2, "toggleConnection"], [_decorator.bound, 2, "openConnection"], [_decorator.bound, 2, "closeConnection"], [_handleJoinWaitingRoomDecs, 18, "_handleJoinWaitingRoom"], [_toggleFoldDecs, 18, "toggleFold"], [_setShowArrowDecs, 18, "setShowArrow"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_kickOutWaitingRoomAllMemberDecs, 18, "kickOutWaitingRoomAllMember"], [_moveToMainRoomAllMemberDecs, 18, "moveToMainRoomAllMember"], [_decorator.bound, 2, "_interceptShareScreen"], [_decorator.bound, 2, "_interceptShareBoard"], [_handleRemoteUsersJoinedDecs, 18, "_handleRemoteUsersJoined"], [_handleRemoteUsersLeftDecs, 18, "_handleRemoteUsersLeft"], [_handleLiveStreamingStateUpdatedDecs, 18, "_handleLiveStreamingStateUpdated"], [_handleChatVisibleDecs, 18, "_handleChatVisible"], [_setAppActionbarPopoverVisibleDecs, 18, "setAppActionbarPopoverVisible"], [_decorator.bound, 2, "setAllowWaterMark"], [_decorator.bound, 2, "setWaterMarkLineType"], [_decorator.bound, 2, "setAlllowChangeName"], [_decorator.bound, 2, "_handleDialogOpen"], [_decorator.bound, 2, "_handleDialogClose"], [_decorator.bound, 2, "_onEvent"], [_operateWaitingRoomDecs, 18, "_operateWaitingRoom"], [_handleCloudRecordingStateUpdatedDecs, 18, "_handleCloudRecordingStateUpdated"], [_setOutputLanguageDecs, 18, "setOutputLanguage"], [_setEndMeetingPopoverOpenedDecs, 18, "setEndMeetingPopoverOpened"], [_subscribeLanguageDecs, 18, "subscribeLanguage"], [_subscribeExtraOriginLanguageDecs, 18, "subscribeExtraOriginLanguage"], [_getOfflineUserExistenceStateDecs, 18, "getOfflineUserExistenceState"], [_clickWidgetDecs, 18, "clickWidget"], [_closeWidgetDecs, 18, "closeWidget"]], []).e, 15);
 _init_newMessageTooltipVisible = _applyDecs$e[0];
 _init_totalWaitingRoomUser = _applyDecs$e[1];
 _init_liveStreamingState = _applyDecs$e[2];

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

@@ -1,10 +1,8 @@
 import { FcrIconProps } from 'agora-ui-foundation/lib/components/icon';
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
 import { PopoverProps } from 'agora-ui-foundation/lib/components/popover';
-import { ToolTipProps } from 'agora-ui-foundation/lib/components/tooltip';
 import { FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
 import { FcrUIRoomType } from '../../type';
-import { GenerateI18nKey } from 'agora-ui-foundation/lib/i18n';
 import { FcrUIObjectManager } from '../../object-manager';
 export interface Item {
     name: string;
@@ -30,14 +28,6 @@ export interface ActionBarItemProps extends React.ComponentProps<'div'> {
 export interface ActionBarItemWithPopoverProps extends ActionBarItemProps {
     popoverProps?: PopoverProps;
 }
-export interface AppItemProps {
-    name: GenerateI18nKey<I18nResouceTypes>;
-    onClick: () => void;
-    fcrToolTipProps?: ToolTipProps;
-    fcrIconProps?: FcrIconProps;
-    permission: boolean;
-    imgSrc?: string;
-}
 export interface AppListPorps {
     onAppClick?: () => void;
 }

package/lib/modules/audio-stream/index.d.ts

@@ -32,6 +32,6 @@ export declare class AudioStreamUIModule extends UIModule {
     private _handleLeaveInterpretingRoom;
     private _createStreamObserver;
     private _clearTimer;
-    private _setMainRoomVolume;
+    private _setMainRoomStreamVolume;
     private _restoreVolumeByMainRoom;
 }