fcr-ui-scene 3.4.5 → 3.5.1

package/lib/shared-data-source/video-window.js

@@ -84,9 +84,8 @@ var _mobx = require("mobx");
 var _type2 = require("fcr-core/lib/type");
 var _fcrCore = require("fcr-core");
 var _base = require("../base");
-var _i18n = require("agora-ui-foundation/lib/i18n");
 var _FcrUIVideoWindowDataImpl, _FcrUIVideoWindowDataSourceImpl;
-var _initProto, _init__videoStream, _init__audioStream, _init__spotlightEnabled, _init__isSpeakerSpotlight, _init__boardCanEdit, _init_isPin, _init_hasScreenSharing, _setVideoStreamDecs, _setVideoStreamOwnerInfoDecs, _setAudioStreamDecs, _setAudioStreamOwnerInfoDecs, _setPinDecs, _setSpotlightEnabledDecs, _setSpeakerSpotlightDecs, _setHasScreenSharingDecs, _setBoardCanEditDecs, _ref, _initProto2, _init_spotlightEnabled, _init_layoutType, _init_manualLayout, _init_pinLimitedCount, _init_mainListLimitedCount, _init_foldListLimitedCount, _init_mainList, _init_foldList, _init_spotlightStreamId, _setSpotlightEnabledDecs2, _setLayoutDecs, _onSpotlightRemovedDecs, _resetListDecs, _addBoardDecs, _updateBoardDecs, _removeBoardDecs, _mergePstnStreamOrInsertNewDataDecs, _addDecs, _updateDecs, _deleteDecs, _addPinDecs, _addPinToastDecs, _removePinToastDecs, _updateSpeakerSpotlightPositionDecs, _removePinDecs, _setSpeakerSpotlightDecs2, _toggleMainStreamDecs, _insertBeginningByPriorityDecs, _insertEndByPriorityDecs, _findInsertBeginningIndexDecs, _findInsertEndIndexDecs, _insertBoardDecs, _insertNewDataDecs, _ref3;
+var _initProto, _init__videoStream, _init__audioStream, _init__spotlightEnabled, _init__isSpeakerSpotlight, _init__boardCanEdit, _init_isPin, _init_hasScreenSharing, _init_hasBoardSharing, _init_hasLoopbackSharing, _setVideoStreamDecs, _setVideoStreamOwnerInfoDecs, _setAudioStreamDecs, _setAudioStreamOwnerInfoDecs, _setPinDecs, _setSpotlightEnabledDecs, _setHasBoardSharingDecs, _setSpeakerSpotlightDecs, _setHasScreenSharingDecs, _setHasLoopbackSharingDecs, _setBoardCanEditDecs, _ref, _initProto2, _init_spotlightEnabled, _init_layoutType, _init_manualLayout, _init_pinLimitedCount, _init_mainListLimitedCount, _init_foldListLimitedCount, _init_mainList, _init_foldList, _init_spotlightStreamId, _setSpotlightEnabledDecs2, _setLayoutDecs, _onSpotlightRemovedDecs, _resetListDecs, _addBoardDecs, _updateBoardDecs, _removeBoardDecs, _mergePstnStreamOrInsertNewDataDecs, _addDecs, _updateDecs, _deleteDecs, _addPinDecs, _updateSpeakerSpotlightPositionDecs, _removePinDecs, _setSpeakerSpotlightDecs2, _toggleMainStreamDecs, _insertBeginningByPriorityDecs, _insertEndByPriorityDecs, _findInsertBeginningIndexDecs, _findInsertEndIndexDecs, _insertBoardDecs, _insertNewDataDecs, _ref3;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -107,7 +106,9 @@ var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
-_ref = (_setVideoStreamDecs = [_mobx.action, _mobx.action.bound], _setVideoStreamOwnerInfoDecs = [_mobx.action, _mobx.action.bound], _setAudioStreamDecs = [_mobx.action, _mobx.action.bound], _setAudioStreamOwnerInfoDecs = [_mobx.action, _mobx.action.bound], _setPinDecs = [_mobx.action, _mobx.action.bound], _setSpotlightEnabledDecs = [_mobx.action, _mobx.action.bound], _setSpeakerSpotlightDecs = [_mobx.action, _mobx.action.bound], _setHasScreenSharingDecs = [_mobx.action, _mobx.action.bound], _setBoardCanEditDecs = [_mobx.action, _mobx.action.bound], "_boardUserInfo");
+var _H = /*#__PURE__*/new WeakMap();
+var _I = /*#__PURE__*/new WeakMap();
+_ref = (_setVideoStreamDecs = [_mobx.action, _mobx.action.bound], _setVideoStreamOwnerInfoDecs = [_mobx.action, _mobx.action.bound], _setAudioStreamDecs = [_mobx.action, _mobx.action.bound], _setAudioStreamOwnerInfoDecs = [_mobx.action, _mobx.action.bound], _setPinDecs = [_mobx.action, _mobx.action.bound], _setSpotlightEnabledDecs = [_mobx.action, _mobx.action.bound], _setHasBoardSharingDecs = [_mobx.action, _mobx.action.bound], _setSpeakerSpotlightDecs = [_mobx.action, _mobx.action.bound], _setHasScreenSharingDecs = [_mobx.action, _mobx.action.bound], _setHasLoopbackSharingDecs = [_mobx.action, _mobx.action.bound], _setBoardCanEditDecs = [_mobx.action, _mobx.action.bound], "_boardUserInfo");
 var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/function () {
   function FcrUIVideoWindowDataImpl(type, _ref2, _placement, _isMySelf) {
     var videoStream = _ref2.videoStream,
@@ -127,6 +128,8 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     (0, _defineProperty2["default"])(this, "needToSort", false);
     _classPrivateFieldInitSpec(this, _F, _init_isPin(this, false));
     _classPrivateFieldInitSpec(this, _G, _init_hasScreenSharing(this, false));
+    _classPrivateFieldInitSpec(this, _H, _init_hasBoardSharing(this, false));
+    _classPrivateFieldInitSpec(this, _I, _init_hasLoopbackSharing(this, false));
     this._placement = _placement;
     this._isMySelf = _isMySelf;
     this.type = type;
@@ -193,6 +196,22 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     set: function set(v) {
       _classPrivateFieldSet(_G, this, v);
     }
+  }, {
+    key: "hasBoardSharing",
+    get: function get() {
+      return _classPrivateFieldGet(_H, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_H, this, v);
+    }
+  }, {
+    key: "hasLoopbackSharing",
+    get: function get() {
+      return _classPrivateFieldGet(_I, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_I, this, v);
+    }
   }, {
     key: "isSpeakerSpotlight",
     get: function get() {
@@ -250,12 +269,24 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
         return true;
       }
     }
+  }, {
+    key: "hasLoopbackAudioStream",
+    get: function get() {
+      var _this$_videoStream4;
+      if (((_this$_videoStream4 = this._videoStream) === null || _this$_videoStream4 === void 0 ? void 0 : _this$_videoStream4.audioSourceType) === _fcrCore.FcrAudioSourceType.LOOPBACK
+      // &&
+      // this._videoStream?.audioSourceState === FcrMediaSourceState.OPEN
+      ) {
+        return true;
+      }
+      return false;
+    }
   }, {
     key: "phoneMicEnabled",
     get: function get() {
       if (this.audioStreamConnectorType === _fcrCore.FcrRoomConnectorType.PSTN) {
-        var _this$_audioStream3, _this$_videoStream4;
-        return ((_this$_audioStream3 = this._audioStream) === null || _this$_audioStream3 === void 0 ? void 0 : _this$_audioStream3.audioSourceState) === _fcrCore.FcrMediaSourceState.OPEN || ((_this$_videoStream4 = this._videoStream) === null || _this$_videoStream4 === void 0 ? void 0 : _this$_videoStream4.streamType) === _fcrCore.FcrStreamType.BOTH;
+        var _this$_audioStream3, _this$_videoStream5;
+        return ((_this$_audioStream3 = this._audioStream) === null || _this$_audioStream3 === void 0 ? void 0 : _this$_audioStream3.audioSourceState) === _fcrCore.FcrMediaSourceState.OPEN || ((_this$_videoStream5 = this._videoStream) === null || _this$_videoStream5 === void 0 ? void 0 : _this$_videoStream5.streamType) === _fcrCore.FcrStreamType.BOTH;
       } else {
         return false;
       }
@@ -263,14 +294,8 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
   }, {
     key: "hasVideoStream",
     get: function get() {
-      var _this$_videoStream5, _this$_videoStream6, _this$_videoStream7;
-      return ((_this$_videoStream5 = this._videoStream) === null || _this$_videoStream5 === void 0 ? void 0 : _this$_videoStream5.videoSourceState) === _fcrCore.FcrMediaSourceState.OPEN && (((_this$_videoStream6 = this._videoStream) === null || _this$_videoStream6 === void 0 ? void 0 : _this$_videoStream6.streamType) === _fcrCore.FcrStreamType.BOTH || ((_this$_videoStream7 = this._videoStream) === null || _this$_videoStream7 === void 0 ? void 0 : _this$_videoStream7.streamType) === _fcrCore.FcrStreamType.VIDEO);
-    }
-  }, {
-    key: "hasLoopbackAudioStream",
-    get: function get() {
-      var _this$_videoStream8;
-      return ((_this$_videoStream8 = this._videoStream) === null || _this$_videoStream8 === void 0 ? void 0 : _this$_videoStream8.audioSourceType) === _fcrCore.FcrAudioSourceType.LOOPBACK;
+      var _this$_videoStream6, _this$_videoStream7, _this$_videoStream8;
+      return ((_this$_videoStream6 = this._videoStream) === null || _this$_videoStream6 === void 0 ? void 0 : _this$_videoStream6.videoSourceState) === _fcrCore.FcrMediaSourceState.OPEN && (((_this$_videoStream7 = this._videoStream) === null || _this$_videoStream7 === void 0 ? void 0 : _this$_videoStream7.streamType) === _fcrCore.FcrStreamType.BOTH || ((_this$_videoStream8 = this._videoStream) === null || _this$_videoStream8 === void 0 ? void 0 : _this$_videoStream8.streamType) === _fcrCore.FcrStreamType.VIDEO);
     }
   }, {
     key: "userId",
@@ -296,6 +321,12 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
       var _this$_videoStream12;
       return ((_this$_videoStream12 = this._videoStream) === null || _this$_videoStream12 === void 0 ? void 0 : _this$_videoStream12.videoSourceType) || _fcrCore.FcrVideoSourceType.CAMERA;
     }
+  }, {
+    key: "audioSourceType",
+    get: function get() {
+      var _this$_audioStream7;
+      return ((_this$_audioStream7 = this._audioStream) === null || _this$_audioStream7 === void 0 ? void 0 : _this$_audioStream7.audioSourceType) || _fcrCore.FcrAudioSourceType.MICROPHONE;
+    }
   }, {
     key: "isMySelf",
     get: function get() {
@@ -410,6 +441,11 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     value: function setSpotlightEnabled(enabled) {
       this._spotlightEnabled = enabled;
     }
+  }, {
+    key: "setHasBoardSharing",
+    value: function setHasBoardSharing(isSharing) {
+      this.hasBoardSharing = isSharing;
+    }
   }, {
     key: "setSpeakerSpotlight",
     value: function setSpeakerSpotlight(speakerSpotlight) {
@@ -420,6 +456,11 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     value: function setHasScreenSharing(screenSharing) {
       this.hasScreenSharing = screenSharing;
     }
+  }, {
+    key: "setHasLoopbackSharing",
+    value: function setHasLoopbackSharing(hasLoopbackSharing) {
+      this.hasLoopbackSharing = hasLoopbackSharing;
+    }
   }, {
     key: "setBoardCanEdit",
     value: function setBoardCanEdit(canEdit) {
@@ -428,7 +469,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
   }]);
 }();
 _FcrUIVideoWindowDataImpl = FcrUIVideoWindowDataImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataImpl, [[_mobx.observable, 1, "_videoStream"], [_mobx.observable, 1, "_audioStream"], [_mobx.observable, 1, "_spotlightEnabled"], [_mobx.observable, 1, "_isSpeakerSpotlight"], [_mobx.observable, 1, "_boardCanEdit"], [_mobx.observable, 1, "isPin"], [_mobx.observable, 1, "hasScreenSharing"], [_mobx.computed, 3, "isSpeakerSpotlight"], [_mobx.computed, 3, "windowId"], [_mobx.computed, 3, "videoStreamId"], [_mobx.computed, 3, "audioStreamId"], [_mobx.computed, 3, "audioStreamConnectorType"], [_mobx.computed, 3, "videoStreamConnectorType"], [_mobx.computed, 3, "hasMicrophoneAudioStream"], [_mobx.computed, 3, "phoneMicEnabled"], [_mobx.computed, 3, "hasVideoStream"], [_mobx.computed, 3, "hasLoopbackAudioStream"], [_mobx.computed, 3, "userId"], [_mobx.computed, 3, "userName"], [_mobx.computed, 3, "ownerRoleType"], [_mobx.computed, 3, "videoSourceType"], [_mobx.computed, 3, "sortingPriority"], [_setVideoStreamDecs, 18, "setVideoStream"], [_setVideoStreamOwnerInfoDecs, 18, "setVideoStreamOwnerInfo"], [_setAudioStreamDecs, 18, "setAudioStream"], [_setAudioStreamOwnerInfoDecs, 18, "setAudioStreamOwnerInfo"], [_setPinDecs, 18, "setPin"], [_setSpotlightEnabledDecs, 18, "setSpotlightEnabled"], [_setSpeakerSpotlightDecs, 18, "setSpeakerSpotlight"], [_setHasScreenSharingDecs, 18, "setHasScreenSharing"], [_setBoardCanEditDecs, 18, "setBoardCanEdit"]], []).e, 8);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataImpl, [[_mobx.observable, 1, "_videoStream"], [_mobx.observable, 1, "_audioStream"], [_mobx.observable, 1, "_spotlightEnabled"], [_mobx.observable, 1, "_isSpeakerSpotlight"], [_mobx.observable, 1, "_boardCanEdit"], [_mobx.observable, 1, "isPin"], [_mobx.observable, 1, "hasScreenSharing"], [_mobx.observable, 1, "hasBoardSharing"], [_mobx.observable, 1, "hasLoopbackSharing"], [_mobx.computed, 3, "isSpeakerSpotlight"], [_mobx.computed, 3, "windowId"], [_mobx.computed, 3, "videoStreamId"], [_mobx.computed, 3, "audioStreamId"], [_mobx.computed, 3, "audioStreamConnectorType"], [_mobx.computed, 3, "videoStreamConnectorType"], [_mobx.computed, 3, "hasMicrophoneAudioStream"], [_mobx.computed, 3, "hasLoopbackAudioStream"], [_mobx.computed, 3, "phoneMicEnabled"], [_mobx.computed, 3, "hasVideoStream"], [_mobx.computed, 3, "userId"], [_mobx.computed, 3, "userName"], [_mobx.computed, 3, "ownerRoleType"], [_mobx.computed, 3, "videoSourceType"], [_mobx.computed, 3, "audioSourceType"], [_mobx.computed, 3, "sortingPriority"], [_setVideoStreamDecs, 18, "setVideoStream"], [_setVideoStreamOwnerInfoDecs, 18, "setVideoStreamOwnerInfo"], [_setAudioStreamDecs, 18, "setAudioStream"], [_setAudioStreamOwnerInfoDecs, 18, "setAudioStreamOwnerInfo"], [_setPinDecs, 18, "setPin"], [_setSpotlightEnabledDecs, 18, "setSpotlightEnabled"], [_setHasBoardSharingDecs, 18, "setHasBoardSharing"], [_setSpeakerSpotlightDecs, 18, "setSpeakerSpotlight"], [_setHasScreenSharingDecs, 18, "setHasScreenSharing"], [_setHasLoopbackSharingDecs, 18, "setHasLoopbackSharing"], [_setBoardCanEditDecs, 18, "setBoardCanEdit"]], []).e, 10);
 _init__videoStream = _applyDecs$e[0];
 _init__audioStream = _applyDecs$e[1];
 _init__spotlightEnabled = _applyDecs$e[2];
