fcr-ui-scene 3.6.1 → 3.6.3

package/lib/modules/components/member-window/components/member-actions/components/icon-status.d.ts

@@ -1,9 +1,7 @@
 import React from 'react';
-import { FcrRoomConnectorType } from 'fcr-core';
 interface IconStatusProps {
     windowSize: 'large' | 'normal';
     iconSize: number;
-    meetingConnectorTypes: Set<FcrRoomConnectorType>;
     id: string | undefined;
     volume: number;
 }

package/lib/modules/components/member-window/components/member-actions/components/icon-status.js

@@ -19,7 +19,6 @@ var _jsxRuntime = require("react/jsx-runtime");
 var IconStatus = exports.IconStatus = (0, _mobxReact.observer)(function (_ref) {
   var windowSize = _ref.windowSize,
     iconSize = _ref.iconSize,
-    meetingConnectorTypes = _ref.meetingConnectorTypes,
     id = _ref.id,
     volume = _ref.volume;
   var t = (0, _i18n.useI18n)();
@@ -29,14 +28,14 @@ var IconStatus = exports.IconStatus = (0, _mobxReact.observer)(function (_ref) {
     videoStreamId = store.videoStreamId,
     hasMicrophoneAudioStream = store.hasMicrophoneAudioStream,
     isManager = store.isManager,
+    isMeeting = store.isMeeting,
     phoneMicEnabled = store.phoneMicEnabled,
-    isScreenSharing = store.isScreenSharing;
+    isSharingWindow = store.isSharingWindow;
   var isNormal = connectorType === _fcrCore.FcrRoomConnectorType.NONE;
   var isPhone = store.isPhone;
-  var isMeeting = meetingConnectorTypes.has(connectorType);
   var isPurePhone = audioStreamId === videoStreamId;
   var renderNormalStatus = function renderNormalStatus() {
-    if (isScreenSharing && windowSize === 'large') {
+    if (isSharingWindow) {
       return;
     }
     if (!hasMicrophoneAudioStream && !isMeeting) {

package/lib/modules/components/member-window/components/member-actions/components/more-actions.d.ts

@@ -1,11 +1,8 @@
 import React from 'react';
-import { FcrRoomConnectorType } from 'fcr-core';
-export declare const meetingConnectorTypes: Set<FcrRoomConnectorType>;
 export interface ActionsTopProps {
     isShowActionAudio: boolean;
     actionAudioTag: string;
     hasPinnedStream: boolean;
-    meetingConnectorTypes: Set<FcrRoomConnectorType>;
     allowedOperations: string[];
 }
 export declare const MoreActions: React.FC<ActionsTopProps>;

package/lib/modules/components/member-window/components/member-actions/components/more-actions.js

@@ -1,44 +1,20 @@
 "use strict";
 
+require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.meetingConnectorTypes = exports.MoreActions = void 0;
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.set.js");
-require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/esnext.set.add-all.js");
-require("core-js/modules/esnext.set.delete-all.js");
-require("core-js/modules/esnext.set.difference.v2.js");
-require("core-js/modules/esnext.set.difference.js");
-require("core-js/modules/esnext.set.every.js");
-require("core-js/modules/esnext.set.filter.js");
-require("core-js/modules/esnext.set.find.js");
-require("core-js/modules/esnext.set.intersection.v2.js");
-require("core-js/modules/esnext.set.intersection.js");
-require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
-require("core-js/modules/esnext.set.is-disjoint-from.js");
-require("core-js/modules/esnext.set.is-subset-of.v2.js");
-require("core-js/modules/esnext.set.is-subset-of.js");
-require("core-js/modules/esnext.set.is-superset-of.v2.js");
-require("core-js/modules/esnext.set.is-superset-of.js");
-require("core-js/modules/esnext.set.join.js");
-require("core-js/modules/esnext.set.map.js");
-require("core-js/modules/esnext.set.reduce.js");
-require("core-js/modules/esnext.set.some.js");
-require("core-js/modules/esnext.set.symmetric-difference.v2.js");
-require("core-js/modules/esnext.set.symmetric-difference.js");
-require("core-js/modules/esnext.set.union.v2.js");
-require("core-js/modules/esnext.set.union.js");
-require("core-js/modules/web.dom-collections.iterator.js");
+exports.MoreActions = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
@@ -54,16 +30,15 @@ var _mobxReact = require("mobx-react");
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-var meetingConnectorTypes = exports.meetingConnectorTypes = new Set([_fcrCore.FcrRoomConnectorType.SIP, _fcrCore.FcrRoomConnectorType.H323]);
 var EMPTY_HIDE_ACTIONS = [];
 var MoreActions = exports.MoreActions = (0, _mobxReact.observer)(function (_ref) {
   var isShowActionAudio = _ref.isShowActionAudio,
     actionAudioTag = _ref.actionAudioTag,
     hasPinnedStream = _ref.hasPinnedStream,
-    meetingConnectorTypes = _ref.meetingConnectorTypes,
     allowedOperations = _ref.allowedOperations;
   var t = (0, _i18n.useI18n)();
   var store = (0, _provider.useMemberWindowActionsStore)();
+  var isMeeting = store.isMeeting;
   var _ref2 = store.windowData || {},
     userId = _ref2.userId,
     userName = _ref2.userName,
@@ -76,7 +51,6 @@ var MoreActions = exports.MoreActions = (0, _mobxReact.observer)(function (_ref)
     videoStreamConnectorType = _ref2.videoStreamConnectorType;
   var connectorType = audioStreamConnectorType !== _fcrCore.FcrRoomConnectorType.NONE ? audioStreamConnectorType : videoStreamConnectorType;
   var isPhone = connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
-  var isMeeting = meetingConnectorTypes.has(connectorType);
   var userType = audioStreamConnectorType === _fcrCore.FcrRoomConnectorType.PSTN && !hasVideoStream ? 'phone' : isMeeting ? 'meeting-system' : 'normal';
   var isHost = ownerRoleType === _type2.FcrUserRole.HOST;
   var audioDeviceType = isPhone ? 'phone-mic' : 'computer-mic';

package/lib/modules/components/member-window/components/member-actions/components/share-status.js

@@ -10,20 +10,28 @@ var _react = _interopRequireDefault(require("react"));
 var _provider = require("../provider");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type = require("../../../../../../type");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var ShareStatus = exports.ShareStatus = function ShareStatus() {
   var store = (0, _provider.useMemberWindowActionsStore)();
   var t = (0, _i18n.useI18n)();
   var windowData = store.windowData,
-    hasScreenSharing = store.hasScreenSharing;
+    hasSharing = store.hasSharing;
   if (windowData.type === _type.FcrUIWindowType.BOARD) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: t('fmt_screenshare_whiteboard_tips_someonesharing', {
+      children: t('fmt_share_label_shareboard', {
         reason1: ''
       })
     });
   }
-  if (hasScreenSharing && windowData.type === _type.FcrUIWindowType.VIDEO) {
+  if (windowData.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      children: t('fmt_whiteboard_tips_share_nick', {
+        reason1: ''
+      })
+    });
+  }
+  if (hasSharing && windowData.type === _type.FcrUIWindowType.VIDEO) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
       children: windowData.hasBoardSharing ? t('fmt_screenshare_whiteboard_tips_someonesharing', {
         reason1: ''

package/lib/modules/components/member-window/components/member-actions/components/user-info.d.ts

@@ -9,7 +9,6 @@ export interface UserInfoProps {
     interpreterUserList: any[] | null;
     isInterpreterEnabled: boolean;
     setVideoOrientation: () => void;
-    meetingConnectorTypes: Set<any>;
     id: string | undefined;
     volume: number;
 }

package/lib/modules/components/member-window/components/member-actions/components/user-info.js

@@ -46,7 +46,6 @@ var UserInfo = exports.UserInfo = (0, _mobxReact.observer)(function (_ref) {
     interpreterUserList = _ref.interpreterUserList,
     isInterpreterEnabled = _ref.isInterpreterEnabled,
     _setVideoOrientation = _ref.setVideoOrientation,
-    meetingConnectorTypes = _ref.meetingConnectorTypes,
     id = _ref.id,
     volume = _ref.volume;
   var t = (0, _i18n.useI18n)();
@@ -55,7 +54,8 @@ var UserInfo = exports.UserInfo = (0, _mobxReact.observer)(function (_ref) {
     ownerRoleType = store.ownerRoleType,
     isMySelf = store.isMySelf,
     connectorType = store.connectorType,
-    hasScreenSharing = store.hasScreenSharing,
+    isScreenSharingWindow = store.isScreenSharingWindow,
+    isSharingPeopleVideoWindow = store.isSharingPeopleVideoWindow,
     isManager = store.isManager,
     userName = store.userName,
     handleRename = store.handleRename,
@@ -69,7 +69,6 @@ var UserInfo = exports.UserInfo = (0, _mobxReact.observer)(function (_ref) {
   var insideShow = ![_fcrCore.FcrUserRole.COHOST, _fcrCore.FcrUserRole.HOST].includes(ownerRoleType);
   var isShowInterpreterTag = interpreter && isInterpreterEnabled;
   var isMeTag = isMySelf ? t('fmt_attendies_labels_setting_mine') : '';
-  var isMeeting = meetingConnectorTypes.has(connectorType);
   var interpreterTagDom = /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
     children: t('fmt_ai_transcriptions_setting_label_translator')
   });
@@ -80,26 +79,24 @@ var UserInfo = exports.UserInfo = (0, _mobxReact.observer)(function (_ref) {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: (0, _classnames["default"])('fcr-user-window-actions-bottom-layout'),
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButtons.ShareScreenIconButton, {
-        hasScreenSharing: hasScreenSharing,
+        isShow: isSharingPeopleVideoWindow,
         windowSize: windowSize
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButtons.ShareSoundIconButton, {
-        hasScreenSharing: hasScreenSharing,
-        windowSize: windowSize,
-        hasLoopbackAudioStream: hasLoopbackAudioStream
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "fcr-user-window-actions-bottom-layout-info",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_userTag.UserTag, {
           iconSize: iconSize,
           windowSize: windowSize,
           isShowInterpreterTag: isShowInterpreterTag,
-          meetingConnectorTypes: meetingConnectorTypes,
           id: id,
           volume: volume,
           insideShow: insideShow,
           interpreterTagDom: interpreterTagDom
         }), windowSize !== 'large' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_audioControl.AudioControl, {
-          isMeeting: isMeeting,
           iconSize: iconSize
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButtons.ShareSoundIconButton, {
+          isShow: isScreenSharingWindow,
+          windowSize: windowSize,
+          hasLoopbackAudioStream: hasLoopbackAudioStream
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: (0, _classnames["default"])('fcr-user-window-actions-name', {
             'ml-5': isManager || isShowInterpreterTag

package/lib/modules/components/member-window/components/member-actions/components/user-tag.d.ts

@@ -3,7 +3,6 @@ export interface UserTagProps {
     windowSize: 'large' | 'normal';
     iconSize: number;
     isShowInterpreterTag: boolean;
-    meetingConnectorTypes: Set<any>;
     id: string | undefined;
     volume: number;
     insideShow: boolean;

package/lib/modules/components/member-window/components/member-actions/components/user-tag.js

@@ -17,7 +17,6 @@ var UserTag = exports.UserTag = function UserTag(_ref) {
   var iconSize = _ref.iconSize,
     windowSize = _ref.windowSize,
     isShowInterpreterTag = _ref.isShowInterpreterTag,
-    meetingConnectorTypes = _ref.meetingConnectorTypes,
     id = _ref.id,
     volume = _ref.volume,
     insideShow = _ref.insideShow,
@@ -33,7 +32,6 @@ var UserTag = exports.UserTag = function UserTag(_ref) {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_iconStatus.IconStatus, {
         windowSize: windowSize,
         iconSize: iconSize,
-        meetingConnectorTypes: meetingConnectorTypes,
         id: id,
         volume: volume
       }), ownerRoleType === _fcrCore.FcrUserRole.HOST && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {

package/lib/modules/components/member-window/components/member-actions/index.js

@@ -6,45 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MemberWindowActions = void 0;
 require("core-js/modules/es.array.find.js");
-require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.set.js");
-require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
-require("core-js/modules/esnext.set.add-all.js");
-require("core-js/modules/esnext.set.delete-all.js");
-require("core-js/modules/esnext.set.difference.v2.js");
-require("core-js/modules/esnext.set.difference.js");
-require("core-js/modules/esnext.set.every.js");
-require("core-js/modules/esnext.set.filter.js");
-require("core-js/modules/esnext.set.find.js");
-require("core-js/modules/esnext.set.intersection.v2.js");
-require("core-js/modules/esnext.set.intersection.js");
-require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
-require("core-js/modules/esnext.set.is-disjoint-from.js");
-require("core-js/modules/esnext.set.is-subset-of.v2.js");
-require("core-js/modules/esnext.set.is-subset-of.js");
-require("core-js/modules/esnext.set.is-superset-of.v2.js");
-require("core-js/modules/esnext.set.is-superset-of.js");
-require("core-js/modules/esnext.set.join.js");
-require("core-js/modules/esnext.set.map.js");
-require("core-js/modules/esnext.set.reduce.js");
-require("core-js/modules/esnext.set.some.js");
-require("core-js/modules/esnext.set.symmetric-difference.v2.js");
-require("core-js/modules/esnext.set.symmetric-difference.js");
-require("core-js/modules/esnext.set.union.v2.js");
-require("core-js/modules/esnext.set.union.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _fcrCore = require("fcr-core");
 var _provider = require("./provider");
 var _index = require("./components/layout/index");
 var _moreActions = require("./components/more-actions");
 var _userInfo = require("./components/user-info");
 var _iconButtons = require("./components/icon-buttons");
 var _jsxRuntime = require("react/jsx-runtime");
-var meetingConnectorTypes = new Set([_fcrCore.FcrRoomConnectorType.SIP, _fcrCore.FcrRoomConnectorType.H323]);
 var MemberWindowActions = exports.MemberWindowActions = function MemberWindowActions(_ref) {
   var windowData = _ref.windowData,
     iconSize = _ref.iconSize,
@@ -97,7 +68,6 @@ var MemberWindowActions = exports.MemberWindowActions = function MemberWindowAct
           isShowActionAudio: isShowActionAudio,
           actionAudioTag: actionAudioTag,
           hasPinnedStream: hasPinnedStream,
-          meetingConnectorTypes: meetingConnectorTypes,
           allowedOperations: allowedOperations
         }),
         bottomSlot: /*#__PURE__*/(0, _jsxRuntime.jsx)(_userInfo.UserInfo, {
@@ -111,8 +81,7 @@ var MemberWindowActions = exports.MemberWindowActions = function MemberWindowAct
           isInterpreterEnabled: isInterpreterEnabled,
           id: id,
           volume: volume,
-          setVideoOrientation: setVideoOrientation,
-          meetingConnectorTypes: meetingConnectorTypes
+          setVideoOrientation: setVideoOrientation
         })
       });
     }

package/lib/modules/components/member-window/components/member-actions/store.d.ts

@@ -18,10 +18,27 @@ export declare class MemberWindowActionsStore {
     get userId(): string;
     get userName(): string;
     get isMySelf(): boolean;
+    get isMeeting(): boolean;
     get ownerRoleType(): FcrUserRole;
     get isManager(): boolean;
     get hasVideoStream(): boolean;
+    /**
+     * 是否有屏幕共享。
+     * 屏幕共享的 windowData、屏幕共享人的 windowData 上的 hasScreenSharing 属性都为 ture，
+     * 所以不能通过此属性判断是屏幕共享窗口，还是屏幕共享人的视频窗口。
+     * 如果需要判断是否是屏幕共享窗口，请使用 isScreenSharingWindow 属性。
+     * 如果需要判断是否是屏幕共享人的视频窗口，请使用 isScreenSharingPeopleVideoWindow 属性。
+     */
     get hasScreenSharing(): boolean;
+    /**
+     * 是否有白板共享。
+     * 参考 hasScreenSharing 的注释。
+     */
+    get hasBoardSharing(): boolean;
+    /**
+     * 是否有共享（屏幕、白板）。
+     */
+    get hasSharing(): boolean;
     get isPin(): boolean;
     get hasMicrophoneAudioStream(): boolean;
     get audioStreamConnectorType(): FcrRoomConnectorType;
@@ -35,7 +52,27 @@ export declare class MemberWindowActionsStore {
     get isInterpreter(): boolean;
     get isPurePhone(): boolean;
     get isScreenSharing(): boolean;
-    get isWhiteboardSharing(): boolean;
+    /**
+     * 是否是屏幕共享人的视频窗口。
+     * 如果有屏幕共享，并且视频源类型是 CAMERA，则认为是屏幕共享人的视频窗口。
+     */
+    get isScreenSharingPeopleVideoWindow(): boolean;
+    /**
+     * 是否是白板共享人的视频窗口。
+     * 如果有白板共享，并且 windowType 是 VIDEO， 则认为是白板共享人的视频窗口。
+     */
+    get isBoardSharingPeopleVideoWindow(): boolean;
+    /**
+     * 是否是共享（屏幕、白板）人的视频窗口。
+     */
+    get isSharingPeopleVideoWindow(): boolean;
+    get isWhiteboardSharingWindow(): boolean;
+    get isScreenSharingWindow(): boolean;
+    /**
+     * 是否是共享窗口（屏幕、白板）。
+     * 如果是白板共享窗口，或者是屏幕共享窗口，则认为是共享窗口。
+     */
+    get isSharingWindow(): boolean;
     get hasLoopbackAudioStream(): boolean;
     setOnlyShowVideoStream(value: boolean): void;
     setIsShowDropMenu(value: boolean): void;

package/lib/modules/components/member-window/components/member-actions/store.js

@@ -37,17 +37,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MemberWindowActionsStoreContext = exports.MemberWindowActionsStore = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.set.add-all.js");
+require("core-js/modules/esnext.set.delete-all.js");
+require("core-js/modules/esnext.set.difference.v2.js");
+require("core-js/modules/esnext.set.difference.js");
+require("core-js/modules/esnext.set.every.js");
+require("core-js/modules/esnext.set.filter.js");
+require("core-js/modules/esnext.set.find.js");
+require("core-js/modules/esnext.set.intersection.v2.js");
+require("core-js/modules/esnext.set.intersection.js");
+require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
+require("core-js/modules/esnext.set.is-disjoint-from.js");
+require("core-js/modules/esnext.set.is-subset-of.v2.js");
+require("core-js/modules/esnext.set.is-subset-of.js");
+require("core-js/modules/esnext.set.is-superset-of.v2.js");
+require("core-js/modules/esnext.set.is-superset-of.js");
+require("core-js/modules/esnext.set.join.js");
+require("core-js/modules/esnext.set.map.js");
+require("core-js/modules/esnext.set.reduce.js");
+require("core-js/modules/esnext.set.some.js");
+require("core-js/modules/esnext.set.symmetric-difference.v2.js");
+require("core-js/modules/esnext.set.symmetric-difference.js");
+require("core-js/modules/esnext.set.union.v2.js");
+require("core-js/modules/esnext.set.union.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/web.timers.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _react = require("react");
 var _mobx = require("mobx");
 var _fcrCore = require("fcr-core");
@@ -65,6 +89,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+var MEETING_CONNECTOR_TYPES = new Set([_fcrCore.FcrRoomConnectorType.SIP, _fcrCore.FcrRoomConnectorType.H323]);
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -142,6 +167,11 @@ var MemberWindowActionsStore = exports.MemberWindowActionsStore = /*#__PURE__*/f
       var _this$_windowData3;
       return (_this$_windowData3 = this._windowData) === null || _this$_windowData3 === void 0 ? void 0 : _this$_windowData3.isMySelf;
     }
+  }, {
+    key: "isMeeting",
+    get: function get() {
+      return MEETING_CONNECTOR_TYPES.has(this.connectorType);
+    }
   }, {
     key: "ownerRoleType",
     get: function get() {
@@ -159,59 +189,89 @@ var MemberWindowActionsStore = exports.MemberWindowActionsStore = /*#__PURE__*/f
       var _this$_windowData5;
       return (_this$_windowData5 = this._windowData) === null || _this$_windowData5 === void 0 ? void 0 : _this$_windowData5.hasVideoStream;
     }
+
+    /**
+     * 是否有屏幕共享。
+     * 屏幕共享的 windowData、屏幕共享人的 windowData 上的 hasScreenSharing 属性都为 ture，
+     * 所以不能通过此属性判断是屏幕共享窗口，还是屏幕共享人的视频窗口。
+     * 如果需要判断是否是屏幕共享窗口，请使用 isScreenSharingWindow 属性。
+     * 如果需要判断是否是屏幕共享人的视频窗口，请使用 isScreenSharingPeopleVideoWindow 属性。
+     */
   }, {
     key: "hasScreenSharing",
     get: function get() {
-      var _this$_windowData6;
-      return (_this$_windowData6 = this._windowData) === null || _this$_windowData6 === void 0 ? void 0 : _this$_windowData6.hasScreenSharing;
+      var _this$_windowData6, _this$_windowData7;
+      // 因为开启白板共享时，hasScreenSharing 和 hasBoardSharing 都为 true，
+      // 所以这里区分一下，如果有屏幕共享，并且没有白板共享时，才认为是屏幕共享。
+      return ((_this$_windowData6 = this._windowData) === null || _this$_windowData6 === void 0 ? void 0 : _this$_windowData6.hasScreenSharing) && !((_this$_windowData7 = this._windowData) !== null && _this$_windowData7 !== void 0 && _this$_windowData7.hasBoardSharing);
+    }
+
+    /**
+     * 是否有白板共享。
+     * 参考 hasScreenSharing 的注释。
+     */
+  }, {
+    key: "hasBoardSharing",
+    get: function get() {
+      var _this$_windowData8;
+      return (_this$_windowData8 = this._windowData) === null || _this$_windowData8 === void 0 ? void 0 : _this$_windowData8.hasBoardSharing;
+    }
+
+    /**
+     * 是否有共享（屏幕、白板）。
+     */
+  }, {
+    key: "hasSharing",
+    get: function get() {
+      return this.hasScreenSharing || this.hasBoardSharing;
     }
   }, {
     key: "isPin",
     get: function get() {
-      var _this$_windowData7;
-      return (_this$_windowData7 = this._windowData) === null || _this$_windowData7 === void 0 ? void 0 : _this$_windowData7.isPin;
+      var _this$_windowData9;
+      return (_this$_windowData9 = this._windowData) === null || _this$_windowData9 === void 0 ? void 0 : _this$_windowData9.isPin;
     }
   }, {
     key: "hasMicrophoneAudioStream",
     get: function get() {
-      var _this$_windowData8;
-      return (_this$_windowData8 = this._windowData) === null || _this$_windowData8 === void 0 ? void 0 : _this$_windowData8.hasMicrophoneAudioStream;
+      var _this$_windowData10;
+      return (_this$_windowData10 = this._windowData) === null || _this$_windowData10 === void 0 ? void 0 : _this$_windowData10.hasMicrophoneAudioStream;
     }
   }, {
     key: "audioStreamConnectorType",
     get: function get() {
-      var _this$_windowData9;
-      return (_this$_windowData9 = this._windowData) === null || _this$_windowData9 === void 0 ? void 0 : _this$_windowData9.audioStreamConnectorType;
+      var _this$_windowData11;
+      return (_this$_windowData11 = this._windowData) === null || _this$_windowData11 === void 0 ? void 0 : _this$_windowData11.audioStreamConnectorType;
     }
   }, {
     key: "videoStreamConnectorType",
     get: function get() {
-      var _this$_windowData10;
-      return (_this$_windowData10 = this._windowData) === null || _this$_windowData10 === void 0 ? void 0 : _this$_windowData10.videoStreamConnectorType;
+      var _this$_windowData12;
+      return (_this$_windowData12 = this._windowData) === null || _this$_windowData12 === void 0 ? void 0 : _this$_windowData12.videoStreamConnectorType;
     }
   }, {
     key: "videoStreamId",
     get: function get() {
-      var _this$_windowData11;
-      return (_this$_windowData11 = this._windowData) === null || _this$_windowData11 === void 0 ? void 0 : _this$_windowData11.videoStreamId;
+      var _this$_windowData13;
+      return (_this$_windowData13 = this._windowData) === null || _this$_windowData13 === void 0 ? void 0 : _this$_windowData13.videoStreamId;
     }
   }, {
     key: "audioStreamId",
     get: function get() {
-      var _this$_windowData12;
-      return (_this$_windowData12 = this._windowData) === null || _this$_windowData12 === void 0 ? void 0 : _this$_windowData12.audioStreamId;
+      var _this$_windowData14;
+      return (_this$_windowData14 = this._windowData) === null || _this$_windowData14 === void 0 ? void 0 : _this$_windowData14.audioStreamId;
     }
   }, {
     key: "phoneMicEnabled",
     get: function get() {
-      var _this$_windowData13;
-      return (_this$_windowData13 = this._windowData) === null || _this$_windowData13 === void 0 ? void 0 : _this$_windowData13.phoneMicEnabled;
+      var _this$_windowData15;
+      return (_this$_windowData15 = this._windowData) === null || _this$_windowData15 === void 0 ? void 0 : _this$_windowData15.phoneMicEnabled;
     }
   }, {
     key: "windowType",
     get: function get() {
-      var _this$_windowData14;
-      return (_this$_windowData14 = this._windowData) === null || _this$_windowData14 === void 0 ? void 0 : _this$_windowData14.type;
+      var _this$_windowData16;
+      return (_this$_windowData16 = this._windowData) === null || _this$_windowData16 === void 0 ? void 0 : _this$_windowData16.type;
     }
   }, {
     key: "connectorType",
@@ -238,11 +298,58 @@ var MemberWindowActionsStore = exports.MemberWindowActionsStore = /*#__PURE__*/f
     get: function get() {
       return this.hasScreenSharing && this.windowType === _type.FcrUIWindowType.VIDEO;
     }
+
+    /**
+     * 是否是屏幕共享人的视频窗口。
+     * 如果有屏幕共享，并且视频源类型是 CAMERA，则认为是屏幕共享人的视频窗口。
+     */
   }, {
-    key: "isWhiteboardSharing",
+    key: "isScreenSharingPeopleVideoWindow",
+    get: function get() {
+      var _this$_windowData17;
+      return this.hasScreenSharing && ((_this$_windowData17 = this._windowData) === null || _this$_windowData17 === void 0 ? void 0 : _this$_windowData17.videoSourceType) === _fcrCore.FcrVideoSourceType.CAMERA;
+    }
+
+    /**
+     * 是否是白板共享人的视频窗口。
+     * 如果有白板共享，并且 windowType 是 VIDEO， 则认为是白板共享人的视频窗口。
+     */
+  }, {
+    key: "isBoardSharingPeopleVideoWindow",
+    get: function get() {
+      var _this$_windowData18;
+      return ((_this$_windowData18 = this._windowData) === null || _this$_windowData18 === void 0 ? void 0 : _this$_windowData18.hasBoardSharing) && this.windowType === _type.FcrUIWindowType.VIDEO;
+    }
+
+    /**
+     * 是否是共享（屏幕、白板）人的视频窗口。
+     */
+  }, {
+    key: "isSharingPeopleVideoWindow",
+    get: function get() {
+      return this.isScreenSharingPeopleVideoWindow || this.isBoardSharingPeopleVideoWindow;
+    }
+  }, {
+    key: "isWhiteboardSharingWindow",
     get: function get() {
       return this.windowType === _type.FcrUIWindowType.BOARD;
     }
+  }, {
+    key: "isScreenSharingWindow",
+    get: function get() {
+      var _this$_windowData19;
+      return ((_this$_windowData19 = this._windowData) === null || _this$_windowData19 === void 0 ? void 0 : _this$_windowData19.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN;
+    }
+
+    /**
+     * 是否是共享窗口（屏幕、白板）。
+     * 如果是白板共享窗口，或者是屏幕共享窗口，则认为是共享窗口。
+     */
+  }, {
+    key: "isSharingWindow",
+    get: function get() {
+      return this.isWhiteboardSharingWindow || this.isScreenSharingWindow;
+    }
   }, {
     key: "hasLoopbackAudioStream",
     get: function get() {
@@ -298,7 +405,7 @@ var MemberWindowActionsStore = exports.MemberWindowActionsStore = /*#__PURE__*/f
   }]);
 }();
 _MemberWindowActionsStore = MemberWindowActionsStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_MemberWindowActionsStore, [[_mobx.observable, 1, "isOnlyShowVideoStream"], [_mobx.observable, 1, "isShowDropMenu"], [_mobx.observable, 1, "timerRef"], [_mobx.observable, 1, "interpreterUser"], [_mobx.computed, 3, "windowData"], [_mobx.computed, 3, "userId"], [_mobx.computed, 3, "userName"], [_mobx.computed, 3, "isMySelf"], [_mobx.computed, 3, "ownerRoleType"], [_mobx.computed, 3, "isManager"], [_mobx.computed, 3, "hasVideoStream"], [_mobx.computed, 3, "hasScreenSharing"], [_mobx.computed, 3, "isPin"], [_mobx.computed, 3, "hasMicrophoneAudioStream"], [_mobx.computed, 3, "audioStreamConnectorType"], [_mobx.computed, 3, "videoStreamConnectorType"], [_mobx.computed, 3, "videoStreamId"], [_mobx.computed, 3, "audioStreamId"], [_mobx.computed, 3, "phoneMicEnabled"], [_mobx.computed, 3, "windowType"], [_mobx.computed, 3, "connectorType"], [_mobx.computed, 3, "isPhone"], [_mobx.computed, 3, "isInterpreter"], [_mobx.computed, 3, "isPurePhone"], [_mobx.computed, 3, "isScreenSharing"], [_mobx.computed, 3, "isWhiteboardSharing"], [_mobx.computed, 3, "hasLoopbackAudioStream"], [_setOnlyShowVideoStreamDecs, 18, "setOnlyShowVideoStream"], [_setIsShowDropMenuDecs, 18, "setIsShowDropMenu"], [_onVisibleChangeDecs, 18, "onVisibleChange"], [_decorator.bound, 2, "sendParticipantEvent"], [_decorator.bound, 2, "muteAudio"], [_decorator.bound, 2, "handleRename"], [_decorator.bound, 2, "release"]], []).e, 5);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_MemberWindowActionsStore, [[_mobx.observable, 1, "isOnlyShowVideoStream"], [_mobx.observable, 1, "isShowDropMenu"], [_mobx.observable, 1, "timerRef"], [_mobx.observable, 1, "interpreterUser"], [_mobx.computed, 3, "windowData"], [_mobx.computed, 3, "userId"], [_mobx.computed, 3, "userName"], [_mobx.computed, 3, "isMySelf"], [_mobx.computed, 3, "isMeeting"], [_mobx.computed, 3, "ownerRoleType"], [_mobx.computed, 3, "isManager"], [_mobx.computed, 3, "hasVideoStream"], [_mobx.computed, 3, "hasScreenSharing"], [_mobx.computed, 3, "hasBoardSharing"], [_mobx.computed, 3, "hasSharing"], [_mobx.computed, 3, "isPin"], [_mobx.computed, 3, "hasMicrophoneAudioStream"], [_mobx.computed, 3, "audioStreamConnectorType"], [_mobx.computed, 3, "videoStreamConnectorType"], [_mobx.computed, 3, "videoStreamId"], [_mobx.computed, 3, "audioStreamId"], [_mobx.computed, 3, "phoneMicEnabled"], [_mobx.computed, 3, "windowType"], [_mobx.computed, 3, "connectorType"], [_mobx.computed, 3, "isPhone"], [_mobx.computed, 3, "isInterpreter"], [_mobx.computed, 3, "isPurePhone"], [_mobx.computed, 3, "isScreenSharing"], [_mobx.computed, 3, "isScreenSharingPeopleVideoWindow"], [_mobx.computed, 3, "isBoardSharingPeopleVideoWindow"], [_mobx.computed, 3, "isSharingPeopleVideoWindow"], [_mobx.computed, 3, "isWhiteboardSharingWindow"], [_mobx.computed, 3, "isScreenSharingWindow"], [_mobx.computed, 3, "isSharingWindow"], [_mobx.computed, 3, "hasLoopbackAudioStream"], [_setOnlyShowVideoStreamDecs, 18, "setOnlyShowVideoStream"], [_setIsShowDropMenuDecs, 18, "setIsShowDropMenu"], [_onVisibleChangeDecs, 18, "onVisibleChange"], [_decorator.bound, 2, "sendParticipantEvent"], [_decorator.bound, 2, "muteAudio"], [_decorator.bound, 2, "handleRename"], [_decorator.bound, 2, "release"]], []).e, 5);
 _init_isOnlyShowVideoStream = _applyDecs$e[0];
 _init_isShowDropMenu = _applyDecs$e[1];
 _init_timerRef = _applyDecs$e[2];

package/lib/modules/components/member-window/components/video-player/components/remote-video-player.d.ts

@@ -1,8 +1,9 @@
 import { AgoraRtcRenderMode, AgoraRtcVideoStreamType } from 'fcr-core/lib/imports';
-export declare const FcrUIRemoteVideoPlayer: ({ streamId, hasVideoStream, videoStreamType, renderMode, }: {
+export declare const FcrUIRemoteVideoPlayer: ({ streamId, hasVideoStream, videoStreamType, renderMode, hasScreenSharing, scalcValue, }: {
     streamId: string;
     hasVideoStream: boolean;
     videoStreamType: AgoraRtcVideoStreamType;
     renderMode: AgoraRtcRenderMode;
     hasScreenSharing: boolean;
+    scalcValue: number;
 }) => import("react/jsx-runtime").JSX.Element;