fcr-ui-scene 3.7.2 → 3.7.4-rc.1

package/lib/modules/secondary-window/view.js

@@ -0,0 +1,257 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SubWindowView = void 0;
+var _mobxReact = require("mobx-react");
+var _useElectron = require("../dialog/hooks/useElectron");
+var _react = require("react");
+var _store = require("./store");
+var _type = require("fcr-core/lib/type");
+var _memberWindow = require("../components/member-window");
+var _controlBar = require("../components/control-bar");
+var _loading = require("../components/control-bar/components/loading");
+var _toolbar = require("../components/toolbar");
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _type2 = require("./type");
+var _progress = _interopRequireDefault(require("../components/control-bar/components/progress"));
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _portal = require("../components/leave-meeting/portal");
+var _jsxRuntime = require("react/jsx-runtime");
+var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (props) {
+  var renderScreenShareControl = props.renderScreenShareControl;
+  var _useContext = (0, _react.useContext)(_useElectron.DialogInstanceContext),
+    continueClose = _useContext.continueClose,
+    baseUrl = _useContext.baseUrl,
+    interceptedClose = _useContext.interceptedClose,
+    setInterceptedClose = _useContext.setInterceptedClose,
+    newRendererWindow = _useContext.newRendererWindow;
+  var _useContext2 = (0, _react.useContext)(_store.SecondaryWindowStoreContext),
+    joinSuccess = _useContext2.joinSuccess,
+    currentUser = _useContext2.currentUser,
+    isHost = _useContext2.isHost,
+    canWriteBoard = _useContext2.canWriteBoard,
+    videoWindowData = _useContext2.videoWindowData,
+    toolbarState = _useContext2.toolbarState,
+    scalValue = _useContext2.scalValue,
+    currentTheme = _useContext2.currentTheme,
+    secondaryWindowContentType = _useContext2.secondaryWindowContentType,
+    connectionState = _useContext2.connectionState,
+    showLoading = _useContext2.showLoading,
+    isScreenShare = _useContext2.isScreenShare,
+    isBoardShare = _useContext2.isBoardShare,
+    annotationHasStart = _useContext2.annotationHasStart,
+    isZoomMinimum = _useContext2.isZoomMinimum,
+    isZoomMaxmum = _useContext2.isZoomMaxmum,
+    isCurrentOriginal = _useContext2.isCurrentOriginal,
+    isAspectRatioPreserved = _useContext2.isAspectRatioPreserved,
+    isShowToolbar = _useContext2.isShowToolbar,
+    setOriginScalc = _useContext2.setOriginScalc,
+    zoomIn = _useContext2.zoomIn,
+    zoomOut = _useContext2.zoomOut,
+    fullContainer = _useContext2.fullContainer,
+    setTheme = _useContext2.setTheme,
+    setScaleValue = _useContext2.setScaleValue,
+    handleIframeLoad = _useContext2.handleIframeLoad,
+    setControlEnable = _useContext2.setControlEnable,
+    setWhiteboardTool = _useContext2.setWhiteboardTool,
+    setShowLoading = _useContext2.setShowLoading,
+    setCommonColors = _useContext2.setCommonColors,
+    saveWhiteboardDraft = _useContext2.saveWhiteboardDraft,
+    setProgress = _useContext2.setProgress,
+    log = _useContext2.log,
+    setSpeakerViewSize = _useContext2.setSpeakerViewSize;
+  var videoWindowContainer = (0, _react.useRef)(null);
+  var handleClick = function handleClick() {
+    setInterceptedClose(false);
+  };
+  (0, _react.useEffect)(function () {
+    log("[SubWindowView]: baseUrl: ".concat(baseUrl));
+    newRendererWindow.addEventListener('click', handleClick);
+    return function () {
+      newRendererWindow.removeEventListener('click', handleClick);
+    };
+  }, []);
+  (0, _react.useLayoutEffect)(function () {
+    var _videoWindowContainer;
+    var rect = (_videoWindowContainer = videoWindowContainer.current) === null || _videoWindowContainer === void 0 ? void 0 : _videoWindowContainer.getBoundingClientRect();
+    if (rect) {
+      var width = rect.width,
+        height = rect.height;
+      setSpeakerViewSize(width, height);
+    }
+  }, [secondaryWindowContentType]);
+  if (!videoWindowData) {
+    return null;
+  }
+  var content = null;
+  if (isBoardShare) {
+    content = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [showLoading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.Loading, {
+        joined: joinSuccess,
+        connectionState: connectionState,
+        canOperate: canWriteBoard,
+        handleClose: function handleClose() {
+          return setShowLoading(false);
+        }
+      }), toolbarState.progress > 0 && toolbarState.progress < 100 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_progress["default"], {
+        title: "".concat((0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_downloading'), "..."),
+        progress: toolbarState.progress
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar.WhiteboardControlbar, {
+        onClose: function onClose() {},
+        onEnable: function onEnable(enable) {
+          setControlEnable(enable);
+        },
+        setTheme: setTheme,
+        ownerUser: {
+          userId: videoWindowData.userId,
+          userName: videoWindowData.userName
+        },
+        currentUser: currentUser,
+        canWriteBoard: canWriteBoard,
+        controlEnabled: toolbarState.controlEnable,
+        isHost: isHost,
+        currentTheme: currentTheme,
+        sharingType: 'whiteboard',
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
+          ref: handleIframeLoad,
+          allow: "webview",
+          src: "".concat(baseUrl, "/whiteboard.html?type=whiteboard"),
+          style: {
+            width: '100vw',
+            height: '100vh',
+            minWidth: '100vw',
+            minHeight: '100vh'
+          }
+        })
+      })]
+    });
+  } else {
+    content = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_memberWindow.MemberWindow, {
+        onRemovePin: function onRemovePin() {},
+        canShowSpeakerSpotlight: true,
+        width: Infinity,
+        height: Infinity,
+        videoRenderMode: _type.FcrVideoRenderMode.FIT,
+        videoStreamType: _type.FcrVideoStreamType.HIGH_STREAM,
+        windowData: videoWindowData,
+        showAvatar: true,
+        isVideoSuspended: false,
+        enableZoom: true,
+        scalcValue: scalValue,
+        onScaleChange: setScaleValue
+      }), secondaryWindowContentType === _type2.FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION && annotationHasStart && /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
+        ref: handleIframeLoad,
+        allow: "webview",
+        src: "".concat(baseUrl, "/whiteboard.html?type=annotation"),
+        style: {
+          width: '100%',
+          height: '100%',
+          position: 'absolute',
+          top: 0,
+          left: 0,
+          background: 'transparent',
+          zIndex: 10
+        }
+      }), !isShowToolbar && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "annotation-action-prevent"
+      }), isScreenShare && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        style: {
+          width: '100%',
+          position: 'absolute',
+          top: '-28px'
+        },
+        children: renderScreenShareControl({
+          isZoomMinimum: isZoomMinimum,
+          isZoomMaxmum: isZoomMaxmum,
+          isCurrentOriginal: isCurrentOriginal,
+          isAspectRatioPreserved: isAspectRatioPreserved,
+          setOriginScalc: setOriginScalc,
+          zoomIn: zoomIn,
+          zoomOut: zoomOut,
+          fullContainer: fullContainer,
+          isShowToolbarToggle: !showLoading && joinSuccess && canWriteBoard
+        })
+      })]
+    });
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    ref: videoWindowContainer,
+    className: "sub-window-view",
+    style: {
+      width: '100%',
+      height: isScreenShare ? 'calc(100% - 28px)' : '100%',
+      position: 'relative',
+      top: isScreenShare ? 28 : 0
+    },
+    children: [interceptedClose && /*#__PURE__*/(0, _jsxRuntime.jsx)(_portal.LeaveMeetingPortal, {
+      onLeave: continueClose,
+      setPopoverOpened: function setPopoverOpened() {
+        return setInterceptedClose(false);
+      }
+    }), content, (isBoardShare || isScreenShare) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_toolbar.WhiteboardToolbar, {
+      offsetTop: 28,
+      direction: "vertical",
+      container: videoWindowContainer.current || undefined,
+      show: canWriteBoard && joinSuccess && isShowToolbar && !showLoading,
+      currentStrokeWidth: toolbarState.currentStrokeWidth,
+      currentColor: toolbarState.currentColor,
+      currentTool: toolbarState.currentTool,
+      currentShape: toolbarState.currentShape,
+      redoSteps: toolbarState.redoSteps,
+      undoSteps: toolbarState.undoSteps,
+      commonColors: isBoardShare ? toolbarState.commonColors : undefined,
+      themeColors: toolbarState.themeColors,
+      setCommonColors: setCommonColors,
+      setStrokeWidth: function setStrokeWidth(width) {
+        setWhiteboardTool({
+          action: _type2.WhiteboardToolAction.WIDTH,
+          tool: width
+        });
+      },
+      setTool: function setTool(tool) {
+        setWhiteboardTool({
+          action: _type2.WhiteboardToolAction.TOOL,
+          tool: tool
+        });
+      },
+      setShape: function setShape(shape) {
+        setWhiteboardTool({
+          action: _type2.WhiteboardToolAction.SHAPE,
+          tool: shape
+        });
+      },
+      setStrokeColor: function setStrokeColor(color) {
+        setWhiteboardTool({
+          action: _type2.WhiteboardToolAction.COLOR,
+          tool: color
+        });
+      },
+      undo: function undo() {
+        return setWhiteboardTool({
+          action: _type2.WhiteboardToolAction.UNDO,
+          tool: _enums.FcrBoardToolType.NONE
+        });
+      },
+      redo: function redo() {
+        return setWhiteboardTool({
+          action: _type2.WhiteboardToolAction.REDO,
+          tool: _enums.FcrBoardToolType.NONE
+        });
+      },
+      clean: function clean() {
+        return setWhiteboardTool({
+          action: _type2.WhiteboardToolAction.CLEAR,
+          tool: _enums.FcrBoardToolType.NONE
+        });
+      },
+      onSave: isBoardShare ? saveWhiteboardDraft : undefined,
+      progress: toolbarState.progress,
+      setProgress: setProgress
+    })]
+  });
+});

