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

package/lib/modules/participant/components/confirm-input/index.css

@@ -14,6 +14,72 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  gap: 15px;
+  gap: 20px;
   overflow: hidden;
 }
+
+.participants-container-rename-input-wrapper {
+  width: 100%;
+  position: relative;
+}
+
+.participants-container-rename-input-wrapper .fcr-textarea {
+  width: 272px;
+  height: 84px;
+  border-radius: var(--fcr_cornerradius_l);
+  border-width: 1px;
+  padding-top: 12px;
+  padding-right: 12px;
+  padding-bottom: 26px; /* 8px (Figma padding-bottom) + 18px (字符计数区域) = 26px */
+  padding-left: 12px;
+  box-sizing: border-box;
+}
+
+.participants-container-rename-input-wrapper .fcr-textarea textarea {
+  width: 248px; /* 272 - 12*2 = 248px */
+  height: 40px;
+  font-family:
+    'Inter',
+    ui-sans-serif,
+    system-ui,
+    -apple-system,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    'Helvetica Neue',
+    Arial,
+    sans-serif;
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0;
+  color: var(--fcr_ui_scene_icontext1);
+  padding: 0; /* 容器的 padding 已经处理了间距 */
+  box-sizing: border-box;
+  vertical-align: bottom;
+}
+
+.participants-container-rename-input-wrapper .fcr-textarea .fcr-textarea-wc {
+  height: 16px;
+  font-family:
+    'Inter',
+    ui-sans-serif,
+    system-ui,
+    -apple-system,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    'Helvetica Neue',
+    Arial,
+    sans-serif;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  letter-spacing: 0;
+  text-align: right;
+  color: var(--fcr_ui_scene_icontext2);
+  position: absolute;
+  bottom: 8px; /* 根据 Figma padding-bottom: 8px 调整 */
+  left: 12px; /* 与容器的 padding-left 对齐 */
+  right: 12px; /* 与容器的 padding-right 对齐，宽度自动计算为 248px (272 - 12*2) */
+}

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

@@ -12,6 +12,7 @@ require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.string.trim.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _input = require("agora-ui-foundation/lib/components/input");
+var _textarea = require("agora-ui-foundation/lib/components/textarea");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _react = require("react");
 var _store = require("../../store.base");