@@ -436,7 +477,9 @@ _init__isSpeakerSpotlight = _applyDecs$e[3];
 _init__boardCanEdit = _applyDecs$e[4];
 _init_isPin = _applyDecs$e[5];
 _init_hasScreenSharing = _applyDecs$e[6];
-_initProto = _applyDecs$e[7];
+_init_hasBoardSharing = _applyDecs$e[7];
+_init_hasLoopbackSharing = _applyDecs$e[8];
+_initProto = _applyDecs$e[9];
 var _A2 = /*#__PURE__*/new WeakMap();
 var _B2 = /*#__PURE__*/new WeakMap();
 var _C2 = /*#__PURE__*/new WeakMap();
@@ -444,9 +487,9 @@ var _D2 = /*#__PURE__*/new WeakMap();
 var _E2 = /*#__PURE__*/new WeakMap();
 var _F2 = /*#__PURE__*/new WeakMap();
 var _G2 = /*#__PURE__*/new WeakMap();
-var _H = /*#__PURE__*/new WeakMap();
-var _I = /*#__PURE__*/new WeakMap();
-_ref3 = (_setSpotlightEnabledDecs2 = [_mobx.action, _mobx.action.bound], _setLayoutDecs = [_mobx.action, _mobx.action.bound], _onSpotlightRemovedDecs = [_mobx.action, _mobx.action.bound], _resetListDecs = [_mobx.action, _mobx.action.bound], _addBoardDecs = [_mobx.action, _mobx.action.bound], _updateBoardDecs = [_mobx.action, _mobx.action.bound], _removeBoardDecs = [_mobx.action, _mobx.action.bound], _mergePstnStreamOrInsertNewDataDecs = [_mobx.action, _mobx.action.bound], _addDecs = [_mobx.action, _mobx.action.bound], _updateDecs = [_mobx.action, _mobx.action.bound], _deleteDecs = [_mobx.action, _mobx.action.bound], _addPinDecs = [_mobx.action, _mobx.action.bound], _addPinToastDecs = [_mobx.action, _mobx.action.bound], _removePinToastDecs = [_mobx.action, _mobx.action.bound], _updateSpeakerSpotlightPositionDecs = [_mobx.action, _mobx.action.bound], _removePinDecs = [_mobx.action, _mobx.action.bound], _setSpeakerSpotlightDecs2 = [_mobx.action, _mobx.action.bound], _toggleMainStreamDecs = [_mobx.action, _mobx.action.bound], _insertBeginningByPriorityDecs = [_mobx.action, _mobx.action.bound], _insertEndByPriorityDecs = [_mobx.action, _mobx.action.bound], _findInsertBeginningIndexDecs = [_mobx.action, _mobx.action.bound], _findInsertEndIndexDecs = [_mobx.action, _mobx.action.bound], _insertBoardDecs = [_mobx.action, _mobx.action.bound], _insertNewDataDecs = [_mobx.action, _mobx.action.bound], "_observer");
+var _H2 = /*#__PURE__*/new WeakMap();
+var _I2 = /*#__PURE__*/new WeakMap();
+_ref3 = (_setSpotlightEnabledDecs2 = [_mobx.action, _mobx.action.bound], _setLayoutDecs = [_mobx.action, _mobx.action.bound], _onSpotlightRemovedDecs = [_mobx.action, _mobx.action.bound], _resetListDecs = [_mobx.action, _mobx.action.bound], _addBoardDecs = [_mobx.action, _mobx.action.bound], _updateBoardDecs = [_mobx.action, _mobx.action.bound], _removeBoardDecs = [_mobx.action, _mobx.action.bound], _mergePstnStreamOrInsertNewDataDecs = [_mobx.action, _mobx.action.bound], _addDecs = [_mobx.action, _mobx.action.bound], _updateDecs = [_mobx.action, _mobx.action.bound], _deleteDecs = [_mobx.action, _mobx.action.bound], _addPinDecs = [_mobx.action, _mobx.action.bound], _updateSpeakerSpotlightPositionDecs = [_mobx.action, _mobx.action.bound], _removePinDecs = [_mobx.action, _mobx.action.bound], _setSpeakerSpotlightDecs2 = [_mobx.action, _mobx.action.bound], _toggleMainStreamDecs = [_mobx.action, _mobx.action.bound], _insertBeginningByPriorityDecs = [_mobx.action, _mobx.action.bound], _insertEndByPriorityDecs = [_mobx.action, _mobx.action.bound], _findInsertBeginningIndexDecs = [_mobx.action, _mobx.action.bound], _findInsertEndIndexDecs = [_mobx.action, _mobx.action.bound], _insertBoardDecs = [_mobx.action, _mobx.action.bound], _insertNewDataDecs = [_mobx.action, _mobx.action.bound], "_observer");
 var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*#__PURE__*/function () {
   function FcrUIVideoWindowDataSourceImpl(_sharedSettingDataSource, _eventProvider) {
     (0, _classCallCheck2["default"])(this, FcrUIVideoWindowDataSourceImpl);
@@ -459,8 +502,8 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     _classPrivateFieldInitSpec(this, _E2, _init_mainListLimitedCount(this, 255));
     _classPrivateFieldInitSpec(this, _F2, _init_foldListLimitedCount(this, 255));
     _classPrivateFieldInitSpec(this, _G2, _init_mainList(this, []));
-    _classPrivateFieldInitSpec(this, _H, _init_foldList(this, []));
-    _classPrivateFieldInitSpec(this, _I, _init_spotlightStreamId(this, ''));
+    _classPrivateFieldInitSpec(this, _H2, _init_foldList(this, []));
+    _classPrivateFieldInitSpec(this, _I2, _init_spotlightStreamId(this, ''));
     this._sharedSettingDataSource = _sharedSettingDataSource;
     this._eventProvider = _eventProvider;
     this._spotlightPool.addObserver({
@@ -526,46 +569,28 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
   }, {
     key: "foldList",
     get: function get() {
-      return _classPrivateFieldGet(_H, this);
+      return _classPrivateFieldGet(_H2, this);
     },
     set: function set(v) {
-      _classPrivateFieldSet(_H, this, v);
+      _classPrivateFieldSet(_H2, this, v);
     }
   }, {
     key: "spotlightStreamId",
     get: function get() {
-      return _classPrivateFieldGet(_I, this);
+      return _classPrivateFieldGet(_I2, this);
     },
     set: function set(v) {
-      _classPrivateFieldSet(_I, this, v);
+      _classPrivateFieldSet(_I2, this, v);
     }
   }, {
     key: "shouldHideNonVideoParticipants",
     get: function get() {
       return this._sharedSettingDataSource.setting.shouldHideNonVideoParticipants || false;
     }
-  }, {
-    key: "layoutMainList",
-    get: function get() {
-      var _this = this;
-      var sourceList = this.mainList.filter(function (i) {
-        return !i.isMySelf || i.videoSourceType !== _fcrCore.FcrVideoSourceType.SCREEN;
-      });
-      var existHasVideoStreamUser = sourceList.some(function (i) {
-        return i.hasVideoStream;
-      });
-      return this.shouldHideNonVideoParticipants ? sourceList.filter(function (i) {
-        var visible = i.isMySelf && !existHasVideoStreamUser || i.hasVideoStream || i.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN || i.type === _type.FcrUIWindowType.BOARD;
-        if (!visible && i.isPin) {
-          _this.removePinToast(i.windowId, (0, _i18n.transI18n)('fmt_internalsetting_other_hide_no_video_pin_cancelled'));
-        }
-        return visible;
-      }) : sourceList;
-    }
   }, {
     key: "setSpotlightEnabled",
     value: function setSpotlightEnabled(enabled) {
-      var _this2 = this;
+      var _this = this;
       var currentSpeakerSpotlightIndex_mainList = this._findCurrentSpeakerSpotlight(this.mainList);
       var currentSpeakerSpotlightIndex_foldList = this._findCurrentSpeakerSpotlight(this.foldList);
       this.spotlightEnabled = enabled;
@@ -576,7 +601,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
         item.setSpotlightEnabled(enabled);
       });
       this._spotlightPool.streams.forEach(function (_ts, streamId) {
-        _this2.setSpeakerSpotlight(streamId);
+        _this.setSpeakerSpotlight(streamId);
       });
       // update speaker spotlight position
       this._updateSpeakerSpotlightPosition(currentSpeakerSpotlightIndex_mainList, this.mainList, this.mainListLimitedCount, 'main-list');
@@ -585,10 +610,17 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
   }, {
     key: "setLayout",
     value: function setLayout(layout, manual) {
+      var _this2 = this;
       if (manual) {
         this.manualLayout = layout;
       }
-      if (this.layoutType === _type.FcrUIVideoWindowLayoutType.Gallery && layout === _type.FcrUIVideoWindowLayoutType.Speaker && this.mainList.length < 2 || this.layoutType === layout) {
+      var windowList = this.mainList.filter(function (item) {
+        if (_this2.shouldHideNonVideoParticipants) {
+          return item.hasVideoStream;
+        }
+        return true;
+      });
+      if (this.layoutType === _type.FcrUIVideoWindowLayoutType.Gallery && layout === _type.FcrUIVideoWindowLayoutType.Speaker && windowList.length < 2 || this.layoutType === layout) {
         return;
       }
       this.layoutType = layout;
@@ -640,8 +672,8 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     key: "addBoard",
     value: function addBoard(userInfo, isMySelf, canEdit) {
       this._insertBoard(userInfo, this.mainList, this.mainListLimitedCount, isMySelf, 'main-list', canEdit);
-      this._syncHasScreenSharing(true, userInfo.userId, this.mainList, this.mainListLimitedCount, 'main-list');
-      this._syncHasScreenSharing(true, userInfo.userId, this.foldList, this.foldListLimitedCount, 'fold-list');
+      this._syncHasScreenSharing(true, true, userInfo.userId, this.mainList, this.mainListLimitedCount, 'main-list');
+      this._syncHasScreenSharing(true, true, userInfo.userId, this.foldList, this.foldListLimitedCount, 'fold-list');
     }
   }, {
     key: "updateBoard",
@@ -662,8 +694,8 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
       if (boardIndex !== -1) {
         var board = this.mainList[boardIndex];
         this.mainList.splice(boardIndex, 1);
-        this._syncHasScreenSharing(false, board.userId, this.mainList, this.mainListLimitedCount, 'main-list');
-        this._syncHasScreenSharing(false, board.userId, this.foldList, this.foldListLimitedCount, 'fold-list');
+        this._syncHasScreenSharing(false, false, board.userId, this.mainList, this.mainListLimitedCount, 'main-list');
+        this._syncHasScreenSharing(false, false, board.userId, this.foldList, this.foldListLimitedCount, 'fold-list');
       }
     }
   }, {
@@ -700,10 +732,11 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
         this._mergePstnStreamOrInsertNewData(streamCopy, this.mainList, this.mainListLimitedCount, isMySelf, 'main-list');
         this._mergePstnStreamOrInsertNewData(streamCopy, this.foldList, this.foldListLimitedCount, isMySelf, 'fold-list');
       }
-      if (streamCopy.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN) {
-        this._syncHasScreenSharing(true, streamCopy.owner.userId, this.mainList, this.mainListLimitedCount, 'main-list');
-        this._syncHasScreenSharing(true, streamCopy.owner.userId, this.foldList, this.foldListLimitedCount, 'fold-list');
-      }
+      var hasScreenSharing = streamCopy.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN || this.mainList.some(function (item) {
+        return item.hasScreenSharing && item.userId === streamCopy.owner.userId;
+      });
+      this._syncHasScreenSharing(hasScreenSharing, false, streamCopy.owner.userId, this.mainList, this.mainListLimitedCount, 'main-list');
+      this._syncHasScreenSharing(hasScreenSharing, false, streamCopy.owner.userId, this.foldList, this.foldListLimitedCount, 'fold-list');
     }
   }, {
     key: "update",
@@ -790,8 +823,8 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
       // if it is the last screen share stream of the user, remove the screen sharing flag
 
       if (stream.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN) {
-        this._syncHasScreenSharing(false, streamCopy.owner.userId, this.mainList, this.mainListLimitedCount, 'main-list');
-        this._syncHasScreenSharing(false, streamCopy.owner.userId, this.foldList, this.foldListLimitedCount, 'fold-list');
+        this._syncHasScreenSharing(false, false, streamCopy.owner.userId, this.mainList, this.mainListLimitedCount, 'main-list');
+        this._syncHasScreenSharing(false, false, streamCopy.owner.userId, this.foldList, this.foldListLimitedCount, 'fold-list');
       }
     }
   }, {
@@ -823,42 +856,6 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
       handlePin(streamId, this.foldList, this.foldListLimitedCount, 'fold-list');
       return success;
     }
