fcr-ui-scene 3.3.0 → 3.4.0

package/lib/modules/layout/video-window-datasource.js

@@ -81,10 +81,10 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _type = require("./type");
 var _mobx = require("mobx");
-var _type2 = require("agora-edu-core/lib/type");
-var _agoraEduCore = require("agora-edu-core");
+var _type2 = require("fcr-core/lib/type");
+var _fcrCore = require("fcr-core");
 var _FcrUIVideoWindowDataImpl, _FcrUIVideoWindowDataSource;
-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, _setSpotlightEnabledDecs2, _setLayoutDecs, _onSpotlightRemovedDecs, _resetListDecs, _addBoardDecs, _updateBoardDecs, _removeBoardDecs, _mergePstnStreamOrInsertNewDataDecs, _addDecs, _updateDecs, _deleteDecs, _addPinDecs, _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, _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, _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; }
@@ -217,20 +217,33 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     key: "audioStreamConnectorType",
     get: function get() {
       var _this$_audioStream2;
-      return ((_this$_audioStream2 = this._audioStream) === null || _this$_audioStream2 === void 0 ? void 0 : _this$_audioStream2.connectorType) || _agoraEduCore.FcrRoomConnectorType.NONE;
+      return ((_this$_audioStream2 = this._audioStream) === null || _this$_audioStream2 === void 0 ? void 0 : _this$_audioStream2.connectorType) || _fcrCore.FcrRoomConnectorType.NONE;
     }
   }, {
     key: "videoStreamConnectorType",
     get: function get() {
       var _this$_videoStream2;
-      return ((_this$_videoStream2 = this._videoStream) === null || _this$_videoStream2 === void 0 ? void 0 : _this$_videoStream2.connectorType) || _agoraEduCore.FcrRoomConnectorType.NONE;
+      return ((_this$_videoStream2 = this._videoStream) === null || _this$_videoStream2 === void 0 ? void 0 : _this$_videoStream2.connectorType) || _fcrCore.FcrRoomConnectorType.NONE;
     }
+
+    // @computed
+    // get hasMicrophoneAudioStream() {
+    //   if (this.audioStreamConnectorType === FcrRoomConnectorType.NONE) {
+    //     return (
+    //       this._videoStream?.audioSourceState === FcrMediaSourceState.OPEN &&
+    //       (this._videoStream.streamType === FcrStreamType.BOTH ||
+    //         this._videoStream.streamType === FcrStreamType.AUDIO)
+    //     );
+    //   } else {
+    //     return true;
+    //   }
+    // }
   }, {
     key: "hasMicrophoneAudioStream",
     get: function get() {
-      if (this.audioStreamConnectorType === _agoraEduCore.FcrRoomConnectorType.NONE) {
+      if (this.audioStreamConnectorType === _fcrCore.FcrRoomConnectorType.NONE) {
         var _this$_videoStream3;
-        return ((_this$_videoStream3 = this._videoStream) === null || _this$_videoStream3 === void 0 ? void 0 : _this$_videoStream3.audioSourceState) === _agoraEduCore.FcrMediaSourceState.STARTED && (this._videoStream.streamType === _agoraEduCore.FcrStreamType.BOTH || this._videoStream.streamType === _agoraEduCore.FcrStreamType.AUDIO);
+        return ((_this$_videoStream3 = this._videoStream) === null || _this$_videoStream3 === void 0 ? void 0 : _this$_videoStream3.audioSourceState) === _fcrCore.FcrMediaSourceState.OPEN;
       } else {
         return true;
       }
@@ -238,9 +251,9 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
   }, {
     key: "phoneMicEnabled",
     get: function get() {
-      if (this.audioStreamConnectorType === _agoraEduCore.FcrRoomConnectorType.PSTN) {
+      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) === _agoraEduCore.FcrMediaSourceState.STARTED || ((_this$_videoStream4 = this._videoStream) === null || _this$_videoStream4 === void 0 ? void 0 : _this$_videoStream4.streamType) === _agoraEduCore.FcrStreamType.BOTH;
+        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;
       } else {
         return false;
       }
@@ -249,13 +262,13 @@ 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) === _agoraEduCore.FcrMediaSourceState.STARTED && (((_this$_videoStream6 = this._videoStream) === null || _this$_videoStream6 === void 0 ? void 0 : _this$_videoStream6.streamType) === _agoraEduCore.FcrStreamType.BOTH || ((_this$_videoStream7 = this._videoStream) === null || _this$_videoStream7 === void 0 ? void 0 : _this$_videoStream7.streamType) === _agoraEduCore.FcrStreamType.VIDEO);
+      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) === _agoraEduCore.FcrAudioSourceType.LOOPBACK;
+      return ((_this$_videoStream8 = this._videoStream) === null || _this$_videoStream8 === void 0 ? void 0 : _this$_videoStream8.audioSourceType) === _fcrCore.FcrAudioSourceType.LOOPBACK;
     }
   }, {
     key: "userId",
@@ -279,7 +292,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     key: "videoSourceType",
     get: function get() {
       var _this$_videoStream12;
-      return ((_this$_videoStream12 = this._videoStream) === null || _this$_videoStream12 === void 0 ? void 0 : _this$_videoStream12.videoSourceType) || _agoraEduCore.FcrVideoSourceType.CAMERA;
+      return ((_this$_videoStream12 = this._videoStream) === null || _this$_videoStream12 === void 0 ? void 0 : _this$_videoStream12.videoSourceType) || _fcrCore.FcrVideoSourceType.CAMERA;
     }
   }, {
     key: "isMySelf",
@@ -294,7 +307,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
         if (this.type === _type.FcrUIWindowType.BOARD && this._boardCanEdit) {
           return _type.FcrUIVideoWindowMainSortingPriority.HIGHEST;
         }
-        if (this.isPin || ((_this$_videoStream13 = this._videoStream) === null || _this$_videoStream13 === void 0 ? void 0 : _this$_videoStream13.videoSourceType) === _agoraEduCore.FcrVideoSourceType.SCREEN || this.type === _type.FcrUIWindowType.BOARD) {
+        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) {
@@ -329,7 +342,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
         if (this.isPin) {
           return _type.FcrUIVideoWindowFoldSortingPriority.PIN;
         }
-        if (((_this$_videoStream14 = this._videoStream) === null || _this$_videoStream14 === void 0 ? void 0 : _this$_videoStream14.videoSourceType) === _agoraEduCore.FcrVideoSourceType.SCREEN) {
+        if (((_this$_videoStream14 = this._videoStream) === null || _this$_videoStream14 === void 0 ? void 0 : _this$_videoStream14.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN) {
           return _type.FcrUIVideoWindowFoldSortingPriority.SCREEN_SHARING_STREAM;
         }
         if (this.hasScreenSharing) {
@@ -430,7 +443,7 @@ var _E2 = /*#__PURE__*/new WeakMap();
 var _F2 = /*#__PURE__*/new WeakMap();
 var _G2 = /*#__PURE__*/new WeakMap();
 var _H = /*#__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], _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");
+_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 FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE__*/function () {
   function FcrUIVideoWindowDataSource() {
     (0, _classCallCheck2["default"])(this, FcrUIVideoWindowDataSource);
@@ -516,6 +529,8 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
     key: "setSpotlightEnabled",
     value: function setSpotlightEnabled(enabled) {
       var _this = this;
+      var currentSpeakerSpotlightIndex_mainList = this._findCurrentSpeakerSpotlight(this.mainList);
+      var currentSpeakerSpotlightIndex_foldList = this._findCurrentSpeakerSpotlight(this.foldList);
       this.spotlightEnabled = enabled;
       this.mainList.forEach(function (item) {
         item.setSpotlightEnabled(enabled);
@@ -526,6 +541,9 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
       this._spotlightPool.streams.forEach(function (_ts, streamId) {
         _this.setSpeakerSpotlight(streamId);
       });
+      // update speaker spotlight position
+      this._updateSpeakerSpotlightPosition(currentSpeakerSpotlightIndex_mainList, this.mainList, this.mainListLimitedCount, 'main-list');
+      this._updateSpeakerSpotlightPosition(currentSpeakerSpotlightIndex_foldList, this.foldList, this.foldListLimitedCount, 'fold-list');
     }
   }, {
     key: "setLayout",
@@ -614,7 +632,7 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
     key: "_mergePstnStreamOrInsertNewData",
     value: function _mergePstnStreamOrInsertNewData(stream, list, limitCount, isMySelf, placement) {
       var existedUserPstnStream = list.find(function (item) {
-        return item.userId === stream.owner.userId && item.audioStreamConnectorType === _agoraEduCore.FcrRoomConnectorType.PSTN;
+        return item.userId === stream.owner.userId && item.audioStreamConnectorType === _fcrCore.FcrRoomConnectorType.PSTN;
       });
       if (existedUserPstnStream) {
         existedUserPstnStream.setVideoStream(stream);
@@ -627,10 +645,10 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
     value: function add(stream, isMySelf) {
       var _this3 = this;
       var streamCopy = this.copyStreamInfo(stream);
-      if (streamCopy.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN) {
+      if (streamCopy.connectorType === _fcrCore.FcrRoomConnectorType.PSTN) {
         var handlePSTNStreamAdded = function handlePSTNStreamAdded(stream, list, limitCount, isMySelf, placement) {
           var existedUserStream = list.find(function (item) {
-            return item.userId === stream.owner.userId && item.videoSourceType === _agoraEduCore.FcrVideoSourceType.CAMERA;
+            return item.userId === stream.owner.userId && item.videoSourceType === _fcrCore.FcrVideoSourceType.CAMERA;
           });
           if (existedUserStream) {
             existedUserStream.setAudioStream(stream);
@@ -644,7 +662,7 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
         this._mergePstnStreamOrInsertNewData(streamCopy, this.mainList, this.mainListLimitedCount, isMySelf, 'main-list');
         this._mergePstnStreamOrInsertNewData(streamCopy, this.foldList, this.foldListLimitedCount, isMySelf, 'fold-list');
       }
-      if (streamCopy.videoSourceType === _agoraEduCore.FcrVideoSourceType.SCREEN) {
+      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');
       }
@@ -656,7 +674,7 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
       var handleStreamInfoUpdated = function handleStreamInfoUpdated(stream, list, limitCount, placement) {
         var existedUserStream = list[_this4._findItemIndexWithWindowId(stream.streamId, list)];
         if (existedUserStream) {
-          if (param.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN) {
+          if (param.connectorType === _fcrCore.FcrRoomConnectorType.PSTN) {
             existedUserStream.setAudioStream(stream);
           } else {
             existedUserStream.setVideoStream(stream);
@@ -706,7 +724,7 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
           }
         }
       };
-      if (stream.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN) {
+      if (stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN) {
         handlePSTNStreamDeleted(streamCopy, this.mainList, 'main-list');
         handlePSTNStreamDeleted(streamCopy, this.foldList, 'fold-list');
       } else {
@@ -725,7 +743,7 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
       }
       // if it is the last screen share stream of the user, remove the screen sharing flag
 
-      if (stream.videoSourceType === _agoraEduCore.FcrVideoSourceType.SCREEN) {
+      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');
       }
@@ -759,6 +777,16 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
       handlePin(streamId, this.foldList, this.foldListLimitedCount, 'fold-list');
       return success;
     }
+  }, {
+    key: "_updateSpeakerSpotlightPosition",
+    value: function _updateSpeakerSpotlightPosition(index, list, limitCount, placement) {
+      var existedUserStream = list[index];
+      if (!existedUserStream) {
+        return;
+      }
+      this._insertByPriority(existedUserStream, list, limitCount);
+      this._observer.notifyObservers(placement === 'main-list' ? 'onMainListUpdated' : 'onFoldListUpdated', index);
+    }
   }, {
     key: "removePin",
     value: function removePin(streamId) {
@@ -867,7 +895,7 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
         });
       } else {
         var remainingShare = list.some(function (item) {
-          return item.userId === userId && (item.type === _type.FcrUIWindowType.BOARD || item.videoSourceType === _agoraEduCore.FcrVideoSourceType.SCREEN);
+          return item.userId === userId && (item.type === _type.FcrUIWindowType.BOARD || item.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN);
         });
         if (!remainingShare) {
           list.forEach(function (item) {
@@ -947,6 +975,13 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
         return index + 1;
       }
     }
+  }, {
+    key: "_findCurrentSpeakerSpotlight",
+    value: function _findCurrentSpeakerSpotlight(list) {
+      return list.findIndex(function (item) {
+        return item.isSpeakerSpotlight;
+      });
+    }
   }, {
     key: "_findItemIndexWithWindowId",
     value: function _findItemIndexWithWindowId(windowId, list) {
@@ -981,7 +1016,7 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
   }, {
     key: "_insertNewData",
     value: function _insertNewData(stream, list, limitCount, isMySelf, placement) {
-      var videoWindowData = new FcrUIVideoWindowDataImpl(_type.FcrUIWindowType.VIDEO, stream.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN ? {
+      var videoWindowData = new FcrUIVideoWindowDataImpl(_type.FcrUIWindowType.VIDEO, stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN ? {
         audioStream: stream
       } : {
         videoStream: stream
@@ -992,7 +1027,7 @@ var FcrUIVideoWindowDataSource = exports.FcrUIVideoWindowDataSource = /*#__PURE_
   }]);
 }();
 _FcrUIVideoWindowDataSource = FcrUIVideoWindowDataSource;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataSource, [[_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"], [_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"], [_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, 9);
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataSource, [[_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"], [_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, 9);
 _init_spotlightEnabled = _applyDecs$e2[0];
 _init_layoutType = _applyDecs$e2[1];
 _init_manualLayout = _applyDecs$e2[2];
@@ -1007,7 +1042,7 @@ var FcrUISpeakerSpotlightPool = exports.FcrUISpeakerSpotlightPool = /*#__PURE__*
     (0, _classCallCheck2["default"])(this, FcrUISpeakerSpotlightPool);
     (0, _defineProperty2["default"])(this, "streams", new Map());
     (0, _defineProperty2["default"])(this, "limitCount", 1);
-    (0, _defineProperty2["default"])(this, "duration", 10);
+    (0, _defineProperty2["default"])(this, "duration", 2);
     (0, _defineProperty2["default"])(this, "_timer", null);
     (0, _defineProperty2["default"])(this, "_observer", new _observable.AgoraObservable());
     this._scan = this._scan.bind(this);

package/lib/modules/live-streaming/index.d.ts

@@ -1,6 +1,6 @@
 import { UIModule } from '../../base';
 import { FcrUIEventStore } from '../../common/event-store';
-import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
+import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
 export declare class LiveStreamingUIModule extends UIModule {
     private _store;
     constructor({ roomControl, uiEventStore, }: {
@@ -9,5 +9,4 @@ export declare class LiveStreamingUIModule extends UIModule {
     });
     getComponent(): import("react/jsx-runtime").JSX.Element;
     onUnload(): void;
-    onProcessEvent(event: RendererCustomEvent): void;
 }

package/lib/modules/live-streaming/index.js

@@ -1,8 +1,17 @@
 "use strict";
 
+require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,11 +22,11 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _base = require("../../base");
-var _context = require("./context");
-var _store = _interopRequireDefault(require("./store"));
+var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
-var _constant = require("../../utilities/constant");
 var _jsxRuntime = require("react/jsx-runtime");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var LiveStreamingUIModule = exports.LiveStreamingUIModule = /*#__PURE__*/function (_UIModule) {
@@ -37,7 +46,7 @@ var LiveStreamingUIModule = exports.LiveStreamingUIModule = /*#__PURE__*/functio
   return (0, _createClass2["default"])(LiveStreamingUIModule, [{
     key: "getComponent",
     value: function getComponent() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.StoreContext.Provider, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: this._store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {})
       });
@@ -47,30 +56,5 @@ var LiveStreamingUIModule = exports.LiveStreamingUIModule = /*#__PURE__*/functio
     value: function onUnload() {
       this._store.release();
     }
-  }, {
-    key: "onProcessEvent",
-    value: function onProcessEvent(event) {
-      var action = event.action,
-        payload = event.payload;
-      switch (action) {
-        case _constant.RendererEventAction.START_LIVE_STREAMING:
-        case _constant.RendererEventAction.STOP_LIVE_STREAMING:
-          this._store.onLiveButtonClick((payload === null || payload === void 0 ? void 0 : payload.videoSteamingUrl) || '', (payload === null || payload === void 0 ? void 0 : payload.videoStreamingKey) || '', (payload === null || payload === void 0 ? void 0 : payload.playUrl) || '');
-          break;
-        case _constant.RendererEventAction.FRAGMENT_LOADED:
-          if (payload === 'live-streaming') {
-            this._store.setLiveStreamingWindowActive(true);
-          }
-          break;
-        case _constant.RendererEventAction.FRAGMENT_CLOSED:
-          if (payload === 'live-streaming') {
-            this._store.closeLiveStreaming();
-          }
-          break;
-        case _constant.RendererEventAction.CLOSE_LIVE_STREAMING:
-          this._store.closeLiveStreaming();
-          break;
-      }
-    }
   }]);
 }(_base.UIModule);

package/lib/modules/live-streaming/store.d.ts

@@ -1,6 +1,6 @@
-import { FcrLiveStreamingState } from 'agora-edu-core/lib/type';
+import { FcrLiveStreamingState } from 'fcr-core/lib/type';
 import { FcrUIEventStore } from '../../common/event-store';
-import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
+import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
 export default class LiveStreamingStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     accessor videoSteamingUrl: string;
@@ -22,17 +22,13 @@ export default class LiveStreamingStore {
         uiEventStore: FcrUIEventStore;
     });
     release(): void;
-    setLiveStreamingWindowActive(active: boolean): void;
     closeLiveStreaming(): void;
-    private _initReactions;
     onLiveButtonClick(videoSteamingUrl: string, videoStreamingKey: string, playUrl: string): Promise<void>;
     private _startLiveStreaming;
-    private _addReactions;
-    private _sendLiveStreamingStateEvent;
-    private _sendLiveStreamingErrorStateEvent;
     private _onUserInfoUpdated;
     private _handleLiveStreamingStateUpdated;
     private _handleEvent;
     private _stopLiveStreaming;
     private _updateLiveStreamingLayout;
 }
+export declare const StoreContext: import("react").Context<LiveStreamingStore>;

package/lib/modules/live-streaming/store.js

@@ -6,6 +6,7 @@ require("core-js/modules/es.symbol.to-primitive.js");
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
@@ -35,33 +36,27 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-require("core-js/modules/es.array.for-each.js");
+exports["default"] = exports.StoreContext = void 0;
 require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.array.push.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.for-each.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _type = require("agora-edu-core/lib/type");
+var _type = require("fcr-core/lib/type");
 var _mobx = require("mobx");
 var _constant = require("../../utilities/constant");
-var _rendererEvent = require("../../utilities/renderer-event");
 var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("agora-foundation/lib/logger");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _react = require("react");
 var _LiveStreamingStore;
 var _initProto, _init_videoSteamingUrl, _init_videoStreamingKey, _init_playUrl, _init_liveStreamingState, _init_isStartError, _onLiveButtonClickDecs, _startLiveStreamingDecs, _handleLiveStreamingStateUpdatedDecs, _handleEventDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -158,38 +153,11 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "release",
     value: function release() {}
-  }, {
-    key: "setLiveStreamingWindowActive",
-    value: function setLiveStreamingWindowActive(active) {
-      if (active) {
-        this._initReactions();
-        this._addReactions();
-      } else {
-        this._disposers.forEach(function (disposer) {
-          return disposer();
-        });
-        this._disposers = [];
-      }
-    }
   }, {
     key: "closeLiveStreaming",
     value: function closeLiveStreaming() {
       this._uiEventStore.closeLiveStreamingDialog();
     }
-  }, {
-    key: "_initReactions",
-    value: function _initReactions() {
-      (0, _rendererEvent.sendEvent)({
-        action: _constant.RendererEventAction.INIT_LIVE_STREAMING,
-        payload: {
-          videoSteamingUrl: this.videoSteamingUrl,
-          videoStreamingKey: this.videoStreamingKey,
-          playUrl: this.playUrl,
-          liveStreamingState: this.liveStreamingState,
-          isStartError: this.isStartError
-        }
-      });
-    }
   }, {
     key: "onLiveButtonClick",
     value: function () {
@@ -257,41 +225,6 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
       }
       return _startLiveStreaming;
     }()
-  }, {
-    key: "_addReactions",
-    value: function _addReactions() {
-      var _this = this;
-      this._disposers.push((0, _mobx.reaction)(function () {
-        return _this.liveStreamingState;
-      }, function (value) {
-        _this._sendLiveStreamingStateEvent(value);
-      }));
-      this._disposers.push((0, _mobx.reaction)(function () {
-        return _this.isStartError;
-      }, function (value) {
-        _this._sendLiveStreamingErrorStateEvent(value);
-      }));
-    }
-  }, {
-    key: "_sendLiveStreamingStateEvent",
-    value: function _sendLiveStreamingStateEvent(state) {
-      (0, _rendererEvent.sendEvent)({
-        action: _constant.RendererEventAction.SET_LIVE_STREAMING_STATE,
-        payload: {
-          liveStreamingState: state
-        }
-      });
-    }
-  }, {
-    key: "_sendLiveStreamingErrorStateEvent",
-    value: function _sendLiveStreamingErrorStateEvent(state) {
-      (0, _rendererEvent.sendEvent)({
-        action: _constant.RendererEventAction.LIVE_STREAMING_ERROR_STATE,
-        payload: {
-          isStartError: state
-        }
-      });
-    }
   }, {
     key: "_onUserInfoUpdated",
     value: function _onUserInfoUpdated(roomId, event) {
@@ -378,4 +311,5 @@ _init_videoStreamingKey = _applyDecs$e[1];
 _init_playUrl = _applyDecs$e[2];
 _init_liveStreamingState = _applyDecs$e[3];
 _init_isStartError = _applyDecs$e[4];
-_initProto = _applyDecs$e[5];
+_initProto = _applyDecs$e[5];
+var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/live-streaming/view.js

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.View = void 0;
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _context = require("./context");
+var _store = require("./store");
 var _container = require("agora-ui-foundation/lib/components/live-streaming/container");
-var _type = require("agora-edu-core/lib/type");
+var _type = require("fcr-core/lib/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var View = exports.View = (0, _mobxReact.observer)(function () {
-  var _useContext = (0, _react.useContext)(_context.StoreContext),
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
     videoSteamingUrl = _useContext.videoSteamingUrl,
     videoStreamingKey = _useContext.videoStreamingKey,
     playUrl = _useContext.playUrl,

package/lib/modules/notification/context.d.ts

@@ -0,0 +1,2 @@
+import NotificationStore from './store';
+export declare const StoreContext: import("react").Context<NotificationStore>;

package/lib/modules/notification/context.js

@@ -0,0 +1,9 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StoreContext = void 0;
+var _react = require("react");
+var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/notification/index.css

@@ -0,0 +1,59 @@
+.waiting-room-confirm-dialog {
+  background-color: white;
+  border-radius: 10px;
+  position: relative;
+  z-index: 9999;
+}
+
+.waiting-room-confirm-dialog .fcr-dialog-body {
+  padding: 20px;
+}
+
+.waiting-room-confirm-dialog-content {
+  display: flex;
+  align-items: center;
+}
+
+.fcr-notification-root .rc-notification {
+  position: absolute;
+  top: 40px;
+  z-index: 999;
+  height: calc(100vh - 40px);
+}
+
+.rc-notification-notice-wrapper {
+  border-radius: 10px;
+  left: 10px;
+}
+
+.waiting-room-confirm-dialog-content-icon {
+  background-color: #a19fff;
+  width: 48px;
+  height: 48px;
+  border-radius: 50px;
+  margin-right: 10px;
+}
+
+.waiting-room-confirm-dialog-content-title {
+  font-size: 14px;
+  margin-bottom: 5px;
+}
+
+.waiting-room-confirm-dialog-content-desc {
+  font-size: 13px;
+  color: var(--fcr_ui_scene_icontext2);
+}
+
+.waiting-room-confirm-dialog-btns {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  margin-top: 10px;
+}
+
+.waiting-room-left-btn {
+  color: var(--fcr_ui_scene_icontext2);
+  margin-right: 15px;
+  font-size: 12px;
+  cursor: pointer;
+}

package/lib/modules/notification/index.d.ts

@@ -0,0 +1,15 @@
+import { FcrPrivilegeControl } from 'fcr-core';
+import { UIModule } from '../../base';
+import { FcrUIEventStore } from '../../common/event-store';
+import { FcrRoomStore } from '../../common/room-store';
+export declare class NotificationUIModule extends UIModule {
+    private _store;
+    private _uiEventStore;
+    constructor(args: {
+        uiEventStore: FcrUIEventStore;
+        privilegeControl: FcrPrivilegeControl;
+        roomStore: FcrRoomStore;
+    });
+    protected onUnload(): void;
+    getComponent(): import("react/jsx-runtime").JSX.Element;
+}