package/lib/modules/setting/audio-settings/audio-settings.js

@@ -104,6 +104,8 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     mediaSetting = _useState4[0],
     setMediaSetting = _useState4[1];
+  var speakerVolumeLevel = speakerDetecting ? speakerTestVolumeLevel / 100 : 0;
+  var microphoneVolumeLevel = microphoneDetecting ? microphoneTestVolumeLevel / 100 : 0;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: ns.b(),
     ref: containerRef,
@@ -129,7 +131,7 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
           className: ns.e('form-label'),
           children: t('fmt_setting_label_oututlevel')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_volumeIndicator.FcrVolumeIndicator, {
-          value: speakerTestVolumeLevel / 100,
+          value: speakerVolumeLevel,
           barCount: 13
         })]
       }), (0, _env.isElectron)() && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -169,7 +171,7 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
           className: ns.e('form-label'),
           children: t('fmt_internalsetting_label_inputlevel')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_volumeIndicator.FcrVolumeIndicator, {
-          value: microphoneDetecting ? microphoneTestVolumeLevel / 100 : 0,
+          value: microphoneVolumeLevel,
           barCount: 13
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

package/lib/modules/setting/config.d.ts

@@ -5,6 +5,7 @@ export declare const defaultCameraVideoEncoderConfig: {
     };
     frameRate: number;
     bitrate: number;
+    isMirror: boolean;
 };
 export declare const hdCameraVideoEncoderConfig: {
     dimensions: {
@@ -13,6 +14,7 @@ export declare const hdCameraVideoEncoderConfig: {
     };
     frameRate: number;
     bitrate: number;
+    isMirror: boolean;
 };
 export declare const clearityEncoderConfig: {
     dimensions: {
@@ -21,6 +23,7 @@ export declare const clearityEncoderConfig: {
     };
     frameRate: number;
     bitrate: number;
+    isMirror: boolean;
 };
 export declare const smoothEncoderConfig: {
     dimensions: {
@@ -29,4 +32,5 @@ export declare const smoothEncoderConfig: {
     };
     frameRate: number;
     bitrate: number;
+    isMirror: boolean;
 };

package/lib/modules/setting/config.js

@@ -13,7 +13,8 @@ var hdCameraVideoEncoderConfig = exports.hdCameraVideoEncoderConfig = {
     height: 1080
   },
   frameRate: 20,
-  bitrate: 2500
+  bitrate: 2500,
+  isMirror: false
 };
 var clearityEncoderConfig = exports.clearityEncoderConfig = {
   dimensions: {
@@ -21,7 +22,8 @@ var clearityEncoderConfig = exports.clearityEncoderConfig = {
     height: 1080
   },
   frameRate: 15,
-  bitrate: 1500
+  bitrate: 1500,
+  isMirror: false
 };
 var smoothEncoderConfig = exports.smoothEncoderConfig = {
   dimensions: {
@@ -29,5 +31,6 @@ var smoothEncoderConfig = exports.smoothEncoderConfig = {
     height: 1080
   },
   frameRate: 25,
-  bitrate: 1200
+  bitrate: 1200,
+  isMirror: false
 };

package/lib/modules/setting/general-settings/general-settings.js

@@ -77,6 +77,15 @@ var GeneralSettings = exports.GeneralSettings = (0, _mobxReact.observer)(functio
         });
       }
     }
+  }, {
+    label: t('fmt_settings_general_label_dual_display'),
+    tooltip: t('fmt_settings_tips_dual_display'),
+    checked: setting.isDualDisplayMode,
+    onChange: function onChange(isDualDisplayMode) {
+      setSetting({
+        isDualDisplayMode: isDualDisplayMode
+      });
+    }
   }];
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: ns.b(),

