fcr-ui-scene 3.9.0-alpha → 3.9.1-alpha

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

@@ -1,9 +1,10 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "core-js/modules/es.error.to-string.js";
 import "core-js/modules/es.date.to-string.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.regexp.to-string.js";
 import { observer } from 'mobx-react';
-import { useContext, useEffect, useLayoutEffect, useRef } from 'react';
+import { useContext, useEffect, useLayoutEffect, useMemo, useRef } from 'react';
 import { SecondaryWindowStoreContext } from './store';
 import { FcrVideoRenderMode, FcrVideoStreamType } from 'fcr-core/lib/type';
 import { MemberWindow } from '../components/member-window';
@@ -16,6 +17,8 @@ import ProgressDialog from '../components/control-bar/components/progress';
 import { transI18n } from 'agora-ui-foundation/lib/i18n';
 import { LeaveMeetingPortal } from '../components/leave-meeting/portal';
 import { FcrVideoTrackRenderContext } from '../../shared-context/video-track-render-context';
+import { WaterMark } from 'agora-ui-foundation/lib/components/watermark';
+import { useDelayedMeasure } from 'agora-ui-foundation/lib/utilities/hooks';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export var SubWindowView = observer(function (props) {
   var renderScreenShareControl = props.renderScreenShareControl;
@@ -38,7 +41,10 @@ export var SubWindowView = observer(function (props) {
     isAspectRatioPreserved = store.isAspectRatioPreserved,
     isShowToolbar = store.isShowToolbar,
     isActive = store.isActive,
+    isWaterMarkEnabled = store.isWaterMarkEnabled,
+    isMulti = store.isMulti,
     baseUrl = store.baseUrl,
+    currentUser = store.currentUser,
     setOriginScalc = store.setOriginScalc,
     zoomIn = store.zoomIn,
     zoomOut = store.zoomOut,
@@ -56,8 +62,17 @@ export var SubWindowView = observer(function (props) {
     interceptedClose = store.interceptedClose,
     setInterceptedClose = store.setInterceptedClose,
     videoRenderContext = store.videoRenderContext,
-    isAnnotationOpened = store.isAnnotationOpened;
+    isAnnotationOpened = store.isAnnotationOpened,
+    getWaterMarkContent = store.getWaterMarkContent;
   var videoWindowContainer = useRef(null);
+  var _useDelayedMeasure = useDelayedMeasure(),
+    _useDelayedMeasure2 = _slicedToArray(_useDelayedMeasure, 2),
+    delayedMeasureRef = _useDelayedMeasure2[0],
+    delayedMeasureBounds = _useDelayedMeasure2[1];
+  var waterMarkRenderContent = useMemo(function () {
+    var remoteWaterMark = getWaterMarkContent();
+    return isWaterMarkEnabled ? [remoteWaterMark] : [];
+  }, [isWaterMarkEnabled, currentUser]);
   useEffect(function () {
     if (!interceptedClose) return;
     if (!videoWindowContainer.current) {
@@ -205,78 +220,87 @@ export var SubWindowView = observer(function (props) {
       })
     });
   }
-  return /*#__PURE__*/_jsxs("div", {
-    ref: videoWindowContainer,
-    className: "sub-window-view",
-    style: {
-      width: '100%',
-      height: '100%',
-      position: 'relative',
-      top: 0
-    },
-    children: [interceptedClose && /*#__PURE__*/_jsx(LeaveMeetingPortal, {
-      setPopoverOpened: function setPopoverOpened() {
-        return setInterceptedClose(false);
-      }
-    }), content, (isBoardShare || isAnnotationOpened) && /*#__PURE__*/_jsx(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: WhiteboardToolAction.WIDTH,
-          tool: width
-        });
-      },
-      setTool: function setTool(tool) {
-        setWhiteboardTool({
-          action: WhiteboardToolAction.TOOL,
-          tool: tool
-        });
-      },
-      setShape: function setShape(shape) {
-        setWhiteboardTool({
-          action: WhiteboardToolAction.SHAPE,
-          tool: shape
-        });
-      },
-      setStrokeColor: function setStrokeColor(color) {
-        setWhiteboardTool({
-          action: WhiteboardToolAction.COLOR,
-          tool: color.toString()
-        });
+  return /*#__PURE__*/_jsx(WaterMark, {
+    content: waterMarkRenderContent,
+    width: isMulti ? 120 : delayedMeasureBounds.width,
+    height: isMulti ? 64 : delayedMeasureBounds.height,
+    multiLine: Boolean(isMulti),
+    children: /*#__PURE__*/_jsxs("div", {
+      ref: function ref(node) {
+        delayedMeasureRef(node);
+        videoWindowContainer.current = node;
       },
-      undo: function undo() {
-        return setWhiteboardTool({
-          action: WhiteboardToolAction.UNDO,
-          tool: FcrBoardToolType.NONE
-        });
+      className: "sub-window-view",
+      style: {
+        width: '100%',
+        height: '100%',
+        position: 'relative',
+        top: 0
       },
-      redo: function redo() {
-        return setWhiteboardTool({
-          action: WhiteboardToolAction.REDO,
-          tool: FcrBoardToolType.NONE
-        });
-      },
-      clean: function clean() {
-        return setWhiteboardTool({
-          action: WhiteboardToolAction.CLEAR,
-          tool: FcrBoardToolType.NONE
-        });
-      },
-      onSave: isBoardShare ? saveWhiteboardDraft : undefined,
-      progress: toolbarState.progress,
-      setProgress: setProgress
-    })]
+      children: [interceptedClose && /*#__PURE__*/_jsx(LeaveMeetingPortal, {
+        setPopoverOpened: function setPopoverOpened() {
+          return setInterceptedClose(false);
+        }
+      }), content, (isBoardShare || isAnnotationOpened) && /*#__PURE__*/_jsx(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: WhiteboardToolAction.WIDTH,
+            tool: width
+          });
+        },
+        setTool: function setTool(tool) {
+          setWhiteboardTool({
+            action: WhiteboardToolAction.TOOL,
+            tool: tool
+          });
+        },
+        setShape: function setShape(shape) {
+          setWhiteboardTool({
+            action: WhiteboardToolAction.SHAPE,
+            tool: shape
+          });
+        },
+        setStrokeColor: function setStrokeColor(color) {
+          setWhiteboardTool({
+            action: WhiteboardToolAction.COLOR,
+            tool: color.toString()
+          });
+        },
+        undo: function undo() {
+          return setWhiteboardTool({
+            action: WhiteboardToolAction.UNDO,
+            tool: FcrBoardToolType.NONE
+          });
+        },
+        redo: function redo() {
+          return setWhiteboardTool({
+            action: WhiteboardToolAction.REDO,
+            tool: FcrBoardToolType.NONE
+          });
+        },
+        clean: function clean() {
+          return setWhiteboardTool({
+            action: WhiteboardToolAction.CLEAR,
+            tool: FcrBoardToolType.NONE
+          });
+        },
+        onSave: isBoardShare ? saveWhiteboardDraft : undefined,
+        progress: toolbarState.progress,
+        setProgress: setProgress
+      })]
+    })
   });
 });

