fcr-ui-scene 3.9.0 → 3.9.1-alpha

package/lib/modules/pc-audio-connect/main-scene/store.js

@@ -168,6 +168,11 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
     get: function get() {
       return this._phoneAudioConnectorProvider.hasOwnPstnStream;
     }
+  }, {
+    key: "hasOwnVolteStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasOwnVolteStream;
+    }
   }, {
     key: "outgoingCall",
     get: function get() {
@@ -178,6 +183,11 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
     get: function get() {
       return this._phoneAudioConnectorProvider.hasPstnStream;
     }
+  }, {
+    key: "hasVolteStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasVolteStream;
+    }
   }, {
     key: "connectInfo",
     get: function get() {
@@ -215,7 +225,7 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
           return false;
         }
         this._needShowConfirmDialog = false;
-        if (this.hasOwnPstnStream) {
+        if (this.hasOwnPstnStream || this.hasOwnVolteStream) {
           return false;
         }
         var dialogId = this._dialogProvider.openConfirmDialog({
@@ -310,7 +320,7 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
   }]);
 }();
 _ConnectionGatewayStoreMainScene = ConnectionGatewayStoreMainScene;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConnectionGatewayStoreMainScene, [[_mobx.observable, 1, "phoneCallState"], [_mobx.observable, 1, "phoneCallReason"], [_mobx.observable, 1, "connectSession"], [_mobx.observable, 1, "calling"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasNeedMergedStream"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "outgoingCall"], [_mobx.computed, 3, "hasPstnStream"], [_mobx.computed, 3, "connectInfo"], [_decorator.bound, 2, "openAudioSettings"], [_decorator.bound, 2, "_handleInterceptorCloseDialog"], [_decorator.bound, 2, "joinAudioByComputer"], [_decorator.bound, 2, "stopAudioByComputer"], [_decorator.bound, 2, "openInviteDialog"]], []).e, 5);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConnectionGatewayStoreMainScene, [[_mobx.observable, 1, "phoneCallState"], [_mobx.observable, 1, "phoneCallReason"], [_mobx.observable, 1, "connectSession"], [_mobx.observable, 1, "calling"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasNeedMergedStream"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "hasOwnVolteStream"], [_mobx.computed, 3, "outgoingCall"], [_mobx.computed, 3, "hasPstnStream"], [_mobx.computed, 3, "hasVolteStream"], [_mobx.computed, 3, "connectInfo"], [_decorator.bound, 2, "openAudioSettings"], [_decorator.bound, 2, "_handleInterceptorCloseDialog"], [_decorator.bound, 2, "joinAudioByComputer"], [_decorator.bound, 2, "stopAudioByComputer"], [_decorator.bound, 2, "openInviteDialog"]], []).e, 5);
 _init_phoneCallState = _applyDecs$e[0];
 _init_phoneCallReason = _applyDecs$e[1];
 _init_connectSession = _applyDecs$e[2];

package/lib/modules/pc-audio-connect/view.js

@@ -25,6 +25,8 @@ var View = (0, _mobxReact.observer)(function () {
     hasOwnPstnStream = _useContext.hasOwnPstnStream,
     outgoingCall = _useContext.outgoingCall,
     hasPstnStream = _useContext.hasPstnStream,
+    hasVolteStream = _useContext.hasVolteStream,
+    hasOwnVolteStream = _useContext.hasOwnVolteStream,
     connectInfo = _useContext.connectInfo;
   var transI18n = (0, _i18n.useI18n)();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -35,7 +37,7 @@ var View = (0, _mobxReact.observer)(function () {
       className: "var(--fcrcornerradiusround) fcr_ui_scene_ramp_brand6",
       onClick: joinAudioByComputer,
       children: transI18n('fmt_pstn_label_accessmethodPC')
-    }), hasPstnStream && !outgoingCall && !hasOwnPstnStream && hasNeedMergedStream && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    }), (hasPstnStream || hasVolteStream) && !outgoingCall && !hasOwnPstnStream && !hasOwnVolteStream && hasNeedMergedStream && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "connector-phone-alert",
       children: transI18n('fmt_pstn_label_alreadyin', {
         reason1: connectInfo === null || connectInfo === void 0 ? void 0 : connectInfo.phoneUserId
@@ -47,7 +49,7 @@ var View = (0, _mobxReact.observer)(function () {
       className: "var(--fcrcornerradiusround)",
       onClick: stopAudioByComputer,
       children: transI18n('fmt_pstn_button_PCaudiostop')
-    }), connectType === _type.FcrUIConnectType.PHONE && hasOwnPstnStream && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+    }), connectType === _type.FcrUIConnectType.PHONE && (hasOwnPstnStream || hasOwnVolteStream) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
       content: transI18n('fmt_pstn_tips_alreadyphone'),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
         size: "XS",