package/lib/modules/setting/state/index.js

@@ -84,16 +84,6 @@ var State = exports.State = (0, _mobxReact.observer)(function () {
     systemMemorySize = _useContext.systemMemorySize,
     systemCpuDesc = _useContext.systemCpuDesc,
     isWifiConnected = _useContext.isWifiConnected;
-
-  // useEffect(() => {
-  //   if (activeKey === 'universal') {
-  //     getSystemInformation();
-  //   } else {
-  //     clearGetSystemInfoInterval();
-  //   }
-  //   return () => clearGetSystemInfoInterval();
-  // }, [activeKey]);
-
   var networkUIData = (0, _react.useMemo)(function () {
     return [{
       title: t('fmt_internalsetting_labels_bandwidth'),

package/lib/modules/setting/store.d.ts

@@ -1,6 +1,6 @@
 import { FcrBeautyOptions } from 'fcr-core/lib/media-control/type';
 import { FcrDeviceInfo, FcrPerformanceInfo } from 'fcr-core/lib/type';
-import { AgoraRtcNetworkStats } from 'agora-rte-sdk';
+import { FcrNetworkStats } from 'fcr-core/lib/type';
 import { FcrUIHighlightElement } from '../../utilities/constant';
 import { DEFAULT_BEAUTY_VALUE } from 'agora-ui-foundation/lib/components/local-video-player';
 import { FcrUIAiDenoiseLevel } from '../../type';
@@ -15,6 +15,10 @@ import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUIRoomProvider } from '../../providers/room-provider';
 import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
 import { FcrUISharedInterpreterDataSource } from '../../shared-data-source/interpreter';
+export declare enum MeetingStatus {
+    PENDING = "pending",
+    ACTIVE = "active"
+}
 export interface FcrDeviceObserver {
     onCameraChanged?(cameraId: string): void;
     onMicrophoneChanged?(microphoneId: string): void;
@@ -59,6 +63,7 @@ export interface FcrUICustomSetting {
     isPlaySound: boolean;
     language: string;
     shouldHideMyVideo: boolean;
+    isDualDisplayMode: boolean;
 }
 export { DEFAULT_BEAUTY_VALUE };
 export type BeautyKey = 'none' | 'smoothnessLevel' | 'lighteningLevel' | 'lighteningLevel';
@@ -91,10 +96,11 @@ export default class SettingStore {
     private _roomObserver;
     private _streamObserver;
     accessor loudestStreamVolumeLevel: number;
+    accessor meetingStatus: MeetingStatus;
     accessor microphoneVolumeLevel: number;
     accessor isWifiConnected: boolean;
     accessor dialogConfig: DeviceSettingDialogConfig;
-    accessor networkState: AgoraRtcNetworkStats;
+    accessor networkState: FcrNetworkStats;
     accessor performanceState: FcrPerformanceInfo & {
         cpuOtherAppUsage: number;
         memoryOtherAppUsageRatio: number;
@@ -173,7 +179,6 @@ export default class SettingStore {
     get speakerDetecting(): boolean;
     get setting(): FcrUICustomSetting;
     get media(): import("../../type").FcrUIMediaConfig;
-    get isPreMeetingSettingsStore(): boolean;
     get sceneConfig(): {
         roomToken: string;
         roomId: string;
@@ -197,6 +202,7 @@ export default class SettingStore {
         sharedInterpreterDataSource?: FcrUISharedInterpreterDataSource;
     });
     get messageProvider(): FcrUIMessageProvider;
+    startMeeting(): void;
     initSettingConfig(): void;
     enableVirtualBackground(enable: boolean, source?: VirtualBackground): void;
     setEditBeautyKey(key: BeautyKey): void;