fcr-ui-scene 3.5.0 → 3.6.0

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

@@ -45,6 +45,10 @@ require("core-js/modules/es.object.assign.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.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");
@@ -81,7 +85,7 @@ var _type2 = require("fcr-core/lib/type");
 var _fcrCore = require("fcr-core");
 var _base = require("../base");
 var _FcrUIVideoWindowDataImpl, _FcrUIVideoWindowDataSourceImpl;
-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;
+var _initProto, _init__videoStream, _init__audioStream, _init__spotlightEnabled, _init__isSpeakerSpotlight, _init__boardCanEdit, _init__isFirstCameraOpen, _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; }
@@ -104,6 +108,7 @@ var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
 var _I = /*#__PURE__*/new WeakMap();
+var _J = /*#__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) {
@@ -121,11 +126,12 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     _classPrivateFieldInitSpec(this, _C, _init__spotlightEnabled(this, true));
     _classPrivateFieldInitSpec(this, _D, _init__isSpeakerSpotlight(this, false));
     _classPrivateFieldInitSpec(this, _E, _init__boardCanEdit(this, false));
+    _classPrivateFieldInitSpec(this, _F, _init__isFirstCameraOpen(this, false));
     (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));
+    _classPrivateFieldInitSpec(this, _G, _init_isPin(this, false));
+    _classPrivateFieldInitSpec(this, _H, _init_hasScreenSharing(this, false));
+    _classPrivateFieldInitSpec(this, _I, _init_hasBoardSharing(this, false));
+    _classPrivateFieldInitSpec(this, _J, _init_hasLoopbackSharing(this, false));
     this._placement = _placement;
     this._isMySelf = _isMySelf;
     this.type = type;
@@ -177,7 +183,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "isPin",
+    key: "_isFirstCameraOpen",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -185,7 +191,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "hasScreenSharing",
+    key: "isPin",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -193,7 +199,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "hasBoardSharing",
+    key: "hasScreenSharing",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -201,13 +207,21 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "hasLoopbackSharing",
+    key: "hasBoardSharing",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_I, this, v);
     }
+  }, {
+    key: "hasLoopbackSharing",
+    get: function get() {
+      return _classPrivateFieldGet(_J, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_J, this, v);
+    }
   }, {
     key: "isSpeakerSpotlight",
     get: function get() {
@@ -339,7 +353,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
         if (this.isPin || ((_this$_videoStream13 = this._videoStream) === null || _this$_videoStream13 === void 0 ? void 0 : _this$_videoStream13.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN || this.type === _type.FcrUIWindowType.BOARD) {
           return _type.FcrUIVideoWindowMainSortingPriority.FOCUS;
         }
-        if (this.isSpeakerSpotlight && this._layoutType === _type.FcrUIVideoWindowLayoutType.Speaker) {
+        if (this.isSpeakerSpotlight) {
           return _type.FcrUIVideoWindowMainSortingPriority.SPEAKER_SPOTLIGHT;
         }
         if (this.hasScreenSharing) {
@@ -354,15 +368,16 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
         if (this.ownerRoleType === _type2.FcrUserRole.COHOST) {
           return _type.FcrUIVideoWindowMainSortingPriority.CO_HOST;
         }
-        if (this.hasMicrophoneAudioStream && this.hasVideoStream) {
-          return _type.FcrUIVideoWindowMainSortingPriority.BOTH_OPEN;
-        }
-        if (this.hasVideoStream) {
+        // if (this.hasMicrophoneAudioStream && this.hasVideoStream) {
+        //   return FcrUIVideoWindowMainSortingPriority.BOTH_OPEN;
+        // }
+        var isFirstCameraOpen = this.hasVideoStream && !this._isFirstCameraOpen;
+        if (isFirstCameraOpen) {
           return _type.FcrUIVideoWindowMainSortingPriority.CAMERA_OPEN;
         }
-        if (this.hasMicrophoneAudioStream) {
-          return _type.FcrUIVideoWindowMainSortingPriority.MICROPHONE_OPEN;
-        }
+        // if (this.hasMicrophoneAudioStream) {
+        //   return FcrUIVideoWindowMainSortingPriority.MICROPHONE_OPEN;
+        // }
       } else {
         var _this$_videoStream14;
         if (this.isSpeakerSpotlight) {
@@ -386,15 +401,15 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
         if (this.ownerRoleType === _type2.FcrUserRole.COHOST) {
           return _type.FcrUIVideoWindowFoldSortingPriority.CO_HOST;
         }
-        if (this.hasMicrophoneAudioStream && this.hasVideoStream) {
-          return _type.FcrUIVideoWindowFoldSortingPriority.BOTH_OPEN;
-        }
+        // if (this.hasMicrophoneAudioStream && this.hasVideoStream) {
+        //   return FcrUIVideoWindowFoldSortingPriority.BOTH_OPEN;
+        // }
         if (this.hasVideoStream) {
           return _type.FcrUIVideoWindowFoldSortingPriority.CAMERA_OPEN;
         }
-        if (this.hasMicrophoneAudioStream) {
-          return _type.FcrUIVideoWindowFoldSortingPriority.MICROPHONE_OPEN;
-        }
+        // if (this.hasMicrophoneAudioStream) {
+        //   return FcrUIVideoWindowFoldSortingPriority.MICROPHONE_OPEN;
+        // }
       }
       return _type.FcrUIVideoWindowMainSortingPriority.NONE;
     }
@@ -403,6 +418,11 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     value: function setLayoutType(layoutType) {
       this._layoutType = layoutType;
     }
+  }, {
+    key: "setIsFirstCameraOpen",
+    value: function setIsFirstCameraOpen(isFirstCameraOpen) {
+      this._isFirstCameraOpen = isFirstCameraOpen;
+    }
   }, {
     key: "setVideoStream",
     value: function setVideoStream(videoStream) {
@@ -465,17 +485,18 @@ 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.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);
+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, "_isFirstCameraOpen"], [_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, "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, 11);
 _init__videoStream = _applyDecs$e[0];
 _init__audioStream = _applyDecs$e[1];
 _init__spotlightEnabled = _applyDecs$e[2];
 _init__isSpeakerSpotlight = _applyDecs$e[3];
 _init__boardCanEdit = _applyDecs$e[4];
-_init_isPin = _applyDecs$e[5];
-_init_hasScreenSharing = _applyDecs$e[6];
-_init_hasBoardSharing = _applyDecs$e[7];
-_init_hasLoopbackSharing = _applyDecs$e[8];
-_initProto = _applyDecs$e[9];
+_init__isFirstCameraOpen = _applyDecs$e[5];
+_init_isPin = _applyDecs$e[6];
+_init_hasScreenSharing = _applyDecs$e[7];
+_init_hasBoardSharing = _applyDecs$e[8];
+_init_hasLoopbackSharing = _applyDecs$e[9];
+_initProto = _applyDecs$e[10];
 var _A2 = /*#__PURE__*/new WeakMap();
 var _B2 = /*#__PURE__*/new WeakMap();
 var _C2 = /*#__PURE__*/new WeakMap();
