fcr-ui-scene 3.4.2 → 3.4.3

package/lib/fragments/control-bar/more-actions/index.js

@@ -1,6 +1,7 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -22,10 +23,12 @@ var _react = require("react");
 var _constant = require("../../../utilities/constant");
 var _context = require("../context");
 require("./index.css");
-var _type2 = require("agora-edu-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _copyText = require("../../../utilities/copyText");
 var _toast = require("agora-ui-foundation/lib/components/toast");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _leaveMeeting = require("../../../modules/action-bar/leave/leave-meeting");
 var _jsxRuntime = require("react/jsx-runtime");
 var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(function (props) {
   var ref = (0, _react.useRef)(null);
@@ -41,7 +44,18 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
     hasStartCloudRecordingPermission = _useContext.hasStartCloudRecordingPermission,
     hasStartLiveStreamingPermission = _useContext.hasStartLiveStreamingPermission,
     hasGetLiveStreamingUrlPermission = _useContext.hasGetLiveStreamingUrlPermission,
-    hasStopLiveStreamingPermission = _useContext.hasStopLiveStreamingPermission;
+    hasStopLiveStreamingPermission = _useContext.hasStopLiveStreamingPermission,
+    setShowMeetingDetailPortal = _useContext.setShowMeetingDetailPortal,
+    setMeetingDetailPortalPosition = _useContext.setMeetingDetailPortalPosition,
+    localUserRole = _useContext.localUserRole,
+    hasAssignHostBeforeLeavingPermission = _useContext.hasAssignHostBeforeLeavingPermission,
+    isPstnUser = _useContext.isPstnUser,
+    remoteUsers = _useContext.remoteUsers,
+    hasEndRoomPermission = _useContext.hasEndRoomPermission,
+    sendLeave = _useContext.sendLeave,
+    sendEnd = _useContext.sendEnd,
+    keepPhoneAudioConnection = _useContext.keepPhoneAudioConnection,
+    sendAssign = _useContext.sendAssign;
   var transI18n = (0, _i18n.useI18n)();
   var onItemClick = function onItemClick(item) {
     if (item.onClick) {
@@ -75,6 +89,7 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
           children: transI18n('fmt_popup_button_endmeeting')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
           size: "S",
+          type: "secondary-bordered",
           onClick: function onClick() {
             _dialog.FcrDialogApi.close('leave-room');
             window.runtime.browserWindow.setIgnoreMouseEvents(true, {
@@ -85,6 +100,7 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
           children: transI18n('fmt_popup_button_leavemeeting')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
           size: "S",
+          type: "secondary-bordered",
           onClick: function onClick() {
             window.runtime.browserWindow.setIgnoreMouseEvents(true, {
               forward: true
@@ -121,11 +137,15 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
       })]
     });
   };
+
+  // 分割线
   var moreOptions = [{
+    icon: _type.FcrIconType.FCR_WEB_CHAT,
     text: transI18n('fmt_chat_label_chat'),
     displayWhenNoPermission: 'hidden',
     key: _constant.RendererEventAction.OPEN_CHAT,
-    hasPermission: hasChatPermission
+    hasPermission: hasChatPermission,
+    classNames: 'share-action-nav__media-list-item-with-divider'
   }, {
     icon: _type.FcrIconType.FCR_EMO,
     text: transI18n('fmt_popup_label_expression'),
@@ -133,6 +153,8 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
     key: 'emoji',
     hasPermission: false
   }, {
+    icon: _type.FcrIconType.FCR_CLOUDRECORD,
+    classNames: 'share-action-nav__media-list-item-with-divider',
     text: transI18n('fmt_screenshare_controlbar_button_more_cloudRecord'),
     displayWhenNoPermission: 'hidden',
     key: cloudRecordingState === _type2.FcrRecordingState.Stopped ? _constant.RendererEventAction.CLOUD_RECORDING_START : _constant.RendererEventAction.CLOUD_RECORDING_STOP,
@@ -147,6 +169,7 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
   //     hasStartCloudRecordingPermission && cloudRecordingState === FcrRecordingState.Stopped,
   // },
   {
+    classNames: 'share-action-nav__media-list-item-with-divider',
     icon: _type.FcrIconType.FCR_LIVE,
     text: transI18n('fmt_screenshare_controlbar_button_more_live'),
     displayWhenNoPermission: 'hidden',
@@ -158,14 +181,29 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
       });
       handleMoreClick(_constant.RendererEventAction.OPEN_LIVE_STEAMING_DIALOG);
     }
+  }, {
+    icon: _type.FcrIconType.FCR_EXCLAMATIONMASK,
+    text: transI18n('fmt_popup_button_meetinginfor'),
+    classNames: 'share-action-nav__media-list-item-with-divider',
+    displayWhenNoPermission: 'hidden',
+    key: 'copyMeetingInfo',
+    hasPermission: true,
+    onClick: function onClick() {
+      closePopover();
+      var currentPopoverPosition = document.getElementsByClassName('share-action-nav__popover')[0].getBoundingClientRect();
+      setMeetingDetailPortalPosition(currentPopoverPosition.x || 0, currentPopoverPosition.y || 0);
+      setShowMeetingDetailPortal(true);
+    }
   }, {
     icon: _type.FcrIconType.FCR_SETTING,
+    classNames: 'share-action-nav__media-list-item-with-divider',
     text: transI18n('fmt_screenshare_controlbar_button_more_setting'),
     displayWhenNoPermission: 'hidden',
     key: _constant.RendererEventAction.OPEN_SETTING,
     hasPermission: true
   }, {
     icon: _type.FcrIconType.FCR_ATTACH,
+    classNames: 'share-action-nav__media-list-item-with-divider',
     text: transI18n('fmt_live_label_copylink'),
     displayWhenNoPermission: 'hidden',
     key: 'copyLiveLink',
@@ -182,43 +220,40 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
       });
     }
   }, {
-    icon: _type.FcrIconType.FCR_ATTACH,
-    text: transI18n('fmt_popup_button_meetinginfor'),
-    displayWhenNoPermission: 'hidden',
-    key: 'copyMeetingInfo',
-    hasPermission: false,
+    icon: _type.FcrIconType.FCR_ENDMEETING,
+    key: _constant.RendererEventAction.LEAVE_ROOM,
+    classNames: 'share-action-nav__popover-inner-content-leave-option',
+    text: isHost ? transI18n('fmt_popup_button_endmeeting') : transI18n('fmt_popup_button_leavemeeting'),
+    hasPermission: true,
     onClick: function onClick() {
-      closePopover();
-      (0, _copyText.copyText)('TODO 会议信息').then(function () {
-        _toast.FcrToastApi.open({
-          id: 'copy-live-link',
-          toastProps: {
-            type: 'info',
-            content: transI18n('fmt_statusbar_status_coppied')
-          }
-        });
+      window.runtime.browserWindow.setIgnoreMouseEvents(false);
+      _dialog.FcrDialogApi.info({
+        id: 'leave-room',
+        dialogProps: {
+          content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_leaveMeeting.LeaveMeeting, {
+            setPopoverOpened: function setPopoverOpened(value) {
+              if (!value) {
+                _dialog.FcrDialogApi.close('leave-room');
+              }
+            },
+            localUserRole: localUserRole,
+            leave: sendLeave,
+            isLocked: false,
+            hasAssignHostBeforeLeavingPermission: hasAssignHostBeforeLeavingPermission,
+            hasEndRoomPermission: hasEndRoomPermission,
+            keepPhoneAudioConnection: keepPhoneAudioConnection,
+            isPstnUser: isPstnUser,
+            remoteUsers: remoteUsers,
+            end: sendEnd,
+            assignHost: sendAssign
+          }),
+          width: 255,
+          closable: false,
+          rootClassName: 'leave-room-dialog'
+        }
       });
     }
-  }
-  // {
-  //   icon: FcrIconType.FCR_ENDMEETING,
-  //   key: RendererEventAction.LEAVE_ROOM,
-  //   text: isHost ? '结束会议' : '离开会议',
-  //   hasPermission: true,
-  //   onClick: () => {
-  //     window.runtime.browserWindow.setIgnoreMouseEvents(false);
-  //     FcrDialogApi.info({
-  //       id: 'leave-room',
-  //       dialogProps: {
-  //         content: <LeaveRoomContent />,
-  //         width: 256,
-  //         closable: false,
-  //         rootClassName: 'leave-room-dialog',
-  //       },
-  //     });
-  //   },
-  // },
-  ];
+  }];
   (0, _react.useEffect)(function () {
     function handleClickOutside(event) {
       if (ref.current && !ref.current.contains(event.target)) {
@@ -239,7 +274,7 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
     className: "share-action-nav__popover-inner-content share-action-nav__not-draggable",
     children: moreOptionsFilter.map(function (item, index) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "share-action-nav__media-list-group",
+        className: (0, _classnames["default"])('share-action-nav__media-list-group', item.classNames),
         onClick: function onClick(e) {
           e.stopPropagation();
           onItemClick(item);

package/lib/fragments/control-bar/security-content/index.css

@@ -8,6 +8,7 @@
 }
 .security-content .fcr-drop-menu-title {
   text-align: left;
+  font-size: 500;
 }
 .security-content .fcr-checkbox-inner {
   background-color: transparent;
@@ -21,4 +22,78 @@
 .security-content .fcr-checkbox-label {
   display: inline-block;
   flex: 1;
+  font-weight: 500;
+}
+
+.security-content .fcr-checkbox path {
+  fill: var(--fcr_ui_scene_mainicon1);
+}
+
+.fcr-drop-menu-option-primary:hover path {
+  fill: var(--fcr_ui_scene_ramp_brand6);
+}
+
+.room-control-options-box {
+  display: flex;
+  justify-content: space-between;
+}
+.room-control-options-box .fcr-checkbox {
+  width: fit-content;
+}
+
+.room-control-options-watermark-btns {
+  min-width: 104px;
+  height: 24px;
+  display: flex;
+  background-color: var(--fcr_mobile_ui_scene_fill1);
+  align-items: center;
+  padding: 2px;
+}
+
+.room-control-options-watermark-btn {
+  min-width: 50px;
+  height: 20px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: var(--fcr_ui_scene_icontext1);
+  font-size: 12px;
+  background-color: transparent;
+  padding: 0px 4px;
+  width: auto !important;
+}
+
+.security-content-more-dropdown .fcr-tooltip-inner {
+  min-width: 302px !important;
+  width: auto !important;
+}
+
+.security-content-more-dropdown .fcr-drop-menu-option {
+  width: auto !important;
+}
+
+.room-control-options-watermark-btn--active {
+  background-color: #ffffff;
+  color: var(--fcr_ui_scene_ramp_brand6);
+}
+
+.room-control-options-watermark-title-box {
+  display: flex;
+  align-items: center;
+  font-size: 13px;
+}
+
+.room-control-drop-with-under-line::after {
+  content: '';
+  position: absolute;
+  left: -10px;
+  right: -10px;
+  bottom: -12px;
+  border-top: 1px solid var(--fcr_ui_scene_line1);
+  margin: 8px 0;
+}
+
+.room-control-drop-disable {
+  opacity: 0.5;
+  cursor: not-allowed;
 }

package/lib/fragments/control-bar/security-content/index.js

@@ -17,6 +17,10 @@ var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 require("./index.css");
 var _mobxReact = require("mobx-react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _type = require("fcr-core/lib/type");
+var _icon = require("agora-ui-foundation/lib/components/icon");
+var _type2 = require("agora-ui-foundation/lib/components/icon/type");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _jsxRuntime = require("react/jsx-runtime");
 var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_context.StoreContext),
@@ -24,6 +28,8 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
     isLockRoomEnabled = _useContext.isLockRoomEnabled,
     allowShareScreen = _useContext.allowShareScreen,
     updateAllowShareScreen = _useContext.updateAllowShareScreen,
+    allowBoardWrite = _useContext.allowBoardWrite,
+    updateBoardWriteEnabled = _useContext.updateBoardWriteEnabled,
     allowChat = _useContext.allowChat,
     updateAllowChat = _useContext.updateAllowChat,
     allowUnmuteSelfAudio = _useContext.allowUnmuteSelfAudio,
@@ -35,9 +41,23 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
     hasEnableStartAudioPermission = _useContext.hasEnableStartAudioPermission,
     hasEnableChangeNamePermission = _useContext.hasEnableChangeNamePermission,
     hasEnableStartVideoPermission = _useContext.hasEnableStartVideoPermission,
-    hasLockRoomPermission = _useContext.hasLockRoomPermission;
+    hasLockRoomPermission = _useContext.hasLockRoomPermission,
+    hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission,
+    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
+    updateWaitingRoomEnabled = _useContext.updateWaitingRoomEnabled,
+    isWaitingRoomEnabled = _useContext.isWaitingRoomEnabled,
+    isWaterMarkEnabled = _useContext.isWaterMarkEnabled,
+    hasWatermarkEnablePermission = _useContext.hasWatermarkEnablePermission,
+    hasWatermarkDisablePermission = _useContext.hasWatermarkDisablePermission,
+    isMulti = _useContext.isMulti,
+    setWaterMarkLineType = _useContext.setWaterMarkLineType,
+    setAllowWaterMark = _useContext.setAllowWaterMark;
   var transI18n = (0, _i18n.useI18n)();
   var allActions = [{
+    title: transI18n('fmt_security_setting_label_security_setting'),
+    key: 'meeting_security_title',
+    type: 'title'
+  }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
       checked: isLockRoomEnabled,
       label: transI18n('fmt_screenshare_controlbar_security_list_lock'),
@@ -51,14 +71,65 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
     }
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-      checked: false,
+      checked: isWaitingRoomEnabled,
       label: transI18n('fmt_security_options_activatewaitingroom'),
       styleType: "white"
     }),
     key: 'enable_waiting_room',
-    type: 'disabled',
-    hasPermission: true,
-    onButtonClick: function onButtonClick() {},
+    hasPermission: hasWaitingRoomPermission,
+    onButtonClick: function onButtonClick() {
+      return updateWaitingRoomEnabled(!isWaitingRoomEnabled);
+    },
+    classNames: 'room-control-drop-with-under-line'
+  }, {
+    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: _type2.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(_type.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(_type.FcrLineType.MULTI_ROW);
+          },
+          children: transI18n('fmt_security_setting_mobile_option_watermark_style_multi')
+        })]
+      })]
+    }),
+    key: 'enable_watermark',
+    type: 'primary',
+    hasPermission: hasWatermarkEnablePermission && hasWatermarkDisablePermission,
+    onButtonClick: function onButtonClick() {
+      setAllowWaterMark();
+    },
     classNames: 'room-control-drop-with-under-line'
   }, {
     title: transI18n('fmt_screenshare_options_allow'),
@@ -68,7 +139,7 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
       checked: allowShareScreen,
-      label: transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare'),
+      label: transI18n('fmt_screenshare_screen_and_board'),
       styleType: "white"
     }),
     key: 'share_screen',
