fcr-ui-scene 3.4.1 → 3.4.3

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

@@ -34,10 +34,6 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.object.values.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
-require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
@@ -68,19 +64,19 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _mobx = require("mobx");
 var _fcrCore = require("fcr-core");
-var _deviceStore = require("../../common/device-store");
+var _type = require("../../type");
+var _type2 = require("fcr-core/lib/room-control/type");
 var _constant = require("../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
-var _type2 = require("./type");
-var _type3 = require("../layout/type");
-var _type4 = require("agora-rte-sdk/lib/core/rtc/type");
-var _renderer = require("../../utilities/renderer");
-var _type5 = require("fcr-core/lib/type");
-var _env = require("agora-foundation/lib/utilities/env");
+var _type3 = require("./type");
+var _type4 = require("../layout/type");
+var _type5 = require("agora-rte-sdk/lib/core/rtc/type");
+var _type6 = require("fcr-core/lib/type");
 var _attendee = require("agora-ui-foundation/lib/components/participants/attendee");
 var _react = require("react");
+var _tools = require("../../utilities/tools");
 var _VideoWindowStore;
-var _initProto, _init_userVolumeMap, _init_speakHover, _init_videoWindowPreviewType, _init_videoWindowCurrentWidth, _init_videoWindowCurrentHeight, _init_foldList, _init_workareaX, _init_workareaY, _init_workareaWidth, _init_workareaHeight, _init_localUserRole, _init__spotlightStreamId, _init_shouldHideNonVideoParticipants, _init_connectType, _init_bounds, _init_interpreterUsers, _init_interpreterState, _setBoundsDecs, _onAudioVolumeUpdatedDecs, _changeVideoWindowBoundsDecs, _onUserInfoUpdatedDecs, _setVideoWindowPreviewTypeDecs, _closeVideoWindowDecs, _setSpeakHoverDecs, _getAllowedOperationsDecs, _getCurrentDisplayBoundsDecs, _handleStreamsAddedOrUpdatedDecs, _getInterpreterStateDecs, _ref;
+var _initProto, _init_userVolumeMap, _init_speakHover, _init_videoWindowPreviewType, _init_videoWindowCurrentWidth, _init_videoWindowCurrentHeight, _init_foldList, _init_workareaX, _init_workareaY, _init_workareaWidth, _init_workareaHeight, _init_localUserRole, _init__spotlightStreamId, _init_connectType, _init_bounds, _setBoundsDecs, _onAudioVolumeUpdatedDecs, _changeVideoWindowBoundsDecs, _onUserInfoUpdatedDecs, _setVideoWindowPreviewTypeDecs, _closeVideoWindowDecs, _setSpeakHoverDecs, _getAllowedOperationsDecs, _getCurrentDisplayBoundsDecs, _handleStreamsAddedOrUpdatedDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -105,20 +101,17 @@ var _K = /*#__PURE__*/new WeakMap();
 var _L = /*#__PURE__*/new WeakMap();
 var _M = /*#__PURE__*/new WeakMap();
 var _N = /*#__PURE__*/new WeakMap();
-var _O = /*#__PURE__*/new WeakMap();
-var _P = /*#__PURE__*/new WeakMap();
-var _Q = /*#__PURE__*/new WeakMap();
-_ref = (_setBoundsDecs = [_mobx.action, _mobx.action.bound], _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], _changeVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _onUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _setVideoWindowPreviewTypeDecs = [_mobx.action, _mobx.action.bound], _closeVideoWindowDecs = [_mobx.action, _mobx.action.bound], _setSpeakHoverDecs = [_mobx.action, _mobx.action.bound], _getAllowedOperationsDecs = [_mobx.action, _mobx.action.bound], _getCurrentDisplayBoundsDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedOrUpdatedDecs = [_mobx.action, _mobx.action.bound], _getInterpreterStateDecs = [_mobx.action, _mobx.action.bound], "_uiEventStore");
+_ref = (_setBoundsDecs = [_mobx.action, _mobx.action.bound], _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], _changeVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _onUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _setVideoWindowPreviewTypeDecs = [_mobx.action, _mobx.action.bound], _closeVideoWindowDecs = [_mobx.action, _mobx.action.bound], _setSpeakHoverDecs = [_mobx.action, _mobx.action.bound], _getAllowedOperationsDecs = [_mobx.action, _mobx.action.bound], _getCurrentDisplayBoundsDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedOrUpdatedDecs = [_mobx.action, _mobx.action.bound], "_uiEventStore");
 var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
   function VideoWindowStore(params) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, VideoWindowStore);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
-    (0, _defineProperty2["default"])(this, "_releaseVideoWindowListeners", []);
     (0, _defineProperty2["default"])(this, "_subscriptions", []);