-  }, {
-    key: "addPinToast",
-    value: function addPinToast(streamId) {
-      if (this.shouldHideNonVideoParticipants) {
-        var _stream = this.layoutMainList.find(function (u) {
-          return u.windowId === streamId;
-        });
-        if (!(_stream !== null && _stream !== void 0 && _stream.hasVideoStream)) {
-          this._eventProvider.showToast({
-            type: 'error',
-            message: (0, _i18n.transI18n)('fmt_internalsetting_other_hide_no_video_pin_cancelled')
-          });
-          return;
-        }
-      }
-      var success = this.addPin(streamId);
-      if (success) {
-        this._eventProvider.showToast({
-          type: 'normal',
-          message: (0, _i18n.transI18n)('fmt_settings_tips_screenlocked')
-        });
-        if (this.layoutType === _type.FcrUIVideoWindowLayoutType.Gallery) {
-          this.setLayout(_type.FcrUIVideoWindowLayoutType.Speaker);
-        }
-      }
-    }
-  }, {
-    key: "removePinToast",
-    value: function removePinToast(streamId) {
-      var toastText = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : (0, _i18n.transI18n)('fmt_settings_tips_screenunlock');
-      this.removePin(streamId);
-      this._eventProvider.showToast({
-        type: 'normal',
-        message: toastText
-      });
-    }
   }, {
     key: "_updateSpeakerSpotlightPosition",
     value: function _updateSpeakerSpotlightPosition(index, list, limitCount, placement) {
@@ -962,7 +959,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     }
   }, {
     key: "_syncHasScreenSharing",
-    value: function _syncHasScreenSharing(enable, userId, list, limitCount, placement) {
+    value: function _syncHasScreenSharing(enable, hasBoardSharing, userId, list, limitCount, placement) {
       var _this10 = this;
       if (enable) {
         list.forEach(function (item, index) {
@@ -970,10 +967,15 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
             var itemIndex = index;
             var originalPriority = item.sortingPriority;
             item.setHasScreenSharing(enable);
+            item.setHasBoardSharing(hasBoardSharing);
             if (item.sortingPriority !== originalPriority) {
               itemIndex = _this10._insertByPriority(item, list, limitCount);
             }
             _this10._observer.notifyObservers(placement === 'main-list' ? 'onMainListUpdated' : 'onFoldListUpdated', itemIndex);
+            var hasLoopbackAudioStream = _this10 === null || _this10 === void 0 ? void 0 : _this10.mainList.some(function (item) {
+              return item.userId === userId && item.hasScreenSharing && item.hasLoopbackAudioStream;
+            });
+            item.setHasLoopbackSharing(hasLoopbackAudioStream);
           }
         });
       } else {
@@ -984,6 +986,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
           list.forEach(function (item) {
             if (item.userId === userId) {
               item.setHasScreenSharing(enable);
+              item.setHasBoardSharing(hasBoardSharing);
               var index = _this10._insertByPriority(item, list, limitCount);
               _this10._observer.notifyObservers(placement === 'main-list' ? 'onMainListUpdated' : 'onFoldListUpdated', index);
             }
@@ -1110,7 +1113,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
   }]);
 }();
 _FcrUIVideoWindowDataSourceImpl = FcrUIVideoWindowDataSourceImpl;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataSourceImpl, [[_mobx.observable, 1, "spotlightEnabled"], [_mobx.observable, 1, "layoutType"], [_mobx.observable, 1, "manualLayout"], [_mobx.observable, 1, "pinLimitedCount"], [_mobx.observable, 1, "mainListLimitedCount"], [_mobx.observable, 1, "foldListLimitedCount"], [_mobx.observable, 1, "mainList"], [_mobx.observable, 1, "foldList"], [_mobx.observable, 1, "spotlightStreamId"], [_mobx.computed, 3, "shouldHideNonVideoParticipants"], [_mobx.computed, 3, "layoutMainList"], [_setSpotlightEnabledDecs2, 18, "setSpotlightEnabled"], [_setLayoutDecs, 18, "setLayout"], [_onSpotlightRemovedDecs, 18, "onSpotlightRemoved"], [_resetListDecs, 18, "resetList"], [_addBoardDecs, 18, "addBoard"], [_updateBoardDecs, 18, "updateBoard"], [_removeBoardDecs, 18, "removeBoard"], [_mergePstnStreamOrInsertNewDataDecs, 18, "_mergePstnStreamOrInsertNewData"], [_addDecs, 18, "add"], [_updateDecs, 18, "update"], [_deleteDecs, 18, "delete"], [_addPinDecs, 18, "addPin"], [_addPinToastDecs, 18, "addPinToast"], [_removePinToastDecs, 18, "removePinToast"], [_updateSpeakerSpotlightPositionDecs, 18, "_updateSpeakerSpotlightPosition"], [_removePinDecs, 18, "removePin"], [_setSpeakerSpotlightDecs2, 18, "setSpeakerSpotlight"], [_toggleMainStreamDecs, 18, "toggleMainStream"], [_insertBeginningByPriorityDecs, 18, "_insertBeginningByPriority"], [_insertEndByPriorityDecs, 18, "_insertEndByPriority"], [_findInsertBeginningIndexDecs, 18, "_findInsertBeginningIndex"], [_findInsertEndIndexDecs, 18, "_findInsertEndIndex"], [_insertBoardDecs, 18, "_insertBoard"], [_insertNewDataDecs, 18, "_insertNewData"]], []).e, 10);
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataSourceImpl, [[_mobx.observable, 1, "spotlightEnabled"], [_mobx.observable, 1, "layoutType"], [_mobx.observable, 1, "manualLayout"], [_mobx.observable, 1, "pinLimitedCount"], [_mobx.observable, 1, "mainListLimitedCount"], [_mobx.observable, 1, "foldListLimitedCount"], [_mobx.observable, 1, "mainList"], [_mobx.observable, 1, "foldList"], [_mobx.observable, 1, "spotlightStreamId"], [_mobx.computed, 3, "shouldHideNonVideoParticipants"], [_setSpotlightEnabledDecs2, 18, "setSpotlightEnabled"], [_setLayoutDecs, 18, "setLayout"], [_onSpotlightRemovedDecs, 18, "onSpotlightRemoved"], [_resetListDecs, 18, "resetList"], [_addBoardDecs, 18, "addBoard"], [_updateBoardDecs, 18, "updateBoard"], [_removeBoardDecs, 18, "removeBoard"], [_mergePstnStreamOrInsertNewDataDecs, 18, "_mergePstnStreamOrInsertNewData"], [_addDecs, 18, "add"], [_updateDecs, 18, "update"], [_deleteDecs, 18, "delete"], [_addPinDecs, 18, "addPin"], [_updateSpeakerSpotlightPositionDecs, 18, "_updateSpeakerSpotlightPosition"], [_removePinDecs, 18, "removePin"], [_setSpeakerSpotlightDecs2, 18, "setSpeakerSpotlight"], [_toggleMainStreamDecs, 18, "toggleMainStream"], [_insertBeginningByPriorityDecs, 18, "_insertBeginningByPriority"], [_insertEndByPriorityDecs, 18, "_insertEndByPriority"], [_findInsertBeginningIndexDecs, 18, "_findInsertBeginningIndex"], [_findInsertEndIndexDecs, 18, "_findInsertEndIndex"], [_insertBoardDecs, 18, "_insertBoard"], [_insertNewDataDecs, 18, "_insertNewData"]], []).e, 10);
 _init_spotlightEnabled = _applyDecs$e2[0];
 _init_layoutType = _applyDecs$e2[1];
 _init_manualLayout = _applyDecs$e2[2];
