fcr-ui-scene 3.9.0 → 3.9.1-alpha

package/lib-es/modules/participant/components/confirm-input/index.js

@@ -4,6 +4,7 @@ import "core-js/modules/es.regexp.test.js";
 import "core-js/modules/es.string.replace.js";
 import "core-js/modules/es.string.trim.js";
 import { FcrInput } from 'agora-ui-foundation/lib/components/input';
+import { FcrTextArea } from 'agora-ui-foundation/lib/components/textarea';
 import { useI18n } from 'agora-ui-foundation/lib/i18n';
 import { useContext, useEffect, useState } from 'react';
 import { StoreContext } from '../../store.base';
@@ -24,12 +25,14 @@ var FcrConfirmRenameForm = function FcrConfirmRenameForm(props) {
     name = _useState2[0],
     setName = _useState2[1];
   var t = useI18n();
+  var MAX_BYTE_LENGTH = 48;
+  var MAX_LENGTH = 24;
   useEffect(function () {
     setName(value);
   }, [value]);
   function handleNameChange(name) {
     var length = name.replace(/[^\x00-\xff]/g, '**').length;
-    if (length > 36) {
+    if (length > MAX_BYTE_LENGTH) {
       return;
     }
     type === 'number' ? (/^\d+$/.test(name) || name === '') && setName(name.trim()) : setName(name.trim());
@@ -37,17 +40,17 @@ var FcrConfirmRenameForm = function FcrConfirmRenameForm(props) {
   }
   return /*#__PURE__*/_jsxs("div", {
     className: "participants-container-rename",
-    children: [/*#__PURE__*/_jsx(FcrInput, {
-      autoFocus: true,
-      style: {
-        width: '100%'
-      },
-      value: name,
-      onChange: handleNameChange,
-      size: "large",
-      allowClear: true,
-      shape: "rounded",
-      placeholder: placeholder || t('fmt_additional_popup_label_enter_nickname')
+    children: [/*#__PURE__*/_jsx("div", {
+      className: "participants-container-rename-input-wrapper",
+      children: /*#__PURE__*/_jsx(FcrTextArea, {
+        value: name,
+        onChange: handleNameChange,
+        placeholder: placeholder || t('fmt_additional_popup_label_enter_nickname'),
+        maxCount: MAX_LENGTH,
+        showCount: true,
+        autoSize: false,
+        resizable: false
+      })
     }), /*#__PURE__*/_jsxs("div", {
       className: 'participants-container-rename-footer fcr-confirm-content-footer fcr-confirm-content-footer__center',
       children: [/*#__PURE__*/_jsx(FcrButton, {
@@ -91,7 +94,7 @@ export var FcrConfirmInput = function FcrConfirmInput(props) {
       size: "large",
       allowClear: true,
       shape: "rounded",
-      maxLength: 18,
+      maxLength: 24,
       placeholder: placeholder || t('fmt_additional_popup_label_enter_nickname')
     })
   });

package/lib-es/modules/participant/components/participants/components/render-user/components/attendee/index.css

@@ -85,3 +85,7 @@
 .operate-waiting-room-dialog-btns .fcr-button-danger {
   width: 48%;
 }
+
+.attendee {
+  min-height: 62px;
+}

package/lib-es/modules/participant/store.base.js

@@ -624,7 +624,7 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
   }, {
     key: "hasInvite",
     get: function get() {
-      return this._abilityProvider.isRoomDetailSupported() && this._abilityProvider.isCallOutAbilitySupported();
+      return this._abilityProvider.isRoomDetailSupported();
     }
   }, {
     key: "checkedStateMap",
@@ -1132,9 +1132,10 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
       var _streams$find;
       var user = this.mainRoomUserMap.get(userId);
       var isPSTN = (user === null || user === void 0 ? void 0 : user.userInfo.connectorType) === FcrRoomConnectorType.PSTN;
+      var isVOLTE = (user === null || user === void 0 ? void 0 : user.userInfo.connectorType) === FcrRoomConnectorType.VOLTE;
       var streams = user === null || user === void 0 ? void 0 : user.streams;
       var streamId = streams === null || streams === void 0 || (_streams$find = streams.find(function (stream) {
-        return stream.videoSourceType === FcrVideoSourceType.CAMERA || isPSTN && stream.videoSourceType === FcrVideoSourceType.NONE;
+        return stream.videoSourceType === FcrVideoSourceType.CAMERA || isPSTN && stream.videoSourceType === FcrVideoSourceType.NONE || isVOLTE && stream.videoSourceType === FcrVideoSourceType.NONE;
       })) === null || _streams$find === void 0 ? void 0 : _streams$find.streamId;
       return streamId;
     }
@@ -1206,6 +1207,8 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
           return this._getNormalUserDeviceInfo(userStreams, isSelf);
         case FcrRoomConnectorType.PSTN:
           return this._getPstnUserDeviceInfo(userStreams);
+        case FcrRoomConnectorType.VOLTE:
+          return this._getVolteUserDeviceInfo(userStreams);
         case FcrRoomConnectorType.SIP:
         case FcrRoomConnectorType.H323:
           return this._getSipOrH323UserDeviceInfo(userStreams);
@@ -1225,14 +1228,16 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
     value: function _getNormalUserDeviceInfo(userStreams, isSelf) {
       var defaultStream = this._findStreamByVideoSourceType(userStreams, FcrVideoSourceType.CAMERA);
       var pstnStream = this._findStreamByConnectorType(userStreams, FcrRoomConnectorType.PSTN);
+      var volteStream = this._findStreamByConnectorType(userStreams, FcrRoomConnectorType.VOLTE);
       var hasVideo = isSelf ? this._deviceStore.cameraEnabled : this._hasVideoPublishedAndStarted(defaultStream);
-      if (pstnStream) {
-        // 有PSTN流，使用电话麦克风
+      var phoneStream = volteStream || pstnStream;
+      if (phoneStream) {
+        // 有PSTN或VOLTE流，使用电话麦克风
         return {
           audioDeviceType: USER_FORMAT_CONFIG.DEVICE_TYPES.AUDIO.PHONE_MIC,
           videoDeviceType: USER_FORMAT_CONFIG.DEVICE_TYPES.VIDEO.COMPUTER_CAM,
           userType: USER_FORMAT_CONFIG.USER_TYPES.NORMAL,
-          hasAudio: pstnStream.audioSourceState === FcrMediaSourceState.OPEN,
+          hasAudio: phoneStream.audioSourceState === FcrMediaSourceState.OPEN,
           hasVideo: hasVideo
         };
       } else {
@@ -1264,6 +1269,18 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
         hasVideo: false
       };
     }
+  }, {
+    key: "_getVolteUserDeviceInfo",
+    value: function _getVolteUserDeviceInfo(userStreams) {
+      var volteStream = this._findStreamByConnectorType(userStreams, FcrRoomConnectorType.VOLTE);
+      return {
+        audioDeviceType: USER_FORMAT_CONFIG.DEVICE_TYPES.AUDIO.PHONE_MIC,
+        videoDeviceType: USER_FORMAT_CONFIG.DEVICE_TYPES.VIDEO.COMPUTER_CAM,
+        userType: USER_FORMAT_CONFIG.USER_TYPES.MEETING_SYSTEM,
+        hasAudio: this._hasAudioPublishedAndStarted(volteStream),
+        hasVideo: this._hasVideoPublishedAndStarted(volteStream)
+      };
+    }
 
     /**
      * 获取SIP/H323会议系统用户的设备信息
@@ -1727,8 +1744,18 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
   }, {
     key: "_unmuteUserVideo",
     value: function _unmuteUserVideo(userId) {
-      var isSelf = userId === this.localUser.userId;
-      if (isSelf) {
+      var _this$_getUserTargetA3 = this._getUserTargetAudioStreams(userId),
+        hardwareDeviceStream = _this$_getUserTargetA3.hardwareDeviceStream,
+        isLocalUser = _this$_getUserTargetA3.isLocalUser;
+
+      // 如果是硬件设备流，直接更新流的发布权限来取消静音
+      if (hardwareDeviceStream) {
+        this._updateStreamPrivilege(hardwareDeviceStream.streamId, FcrStreamPrivilegeOperation.NOOPERATION, FcrStreamPrivilegeOperation.HAS_PRIVILEGE);
+        return;
+      }
+
+      // 如果是本地用户，直接启用本地麦克风（上面硬件已经处理了，所以从这里往后都不是硬件设备了）
+      if (isLocalUser) {
         this._deviceStreamStore.enableCameraWithPreCheck(true);
         return;
       }

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

@@ -161,6 +161,11 @@ var ConnectionGatewayStoreMainScene = /*#__PURE__*/function () {
     get: function get() {
       return this._phoneAudioConnectorProvider.hasOwnPstnStream;
     }
+  }, {
+    key: "hasOwnVolteStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasOwnVolteStream;
+    }
   }, {
     key: "outgoingCall",
     get: function get() {
@@ -171,6 +176,11 @@ var ConnectionGatewayStoreMainScene = /*#__PURE__*/function () {
     get: function get() {
       return this._phoneAudioConnectorProvider.hasPstnStream;
     }
+  }, {
+    key: "hasVolteStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasVolteStream;
+    }
   }, {
     key: "connectInfo",
     get: function get() {
@@ -208,7 +218,7 @@ var ConnectionGatewayStoreMainScene = /*#__PURE__*/function () {
           return false;
         }
         this._needShowConfirmDialog = false;
-        if (this.hasOwnPstnStream) {
+        if (this.hasOwnPstnStream || this.hasOwnVolteStream) {
           return false;
         }
         var dialogId = this._dialogProvider.openConfirmDialog({
@@ -303,7 +313,7 @@ var ConnectionGatewayStoreMainScene = /*#__PURE__*/function () {
   }]);
 }();
 _ConnectionGatewayStoreMainScene = ConnectionGatewayStoreMainScene;
-var _applyDecs$e = _slicedToArray(_applyDecs(_ConnectionGatewayStoreMainScene, [[observable, 1, "phoneCallState"], [observable, 1, "phoneCallReason"], [observable, 1, "connectSession"], [observable, 1, "calling"], [computed, 3, "connectType"], [computed, 3, "hasNeedMergedStream"], [computed, 3, "hasOwnPstnStream"], [computed, 3, "outgoingCall"], [computed, 3, "hasPstnStream"], [computed, 3, "connectInfo"], [bound, 2, "openAudioSettings"], [bound, 2, "_handleInterceptorCloseDialog"], [bound, 2, "joinAudioByComputer"], [bound, 2, "stopAudioByComputer"], [bound, 2, "openInviteDialog"]], []).e, 5);
+var _applyDecs$e = _slicedToArray(_applyDecs(_ConnectionGatewayStoreMainScene, [[observable, 1, "phoneCallState"], [observable, 1, "phoneCallReason"], [observable, 1, "connectSession"], [observable, 1, "calling"], [computed, 3, "connectType"], [computed, 3, "hasNeedMergedStream"], [computed, 3, "hasOwnPstnStream"], [computed, 3, "hasOwnVolteStream"], [computed, 3, "outgoingCall"], [computed, 3, "hasPstnStream"], [computed, 3, "hasVolteStream"], [computed, 3, "connectInfo"], [bound, 2, "openAudioSettings"], [bound, 2, "_handleInterceptorCloseDialog"], [bound, 2, "joinAudioByComputer"], [bound, 2, "stopAudioByComputer"], [bound, 2, "openInviteDialog"]], []).e, 5);
 _init_phoneCallState = _applyDecs$e[0];
 _init_phoneCallReason = _applyDecs$e[1];
 _init_connectSession = _applyDecs$e[2];

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

@@ -18,6 +18,8 @@ var View = observer(function () {
     hasOwnPstnStream = _useContext.hasOwnPstnStream,
     outgoingCall = _useContext.outgoingCall,
     hasPstnStream = _useContext.hasPstnStream,
+    hasVolteStream = _useContext.hasVolteStream,
+    hasOwnVolteStream = _useContext.hasOwnVolteStream,
     connectInfo = _useContext.connectInfo;
   var transI18n = useI18n();
   return /*#__PURE__*/_jsxs("div", {
@@ -28,7 +30,7 @@ var View = observer(function () {
       className: "var(--fcrcornerradiusround) fcr_ui_scene_ramp_brand6",
       onClick: joinAudioByComputer,
       children: transI18n('fmt_pstn_label_accessmethodPC')
-    }), hasPstnStream && !outgoingCall && !hasOwnPstnStream && hasNeedMergedStream && /*#__PURE__*/_jsx("div", {
+    }), (hasPstnStream || hasVolteStream) && !outgoingCall && !hasOwnPstnStream && !hasOwnVolteStream && hasNeedMergedStream && /*#__PURE__*/_jsx("div", {
       className: "connector-phone-alert",
       children: transI18n('fmt_pstn_label_alreadyin', {
         reason1: connectInfo === null || connectInfo === void 0 ? void 0 : connectInfo.phoneUserId
@@ -40,7 +42,7 @@ var View = observer(function () {
       className: "var(--fcrcornerradiusround)",
       onClick: stopAudioByComputer,
       children: transI18n('fmt_pstn_button_PCaudiostop')
-    }), connectType === FcrUIConnectType.PHONE && hasOwnPstnStream && /*#__PURE__*/_jsx(FcrToolTip, {
+    }), connectType === FcrUIConnectType.PHONE && (hasOwnPstnStream || hasOwnVolteStream) && /*#__PURE__*/_jsx(FcrToolTip, {
       content: transI18n('fmt_pstn_tips_alreadyphone'),
       children: /*#__PURE__*/_jsx(FcrButton, {
         size: "XS",

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

@@ -75,6 +75,7 @@ import { FcrUIDialogKey, FcrUIHighlightElement } from '../../utilities/constant'
 import { ConnectorRegion } from './enums';
 import { FcrUIObjectKeys } from '../../object-manager';
 import { DeviceSettingTab } from '../setting/type';
+import { FcrPhoneConnectorSessionType } from 'fcr-core/lib/room-control/room-connector-control/type';
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -182,6 +183,16 @@ var ConnectionGatewayStore = /*#__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() {
@@ -200,7 +211,7 @@ var ConnectionGatewayStore = /*#__PURE__*/function () {
   }, {
     key: "startCall",
     value: function startCall() {
-      this._phoneAudioConnectorProvider.startCall(this.currentCallInfo.phone);
+      this._phoneAudioConnectorProvider.startCall(this.currentCallInfo.phone, FcrPhoneConnectorSessionType.PSTN);
     }
   }, {
     key: "stopCall",

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

@@ -39,7 +39,9 @@ var View = 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 = useI18n();
   var _useState = useState(''),
@@ -88,7 +90,7 @@ var View = observer(function () {
   }, [phoneCallState, phoneCallReason]);
   return /*#__PURE__*/_jsxs("div", {
     className: "connector-phone",
-    children: [(isStaticState && !isAcceptingState && !hasOwnPstnStream || hasPstnStream && !hasOwnPstnStream) && /*#__PURE__*/_jsxs("div", {
+    children: [(isStaticState && !isAcceptingState && !hasOwnPstnStream && !hasOwnVolteStream || hasPstnStream && !hasOwnPstnStream || hasVolteStream && !hasOwnVolteStream) && /*#__PURE__*/_jsxs("div", {
       className: "connector-phone_inner",
       children: [/*#__PURE__*/_jsxs("div", {
         className: "connector-phone_selector",
@@ -127,7 +129,7 @@ var View = observer(function () {
         checked: rememberMe,
         onChange: setRememberMe
       })]
-    }), (isPhoneAudioConnected || isAcceptingState) && hasOwnPstnStream && /*#__PURE__*/_jsx(ConnectionUsing, {}), isStaticState && !hasOwnPstnStream && /*#__PURE__*/_jsx("div", {
+    }), (isPhoneAudioConnected || isAcceptingState) && (hasOwnPstnStream || hasOwnVolteStream) && /*#__PURE__*/_jsx(ConnectionUsing, {}), isStaticState && !hasOwnPstnStream && !hasOwnVolteStream && /*#__PURE__*/_jsx("div", {
       className: "connector-phone_inner",
       children: /*#__PURE__*/_jsx(FcrButton, {
         size: "XS",
@@ -154,14 +156,14 @@ var View = observer(function () {
         onClick: stopCall,
         children: transI18n('fmt_pstn_button_hangupphone')
       })
-    }), (outgoingCall || isStaticState) && (!hasOwnPstnStream || isAcceptingState) && /*#__PURE__*/_jsx(FcrDivider, {
+    }), (outgoingCall || isStaticState) && (!hasOwnPstnStream && !hasOwnVolteStream || isAcceptingState) && /*#__PURE__*/_jsx(FcrDivider, {
       style: {
         margin: '10px 0 12px'
       },
       type: "horizontal",
       size: "0.4px",
       children: transI18n('fmt_pstn_label_dialinphone')
-    }), hasPstnStream && !outgoingCall && !hasOwnPstnStream && hasNeedMergedStream && /*#__PURE__*/_jsx("div", {
+    }), (hasPstnStream || hasVolteStream) && !outgoingCall && !hasOwnPstnStream && !hasOwnVolteStream && hasNeedMergedStream && /*#__PURE__*/_jsx("div", {
       className: "connector-phone-alert",
       children: transI18n('fmt_pstn_label_alreadyin', {
         reason1: connectInfo === null || connectInfo === void 0 ? void 0 : connectInfo.phoneUserId

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

@@ -93,7 +93,7 @@ export var FcrUISecondaryWindowModule = /*#__PURE__*/function (_UIModule) {
     }
   }]);
 }(UIModule);
-export var FcrUIMainWindowRendererImpl = /*#__PURE__*/function (_ref) {
+export var FcrUIMainWindowRendererImpl = /*#__PURE__*/function (_AgoraObservable) {
   function FcrUIMainWindowRendererImpl() {
     var _this2;
     _classCallCheck(this, FcrUIMainWindowRendererImpl);
@@ -106,7 +106,7 @@ export var FcrUIMainWindowRendererImpl = /*#__PURE__*/function (_ref) {
     _this2.addObserver(generateLogObserver(_this2.logger, ['onConnectionStateUpdated', 'onViewportSizeUpdated', 'onBackgroundColorUpdated', 'onDraftSaved', 'onPermissionUpdated', 'onRedoStateUpdated', 'onUndoStateUpdated', 'onWhiteboardStrokeColorChanged', 'onWhiteboardStrokeWidthChanged', 'onWhiteboardToolSelected']));
     return _this2;
   }
-  _inherits(FcrUIMainWindowRendererImpl, _ref);
+  _inherits(FcrUIMainWindowRendererImpl, _AgoraObservable);
   return _createClass(FcrUIMainWindowRendererImpl, [{
     key: "ownerUser",
     get: function get() {

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

@@ -317,9 +317,24 @@ export var 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) {
@@ -525,7 +540,7 @@ export var SecondaryWindowStore = /*#__PURE__*/function () {
   }]);
 }();
 _SecondaryWindowStore = SecondaryWindowStore;
-var _applyDecs$e = _slicedToArray(_applyDecs(_SecondaryWindowStore, [[observable, 1, "_screenShareScalcValue"], [observable, 1, "isSharingWhiteboard"], [observable, 1, "interceptedClose"], [computed, 3, "videoWindowData"], [computed, 3, "isAspectRatioPreserved"], [computed, 3, "scalValue"], [computed, 3, "canWriteBoard"], [bound, 2, "handleIframeLoad"], [bound, 2, "zoomIn"], [bound, 2, "zoomOut"], [bound, 2, "fullContainer"], [bound, 2, "setInterceptedClose"], [bound, 2, "setScaleValue"], [bound, 2, "setOriginScalc"], [bound, 2, "setSpeakerViewSize"], [bound, 2, "setWhiteboardTool"], [bound, 2, "saveWhiteboardDraft"], [bound, 2, "setProgress"], [bound, 2, "setTheme"], [bound, 2, "setControlEnable"], [bound, 2, "setShowLoading"], [bound, 2, "setCommonColors"], [bound, 2, "log"]], []).e, 4);
+var _applyDecs$e = _slicedToArray(_applyDecs(_SecondaryWindowStore, [[observable, 1, "_screenShareScalcValue"], [observable, 1, "isSharingWhiteboard"], [observable, 1, "interceptedClose"], [computed, 3, "videoWindowData"], [computed, 3, "isAspectRatioPreserved"], [computed, 3, "scalValue"], [computed, 3, "canWriteBoard"], [computed, 3, "isWaterMarkEnabled"], [computed, 3, "isMulti"], [bound, 2, "getWaterMarkContent"], [bound, 2, "handleIframeLoad"], [bound, 2, "zoomIn"], [bound, 2, "zoomOut"], [bound, 2, "fullContainer"], [bound, 2, "setInterceptedClose"], [bound, 2, "setScaleValue"], [bound, 2, "setOriginScalc"], [bound, 2, "setSpeakerViewSize"], [bound, 2, "setWhiteboardTool"], [bound, 2, "saveWhiteboardDraft"], [bound, 2, "setProgress"], [bound, 2, "setTheme"], [bound, 2, "setControlEnable"], [bound, 2, "setShowLoading"], [bound, 2, "setCommonColors"], [bound, 2, "log"]], []).e, 4);
 _init__screenShareScalcValue = _applyDecs$e[0];
 _init_isSharingWhiteboard = _applyDecs$e[1];
 _init_interceptedClose = _applyDecs$e[2];

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;