package/lib-es/modules/toast-manager/type.js

@@ -107,6 +107,7 @@ export var FcrUIToastKey = /*#__PURE__*/function (FcrUIToastKey) {
   FcrUIToastKey["FMT_WHITEBOARD_TIPS_SHARE_FAILED"] = "fmt_whiteboard_tips_share_failed";
   FcrUIToastKey["FMT_AUDIO_WINDOW_MIC_TURN_ON_ERROR"] = "fmt_audio_window_mic_turn_on_error";
   FcrUIToastKey["FMT_AUDIO_WINDOW_CAMERA_TURN_ON_ERROR"] = "fmt_audio_window_camera_turn_on_error";
+  FcrUIToastKey["FMT_SIP_TIPS_ENTER_CORRECT_NUMBER"] = "fmt_SIP_tips_enter_correct_number";
   return FcrUIToastKey;
 }({});
 export var DefaultToastParamsMap = (_DefaultToastParamsMa = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_DefaultToastParamsMa, FcrUIToastKey.ERR_MESSAGE, {
@@ -314,7 +315,7 @@ export var DefaultToastParamsMap = (_DefaultToastParamsMa = {}, _defineProperty(
   type: 'normal'
 }), FcrUIToastKey.FMT_MEETING_TOAST_DISABLED_WAITINGROOM, {
   type: 'normal'
-}), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_DefaultToastParamsMa, FcrUIToastKey.FMT_SCREENSHARE_TIPS_FAILD_RESELECT, {
+}), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_DefaultToastParamsMa, FcrUIToastKey.FMT_SCREENSHARE_TIPS_FAILD_RESELECT, {
   type: 'error'
 }), FcrUIToastKey.FMT_SCREENSHARE_TIPS_FAILD_SCREENSELECT, {
   type: 'error'
@@ -326,4 +327,6 @@ export var DefaultToastParamsMap = (_DefaultToastParamsMa = {}, _defineProperty(
   type: 'error'
 }), FcrUIToastKey.FMT_AUDIO_WINDOW_CAMERA_TURN_ON_ERROR, {
   type: 'error'
+}), FcrUIToastKey.FMT_SIP_TIPS_ENTER_CORRECT_NUMBER, {
+  type: 'error'
 }));