@@ -487,7 +508,7 @@ 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) {
+  function FcrUIVideoWindowDataSourceImpl(_sharedSettingDataSource) {
     (0, _classCallCheck2["default"])(this, FcrUIVideoWindowDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref3, (_initProto2(this), new _observable.AgoraObservable()));
     (0, _defineProperty2["default"])(this, "_spotlightPool", new FcrUISpeakerSpotlightPool());
@@ -501,7 +522,6 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     _classPrivateFieldInitSpec(this, _H2, _init_foldList(this, []));
     _classPrivateFieldInitSpec(this, _I2, _init_spotlightStreamId(this, ''));
     this._sharedSettingDataSource = _sharedSettingDataSource;
-    this._eventProvider = _eventProvider;
     this._spotlightPool.addObserver({
       onRemoved: this.onSpotlightRemoved
     });
@@ -900,11 +920,9 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
         if (existedUserStream) {
           existedUserStream.setSpeakerSpotlight(true);
         }
-        if (_this9.layoutType === _type.FcrUIVideoWindowLayoutType.Speaker || list === _this9.foldList) {
-          var isSpeakerSpotlightSortingPriority = existedUserStream.sortingPriority === (placement === 'main-list' ? _type.FcrUIVideoWindowMainSortingPriority.SPEAKER_SPOTLIGHT : _type.FcrUIVideoWindowFoldSortingPriority.FOCUS);
-          if (isSpeakerSpotlightSortingPriority) {
-            _this9._insertBeginningByPriority(existedUserStream, list, limitCount);
-          }
+        var isSpeakerSpotlightSortingPriority = existedUserStream.sortingPriority === (placement === 'main-list' ? _type.FcrUIVideoWindowMainSortingPriority.SPEAKER_SPOTLIGHT : _type.FcrUIVideoWindowFoldSortingPriority.FOCUS);
+        if (isSpeakerSpotlightSortingPriority) {
+          _this9._insertBeginningByPriority(existedUserStream, list, limitCount);
         }
         list.forEach(function (item) {
           if (item.needToSort) {
@@ -994,11 +1012,14 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     key: "_insertByPriority",
     value: function _insertByPriority(data, list, limitCount) {
       var insertIndex = -1;
-      if (data.sortingPriority >= _type.FcrUIVideoWindowMainSortingPriority.FOCUS) {
+      if (data.sortingPriority >= _type.FcrUIVideoWindowMainSortingPriority.FOCUS || data.sortingPriority === _type.FcrUIVideoWindowMainSortingPriority.CAMERA_OPEN) {
         insertIndex = this._insertBeginningByPriority(data, list, limitCount);
       } else {
         insertIndex = this._insertEndByPriority(data, list, limitCount);
       }
+      if (data.hasVideoStream) {
+        data.setIsFirstCameraOpen(true);
+      }
       return insertIndex;
     }
   }, {
@@ -1133,7 +1154,7 @@ var FcrUISpeakerSpotlightPool = exports.FcrUISpeakerSpotlightPool = /*#__PURE__*
   return (0, _createClass2["default"])(FcrUISpeakerSpotlightPool, [{
     key: "add",
     value: function add(streamId) {
-      if (this.streams.size >= this.limitCount) {
+      if (this.streams.size >= this.limitCount && !this.streams.has(streamId)) {
         return false;
       }
       this.streams.set(streamId, Date.now());

package/lib/shared-data-source/waiting-room.js

@@ -46,6 +46,8 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.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.for-each.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");

package/lib/translations/enUS.d.ts

@@ -34,6 +34,7 @@ export declare const enUs: {
     fmt_attendies_toast_cant_sethost: string;
     fmt_attendies_toast_cant_setcohost: string;
     fmt_attendies_button_revokehost_error: string;
+    fmt_attendies_toast_cohost_upper_limit: string;
     fmt_attendies_button_rename: string;
     fmt_attendies_options_allowlocalrecord: string;
     fmt_attendies_options_putinwaitingroom: string;
@@ -89,10 +90,11 @@ export declare const enUs: {
     fmt_additional_label_meet_view_all: string;
     fmt_additional_label_change_name_self: string;
     fmt_additional_tips_nickname_change_success: string;
-    fmt_additional_popup_label_change_nickname: string;
     fmt_additional_popup_label_enter_nickname: string;
     fmt_additional_popup_label_enter_nickname_ok: string;
     fmt_additional_label_toast_rename_off: string;
+    fmt_attendies_toast_host_enabled_mute: string;
+    fmt_attendies_toast_host_turned_off_video: string;
     fmt_actionbar_tips_leavemeeting: string;
     fmt_actionbar_tips_locked: string;
     fmt_actionbar_tips_recheckleave: string;
@@ -560,6 +562,21 @@ export declare const enUs: {
     fmt_screenshare_tips_sharing_audio_cancel: string;
     fmt_screenshare_tips_sharing_audio_confirm: string;
     fmt_screenshare_tips_sharing_disabled_tocontact: string;
+    fmt_screenshare_toast_network_error_unable_start_screen_share: string;
+    fmt_screenshare_controlbar_button_annotations: string;
+    fmt_screenshare_controlbar_annotations_options_attendees_annotate: string;
+    fmt_screenshare_controlbar_annotations_options_show_name: string;
+    fmt_screenshare_toast_host_enabled_annotations: string;
+    fmt_screenshare_toast_host_disabled_annotations: string;
+    fmt_screenshare_controlbar_options_clear_all: string;
+    fmt_screenshare_toast_annotations_visible_participants: string;
+    fmt_screenshare_controlbar_button_settings: string;
+    fmt_screenshare_controlbar_settings_label_share_audio_settings: string;
+    fmt_screenshare_controlbar_settings_options_enable_share_audio: string;
+    fmt_screenshare_controlbar_settings_label_annotation_settings: string;
+    fmt_screenshare_controlbar_settings_label_annotation_controls: string;
+    fmt_screenshare_toast_annotation_controls_screen_sharing_disabled: string;
+    fmt_screenshare_tips_host_not_enabled_annotations: string;
     fmt_screenshare_tips_unenabled: string;
     fmt_screenshare_whiteboard_options_changetheme: string;
     fmt_screenshare_tips_alreadyoriginalsize: string;
@@ -877,6 +894,31 @@ export declare const enUs: {
     fmt_internalsetting_room_window_switched: string;
     fmt_internalsetting_labels_Network_type: string;
     fmt_internalsetting_labels_resolving_power: string;
+    fmt_internalsetting_options_play_prompt: string;
+    fmt_internalsetting_labels_audio: string;
+    fmt_internalsetting_labels_hide_video_off: string;
+    fmt_internalsetting_labels_hide_my_video: string;
+    fmt_settings_labels_virtual_background: string;
+    fmt_settings_labels_prompt_tone: string;
+    fmt_meeting_setting_button_meeting_settings: string;
+    fmt_meeting_setting_labels_meeting_settings: string;
+    fmt_meeting_setting_labels_audio_video_settings: string;
+    fmt_meeting_setting_options_mute_participants: string;
+    fmt_meeting_setting_options_disable_video: string;
+    fmt_meeting_setting_labels_Security: string;
+    fmt_meeting_setting_options_enable_waiting_room: string;
+    fmt_meeting_setting_options_jbh: string;
+    fmt_meeting_setting_options_show_time: string;
+    fmt_meeting_setting_options_show_duration: string;
+    fmt_meeting_setting_options_show_information: string;
+    fmt_meeting_setting_labels_advanced: string;
+    fmt_meeting_setting_options_enable_live_streaming: string;
+    fmt_meeting_setting_options_enable_interpretation: string;
+    fmt_meeting_setting_options_generate_meeting_minutes: string;
+    fmt_meeting_setting_toast_enabled_mute: string;
+    fmt_meeting_setting_toast_turned_off_video: string;
+    fmt_meeting_setting_toast_disabled_mute: string;
+    fmt_meeting_setting_toast_turned_on_video: string;
     fmt_settings_labels_sidebar: string;
     fmt_settings_labels_fold: string;
     fmt_settings_labels_theme: string;
@@ -1272,6 +1314,7 @@ export declare const enUs: {
     fmt_premeeting_setting_mobile_option_auto: string;
     fmt_premeeting_setting_mobile_option_bright: string;
     fmt_premeeting_setting_mobile_option_dark: string;
+    fmt_premeeting_setting_option_setting_after_restarting: string;
     fmt_premeeting_setting_mobile_option_region: string;
     fmt_premeeting_setting_mobile_option_developer_mode: string;
     fmt_premeeting_setting_mobile_label_about_us: string;
@@ -1296,6 +1339,8 @@ export declare const enUs: {
     fmt_premeeting_setting_mobile_popup_button_cancel: string;
     fmt_premeeting_setting_mobile_popup_button_log_out: string;
     fmt_premeeting_setting_mobile_button_log_out_confirm: string;
+    fmt_premeeting_setting_button_more_meeting_control: string;
+    fmt_premeeting_setting_checkbox_joining_meeting_connect_audio: string;
     fmt_premeeting_joinroom_mobile_button_upandin: string;
     fmt_premeeting_joinroom_mobile_label_flexible_meeting: string;
     fmt_premeeting_joinroom_mobile_label_enterprise_account: string;
@@ -1357,6 +1402,7 @@ export declare const enUs: {
     fmt_security_mainwindow_label_watermark: string;
     fmt_security_mainwindow_label_toast_unmute_not_allow: string;
     fmt_security_mainwindow_label_toast_name_change_not_allow: string;
+    fmt_security_mainwindow_label_interactive_annotations: string;
     fmt_premeeting_setting_label_settings: string;
     fmt_premeeting_setting_label_normal: string;
     fmt_premeeting_setting_label_voice_motivation: string;
@@ -1413,6 +1459,7 @@ export declare const enUs: {
     fmt_premeeting_setting_label_low: string;
     fmt_premeeting_setting_label_medium: string;
     fmt_premeeting_setting_label_high: string;
+    fmt_premeeting_setting_label_turn_off: string;
     fmt_premeeting_setting_label_professional_audio: string;
     fmt_premeeting_setting_label_enable_stereo: string;
     fmt_premeeting_setting_label_high_fidelity_music_mode: string;

package/lib/translations/enUS.js

@@ -43,6 +43,7 @@ var enUs = exports.enUs = {
   fmt_attendies_toast_cant_sethost: "The member's device cannot be assigned as the host.",
   fmt_attendies_toast_cant_setcohost: "The member's device cannot be assigned as the co-host.",
   fmt_attendies_button_revokehost_error: 'Your host privileges have been revoked, and the setup has failed.',
+  fmt_attendies_toast_cohost_upper_limit: 'The number of co-hosts has reached the upper limit; no more co-hosts can be set.',
   fmt_attendies_button_rename: 'Rename',
   fmt_attendies_options_allowlocalrecord: 'Allow recording of local videos',
   fmt_attendies_options_putinwaitingroom: 'Put it in the waiting room',
@@ -98,10 +99,11 @@ var enUs = exports.enUs = {
   fmt_additional_label_meet_view_all: 'Meeting View for All',
   fmt_additional_label_change_name_self: 'Rename',
   fmt_additional_tips_nickname_change_success: 'Nickname changed successfully',
-  fmt_additional_popup_label_change_nickname: 'Rename in the Meeting',
   fmt_additional_popup_label_enter_nickname: 'Please enter a nickname',
   fmt_additional_popup_label_enter_nickname_ok: 'OK',
   fmt_additional_label_toast_rename_off: 'Host has closed the rename function',
+  fmt_attendies_toast_host_enabled_mute: 'The host has enabled mute upon entry for all participants​​',
+  fmt_attendies_toast_host_turned_off_video: '​​The host has turned off video automatically upon entry',
   fmt_actionbar_tips_leavemeeting: 'Are you sure you want to leave the meeting now?',
   fmt_actionbar_tips_locked: 'The meeting has been locked by the host',
   fmt_actionbar_tips_recheckleave: 'You cannot join the meeting after leaving the meeting; Are you sure you want to leave the meeting now?',
@@ -168,7 +170,7 @@ var enUs = exports.enUs = {
   fmt_popup_button_openvideo: 'Open video',
   fmt_popup_button_drag: 'Drag',
   fmt_popup_label_muted: 'Muted',
-  fmt_popup_label_turnedon: 'Turned on',
+  fmt_popup_label_turnedon: 'On',
   fmt_popup_label_meetingduration: 'Meeting duration {reason1} minutes',
   fmt_leave_tips_removetip: 'You have been removed from this meeting. Clicking the button to exit',
   fmt_leave_tips_classover: 'The meeting has ended, click the button to leave the meeting room.',
@@ -228,8 +230,8 @@ var enUs = exports.enUs = {
   fmt_audio_popup_button_cancel: 'Cancel',
   fmt_popup_copywrite_stopstreamingnow: 'Are you sure to stop the live broadcast now？',
   fmt_popup_options_confirmstop: 'Confirm to stop live streaming',
-  fmt_popup_options_placedbottom: 'Send to back',
-  fmt_popup_options_placedtop: 'Bring to front',
+  fmt_popup_options_placedbottom: 'Move to Bottom​',
+  fmt_popup_options_placedtop: '​​Move to Top​',
   fmt_broadcast_tips_righturl: 'Please enter the correct live streaming page address',
   fmt_broadcast_tips_anyonewatch: 'Anyone who uses this link can watch the live broadcast',
   fmt_broadcast_tips_streamingwebpage: 'Please enter the URL of the live streaming webpage',
@@ -434,7 +436,7 @@ var enUs = exports.enUs = {
   fmt_chat_enable_limit: 'Currently mutted',
   fmt_chat_say_something: 'Say something',
   fmt_chat_send_cohost: 'Host/Co-host',
-  fmt_chat_setting_value: "Participants' chat permissions in the meeting",
+  fmt_chat_setting_value: 'chat permissions',
   fmt_chat_send_open: 'Allow chat freely',
   fmt_chat_send_only_open: 'Only public chat allowed',
   fmt_chat_send_only_cohost: 'Only hosts and co-hosts private chat allowed',
@@ -571,6 +573,21 @@ var enUs = exports.enUs = {
   fmt_screenshare_tips_sharing_audio_cancel: 'Stop audio sharing ',
   fmt_screenshare_tips_sharing_audio_confirm: 'Keep Mic on',
   fmt_screenshare_tips_sharing_disabled_tocontact: '{reason1} Disabled sharing, you can contact the meeting administrator to enable it',
+  fmt_screenshare_toast_network_error_unable_start_screen_share: 'Network error,unable to start screen sharing.Please check network.',
+  fmt_screenshare_controlbar_button_annotations: 'Annotations',
+  fmt_screenshare_controlbar_annotations_options_attendees_annotate: 'Allow other attendees to annotate',
+  fmt_screenshare_controlbar_annotations_options_show_name: 'Show annoatator name',
+  fmt_screenshare_toast_host_enabled_annotations: 'The host or sharer has enabled interactive annotations',
+  fmt_screenshare_toast_host_disabled_annotations: 'The host or sharer has disabled interactive annotations',
+  fmt_screenshare_controlbar_options_clear_all: 'Clear all annotations',
+  fmt_screenshare_toast_annotations_visible_participants: 'Your annotations are visible to all participants',
+  fmt_screenshare_controlbar_button_settings: 'settings',
+  fmt_screenshare_controlbar_settings_label_share_audio_settings: 'Share Audio Settings',
+  fmt_screenshare_controlbar_settings_options_enable_share_audio: 'Enable Shared Audio',
+  fmt_screenshare_controlbar_settings_label_annotation_settings: 'Interactive Annotation Settings',
+  fmt_screenshare_controlbar_settings_label_annotation_controls: 'Interactive Annotation Controls',
+  fmt_screenshare_toast_annotation_controls_screen_sharing_disabled: 'Screen sharing has been turned off',
+  fmt_screenshare_tips_host_not_enabled_annotations: 'The host or presenter has not enabled the interactive annotation',
   fmt_screenshare_tips_unenabled: 'The conference administrator has not enabled the whiteboard editing function',
   fmt_screenshare_whiteboard_options_changetheme: 'Change whiteboard theme',
   fmt_screenshare_tips_alreadyoriginalsize: "It is already 'original size'",
@@ -594,20 +611,20 @@ var enUs = exports.enUs = {
   fmt_screenshare_whiteboard_tips_righclick: 'Right click to set as permanent color',
   fmt_screenshare_whiteboard_button_setcolor: 'Set as permanent color',
   fmt_screenshare_whiteboard_button_eraser: 'Eraser',
-  fmt_screenshare_whiteboard_button_empty: 'Empty',
+  fmt_screenshare_whiteboard_button_empty: 'Clear',
   fmt_screenshare_whiteboard_button_additionaltools: 'Additional tools',
-  fmt_screenshare_whiteboard_button_withdrwa: 'Withdraw',
-  fmt_screenshare_whiteboard_button_forward: 'Forward',
-  fmt_screenshare_whiteboard_button_paintbrush: 'Paint brush',
+  fmt_screenshare_whiteboard_button_withdrwa: 'Undo',
+  fmt_screenshare_whiteboard_button_forward: 'Redo',
+  fmt_screenshare_whiteboard_button_paintbrush: 'Pen',
   fmt_screenshare_whiteboard_button_cutting: 'Cutting',
   fmt_screenshare_whiteboard_button_screenshot: 'Screenshot',
   fmt_screenshare_whiteboard_options_hideshot: 'Hidden room screenshot',
-  fmt_screenshare_whiteboard_button_shape: 'Shape',
-  fmt_screenshare_whiteboard_button_laserpen: 'Laser pen',
-  fmt_screenshare_whiteboard_button_boxselection: 'Box selection',
+  fmt_screenshare_whiteboard_button_shape: 'Graphic',
+  fmt_screenshare_whiteboard_button_laserpen: 'Laser',
+  fmt_screenshare_whiteboard_button_boxselection: 'Select',
   fmt_screenshare_whiteboard_button_text: 'Text',
   fmt_screenshare_whiteboard_button_dragdrop: 'Drag and drop',
-  fmt_screenshare_whiteboard_button_savescript: 'Save Whiteboard Script',
+  fmt_screenshare_whiteboard_button_savescript: 'Save',
   fmt_screenshare_whiteboard_button_spread: 'Spread',
   fmt_screenshare_whiteboard_tips_choose_pen_first: 'Start by selecting a shape or brush',
   fmt_screenshare_whiteboard_tips_downloading: 'The blackboard is currently being downloaded',
@@ -898,6 +915,32 @@ var enUs = exports.enUs = {
   fmt_internalsetting_room_window_switched: 'Switch to {reason1}',
   fmt_internalsetting_labels_Network_type: 'Network type',
   fmt_internalsetting_labels_resolving_power: 'Resolution',
+  fmt_internalsetting_options_play_prompt: 'Play a prompt tone upon entry',
+  fmt_internalsetting_labels_audio: 'Audio',
+  fmt_internalsetting_labels_hide_video_off: 'After checking this option, you will not see the views of participants who have not turned on their cameras during the meeting (others will still be able to see them).',
+  fmt_internalsetting_labels_hide_my_video: 'After checking this option, you will not see your own view during the meeting (others will still be able to see your view).',
+  fmt_settings_labels_virtual_background: 'Virtual Background',
+  fmt_settings_labels_prompt_tone: 'prompt tone',
+  //****************** 会控设置 ******************
+  fmt_meeting_setting_button_meeting_settings: 'Meeting settings',
+  fmt_meeting_setting_labels_meeting_settings: 'Meeting settings',
+  fmt_meeting_setting_labels_audio_video_settings: 'Audio and Video Settings (when joining a meeting)',
+  fmt_meeting_setting_options_mute_participants: 'Mute participants upon entry',
+  fmt_meeting_setting_options_disable_video: 'Disable video for attendees upon entry',
+  fmt_meeting_setting_labels_Security: 'Security',
+  fmt_meeting_setting_options_enable_waiting_room: 'Enable Waiting Room',
+  fmt_meeting_setting_options_jbh: 'Attendees can join before host',
+  fmt_meeting_setting_options_show_time: 'Show meeting time',
+  fmt_meeting_setting_options_show_duration: 'Show participant duration',
+  fmt_meeting_setting_options_show_information: 'Show meeting information',
+  fmt_meeting_setting_labels_advanced: 'Advanced',
+  fmt_meeting_setting_options_enable_live_streaming: 'Enable Live Streaming',
+  fmt_meeting_setting_options_enable_interpretation: 'Enable Interpretation',
+  fmt_meeting_setting_options_generate_meeting_minutes: 'Generate AI Meeting Minutes',
+  fmt_meeting_setting_toast_enabled_mute: 'You has enabled mute upon entry for all participants​​',
+  fmt_meeting_setting_toast_turned_off_video: '​​You has turned off video automatically upon entry',
+  fmt_meeting_setting_toast_disabled_mute: 'You has disabled mute upon entry for all participants​​',
+  fmt_meeting_setting_toast_turned_on_video: '​​You has turned on video automatically upon entry',
   //****************** 设置提示部分 ******************
   fmt_settings_labels_sidebar: 'Sidebar',
   fmt_settings_labels_fold: 'Fold',
@@ -916,7 +959,7 @@ var enUs = exports.enUs = {
   fmt_settings_tips_Blockallchat: "‘Block all chat'",
   fmt_settings_tips_groupchatonly: "'Group chat only'",
   fmt_settings_tips_hostchatonly: "'Only permit chat to host or cohost'",
-  fmt_settings_tips_confirmactivate: 'Confirm to activate',
+  fmt_settings_tips_confirmactivate: 'Confirm',
   fmt_settings_tips_passwordcopyfailed: 'Meeting password copying failed',
   fmt_settings_tips_sharing: 'You are screen sharing',
   fmt_settings_labels_miniutes: '{reason1} minutes',
@@ -930,7 +973,7 @@ var enUs = exports.enUs = {
   fmt_settings_options_pausecloudrecording: 'Pause cloud recording',
   fmt_settings_popup_disable_while_microphone_detected: 'This function is disabled while the microphone is being detected',
   fmt_settings_popup_disable_while_speaker_detected: 'This function is disabled while the speaker is beiing detected',
-  fmt_settings_popup_label_use_phone_audio: 'Using phone audio',
+  fmt_settings_popup_label_use_phone_audio: 'Phone',
   fmt_settings_popup_label_link_audio_to_hear_others: 'In order to hear other users, please join the meeting using cell phone audio',
   fmt_settings_popup_label_select_audio: 'Select audio',
   fmt_settings_popup_label_audio_not_connect_click_select: 'Audio not connected, please click to select',
@@ -1291,13 +1334,14 @@ var enUs = exports.enUs = {
   fmt_premeeting_setting_mobile_swtich_voice_stimulation: 'Voice stimulation',
   fmt_premeeting_setting_mobile_label_speaking_display_first: 'When voice stimulation is enabled, the participants who are speaking are displayed first.',
   fmt_premeeting_setting_mobile_option_bilingual: 'Bilingual ',
-  fmt_premeeting_setting_mobile_option_chinese: 'Chinese',
-  fmt_premeeting_setting_mobile_option_english: 'English',
+  fmt_premeeting_setting_mobile_option_chinese: '中文',
+  fmt_premeeting_setting_mobile_option_english: 'EN',
   fmt_premeeting_setting_mobile_option_language_auto: 'Auto',
   fmt_premeeting_setting_mobile_option_appearance: 'Appearance',
   fmt_premeeting_setting_mobile_option_auto: 'Auto',
   fmt_premeeting_setting_mobile_option_bright: 'Bright',
   fmt_premeeting_setting_mobile_option_dark: 'Dark',
+  fmt_premeeting_setting_option_setting_after_restarting: 'Appearance settings will take effect after restarting Flexible Meeting',
   fmt_premeeting_setting_mobile_option_region: 'Region',
   fmt_premeeting_setting_mobile_option_developer_mode: 'Developer mode',
   fmt_premeeting_setting_mobile_label_about_us: 'About us',
@@ -1322,6 +1366,8 @@ var enUs = exports.enUs = {
   fmt_premeeting_setting_mobile_popup_button_cancel: 'Cancel',
   fmt_premeeting_setting_mobile_popup_button_log_out: 'Log out ',
   fmt_premeeting_setting_mobile_button_log_out_confirm: 'Confirm',
+  fmt_premeeting_setting_button_more_meeting_control: 'More Conference Control Settings',
+  fmt_premeeting_setting_checkbox_joining_meeting_connect_audio: 'Automatically connect audio when joining a meeting',
   //****************** 首页  ******************
   fmt_premeeting_joinroom_mobile_button_upandin: 'Sign up and log in',
   fmt_premeeting_joinroom_mobile_label_flexible_meeting: 'Flexible Meeting',
@@ -1387,6 +1433,7 @@ var enUs = exports.enUs = {
   fmt_security_mainwindow_label_watermark: '{reason1}{reason1}',
   fmt_security_mainwindow_label_toast_unmute_not_allow: 'Hosts/co-hosts not allowed to unmute themselves',
   fmt_security_mainwindow_label_toast_name_change_not_allow: 'Hosts/co-hosts are not allowed to change their own name',
+  fmt_security_mainwindow_label_interactive_annotations: 'Allow interactive annotations',
   //****************** 设置 ******************
   fmt_premeeting_setting_label_settings: 'Setting',
   fmt_premeeting_setting_label_normal: 'Normal',
@@ -1444,6 +1491,7 @@ var enUs = exports.enUs = {
   fmt_premeeting_setting_label_low: 'Low',
   fmt_premeeting_setting_label_medium: 'Medium',
   fmt_premeeting_setting_label_high: 'High',
+  fmt_premeeting_setting_label_turn_off: 'Turn Off',
   fmt_premeeting_setting_label_professional_audio: 'Professional Audio',
   fmt_premeeting_setting_label_enable_stereo: 'Enable Stereo',
   fmt_premeeting_setting_label_high_fidelity_music_mode: 'High-Fidelity Music Mode',