@@ -32,12 +33,14 @@ var FcrConfirmRenameForm = function FcrConfirmRenameForm(props) {
     name = _useState2[0],
     setName = _useState2[1];
   var t = (0, _i18n.useI18n)();
+  var MAX_BYTE_LENGTH = 48;
+  var MAX_LENGTH = 24;
   (0, _react.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());
@@ -45,17 +48,17 @@ var FcrConfirmRenameForm = function FcrConfirmRenameForm(props) {
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "participants-container-rename",
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_input.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__*/(0, _jsxRuntime.jsx)("div", {
+      className: "participants-container-rename-input-wrapper",
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_textarea.FcrTextArea, {
+        value: name,
+        onChange: handleNameChange,
+        placeholder: placeholder || t('fmt_additional_popup_label_enter_nickname'),
+        maxCount: MAX_LENGTH,
+        showCount: true,
+        autoSize: false,
+        resizable: false
+      })
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: 'participants-container-rename-footer fcr-confirm-content-footer fcr-confirm-content-footer__center',
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
@@ -99,7 +102,7 @@ var FcrConfirmInput = exports.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/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/modules/participant/store.base.d.ts

@@ -187,6 +187,7 @@ export declare abstract class ParticipantStoreBase {
      * @returns 设备信息对象
      */
     private _getPstnUserDeviceInfo;
+    private _getVolteUserDeviceInfo;
     /**
      * 获取SIP/H323会议系统用户的设备信息
      * @param userStreams 用户流数据

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

@@ -631,7 +631,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
   }, {
     key: "hasInvite",
     get: function get() {
-      return this._abilityProvider.isRoomDetailSupported() && this._abilityProvider.isCallOutAbilitySupported();
+      return this._abilityProvider.isRoomDetailSupported();
     }
   }, {
     key: "checkedStateMap",
@@ -1139,9 +1139,10 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       var _streams$find;
       var user = this.mainRoomUserMap.get(userId);
       var isPSTN = (user === null || user === void 0 ? void 0 : user.userInfo.connectorType) === _fcrCore.FcrRoomConnectorType.PSTN;
+      var isVOLTE = (user === null || user === void 0 ? void 0 : user.userInfo.connectorType) === _fcrCore.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 === _fcrCore.FcrVideoSourceType.CAMERA || isPSTN && stream.videoSourceType === _fcrCore.FcrVideoSourceType.NONE;
+        return stream.videoSourceType === _fcrCore.FcrVideoSourceType.CAMERA || isPSTN && stream.videoSourceType === _fcrCore.FcrVideoSourceType.NONE || isVOLTE && stream.videoSourceType === _fcrCore.FcrVideoSourceType.NONE;
       })) === null || _streams$find === void 0 ? void 0 : _streams$find.streamId;
       return streamId;
     }
@@ -1213,6 +1214,8 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
           return this._getNormalUserDeviceInfo(userStreams, isSelf);
         case _fcrCore.FcrRoomConnectorType.PSTN:
           return this._getPstnUserDeviceInfo(userStreams);
+        case _fcrCore.FcrRoomConnectorType.VOLTE:
+          return this._getVolteUserDeviceInfo(userStreams);
         case _fcrCore.FcrRoomConnectorType.SIP:
         case _fcrCore.FcrRoomConnectorType.H323:
           return this._getSipOrH323UserDeviceInfo(userStreams);
@@ -1232,14 +1235,16 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     value: function _getNormalUserDeviceInfo(userStreams, isSelf) {
       var defaultStream = this._findStreamByVideoSourceType(userStreams, _fcrCore.FcrVideoSourceType.CAMERA);
       var pstnStream = this._findStreamByConnectorType(userStreams, _fcrCore.FcrRoomConnectorType.PSTN);
+      var volteStream = this._findStreamByConnectorType(userStreams, _fcrCore.FcrRoomConnectorType.VOLTE);
       var hasVideo = isSelf ? this._deviceStore.cameraEnabled : this._hasVideoPublishedAndStarted(defaultStream);
-      if (pstnStream) {
-        // 有PSTN流，使用电话麦克风
+      var phoneStream = volteStream || pstnStream;
+      if (phoneStream) {
+        // 有PSTN或VOLTE流，使用电话麦克风
         return {
           audioDeviceType: _struct.USER_FORMAT_CONFIG.DEVICE_TYPES.AUDIO.PHONE_MIC,
           videoDeviceType: _struct.USER_FORMAT_CONFIG.DEVICE_TYPES.VIDEO.COMPUTER_CAM,
           userType: _struct.USER_FORMAT_CONFIG.USER_TYPES.NORMAL,
-          hasAudio: pstnStream.audioSourceState === _fcrCore.FcrMediaSourceState.OPEN,
+          hasAudio: phoneStream.audioSourceState === _fcrCore.FcrMediaSourceState.OPEN,
           hasVideo: hasVideo
         };
       } else {
@@ -1271,6 +1276,18 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
         hasVideo: false
       };
     }
+  }, {
+    key: "_getVolteUserDeviceInfo",
+    value: function _getVolteUserDeviceInfo(userStreams) {
+      var volteStream = this._findStreamByConnectorType(userStreams, _fcrCore.FcrRoomConnectorType.VOLTE);
+      return {
+        audioDeviceType: _struct.USER_FORMAT_CONFIG.DEVICE_TYPES.AUDIO.PHONE_MIC,
+        videoDeviceType: _struct.USER_FORMAT_CONFIG.DEVICE_TYPES.VIDEO.COMPUTER_CAM,
+        userType: _struct.USER_FORMAT_CONFIG.USER_TYPES.MEETING_SYSTEM,
+        hasAudio: this._hasAudioPublishedAndStarted(volteStream),
+        hasVideo: this._hasVideoPublishedAndStarted(volteStream)
+      };
+    }
 
     /**
      * 获取SIP/H323会议系统用户的设备信息
@@ -1734,8 +1751,18 @@ var ParticipantStoreBase = exports.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, _type.FcrStreamPrivilegeOperation.NOOPERATION, _type.FcrStreamPrivilegeOperation.HAS_PRIVILEGE);
+        return;
+      }
+
+      // 如果是本地用户，直接启用本地麦克风（上面硬件已经处理了，所以从这里往后都不是硬件设备了）
+      if (isLocalUser) {
         this._deviceStreamStore.enableCameraWithPreCheck(true);
         return;
       }

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

@@ -20,8 +20,10 @@ export default class ConnectionGatewayStoreMainScene {
     get connectType(): import("../../../type").FcrUIConnectType;
     get hasNeedMergedStream(): boolean;
     get hasOwnPstnStream(): boolean;
+    get hasOwnVolteStream(): boolean;
     get outgoingCall(): boolean;
     get hasPstnStream(): boolean;
+    get hasVolteStream(): boolean;
     get connectInfo(): import("fcr-core/lib/room-control/room-connector-control/type").FcrRoomConnectorPhoneInfo;
     constructor({ objectManager }: ConnectionGatewayStoreArgs);
     openAudioSettings(): void;

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];