package/lib-es/plugins/module-dev-plugin.js

@@ -16,7 +16,7 @@ var createRoom = /*#__PURE__*/function () {
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          url = "http://api-solutions-dev.bj2.agoralab.co/conference/companys/v1/rooms";
+          url = "http://api-solutions-dev-bj.shengwang.cn/conference/companys/v1/rooms";
           _context.next = 1;
           return fetch(url, {
             headers: {
@@ -64,7 +64,7 @@ var getUserToken = /*#__PURE__*/function () {
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          url = "https://api-solutions-dev.bj2.agoralab.co/conference/companys/v1/rooms";
+          url = "https://api-solutions-test.shengwang.cn/conference/companys/v1/rooms";
           _context2.next = 1;
           return fetch(url, {
             headers: {
@@ -144,10 +144,10 @@ var role = 'host';
 //       },
 //       parameters: {
 //         rte: {
-//           rteIpList: ['http://api-solutions-dev.bj2.agoralab.co'],
+//           rteIpList: ['http://api-solutions-dev-bj.shengwang.cn'],
 //         },
 //         core: {
-//           coreIpList: ['http://api-solutions-dev.bj2.agoralab.co'],
+//           coreIpList: ['http://api-solutions-dev-bj.shengwang.cn'],
 //         },
 //       },
 //     });

package/lib-es/providers/ability-provider.js

@@ -92,7 +92,19 @@ export var FcrUIAbilityProviderImpl = /*#__PURE__*/function () {
      * 检查当前平台是否支持外呼
      */
     _defineProperty(this, "isCallOutAbilitySupported", function () {
-      var result = _this._abilityControl.isAbilitySupported(FcrAbility.PstnCallOut);
+      var result = _this._abilityControl.isAbilitySupported(FcrAbility.CallOutPstn);
+      return result;
+    });
+    _defineProperty(this, "isCallOutVolteAbilitySupported", function () {
+      var result = _this._abilityControl.isAbilitySupported(FcrAbility.CallOutVolte);
+      return result;
+    });
+    _defineProperty(this, "isCallOutH323AbilitySupported", function () {
+      var result = _this._abilityControl.isAbilitySupported(FcrAbility.CallOutH323);
+      return result;
+    });
+    _defineProperty(this, "isCallOutSipAbilitySupported", function () {
+      var result = _this._abilityControl.isAbilitySupported(FcrAbility.CallOutSip);
       return result;
     });
     this._abilityControl = _abilityControl;

package/lib-es/providers/mouse-detect/provider.empty.js

@@ -0,0 +1,39 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+export var FcrUIMouseDetectProviderEmptyImpl = /*#__PURE__*/function () {
+  function FcrUIMouseDetectProviderEmptyImpl() {
+    _classCallCheck(this, FcrUIMouseDetectProviderEmptyImpl);
+  }
+  return _createClass(FcrUIMouseDetectProviderEmptyImpl, [{
+    key: "isMouseDetectEnabled",
+    value: function isMouseDetectEnabled() {
+      return false;
+    }
+  }, {
+    key: "setDisplayId",
+    value: function setDisplayId(_displayId) {}
+  }, {
+    key: "setDetectionPositionOffset",
+    value: function setDetectionPositionOffset(_offset) {}
+  }, {
+    key: "setDetectArea",
+    value: function setDetectArea(_areaId, _areaList) {}
+  }, {
+    key: "getDetectAreas",
+    value: function getDetectAreas(_areaId) {
+      return [];
+    }
+  }, {
+    key: "deleteDetectArea",
+    value: function deleteDetectArea(_areaId) {}
+  }, {
+    key: "addObserver",
+    value: function addObserver(_observer) {}
+  }, {
+    key: "removeObserver",
+    value: function removeObserver(_observer) {}
+  }, {
+    key: "release",
+    value: function release() {}
+  }]);
+}();

package/lib-es/providers/mouse-detect/provider.js

@@ -119,6 +119,7 @@ export var FcrUIMouseDetectProviderImpl = /*#__PURE__*/function () {
     });
     _defineProperty(this, "_isDebug", false);
     _defineProperty(this, "_displayId", null);
+    _defineProperty(this, "_macMenuBarOffsetY", 30);
     _defineProperty(this, "_debugWindowObserver", {
       onReady: function onReady() {
         var AreaDebugger = observer(function () {
@@ -156,9 +157,6 @@ export var FcrUIMouseDetectProviderImpl = /*#__PURE__*/function () {
     this._task = AgoraScheduler.shared.addPollingTask(function () {
       _this._detect();
     }, 50);
-    if (isMac()) {
-      this._task.stop();
-    }
 
     // 调试时使用，用于查看检测区域
     // this._debug(true);
@@ -171,6 +169,11 @@ export var FcrUIMouseDetectProviderImpl = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_A, this, v);
     }
+  }, {
+    key: "isMouseDetectEnabled",
+    value: function isMouseDetectEnabled() {
+      return true;
+    }
   }, {
     key: "setDisplayId",
     value: function setDisplayId(displayId) {
@@ -213,7 +216,10 @@ export var FcrUIMouseDetectProviderImpl = /*#__PURE__*/function () {
   }, {
     key: "setDetectionPositionOffset",
     value: function setDetectionPositionOffset(offset) {
-      this._detectionOffset = offset;
+      this._detectionOffset = {
+        x: offset.x,
+        y: offset.y + (isMac() ? this._macMenuBarOffsetY : 0)
+      };
     }
   }, {
     key: "addObserver",
@@ -282,6 +288,9 @@ export var FcrUIMouseDetectProviderImpl = /*#__PURE__*/function () {
         window.show();
         window.setIgnoreMouseEvents(true);
         window.setAlwaysOnTop(true, 'screen-saver', WindowRelativeLevel.MOUSE_DETECT_DEBUGGER_LEVEL);
+        window.setVisibleOnAllWorkspaces(true, {
+          visibleOnFullScreen: true
+        });
         window.addObserver(this._debugWindowObserver);
       } else {
         this._isDebug = false;