@@ -1134,7 +1137,7 @@ var FcrUISpeakerSpotlightPool = exports.FcrUISpeakerSpotlightPool = /*#__PURE__*
   return (0, _createClass2["default"])(FcrUISpeakerSpotlightPool, [{
     key: "add",
     value: function add(streamId) {
-      if (this.streams.size >= this.limitCount && !this.streams.has(streamId)) {
+      if (this.streams.size >= this.limitCount) {
         return false;
       }
       this.streams.set(streamId, Date.now());

package/lib/shared-data-source/waiting-room.d.ts

@@ -1,19 +1,46 @@
 import { FcrUIRoomProvider } from '../providers/room-provider';
 import { FcrUIEventProvider } from '../providers/event-provider';
+import { FcrUIMemberListDataSourceImpl } from '../modules/participant/member-list-data-source';
 export interface FcrUISharedWaitingRoomDataSource {
+    /**
+     * 设置action-bar成员列表icon小红点未读状态
+     * @param state 状态
+     */
     set unReadState(state: boolean);
+    /**
+     * 获取action-bar成员列表icon小红点未读状态
+     */
     get unReadState(): boolean;
+    /**
+     * 获取等候室参会者人数
+     */
     get totalWaitingRoomUser(): number;
+    /**
+     * 获取等候室参会者列表
+     */
+    get waitingRoomDataSource(): FcrUIMemberListDataSourceImpl;
+    release(): void;
 }
 export declare class FcrUISharedWaitingRoomDataSourceImpl implements FcrUISharedWaitingRoomDataSource {
+    private _roomProvider;
     private _uiEventStore;
     private _waitingRoomControl?;
     private _mainRoomControl?;
+    private _waitingRoomUserControl?;
+    accessor waitingRoomDataSource: FcrUIMemberListDataSourceImpl;
+    private _waitingRoomTargetUserRole?;
+    private _localUserId?;
+    private _streamControl?;
+    private _roomProviderObserver;
+    private _userControlObserver;
     accessor totalWaitingRoomUser: number;
     accessor unReadState: boolean;
-    constructor(roomProvider: FcrUIRoomProvider, _uiEventStore: FcrUIEventProvider);
+    constructor(_roomProvider: FcrUIRoomProvider, _uiEventStore: FcrUIEventProvider);
+    private _isWaitingRoomTargetUser;
     private _getWaitingRoomUserCount;
     private _handleRemoteWaitingUserJoined;
     private _handleRemoteWaitingUserLeft;
-    private _handleEvent;
+    private _addWaitingRoomDataSource;
+    private _initWaitingRoomUserList;
+    release(): void;
 }