@@ -77,6 +148,16 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
     onButtonClick: function onButtonClick() {
       updateAllowShareScreen(!allowShareScreen);
     }
+  }, {
+    title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+      checked: allowBoardWrite,
+      label: transI18n('fmt_screenshare_options_editable'),
+      styleType: "white"
+    }),
+    key: 'enable_whiteboard',
+    type: 'primary',
+    hasPermission: hasAllowWriteBoardPermission,
+    onButtonClick: updateBoardWriteEnabled
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
       checked: allowChat,
@@ -124,20 +205,25 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
       updateAllowUnmuteSelfVideo(!allowUnmuteSelfVideo);
     },
     classNames: 'room-control-drop-with-under-line'
-  }, {
-    title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-      checked: false,
-      label: transI18n('fmt_security_options_removemultiple'),
-      styleType: "white"
-    }),
-    key: 'remove_fcr-participants',
-    type: 'danger',
-    hasPermission: true,
-    onButtonClick: function onButtonClick() {},
-    classNames: 'room-control-drop-disable'
-  }];
+  }
+  // 功能没实现，暂时注释
+  // {
+  //   title: (
+  //     <FcrCheckbox
+  //       checked={false}
+  //       label={transI18n('fmt_security_options_removemultiple')}
+  //       styleType="white"
+  //     />
+  //   ),
+  //   key: 'remove_fcr-participants',
+  //   type: 'danger',
+  //   hasPermission: true,
+  //   onButtonClick: () => {},
+  //   classNames: 'room-control-drop-disable',
+  // },
+  ];
   var securityHasPermissionActions = allActions.filter(function (item) {
-    return item.hasPermission;
+    return item.hasPermission || item.type === 'title';
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "security-content",

package/lib/fragments/control-bar/share-state-nav/index.js

@@ -16,7 +16,7 @@ var _mobxReact = require("mobx-react");
 var _context = require("../context");
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _type2 = require("agora-edu-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _meetingTime = require("../../../hooks/meeting-time");
 var _jsxRuntime = require("react/jsx-runtime");

package/lib/fragments/control-bar/view.js

@@ -28,10 +28,11 @@ var _moreActions = require("./more-actions");
 var _constant = require("../../utilities/constant");
 var _stopLiveStreaming = require("./stop-live-streaming");
 var _cloudRecordingButtons = require("./cloud-recording-buttons");
-var _type = require("agora-edu-core/lib/type");
+var _type = require("fcr-core/lib/type");
 var _toast = require("agora-ui-foundation/lib/components/toast");
 var _platform = require("../../utilities/platform");
 var _type2 = require("../../modules/action-bar/type");
+var _meetingDetailsPortal = _interopRequireDefault(require("./meeting-details/meeting-details-portal"));
 var _jsxRuntime = require("react/jsx-runtime");
 var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function () {
   var _screenBounds$availTo;
@@ -71,7 +72,9 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     screenBounds = _useContext.screenBounds,
     connectType = _useContext.connectType,
     phoneMicEnabled = _useContext.phoneMicEnabled,
-    hasSecurityPermission = _useContext.hasSecurityPermission;
+    hasSecurityPermission = _useContext.hasSecurityPermission,
+    setShowMeetingDetailPortal = _useContext.setShowMeetingDetailPortal,
+    fetchLeavingRoomPropsAfterInit = _useContext.fetchLeavingRoomPropsAfterInit;
   // 控制栏本身的高度
   var NAV_HEIGHT = 84;
   // 鼠标移开后自动隐藏的时间
@@ -184,6 +187,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
   (0, _react.useEffect)(function () {
     function handleBlur(event) {
       setMoreVisible(false);
+      setShowMeetingDetailPortal(false);
       setShowSecurityPopover(false);
     }
     window.addEventListener('blur', handleBlur);
@@ -191,11 +195,20 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       window.removeEventListener('blur', handleBlur);
     };
   }, []);
+  var setControlBarAlwaysOnTop = function setControlBarAlwaysOnTop() {
+    window.runtime.setAlwaysOnTop();
+    window.runtime.browserWindow.setAlwaysOnTop(true, 'screen-saver');
+  };
   (0, _react.useEffect)(function () {
-    window.runtime.browserWindow.setAlwaysOnTop(false);
-    setTimeout(function () {
-      window.runtime.browserWindow.setAlwaysOnTop(true, 'screen-saver');
-    }, 500);
+    setControlBarAlwaysOnTop();
+    /** control-bar初始化后补偿发起一次store数据同步 */
+    fetchLeavingRoomPropsAfterInit();
+    var timberId = setTimeout(setControlBarAlwaysOnTop, 500);
+    window.runtime.browserWindow.addListener('blur', setControlBarAlwaysOnTop);
+    return function () {
+      window.runtime.browserWindow.removeListener('blur', setControlBarAlwaysOnTop);
+      clearTimeout(timberId);
+    };
   }, []);
   return currentShareId ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRnd.Rnd, {
     style: {
@@ -262,10 +275,12 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
           className: "share-action-nav__meeting-control-group",
           children: [hasSecurityPermission && /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
             mouseEnterDelay: 0,
+            overlayClassName: "security-content-more-dropdown",
             overlayInnerStyle: {
               boxShadow: 'none',
               backgroundColor: 'none',
-              borderRadius: 'var(--fcr_cornerradius_l)'
+              borderRadius: 'var(--fcr_cornerradius_l)',
+              minWidth: '302px'
             },
             content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityContent.SecurityContent, {}),
             trigger: "click",
@@ -315,7 +330,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
         onShareStateNavTransferPosition: handlerShareNavTransferPosition,
         currentPosition: navCurrentPosition,
         onStopShare: handlerStopShare
-      })]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingDetailsPortal["default"], {})]
     })
   }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
 });