package/lib/modules/phone-audio-connect/store.d.ts

@@ -13,16 +13,18 @@ export default class ConnectionGatewayStore {
     accessor currentRegion: ConnectorRegion;
     accessor currentCallInfo: ConnectListType;
     get connectType(): import("../../type").FcrUIConnectType;
-    get phoneCallState(): import("fcr-core/lib/type").FcrRoomConnectorSessionState;
+    get phoneCallState(): import("fcr-core/lib/room-control/room-connector-control/type").FcrRoomConnectorSessionState;
     get calling(): boolean;
-    get phoneCallReason(): import("fcr-core/lib/type").FcrRoomConnectorSessionReason;
+    get phoneCallReason(): import("fcr-core/lib/room-control/room-connector-control/type").FcrRoomConnectorSessionReason;
     get outgoingCall(): boolean;
     get isHangup(): boolean;
     get hasPstnStream(): boolean;
     get hasOwnPstnStream(): boolean;
+    get hasVolteStream(): boolean;
+    get hasOwnVolteStream(): boolean;
     get hasNeedMergedStream(): boolean;
-    get connectInfo(): import("fcr-core/lib/type").FcrRoomConnectorPhoneInfo;
-    get connectSession(): import("fcr-core/lib/type").FcrPhoneConnectorSession | null;
+    get connectInfo(): import("fcr-core/lib/room-control/room-connector-control/type").FcrRoomConnectorPhoneInfo;
+    get connectSession(): import("fcr-core/lib/room-control/room-connector-control/type").FcrPhoneConnectorSession | null;
     constructor({ objectManager }: ConnectionGatewayStoreArgs);
     startCall(): void;
     stopCall(): void;

package/lib/modules/phone-audio-connect/store.js

@@ -70,6 +70,7 @@ var _constant = require("../../utilities/constant");
 var _enums = require("./enums");
 var _objectManager = require("../../object-manager");
 var _type = require("../setting/type");
+var _type2 = require("fcr-core/lib/room-control/room-connector-control/type");
 var _ConnectionGatewayStore;
 var _initProto, _init_rememberMe, _init_rememberedNumberList, _init_currentRegion, _init_currentCallInfo, _startCallDecs, _stopCallDecs, _regionChangeHandlerDecs, _setRememberMeDecs, _initRememberedDataDecs, _rememberNumberDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -189,6 +190,16 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._phoneAudioConnectorProvider.hasOwnPstnStream;
     }