+    (0, _defineProperty2["default"])(this, "_isPopoverVisible", false);
     _classPrivateFieldInitSpec(this, _A, _init_userVolumeMap(this, new Map()));
     _classPrivateFieldInitSpec(this, _B, _init_speakHover(this));
-    _classPrivateFieldInitSpec(this, _C, _init_videoWindowPreviewType(this, _type2.FcrVideoWindowPreviewType.SMALL));
+    _classPrivateFieldInitSpec(this, _C, _init_videoWindowPreviewType(this, _type3.FcrVideoWindowPreviewType.SMALL));
     _classPrivateFieldInitSpec(this, _D, _init_videoWindowCurrentWidth(this));
     _classPrivateFieldInitSpec(this, _E, _init_videoWindowCurrentHeight(this));
     _classPrivateFieldInitSpec(this, _F, _init_foldList(this, []));
@@ -126,34 +119,41 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _H, _init_workareaY(this, 0));
     _classPrivateFieldInitSpec(this, _I, _init_workareaWidth(this, 0));
     _classPrivateFieldInitSpec(this, _J, _init_workareaHeight(this, 0));
-    _classPrivateFieldInitSpec(this, _K, _init_localUserRole(this, _type5.FcrUserRole.PARTICIPANT));
+    _classPrivateFieldInitSpec(this, _K, _init_localUserRole(this, _type6.FcrUserRole.PARTICIPANT));
+    // @observable accessor _spotlightStreamId: string = '';
+    // @observable accessor shouldHideNonVideoParticipants = false;
     _classPrivateFieldInitSpec(this, _L, _init__spotlightStreamId(this, ''));