package/lib/fragments/live-streaming/store.d.ts

@@ -1,4 +1,4 @@
-import { FcrLiveStreamingState } from 'agora-edu-core/lib/type';
+import { FcrLiveStreamingState } from 'fcr-core/lib/type';
 export default class LiveStreamingStore {
     accessor videoSteamingUrl: string;
     accessor videoStreamingKey: string;

package/lib/fragments/live-streaming/store.js

@@ -49,7 +49,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _type = require("agora-edu-core/lib/type");
+var _type = require("fcr-core/lib/type");
 var _mobx = require("mobx");
 var _rendererEvent = require("../../utilities/renderer-event");
 var _constant = require("../../utilities/constant");

package/lib/fragments/live-streaming/view.js

@@ -9,11 +9,13 @@ var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _context = require("./context");
 var _container = require("agora-ui-foundation/lib/components/live-streaming/container");
-var _type = require("agora-edu-core/lib/type");
+var _type = require("fcr-core/lib/type");
 require("./index.css");
 var _windowHeader = require("agora-ui-foundation/lib/components/window-header");
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 var View = exports.View = (0, _mobxReact.observer)(function () {
+  var t = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_context.StoreContext),
     videoSteamingUrl = _useContext.videoSteamingUrl,
     videoStreamingKey = _useContext.videoStreamingKey,
@@ -29,7 +31,7 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
       withWindowPopUpButton: false,
       enableMinimize: false,
       enableMaximize: false,
-      title: "Push the meeting to the specified live platform",
+      title: t('fmt_live_label_push_platform'),
       onClose: closeLiveStreaming
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_container.FcrLiveStreamingContainer, {
       defaultVideoSteamingUrl: videoSteamingUrl,

package/lib/fragments/share-screen-selection/selection-store.d.ts

@@ -1,6 +1,6 @@
 import { AgoraRtcDisplayInfo, AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
-import { FcrUserInfo, FcrUserRole } from 'agora-edu-core/lib/type';
+import { FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
 type ScreenCaptureSourceType = Omit<AgoraRtcDisplayInfo, 'image'> & {
     image: React.ReactNode | Uint8Array;
 };

package/lib/fragments/share-screen-selection/selection-store.js

@@ -63,7 +63,7 @@ var _constant = require("../../utilities/constant");
 var _rendererEvent = require("../../utilities/renderer-event");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type2 = require("agora-ui-foundation/lib/components/icon/type");
-var _type3 = require("agora-edu-core/lib/type");
+var _type3 = require("fcr-core/lib/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var _SelectionStore;
 var _initProto, _init_shareWithAudio, _init_currentSelection, _init_currentSelectionType, _init_applicationCaptureSources, _init_localUserRole, _init_boardOwnerUser, _init_localUser, _init_screenCaptureSources, _init_currentShareAudioProcessingChannel, _init_title, _init_localMicrophoneMute, _setDefaultScreenDecs, _setShareAudioProcessingChannelDecs, _setLocalMicrophoneStateDecs, _sendLocalAudioStateEventDecs, _setApplicationCaptureSourcesDecs, _setScreenCaptureSourcesDecs, _handleStartShareDecs, _handleChooseScreenDecs, _init_handleChooseScreen, _setShareWithAudioStateDecs, _setLocalUserRoleDecs, _setOwnerUserDecs, _setLocalUserDecs, _ref;