+  }, {
+    key: "hasVolteStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasVolteStream;
+    }
+  }, {
+    key: "hasOwnVolteStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasOwnVolteStream;
+    }
   }, {
     key: "hasNeedMergedStream",
     get: function get() {
@@ -207,7 +218,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "startCall",
     value: function startCall() {
-      this._phoneAudioConnectorProvider.startCall(this.currentCallInfo.phone);
+      this._phoneAudioConnectorProvider.startCall(this.currentCallInfo.phone, _type2.FcrPhoneConnectorSessionType.PSTN);
     }
   }, {
     key: "stopCall",

package/lib/modules/phone-audio-connect/view.js

@@ -47,7 +47,9 @@ var View = (0, _mobxReact.observer)(function () {
     outgoingCall = _useContext.outgoingCall,
     isHangup = _useContext.isHangup,
     hasPstnStream = _useContext.hasPstnStream,
+    hasVolteStream = _useContext.hasVolteStream,
     hasOwnPstnStream = _useContext.hasOwnPstnStream,
+    hasOwnVolteStream = _useContext.hasOwnVolteStream,
     hasNeedMergedStream = _useContext.hasNeedMergedStream;
   var transI18n = (0, _i18n.useI18n)();
   var _useState = (0, _react.useState)(''),
@@ -96,7 +98,7 @@ var View = (0, _mobxReact.observer)(function () {
   }, [phoneCallState, phoneCallReason]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "connector-phone",
-    children: [(isStaticState && !isAcceptingState && !hasOwnPstnStream || hasPstnStream && !hasOwnPstnStream) && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    children: [(isStaticState && !isAcceptingState && !hasOwnPstnStream && !hasOwnVolteStream || hasPstnStream && !hasOwnPstnStream || hasVolteStream && !hasOwnVolteStream) && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "connector-phone_inner",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "connector-phone_selector",
@@ -135,7 +137,7 @@ var View = (0, _mobxReact.observer)(function () {
         checked: rememberMe,
         onChange: setRememberMe
       })]
-    }), (isPhoneAudioConnected || isAcceptingState) && hasOwnPstnStream && /*#__PURE__*/(0, _jsxRuntime.jsx)(_useing.ConnectionUsing, {}), isStaticState && !hasOwnPstnStream && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    }), (isPhoneAudioConnected || isAcceptingState) && (hasOwnPstnStream || hasOwnVolteStream) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_useing.ConnectionUsing, {}), isStaticState && !hasOwnPstnStream && !hasOwnVolteStream && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "connector-phone_inner",
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
         size: "XS",
@@ -162,14 +164,14 @@ var View = (0, _mobxReact.observer)(function () {
         onClick: stopCall,
         children: transI18n('fmt_pstn_button_hangupphone')
       })
-    }), (outgoingCall || isStaticState) && (!hasOwnPstnStream || isAcceptingState) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_divider["default"], {
+    }), (outgoingCall || isStaticState) && (!hasOwnPstnStream && !hasOwnVolteStream || isAcceptingState) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_divider["default"], {
       style: {
         margin: '10px 0 12px'
       },
       type: "horizontal",
       size: "0.4px",
       children: transI18n('fmt_pstn_label_dialinphone')
-    }), hasPstnStream && !outgoingCall && !hasOwnPstnStream && hasNeedMergedStream && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    }), (hasPstnStream || hasVolteStream) && !outgoingCall && !hasOwnPstnStream && !hasOwnVolteStream && hasNeedMergedStream && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "connector-phone-alert",
       children: transI18n('fmt_pstn_label_alreadyin', {
         reason1: connectInfo === null || connectInfo === void 0 ? void 0 : connectInfo.phoneUserId

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

@@ -101,7 +101,7 @@ var FcrUISecondaryWindowModule = exports.FcrUISecondaryWindowModule = /*#__PURE_
     }
   }]);
 }(_base.UIModule);
-var FcrUIMainWindowRendererImpl = exports.FcrUIMainWindowRendererImpl = /*#__PURE__*/function (_ref) {
+var FcrUIMainWindowRendererImpl = exports.FcrUIMainWindowRendererImpl = /*#__PURE__*/function (_AgoraObservable) {
   function FcrUIMainWindowRendererImpl() {
     var _this2;
     (0, _classCallCheck2["default"])(this, FcrUIMainWindowRendererImpl);
@@ -114,7 +114,7 @@ var FcrUIMainWindowRendererImpl = exports.FcrUIMainWindowRendererImpl = /*#__PUR
     _this2.addObserver((0, _logger.generateLogObserver)(_this2.logger, ['onConnectionStateUpdated', 'onViewportSizeUpdated', 'onBackgroundColorUpdated', 'onDraftSaved', 'onPermissionUpdated', 'onRedoStateUpdated', 'onUndoStateUpdated', 'onWhiteboardStrokeColorChanged', 'onWhiteboardStrokeWidthChanged', 'onWhiteboardToolSelected']));
     return _this2;
   }
-  (0, _inherits2["default"])(FcrUIMainWindowRendererImpl, _ref);
+  (0, _inherits2["default"])(FcrUIMainWindowRendererImpl, _AgoraObservable);
   return (0, _createClass2["default"])(FcrUIMainWindowRendererImpl, [{
     key: "ownerUser",
     get: function get() {

package/lib/modules/secondary-window/store.d.ts

@@ -48,8 +48,11 @@ export declare class SecondaryWindowStore {
     get isActive(): boolean;
     get baseUrl(): string;
     get isAnnotationOpened(): boolean;
+    get isWaterMarkEnabled(): boolean;
+    get isMulti(): boolean;
     constructor({ objectManager }: SecondaryWindowStoreArgs);
     getContent(): void;
+    getWaterMarkContent(): string;
     handleIframeLoad(iframe: HTMLIFrameElement): void;
     zoomIn(): void;
     zoomOut(): void;

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

@@ -324,9 +324,24 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     get: function get() {
       return this._annotationProvider.isAnnotationOpened;
     }
+  }, {
+    key: "isWaterMarkEnabled",
+    get: function get() {
+      return this._privilegeProvider.isWaterMarkEnabled();
+    }
+  }, {
+    key: "isMulti",
+    get: function get() {
+      return this._privilegeProvider.isMultiWaterMarkEnabled();
+    }
   }, {
     key: "getContent",
     value: function getContent() {}
+  }, {
+    key: "getWaterMarkContent",
+    value: function getWaterMarkContent() {
+      return this._privilegeProvider.getWaterMarkContent();
+    }
   }, {
     key: "handleIframeLoad",
     value: function handleIframeLoad(iframe) {
@@ -532,7 +547,7 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }]);
 }();
 _SecondaryWindowStore = SecondaryWindowStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SecondaryWindowStore, [[_mobx.observable, 1, "_screenShareScalcValue"], [_mobx.observable, 1, "isSharingWhiteboard"], [_mobx.observable, 1, "interceptedClose"], [_mobx.computed, 3, "videoWindowData"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_mobx.computed, 3, "scalValue"], [_mobx.computed, 3, "canWriteBoard"], [_decorator.bound, 2, "handleIframeLoad"], [_decorator.bound, 2, "zoomIn"], [_decorator.bound, 2, "zoomOut"], [_decorator.bound, 2, "fullContainer"], [_decorator.bound, 2, "setInterceptedClose"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "setOriginScalc"], [_decorator.bound, 2, "setSpeakerViewSize"], [_decorator.bound, 2, "setWhiteboardTool"], [_decorator.bound, 2, "saveWhiteboardDraft"], [_decorator.bound, 2, "setProgress"], [_decorator.bound, 2, "setTheme"], [_decorator.bound, 2, "setControlEnable"], [_decorator.bound, 2, "setShowLoading"], [_decorator.bound, 2, "setCommonColors"], [_decorator.bound, 2, "log"]], []).e, 4);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SecondaryWindowStore, [[_mobx.observable, 1, "_screenShareScalcValue"], [_mobx.observable, 1, "isSharingWhiteboard"], [_mobx.observable, 1, "interceptedClose"], [_mobx.computed, 3, "videoWindowData"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_mobx.computed, 3, "scalValue"], [_mobx.computed, 3, "canWriteBoard"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_decorator.bound, 2, "getWaterMarkContent"], [_decorator.bound, 2, "handleIframeLoad"], [_decorator.bound, 2, "zoomIn"], [_decorator.bound, 2, "zoomOut"], [_decorator.bound, 2, "fullContainer"], [_decorator.bound, 2, "setInterceptedClose"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "setOriginScalc"], [_decorator.bound, 2, "setSpeakerViewSize"], [_decorator.bound, 2, "setWhiteboardTool"], [_decorator.bound, 2, "saveWhiteboardDraft"], [_decorator.bound, 2, "setProgress"], [_decorator.bound, 2, "setTheme"], [_decorator.bound, 2, "setControlEnable"], [_decorator.bound, 2, "setShowLoading"], [_decorator.bound, 2, "setCommonColors"], [_decorator.bound, 2, "log"]], []).e, 4);
 _init__screenShareScalcValue = _applyDecs$e[0];
 _init_isSharingWhiteboard = _applyDecs$e[1];
 _init_interceptedClose = _applyDecs$e[2];

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

@@ -10,6 +10,7 @@ require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.date.to-string.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.regexp.to-string.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _store = require("./store");
@@ -24,6 +25,8 @@ var _progress = _interopRequireDefault(require("../components/control-bar/compon
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _portal = require("../components/leave-meeting/portal");
 var _videoTrackRenderContext = require("../../shared-context/video-track-render-context");
+var _watermark = require("agora-ui-foundation/lib/components/watermark");
+var _hooks = require("agora-ui-foundation/lib/utilities/hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (props) {
   var renderScreenShareControl = props.renderScreenShareControl;
@@ -46,7 +49,10 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
     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,
@@ -64,8 +70,17 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
     interceptedClose = store.interceptedClose,
     setInterceptedClose = store.setInterceptedClose,
     videoRenderContext = store.videoRenderContext,
-    isAnnotationOpened = store.isAnnotationOpened;
+    isAnnotationOpened = store.isAnnotationOpened,
+    getWaterMarkContent = store.getWaterMarkContent;
   var videoWindowContainer = (0, _react.useRef)(null);
+  var _useDelayedMeasure = (0, _hooks.useDelayedMeasure)(),
+    _useDelayedMeasure2 = (0, _slicedToArray2["default"])(_useDelayedMeasure, 2),
+    delayedMeasureRef = _useDelayedMeasure2[0],
+    delayedMeasureBounds = _useDelayedMeasure2[1];
+  var waterMarkRenderContent = (0, _react.useMemo)(function () {
+    var remoteWaterMark = getWaterMarkContent();
+    return isWaterMarkEnabled ? [remoteWaterMark] : [];
+  }, [isWaterMarkEnabled, currentUser]);
   (0, _react.useEffect)(function () {
     if (!interceptedClose) return;
     if (!videoWindowContainer.current) {
@@ -213,78 +228,87 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       })
     });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    ref: videoWindowContainer,
-    className: "sub-window-view",
-    style: {
-      width: '100%',
-      height: '100%',
-      position: 'relative',
-      top: 0
-    },
-    children: [interceptedClose && /*#__PURE__*/(0, _jsxRuntime.jsx)(_portal.LeaveMeetingPortal, {
-      setPopoverOpened: function setPopoverOpened() {
-        return setInterceptedClose(false);
-      }
-    }), content, (isBoardShare || isAnnotationOpened) && /*#__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.toString()
-        });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_watermark.WaterMark, {
+    content: waterMarkRenderContent,
+    width: isMulti ? 120 : delayedMeasureBounds.width,
+    height: isMulti ? 64 : delayedMeasureBounds.height,
+    multiLine: Boolean(isMulti),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      ref: function ref(node) {
+        delayedMeasureRef(node);
+        videoWindowContainer.current = node;
       },
-      undo: function undo() {
-        return setWhiteboardTool({
-          action: _type2.WhiteboardToolAction.UNDO,
-          tool: _fcrCore.FcrBoardToolType.NONE
-        });
+      className: "sub-window-view",
+      style: {
+        width: '100%',
+        height: '100%',
+        position: 'relative',
+        top: 0
       },
-      redo: function redo() {
-        return setWhiteboardTool({
-          action: _type2.WhiteboardToolAction.REDO,
-          tool: _fcrCore.FcrBoardToolType.NONE
-        });
-      },
-      clean: function clean() {
-        return setWhiteboardTool({
-          action: _type2.WhiteboardToolAction.CLEAR,
-          tool: _fcrCore.FcrBoardToolType.NONE
-        });
-      },
-      onSave: isBoardShare ? saveWhiteboardDraft : undefined,
-      progress: toolbarState.progress,
-      setProgress: setProgress
-    })]
+      children: [interceptedClose && /*#__PURE__*/(0, _jsxRuntime.jsx)(_portal.LeaveMeetingPortal, {
+        setPopoverOpened: function setPopoverOpened() {
+          return setInterceptedClose(false);
+        }
+      }), content, (isBoardShare || isAnnotationOpened) && /*#__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.toString()
+          });
+        },
+        undo: function undo() {
+          return setWhiteboardTool({
+            action: _type2.WhiteboardToolAction.UNDO,
+            tool: _fcrCore.FcrBoardToolType.NONE
+          });
+        },
+        redo: function redo() {
+          return setWhiteboardTool({
+            action: _type2.WhiteboardToolAction.REDO,
+            tool: _fcrCore.FcrBoardToolType.NONE
+          });
+        },
+        clean: function clean() {
+          return setWhiteboardTool({
+            action: _type2.WhiteboardToolAction.CLEAR,
+            tool: _fcrCore.FcrBoardToolType.NONE
+          });
+        },
+        onSave: isBoardShare ? saveWhiteboardDraft : undefined,
+        progress: toolbarState.progress,
+        setProgress: setProgress
+      })]
+    })
   });
 });

package/lib/modules/toast-manager/type.d.ts

@@ -104,7 +104,8 @@ export declare enum FcrUIToastKey {
     FMT_SCREENSHARE_TIPS_ALREADYOPENED = "fmt_screenshare_tips_alreadyopened",
     FMT_WHITEBOARD_TIPS_SHARE_FAILED = "fmt_whiteboard_tips_share_failed",
     FMT_AUDIO_WINDOW_MIC_TURN_ON_ERROR = "fmt_audio_window_mic_turn_on_error",
-    FMT_AUDIO_WINDOW_CAMERA_TURN_ON_ERROR = "fmt_audio_window_camera_turn_on_error"
+    FMT_AUDIO_WINDOW_CAMERA_TURN_ON_ERROR = "fmt_audio_window_camera_turn_on_error",
+    FMT_SIP_TIPS_ENTER_CORRECT_NUMBER = "fmt_SIP_tips_enter_correct_number"
 }
 export declare const DefaultToastParamsMap: Record<FcrUIToastKey, {
     type: 'error' | 'warn' | 'info' | 'normal';

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

@@ -115,6 +115,7 @@ var FcrUIToastKey = exports.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;
 }({});
 var DefaultToastParamsMap = exports.DefaultToastParamsMap = (_DefaultToastParamsMa = {}, (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])(_DefaultToastParamsMa, FcrUIToastKey.ERR_MESSAGE, {
@@ -322,7 +323,7 @@ var DefaultToastParamsMap = exports.DefaultToastParamsMap = (_DefaultToastParams
   type: 'normal'
 }), FcrUIToastKey.FMT_MEETING_TOAST_DISABLED_WAITINGROOM, {
   type: 'normal'
-}), (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])(_DefaultToastParamsMa, FcrUIToastKey.FMT_SCREENSHARE_TIPS_FAILD_RESELECT, {
+}), (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])(_DefaultToastParamsMa, FcrUIToastKey.FMT_SCREENSHARE_TIPS_FAILD_RESELECT, {
   type: 'error'
 }), FcrUIToastKey.FMT_SCREENSHARE_TIPS_FAILD_SCREENSELECT, {
   type: 'error'
@@ -334,4 +335,6 @@ var DefaultToastParamsMap = exports.DefaultToastParamsMap = (_DefaultToastParams
   type: 'error'
 }), FcrUIToastKey.FMT_AUDIO_WINDOW_CAMERA_TURN_ON_ERROR, {
   type: 'error'
+}), FcrUIToastKey.FMT_SIP_TIPS_ENTER_CORRECT_NUMBER, {
+  type: 'error'
 }));

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

@@ -23,7 +23,7 @@ var createRoom = /*#__PURE__*/function () {
     return _regenerator["default"].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: {
@@ -71,7 +71,7 @@ var getUserToken = /*#__PURE__*/function () {
     return _regenerator["default"].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: {
@@ -151,10 +151,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/providers/ability-provider.d.ts

@@ -51,6 +51,18 @@ export interface FcrUIAbilityProvider {
      * 检查当前平台是否支持外呼
      */
     isCallOutAbilitySupported(): boolean;
+    /**
+     * 检查当前平台是否支持Volte外呼
+     */
+    isCallOutVolteAbilitySupported(): boolean;
+    /**
+     * 检查当前平台是否支持H323外呼
+     */
+    isCallOutH323AbilitySupported(): boolean;
+    /**
+     * 检查当前平台是否支持Sip外呼
+     */
+    isCallOutSipAbilitySupported(): boolean;
 }
 export declare class FcrUIAbilityProviderImpl implements FcrUIAbilityProvider, FcrUIManagedObject {
     private _abilityControl;
@@ -106,4 +118,7 @@ export declare class FcrUIAbilityProviderImpl implements FcrUIAbilityProvider, F
      * 检查当前平台是否支持外呼
      */
     isCallOutAbilitySupported: () => boolean;
+    isCallOutVolteAbilitySupported: () => boolean;
+    isCallOutH323AbilitySupported: () => boolean;
+    isCallOutSipAbilitySupported: () => boolean;
 }

package/lib/providers/ability-provider.js

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

package/lib/providers/mouse-detect/provider.d.ts

@@ -13,8 +13,10 @@ export declare class FcrUIMouseDetectProviderImpl implements FcrUIManagedObject,
     private _detectionOffset;
     private _isDebug;
     private _displayId;
+    private _macMenuBarOffsetY;
     private _debugWindowObserver;
     constructor(objectManager: FcrUIObjectManager);
+    isMouseDetectEnabled(): boolean;
     setDisplayId(displayId: number): void;
     setDetectArea(areaId: FcrUIDetectAreaID, areaList: FcrUI.FcrUIRectangle[]): void;
     getDetectAreas(areaId: FcrUIDetectAreaID): FcrUI.FcrUIRectangle[];

package/lib/providers/mouse-detect/provider.empty.d.ts

@@ -0,0 +1,14 @@
+import { FcrUIManagedObject } from '../../object-manager';
+import { FcrUIDetectAreaID } from './struct';
+import { FcrUIMouseDetectObserver, FcrUIMouseDetectProvider } from './type';
+export declare class FcrUIMouseDetectProviderEmptyImpl implements FcrUIManagedObject, FcrUIMouseDetectProvider {
+    isMouseDetectEnabled(): boolean;
+    setDisplayId(_displayId: number): void;
+    setDetectionPositionOffset(_offset: FcrUI.FcrUIPoint): void;
+    setDetectArea(_areaId: FcrUIDetectAreaID, _areaList: FcrUI.FcrUIRectangle[]): void;
+    getDetectAreas(_areaId: FcrUIDetectAreaID): FcrUI.FcrUIRectangle[];
+    deleteDetectArea(_areaId: FcrUIDetectAreaID): void;
+    addObserver(_observer: FcrUIMouseDetectObserver): void;
+    removeObserver(_observer: FcrUIMouseDetectObserver): void;
+    release(): void;
+}

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

@@ -0,0 +1,47 @@
+"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.FcrUIMouseDetectProviderEmptyImpl = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var FcrUIMouseDetectProviderEmptyImpl = exports.FcrUIMouseDetectProviderEmptyImpl = /*#__PURE__*/function () {
+  function FcrUIMouseDetectProviderEmptyImpl() {
+    (0, _classCallCheck2["default"])(this, FcrUIMouseDetectProviderEmptyImpl);
+  }
+  return (0, _createClass2["default"])(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() {}
+  }]);
+}();