-    _classPrivateFieldInitSpec(this, _M, _init_shouldHideNonVideoParticipants(this, false));
-    _classPrivateFieldInitSpec(this, _N, _init_connectType(this, _deviceStore.ConnectType.COMPUTER));
-    _classPrivateFieldInitSpec(this, _O, _init_bounds(this, {
+    _classPrivateFieldInitSpec(this, _M, _init_connectType(this, _type.FcrUIConnectType.COMPUTER));
+    _classPrivateFieldInitSpec(this, _N, _init_bounds(this, {
       width: 0,
       height: 0
     }));
-    _classPrivateFieldInitSpec(this, _P, _init_interpreterUsers(this, []));
-    //  翻译官列表
-    _classPrivateFieldInitSpec(this, _Q, _init_interpreterState(this));
     var uiEventStore = params.uiEventStore,
       userControl = params.userControl,
       streamControl = params.streamControl,
       securityStore = params.securityStore,
       deviceStore = params.deviceStore,
-      mediaControl = params.mediaControl,
       deviceStreamStore = params.deviceStreamStore,
-      roomControl = params.roomControl;
+      sharedLayoutDataSource = params.sharedLayoutDataSource,
+      sharedInterpreterDataSource = params.sharedInterpreterDataSource,
+      sharedSettingDataSource = params.sharedSettingDataSource,
+      chatProvider = params.chatProvider,
+      sharedVideoWindowDataSource = params.sharedVideoWindowDataSource,
+      remoteRenderProvider = params.remoteRenderProvider;
     this._uiEventStore = uiEventStore;
     this._deviceStore = deviceStore;
     this._deviceStreamStore = deviceStreamStore;
     this._streamControl = streamControl;
-    this._mediaControl = mediaControl;
     this._securityStore = securityStore;
-    this._uiEventStore.addObserver({
-      onEvent: this.onEvent
-    });
+    this._sharedLayoutDataSource = sharedLayoutDataSource;
+    this._sharedInterpreterDataSource = sharedInterpreterDataSource;
+    this._sharedSettingDataSource = sharedSettingDataSource;
+    this._chatProvider = chatProvider;
+    this._sharedVideoWindowDataSource = sharedVideoWindowDataSource;
+    this._remoteRenderProvider = remoteRenderProvider;
+    // this._uiEventStore.addObserver({
+    //   onEvent: this.onEvent,
+    // });
     this._streamControl.addObserver({
       onStreamVolumeIndicationUpdated: this._onAudioVolumeUpdated,
       onStreamsAdded: this._handleStreamsAddedOrUpdated,
@@ -166,8 +166,8 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     });
     this.setLocalUserRole(userControl.getLocalUser().userRole);
     this.speakHover = false;
-    this.videoWindowCurrentHeight = _type2.DefaultVideoWindowSmallTypeHeight;
-    this.videoWindowCurrentWidth = _type2.DefaultVideoWindowWidth;
+    this.videoWindowCurrentHeight = _type3.DefaultVideoWindowSmallTypeHeight;
+    this.videoWindowCurrentWidth = _type3.DefaultVideoWindowWidth;
     this._subscriptions.push((0, _mobx.reaction)(function () {
       return _this._deviceStore.microphoneVolumeLevel;
     }, function (volume) {
@@ -175,18 +175,6 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
         _this.userVolumeMap.set('0', volume);
       });
     }));
-    this._interpreterControl = roomControl.getInterpreterControl();
-    this.interpreterUsers = this._interpreterControl.getInterpreterUserList() || [];
-    this.interpreterState = this.getInterpreterState();
-    this._interpreterControl.addObserver({
-      onInterpreterUsersUpdated: function onInterpreterUsersUpdated(roomId, users) {
-        _this.interpreterUsers = users;
-      },
-      onInterpreterStateUpdated: function onInterpreterStateUpdated() {
-        _this.interpreterState = _this.getInterpreterState();
-        _this.interpreterUsers = _this._interpreterControl.getInterpreterUserList() || [];
-      }
-    });
   }
   return (0, _createClass2["default"])(VideoWindowStore, [{
     key: "userVolumeMap",
@@ -285,7 +273,7 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "shouldHideNonVideoParticipants",
+    key: "connectType",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
@@ -293,7 +281,7 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "connectType",
+    key: "bounds",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
@@ -301,32 +289,17 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "bounds",
-    get: function get() {
-      return _classPrivateFieldGet(_O, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_O, this, v);
-    }
-  }, {
-    key: "interpreterUsers",
-    get: function get() {
-      return _classPrivateFieldGet(_P, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_P, this, v);
-    }
-  }, {
-    key: "interpreterState",
-    get: function get() {
-      return _classPrivateFieldGet(_Q, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_Q, this, v);
+    key: "setPopoverVisible",
+    value: function setPopoverVisible(visible) {
+      this._isPopoverVisible = visible;
     }
   }, {
     key: "setBounds",
     value: function setBounds(width, height) {
+      // 如果当前popover区域展开了，宽高不能为0，否则会超出渲染区域
+      if (this.videoWindowPreviewType !== _type3.FcrVideoWindowPreviewType.SMALL && this._isPopoverVisible && width === 0 && height === 0) {
+        return;
+      }
       this.bounds = {
         width: width,
         height: height
@@ -344,6 +317,11 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
         return fn();
       });
     }
+  }, {
+    key: "shouldHideNonVideoParticipants",
+    get: function get() {
+      return this._sharedSettingDataSource.setting.shouldHideNonVideoParticipants;
+    }
   }, {
     key: "_onAudioVolumeUpdated",
     value: function _onAudioVolumeUpdated(roomId, streamId, volume) {
@@ -355,12 +333,17 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       var filterList = this.filterFoldList(this.foldList, this.shouldHideNonVideoParticipants);
       return this.sliceFoldList(filterList, this.videoWindowPreviewType);
     }
+  }, {
+    key: "spotlightStreamId",
+    get: function get() {
+      return this._sharedVideoWindowDataSource.spotlightStreamId;
+    }
   }, {
     key: "findSpotlightUser",
     get: function get() {
       var _this2 = this;
-      return this._spotlightStreamId ? this.foldList.find(function (item) {
-        return item.videoStreamId === _this2._spotlightStreamId || item.audioStreamId === _this2._spotlightStreamId;
+      return this.spotlightStreamId ? this.foldList.find(function (item) {
+        return item.videoStreamId === _this2.spotlightStreamId || item.audioStreamId === _this2.spotlightStreamId;
       }) : null;
     }
   }, {
@@ -379,23 +362,17 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "removePin",
     value: function removePin(streamId) {
-      this._uiEventStore.sendEvent(_constant.UIAction.VIDEO_WINDOW_PIN_ACTION, {
-        action: _constant.VideoWindowPinType.REMOVE_PIN,
-        streamId: streamId
-      });
+      this._sharedVideoWindowDataSource.removePin(streamId);
     }
   }, {
     key: "addPin",
     value: function addPin(streamId) {
-      this._uiEventStore.sendEvent(_constant.UIAction.VIDEO_WINDOW_PIN_ACTION, {
-        action: _constant.VideoWindowPinType.ADD_PIN,
-        streamId: streamId
-      });
+      this._sharedVideoWindowDataSource.addPin(streamId);
     }
   }, {
     key: "startPlayLocalVideo",
-    value: function startPlayLocalVideo(element) {
-      this._deviceStore.startPlayLocalVideo(element);
+    value: function startPlayLocalVideo(element, isMirror) {
+      this._deviceStore.startPlayLocalVideo(element, isMirror);
     }
   }, {
     key: "stopPlayLocalVideo",
@@ -405,7 +382,7 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "startRenderRemoteVideo",
     value: function startRenderRemoteVideo(streamId, type, renderMode, isMirror, element) {
-      return this._streamControl.startRenderRemoteVideoStream(streamId, type, {
+      return this._remoteRenderProvider.startRenderRemoteVideo(streamId, type, {
         renderMode: renderMode,
         isMirror: isMirror
       }, element);
@@ -413,17 +390,17 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "stopRenderRemoteVideo",
     value: function stopRenderRemoteVideo(streamId, element) {
-      this._streamControl.stopRenderRemoteVideoStream(streamId, element);
+      this._remoteRenderProvider.stopRenderRemoteVideo(streamId, element);
     }
   }, {
     key: "sendParticipantEvent",
     value: function sendParticipantEvent(payload) {
-      this._uiEventStore.sendEvent(_constant.UIAction.PARTICIPANT_ACTION, payload);
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.PARTICIPANT_ACTION, payload);
     }
   }, {
     key: "muteAudio",
     value: function muteAudio(mute, userId) {
-      this._uiEventStore.sendEvent(_constant.UIAction.PARTICIPANT_ACTION, {
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.PARTICIPANT_ACTION, {
         action: mute ? _attendee.ParticipantActionType.MUTE_AUDIO : _attendee.ParticipantActionType.UNMUTE_AUDIO,
         userId: userId
       });
@@ -436,13 +413,13 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "computedVideoWindowHeight",
     value: function computedVideoWindowHeight(list, previewType) {
-      var _height = _type2.DefaultVideoWindowHeight;
+      var _height = _type3.DefaultVideoWindowHeight;
       var listCount = list.length > 4 ? 4 : list.length;
-      if (previewType !== _type2.FcrVideoWindowPreviewType.MIX) {
-        if (previewType === _type2.FcrVideoWindowPreviewType.SMALL) {
-          _height = _type2.DefaultVideoWindowHeight + _type2.VideoWindowItemHeight;
-        } else if (previewType === _type2.FcrVideoWindowPreviewType.MIDDLE) {
-          _height = _type2.DefaultVideoWindowHeight + listCount * _type2.VideoWindowItemHeight;
+      if (previewType !== _type3.FcrVideoWindowPreviewType.MIX) {
+        if (previewType === _type3.FcrVideoWindowPreviewType.SMALL) {
+          _height = _type3.DefaultVideoWindowHeight + _type3.VideoWindowItemHeight;
+        } else if (previewType === _type3.FcrVideoWindowPreviewType.MIDDLE) {
+          _height = _type3.DefaultVideoWindowHeight + listCount * _type3.VideoWindowItemHeight;
         }
       }
       return _height;
@@ -450,12 +427,13 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "sliceFoldList",
     value: function sliceFoldList(list, previewType) {
-      return previewType === _type2.FcrVideoWindowPreviewType.MIDDLE ? list.slice(0, 4) : previewType === _type2.FcrVideoWindowPreviewType.SMALL ? list.slice(0, 1) : [];
+      return previewType === _type3.FcrVideoWindowPreviewType.MIDDLE ? list.slice(0, 4) : previewType === _type3.FcrVideoWindowPreviewType.SMALL ? list.slice(0, 1) : [];
     }
   }, {
     key: "changeVideoWindowBounds",
-    value: function changeVideoWindowBounds(x, y, width, height, list, previewType) {
-      this._uiEventStore.sendEvent(_constant.UIAction.VIDEO_WINDOW_BOUNDS, {
+    value: function changeVideoWindowBounds(x, y, width, height, list) {
+      var previewType = this.videoWindowPreviewType;
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.VIDEO_WINDOW_BOUNDS, {
         videoWindowHeight: this.computedVideoWindowHeight(list, previewType),
         videoWindowPreviewType: previewType,
         workareaX: x,
@@ -463,6 +441,12 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
         workareaWidth: width || this.workareaWidth,
         workareaHeight: height || this.workareaHeight
       });
+      // 判断当前是否展开了popover区域，实际上只有展开了popover区域，这里的width和height才会有值
+      if (this.bounds.width && this.bounds.width >= _type3.DefaultVideoWindowWidth) {
+        this.setBounds(this.bounds.width, this.bounds.height);
+      } else {
+        this.setBounds(0, 0);
+      }
     }
   }, {
     key: "openPrivateChat",
@@ -471,18 +455,19 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
       if (!this._securityStore.permitPrivateChat(userId)) {
         return;
       }
-      this._uiEventStore.updateAside({
+      this._sharedLayoutDataSource.setAsideLayout({
         chat: true
       });
       var user = Object.values(this === null || this === void 0 || (_this$_userControl = this._userControl) === null || _this$_userControl === void 0 ? void 0 : _this$_userControl.getUsers()).find(function (u) {
         return u.userId === userId;
       });
-      user && this._uiEventStore.notifyChatUpdateTarget(user, _constant.RoomType.MAIN_ROOM);
+      // user && this._uiEventStore.notifyChatUpdateTarget(user, FcrRoomType.Mainroom);
+      user && this._chatProvider.setPrivateChatTargetUser(user, _type2.FcrRoomType.Mainroom);
     }
   }, {
     key: "openRenameDialog",
     value: function openRenameDialog(userId) {
-      this._uiEventStore.sendEvent(_constant.UIAction.PARTICIPANT_ACTION, {
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.PARTICIPANT_ACTION, {
         action: _attendee.ParticipantActionType.RENAME_IN_MEETING,
         userId: userId
       });
@@ -510,20 +495,26 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setVideoWindowPreviewType",
     value: function setVideoWindowPreviewType(type) {
-      var _list = this.filterFoldList(this.foldList, this.shouldHideNonVideoParticipants);
       this.videoWindowPreviewType = type;
-      this.changeVideoWindowBounds(this.workareaX, this.workareaY, this.workareaWidth, this.workareaHeight, _list, type);
-      // this.setBounds(DefaultVideoWindowWidth, this.computedVideoWindowHeight(_list, type));
-      this._uiEventStore.sendEvent(_constant.UIAction.VIDEO_WINDOW_RESIZE, {
-        width: _type2.DefaultVideoWindowWidth,
-        height: this.computedVideoWindowHeight(_list, type)
+      this.handleFoldListChanged();
+    }
+  }, {
+    key: "handleFoldListChanged",
+    value: function handleFoldListChanged() {
+      var list = this.filterFoldList(this.foldList, this.shouldHideNonVideoParticipants);
+      this.changeVideoWindowBounds(this.workareaX, this.workareaY, this.workareaWidth, this.workareaHeight, list);
+      var height = this.computedVideoWindowHeight(list, this.videoWindowPreviewType);
+      this.setBounds(_type3.DefaultVideoWindowWidth, height);
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.VIDEO_WINDOW_RESIZE, {
+        width: _type3.DefaultVideoWindowWidth,
+        height: height
       });
     }
   }, {
     key: "closeVideoWindow",
     value: function closeVideoWindow() {
-      this.videoWindowPreviewType = _type2.FcrVideoWindowPreviewType.SMALL;
-      this.setVideoWindowPreviewType(_type2.FcrVideoWindowPreviewType.SMALL);
+      this.videoWindowPreviewType = _type3.FcrVideoWindowPreviewType.SMALL;
+      this.setVideoWindowPreviewType(_type3.FcrVideoWindowPreviewType.SMALL);
     }
   }, {
     key: "microphoneEnabled",
@@ -539,10 +530,10 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     key: "filterFoldList",
     value: function filterFoldList(list, shouldHideNonVideoParticipants) {
       var sourceList = list.filter(function (i) {
-        return !i.isMySelf || i.videoSourceType !== _type4.AgoraRtcVideoSourceType.SCREEN;
+        return !i.isMySelf || i.videoSourceType !== _type5.AgoraRtcVideoSourceType.SCREEN;
       });
       var _list = shouldHideNonVideoParticipants ? sourceList.filter(function (i) {
-        return i.isMySelf || i.hasVideoStream || i.videoSourceType === _type4.AgoraRtcVideoSourceType.SCREEN || i.type === _type3.FcrUIWindowType.BOARD;
+        return i.isMySelf || i.hasVideoStream || i.videoSourceType === _type5.AgoraRtcVideoSourceType.SCREEN || i.type === _type4.FcrUIWindowType.BOARD;
       }) : sourceList;
       return _list;
     }
@@ -551,7 +542,17 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       var filterList = this.filterFoldList(this.foldList, this.shouldHideNonVideoParticipants);
       var list = this.sliceFoldList(filterList, this.videoWindowPreviewType);
-      return _type2.DefaultVideoWindowHeight + list.length * _type2.VideoWindowItemHeight;
+      return _type3.DefaultVideoWindowHeight + list.length * _type3.VideoWindowItemHeight;
+    }
+  }, {
+    key: "interpreterUsers",
+    get: function get() {
+      return this._sharedInterpreterDataSource.interpreterUsers;
+    }
+  }, {
+    key: "interpreterState",
+    get: function get() {
+      return this._sharedInterpreterDataSource.interpreterOff;
     }
   }, {
     key: "setSpeakHover",
@@ -563,32 +564,43 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
     value: function getAllowedOperations(targetRole, isSelf) {
       return this._securityStore.getAllowedOperations(targetRole, isSelf);
     }
+  }, {
+    key: "shouldHaveMiddleView",
+    get: function get() {
+      var _this$filterFoldList;
+      return ((_this$filterFoldList = this.filterFoldList(this.foldList, this.shouldHideNonVideoParticipants)) === null || _this$filterFoldList === void 0 ? void 0 : _this$filterFoldList.length) > 1;
+    }
   }, {
     key: "getCurrentDisplayBounds",
     value: function () {
-      var _getCurrentDisplayBounds = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(id, type) {
+      var _getCurrentDisplayBounds = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(id, type, bounds) {
         var allApplicationWindows, filterList, _getCurrentSharingWor, x, y, width, height;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return this._mediaControl.getWindowList();
+              return this._deviceStore.getWindowList();
             case 2:
               allApplicationWindows = _context.sent;
               filterList = this.filterFoldList(this.foldList, this.shouldHideNonVideoParticipants);
-              _getCurrentSharingWor = (0, _renderer.getCurrentSharingWorkArea)(id, type, allApplicationWindows), x = _getCurrentSharingWor.x, y = _getCurrentSharingWor.y, width = _getCurrentSharingWor.width, height = _getCurrentSharingWor.height;
+              _getCurrentSharingWor = (0, _tools.getCurrentSharingWorkArea)({
+                currentShareId: id,
+                currentShareType: type,
+                currentShareBounds: bounds,
+                allApplicationWindows: allApplicationWindows
+              }), x = _getCurrentSharingWor.x, y = _getCurrentSharingWor.y, width = _getCurrentSharingWor.width, height = _getCurrentSharingWor.height;
               this.workareaX = x;
               this.workareaY = y;
               this.workareaWidth = width;
               this.workareaHeight = height;
-              this.changeVideoWindowBounds(x, y, width, height, filterList, this.videoWindowPreviewType);
+              this.changeVideoWindowBounds(x, y, width, height, filterList);
             case 10:
             case "end":
               return _context.stop();
           }
         }, _callee, this);
       }));
-      function getCurrentDisplayBounds(_x, _x2) {
+      function getCurrentDisplayBounds(_x, _x2, _x3) {
         return _getCurrentDisplayBounds.apply(this, arguments);
       }
       return getCurrentDisplayBounds;
@@ -603,65 +615,57 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
         var connectorType = _ref2.connectorType;
         return connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
       });
-      this.connectType = hasPstnStream ? _deviceStore.ConnectType.PHONE : _deviceStore.ConnectType.COMPUTER;
+      this.connectType = hasPstnStream ? _type.FcrUIConnectType.PHONE : _type.FcrUIConnectType.COMPUTER;
     }
   }, {
     key: "openConnection",
     value: function openConnection(type) {
-      this._uiEventStore.openDialog(_constant.DialogKey.CONNECTION_GATEWAY, '', {
+      this._uiEventStore.openDialog(_constant.FcrUIDialogKey.CONNECTION_GATEWAY, '', {
         type: type
       });
     }
   }, {
     key: "enableMicrophone",
     value: function enableMicrophone(enable) {
-      this._deviceStreamStore.enableMicrophoneWithStream(enable);
-    }
-  }, {
-    key: "onEvent",
-    value: function onEvent(action, payload) {
-      if (action === _constant.UIAction.SET_CURRENT_SHARE_SCREEN) {
-        var _ref3 = payload,
-          id = _ref3.id,
-          type = _ref3.type;
-        (0, _env.isElectron)() && this.getCurrentDisplayBounds(id, type);
-      }
-      if (action === _constant.UIAction.VIDEO_WINDOW_RESIZE) {
-        var _ref4 = payload,
-          width = _ref4.width,
-          height = _ref4.height;
-        this.videoWindowCurrentHeight = height;
-        this.videoWindowCurrentWidth = width;
-      }
-      if (action === _constant.UIAction.CUSTOM_SETTINGS_CHANGED) {
-        var _ref5 = payload,
-          shouldHideNonVideoParticipants = _ref5.shouldHideNonVideoParticipants;
-        this.shouldHideNonVideoParticipants = shouldHideNonVideoParticipants;
-      }
-      if (action === _constant.UIAction.FOLD_LIST_CHANGED) {
-        this.foldList = payload || [];
-        this.changeVideoWindowBounds(this.workareaX, this.workareaY, this.workareaWidth, this.workareaHeight, this.filterFoldList(payload, this.shouldHideNonVideoParticipants), this.videoWindowPreviewType);
-      }
-      if (action === _constant.UIAction.SPOTLIGHT_STREAM_CHANGED) {
-        var _ref6 = payload,
-          _type = _ref6.type,
-          streamId = _ref6.streamId;
-        if (_type === 'add') {
-          this._spotlightStreamId = streamId;
-        } else {
-          this._spotlightStreamId = '';
-        }
-      }
-    }
-  }, {
-    key: "getInterpreterState",
-    value: function getInterpreterState() {
-      return this._interpreterControl.getState().enable;
-    }
+      this._deviceStreamStore.enableMicrophoneWithPreCheck(enable);
+    }
+    // @bound
+    // onEvent(action: FcrUIAction, payload: unknown) {
+    //   if (action === FcrUIAction.SET_CURRENT_SHARE_SCREEN) {
+    //     const { id, type, bounds } = payload as CurrentShareScreenTypes;
+    //     isElectron() && this.getCurrentDisplayBounds(id, type, bounds);
+    //   }
+    //   if (action === FcrUIAction.VIDEO_WINDOW_RESIZE) {
+    //     const { width, height } = payload as { width: number; height: number };
+    //     this.videoWindowCurrentHeight = height;
+    //     this.videoWindowCurrentWidth = width;
+    //   }
+    //   if (action === FcrUIAction.FOLD_LIST_CHANGED) {
+    //     this.foldList = (payload as FcrUIVideoWindowData[]) || [];
+
+    //     // 没有远端可以看了，如果当前在middle模式，切换到small模式
+    //     if (
+    //       !this.shouldHaveMiddleView &&
+    //       this.videoWindowPreviewType === FcrVideoWindowPreviewType.MIDDLE
+    //     ) {
+    //       this.setVideoWindowPreviewType(FcrVideoWindowPreviewType.SMALL);
+    //     } else {
+    //       this.handleFoldListChanged();
+    //     }
+    //   }
+    //   // if (action === FcrUIAction.SPOTLIGHT_STREAM_CHANGED) {
+    //   //   const { type, streamId } = payload as FcrUISpotlightStreamChangedParams;
+    //   //   if (type === 'add') {
+    //   //     this._spotlightStreamId = streamId;
+    //   //   } else {
+    //   //     this._spotlightStreamId = '';
+    //   //   }
+    //   // }
+    // }
   }]);
 }();
 _VideoWindowStore = VideoWindowStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_VideoWindowStore, [[_mobx.observable, 1, "userVolumeMap"], [_mobx.observable, 1, "speakHover"], [_mobx.observable, 1, "videoWindowPreviewType"], [_mobx.observable, 1, "videoWindowCurrentWidth"], [_mobx.observable, 1, "videoWindowCurrentHeight"], [_mobx.observable, 1, "foldList"], [_mobx.observable, 1, "workareaX"], [_mobx.observable, 1, "workareaY"], [_mobx.observable, 1, "workareaWidth"], [_mobx.observable, 1, "workareaHeight"], [_mobx.observable, 1, "localUserRole"], [_mobx.observable, 1, "_spotlightStreamId"], [_mobx.observable, 1, "shouldHideNonVideoParticipants"], [_mobx.observable, 1, "connectType"], [_mobx.observable, 1, "bounds"], [_mobx.observable, 1, "interpreterUsers"], [_mobx.observable, 1, "interpreterState"], [_setBoundsDecs, 18, "setBounds"], [_decorator.bound, 2, "setVideoOrientation"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_mobx.computed, 3, "foldListRenderData"], [_mobx.computed, 3, "findSpotlightUser"], [_mobx.computed, 3, "hasPinnedStream"], [_decorator.bound, 2, "removePin"], [_decorator.bound, 2, "addPin"], [_decorator.bound, 2, "startPlayLocalVideo"], [_decorator.bound, 2, "stopPlayLocalVideo"], [_decorator.bound, 2, "startRenderRemoteVideo"], [_decorator.bound, 2, "stopRenderRemoteVideo"], [_decorator.bound, 2, "sendParticipantEvent"], [_decorator.bound, 2, "muteAudio"], [_mobx.action, 2, "setLocalUserRole"], [_decorator.bound, 2, "computedVideoWindowHeight"], [_decorator.bound, 2, "sliceFoldList"], [_changeVideoWindowBoundsDecs, 18, "changeVideoWindowBounds"], [_decorator.bound, 2, "openPrivateChat"], [_decorator.bound, 2, "openRenameDialog"], [_decorator.bound, 2, "hasMutePermission"], [_decorator.bound, 2, "hasUnmutePermission"], [_decorator.bound, 2, "hasRequestStartAudioPermission"], [_onUserInfoUpdatedDecs, 18, "onUserInfoUpdated"], [_setVideoWindowPreviewTypeDecs, 18, "setVideoWindowPreviewType"], [_closeVideoWindowDecs, 18, "closeVideoWindow"], [_decorator.bound, 2, "filterFoldList"], [_mobx.computed, 3, "videoWindowHeight"], [_setSpeakHoverDecs, 18, "setSpeakHover"], [_getAllowedOperationsDecs, 18, "getAllowedOperations"], [_getCurrentDisplayBoundsDecs, 18, "getCurrentDisplayBounds"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_decorator.bound, 2, "openConnection"], [_decorator.bound, 2, "enableMicrophone"], [_decorator.bound, 2, "onEvent"], [_getInterpreterStateDecs, 18, "getInterpreterState"]], []).e, 18);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_VideoWindowStore, [[_mobx.observable, 1, "userVolumeMap"], [_mobx.observable, 1, "speakHover"], [_mobx.observable, 1, "videoWindowPreviewType"], [_mobx.observable, 1, "videoWindowCurrentWidth"], [_mobx.observable, 1, "videoWindowCurrentHeight"], [_mobx.observable, 1, "foldList"], [_mobx.observable, 1, "workareaX"], [_mobx.observable, 1, "workareaY"], [_mobx.observable, 1, "workareaWidth"], [_mobx.observable, 1, "workareaHeight"], [_mobx.observable, 1, "localUserRole"], [_mobx.observable, 1, "_spotlightStreamId"], [_mobx.observable, 1, "connectType"], [_mobx.observable, 1, "bounds"], [_decorator.bound, 2, "setPopoverVisible"], [_setBoundsDecs, 18, "setBounds"], [_decorator.bound, 2, "setVideoOrientation"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_mobx.computed, 3, "foldListRenderData"], [_mobx.computed, 3, "spotlightStreamId"], [_mobx.computed, 3, "findSpotlightUser"], [_mobx.computed, 3, "hasPinnedStream"], [_decorator.bound, 2, "removePin"], [_decorator.bound, 2, "addPin"], [_decorator.bound, 2, "startPlayLocalVideo"], [_decorator.bound, 2, "stopPlayLocalVideo"], [_decorator.bound, 2, "startRenderRemoteVideo"], [_decorator.bound, 2, "stopRenderRemoteVideo"], [_decorator.bound, 2, "sendParticipantEvent"], [_decorator.bound, 2, "muteAudio"], [_mobx.action, 2, "setLocalUserRole"], [_decorator.bound, 2, "computedVideoWindowHeight"], [_decorator.bound, 2, "sliceFoldList"], [_changeVideoWindowBoundsDecs, 18, "changeVideoWindowBounds"], [_decorator.bound, 2, "openPrivateChat"], [_decorator.bound, 2, "openRenameDialog"], [_decorator.bound, 2, "hasMutePermission"], [_decorator.bound, 2, "hasUnmutePermission"], [_decorator.bound, 2, "hasRequestStartAudioPermission"], [_onUserInfoUpdatedDecs, 18, "onUserInfoUpdated"], [_setVideoWindowPreviewTypeDecs, 18, "setVideoWindowPreviewType"], [_closeVideoWindowDecs, 18, "closeVideoWindow"], [_decorator.bound, 2, "filterFoldList"], [_mobx.computed, 3, "videoWindowHeight"], [_setSpeakHoverDecs, 18, "setSpeakHover"], [_getAllowedOperationsDecs, 18, "getAllowedOperations"], [_mobx.computed, 3, "shouldHaveMiddleView"], [_getCurrentDisplayBoundsDecs, 18, "getCurrentDisplayBounds"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_decorator.bound, 2, "openConnection"], [_decorator.bound, 2, "enableMicrophone"]], []).e, 15);
 _init_userVolumeMap = _applyDecs$e[0];
 _init_speakHover = _applyDecs$e[1];
 _init_videoWindowPreviewType = _applyDecs$e[2];
@@ -674,10 +678,7 @@ _init_workareaWidth = _applyDecs$e[8];
 _init_workareaHeight = _applyDecs$e[9];
 _init_localUserRole = _applyDecs$e[10];
 _init__spotlightStreamId = _applyDecs$e[11];
-_init_shouldHideNonVideoParticipants = _applyDecs$e[12];
-_init_connectType = _applyDecs$e[13];
-_init_bounds = _applyDecs$e[14];
-_init_interpreterUsers = _applyDecs$e[15];
-_init_interpreterState = _applyDecs$e[16];
-_initProto = _applyDecs$e[17];
+_init_connectType = _applyDecs$e[12];
+_init_bounds = _applyDecs$e[13];
+_initProto = _applyDecs$e[14];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/video-window/topControl/index.js

@@ -17,8 +17,6 @@ exports["default"] = void 0;
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");

package/lib/modules/waiting-room-layout/index.d.ts

@@ -1,10 +1,17 @@
 import { UIModule } from '../../base';
-import { LayoutStoreParams, FcrLayoutSlots } from './store';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
+import { FcrUILocalVideoRenderProvider } from '../../providers/renderer-provider';
+import { FcrLayoutSlots } from './store';
+import { FcrUICurrentRoomControlProvider } from '../../providers/room-provider';
 export declare class WaitingRoomLayout extends UIModule {
-    private _store;
-    constructor(args: LayoutStoreParams);
+    private _store?;
+    deviceProvider?: FcrUIDeviceProvider;
+    localVideoRenderProvider?: FcrUILocalVideoRenderProvider;
+    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
+    onNodeWillActive(): void;
+    onNodeWillInactive(): void;
     getComponent(slots?: Partial<FcrLayoutSlots & {
         globalToast: React.ReactNode;
+        confirm: React.ReactNode;
     }>): import("react/jsx-runtime").JSX.Element;
-    onUnload(): void;
 }