fcr-ui-scene 3.4.4 → 3.5.0

package/lib/providers/room-provider.js

@@ -3,8 +3,6 @@
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 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.filter.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.push.js");
@@ -17,7 +15,6 @@ 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.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.symbol.metadata.js");
@@ -28,6 +25,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrUIWaitingRoomControlProviderImpl = exports.FcrUIRoomProviderImpl = exports.FcrUIMainRoomControlProviderImpl = exports.FcrUICurrentRoomControlProviderImpl = exports.FcrUIConnectionProviderImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
@@ -41,8 +40,6 @@ require("core-js/modules/es.object.values.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.find.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.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -84,11 +81,11 @@ var _base = require("../base");
 var _privilegeProvider = require("./privilege-provider");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobx = require("mobx");
-var _misc = require("agora-foundation/lib/utilities/misc");
 var _type7 = require("agora-ui-foundation/lib/components/icon/type");
 var _type8 = require("../modules/whiteboard/type");
+var _waitingRoomControlManager = _interopRequireDefault(require("../waiting-room-control-manager"));
 var _FcrUIRoomProviderImpl, _FcrUIMainRoomControlProviderImpl;
-var _initProto, _init_liveStreamingState, _init_liveStreamingConfig, _init_cloudRecordingState, _initMainRoomStateDecs, _initWaitingRoomStateDecs, _ref, _initProto2, _init_privilegeOperator, _init_boardOwnerUser, _handleSecurityUpdatedDecs, _ref2;
+var _initProto, _init_liveStreamingState, _init_liveStreamingConfig, _init_cloudRecordingState, _initMainRoomStateDecs, _ref, _initProto2, _init_privilegeOperator, _init_boardOwnerUser, _handleSecurityUpdatedDecs, _ref2;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -104,13 +101,22 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
-_ref = (_initMainRoomStateDecs = [_mobx.action, _mobx.action.bound], _initWaitingRoomStateDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_initMainRoomStateDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/function () {
   function FcrUIRoomProviderImpl(_eventProvider, _sceneConfig, _engine, _messageProvider) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUIRoomProviderImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
+    (0, _defineProperty2["default"])(this, "_waitingRoomManagerObserver", {
+      onWaitingRoomControlCreated: function onWaitingRoomControlCreated(roomControl) {
+        _this._observable.notifyObservers('onJoinWaitingRoom', roomControl, true);
+      },
+      onWaitingRoomControlLeft: function onWaitingRoomControlLeft() {
+        _this._observable.notifyObservers('onWaitingRoomManageCanceled');
+        _this._messageProvider.closeNotification(_type5.FcrUINotificationContentType.WAITING_ROOM);
+      }
+    });
     _classPrivateFieldInitSpec(this, _A, _init_liveStreamingState(this, _type3.FcrLiveStreamingState.STOPPED));
     _classPrivateFieldInitSpec(this, _B, _init_liveStreamingConfig(this, undefined));
     _classPrivateFieldInitSpec(this, _C, _init_cloudRecordingState(this, _type3.FcrRecordingState.Stopped));
@@ -130,9 +136,8 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
         _this.cloudRecordingState = state;
       }),
       onLiveStreamingStateUpdated: (0, _mobx.action)(function (roomId, state) {
-        var _this$_mainRoomContro;
         _this.liveStreamingState = state;
-        _this.liveStreamingConfig = (_this$_mainRoomContro = _this._mainRoomControl) === null || _this$_mainRoomContro === void 0 ? void 0 : _this$_mainRoomContro.getLiveStreamingConfig();
+        _this.liveStreamingConfig = _this.currentRoomControl.getLiveStreamingConfig();
       }),
       onLocalUserMovedToWaitingRoom: function () {
         var _onLocalUserMovedToWaitingRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(roomId, event) {
@@ -140,38 +145,34 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
           return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                roomControl = _this._mainRoomControl; //todo
-                if (!roomControl) {
-                  _context.next = 19;
-                  break;
-                }
+                roomControl = _this.currentRoomControl; //todo
                 _roomControl$getPrivi = roomControl.getPrivilegeControl().getSecurityInfo(_type2.FcrSecurityAction.WaitingRoom), info = _roomControl$getPrivi.info;
                 if (!info) {
-                  _context.next = 19;
+                  _context.next = 18;
                   break;
                 }
-                _context.prev = 4;
+                _context.prev = 3;
                 _this._observable.notifyObservers('onLeaveMainRoom');
                 room = _this._engine.createWaitingRoomControl(info.payload.roomUuid);
-                _context.next = 9;
+                _context.next = 8;
                 return room.join(_objectSpread({}, _this._getJoinRoomOption()));
-              case 9:
-                _this._waitingRoomControl = room;
+              case 8:
+                _this._currentRoomControl = room;
                 room.addObserver(_this._waitingRoomObserver);
                 room.getUserControl().addObserver(_this._waitingRoomUserObserver);
                 roomControl.getUserControl().removeObserver(_this._mainRoomUserObserver);
-                _this._observable.notifyObservers('onJoinWaitingRoom', _this._waitingRoomControl);
-                _context.next = 19;
+                _this._observable.notifyObservers('onJoinWaitingRoom', _this._currentRoomControl);
+                _context.next = 18;
                 break;
-              case 16:
-                _context.prev = 16;
-                _context.t0 = _context["catch"](4);
+              case 15:
+                _context.prev = 15;
+                _context.t0 = _context["catch"](3);
                 _this.logger.error('onLocalUserMovedToWaitingRoom error', _context.t0);
-              case 19:
+              case 18:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[4, 16]]);
+          }, _callee, null, [[3, 15]]);
         }));
         function onLocalUserMovedToWaitingRoom(_x, _x2) {
           return _onLocalUserMovedToWaitingRoom.apply(this, arguments);
@@ -211,19 +212,34 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     };
     this._mainRoomUserObserver = {
       onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
-        var isLocalUserInfoUpdated = _this._mainRoomControl && event.modifiedUser.userId === _this._mainRoomControl.getUserControl().getLocalUser().userId;
+        var isLocalUserInfoUpdated = event.modifiedUser.userId === _this.currentRoomControl.getUserControl().getLocalUser().userId;
 
         // 权限变更的时候
         if (isLocalUserInfoUpdated) {
           _this._sceneConfig.userRole = event.modifiedUser.userRole;
-          _this._judgeWaitingRoomPremissionAndCreateRoomControl();
+          var isWaitingRoomManager = _this._isWaitingRoomManager();
+          if (isWaitingRoomManager) {
+            _this._waitingRoomManager.joinWaitingRoom();
+          } else {
+            _this._waitingRoomManager.leaveWaitingRoom();
+          }
         }
       },
       onLocalUserKickedOut: function onLocalUserKickedOut() {
         _this._observable.notifyObservers('onLocalUserKickedOut');
       }
     };
+    this._waitingRoomManager = new _waitingRoomControlManager["default"](this._sceneConfig, this._engine);
+    this._waitingRoomManager.addObserver(this._waitingRoomManagerObserver);
   }
+
+  // get waitingRoomControl() {
+  //   return this._currentRoomControl as FcrWaitingRoomControl;
+  // }
+
+  // get mainRoomControl() {
+  //   return this._currentRoomControl as FcrMainRoomControl;
+  // }
   return (0, _createClass2["default"])(FcrUIRoomProviderImpl, [{
     key: "liveStreamingState",
     get: function get() {
@@ -248,47 +264,41 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     set: function set(v) {
       _classPrivateFieldSet(_C, this, v);
     }
-  }, {
-    key: "waitingRoomControl",
-    get: function get() {
-      return this._waitingRoomControl;
-    }
-  }, {
-    key: "mainRoomControl",
-    get: function get() {
-      return this._mainRoomControl;
-    }
   }, {
     key: "currentRoomControl",
     get: function get() {
+      if (!this._currentRoomControl) {
+        throw new Error('currentRoomControl is not initialized');
+      }
       return this._currentRoomControl;
     }
   }, {
     key: "release",
     value: function release() {
-      if (this._mainRoomControl) {
-        this._mainRoomControl.leave();
-        this._mainRoomControl = undefined;
-      }
-      if (this._waitingRoomControl) {
-        this._waitingRoomControl.leave();
-        this._waitingRoomControl = undefined;
-      }
+      var _this$_currentRoomCon;
+      (_this$_currentRoomCon = this._currentRoomControl) === null || _this$_currentRoomCon === void 0 || _this$_currentRoomCon.leave();
+      this._currentRoomControl = undefined;
+      this._releaseWaitingRoomManager();
     }
   }, {
-    key: "leaveWaitingRoom",
-    value: function leaveWaitingRoom() {
-      if (this._waitingRoomControl) {
-        this._waitingRoomControl.leave();
-        this._waitingRoomControl = undefined;
-      }
+    key: "leaveRoom",
+    value: function leaveRoom() {
+      var _this$_currentRoomCon2;
+      (_this$_currentRoomCon2 = this._currentRoomControl) === null || _this$_currentRoomCon2 === void 0 || _this$_currentRoomCon2.leave();
+      this._currentRoomControl = undefined;
+    }
+  }, {
+    key: "_releaseWaitingRoomManager",
+    value: function _releaseWaitingRoomManager() {
+      this._waitingRoomManager.removeObserver(this._waitingRoomManagerObserver);
+      this._waitingRoomManager.release();
     }
   }, {
     key: "handleJoinRoom",
     value: function () {
       var _handleJoinRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(roomId) {
         var _room$getRoomInfo;
-        var room;
+        var room, roomControl, isWaitingRoomManager, _roomControl;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -296,28 +306,33 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
               return this._engine.createRoomControlAndJoin(roomId, this._getJoinRoomOption());
             case 2:
               room = _context3.sent;
-              this._currentRoomControl = room;
               if (!(((_room$getRoomInfo = room.getRoomInfo()) === null || _room$getRoomInfo === void 0 ? void 0 : _room$getRoomInfo.roomType) === _type.FcrRoomType.Mainroom)) {
-                _context3.next = 13;
+                _context3.next = 15;
                 break;
               }
-              this._mainRoomControl = room;
-              this._mainRoomControl.addObserver(this._mainRoomObserver);
-              this._mainRoomControl.getUserControl().addObserver(this._mainRoomUserObserver);
-              this._initMainRoomState(this._mainRoomControl);
+              roomControl = room;
+              this._currentRoomControl = roomControl;
+              this._currentRoomControl.addObserver(this._mainRoomObserver);
+              this._currentRoomControl.getUserControl().addObserver(this._mainRoomUserObserver);
+              this._initMainRoomState(this._currentRoomControl);
               // 如果已经有等候室管理员权限 再次创建房间
-              this._judgeWaitingRoomPremissionAndCreateRoomControl();
-              return _context3.abrupt("return", [_type.FcrRoomType.Mainroom, this._mainRoomControl]);
-            case 13:
-              this._waitingRoomControl = room;
-              this._waitingRoomControl.addObserver(this._waitingRoomObserver);
-              this._waitingRoomControl.getUserControl().addObserver(this._waitingRoomUserObserver);
-              this._initWaitingRoomState(this._waitingRoomControl);
+              // this._judgeWaitingRoomPremissionAndCreateRoomControl();
+              this._waitingRoomManager.setMainRoomControl(roomControl);
+              isWaitingRoomManager = this._isWaitingRoomManager();
+              if (isWaitingRoomManager) {
+                this._waitingRoomManager.joinWaitingRoom();
+              }
+              return _context3.abrupt("return", roomControl);
+            case 15:
+              _roomControl = room;
+              this._currentRoomControl = _roomControl;
+              this._currentRoomControl.addObserver(this._waitingRoomObserver);
+              this._currentRoomControl.getUserControl().addObserver(this._waitingRoomUserObserver);
               room.sendRoomMessage({
                 messageKey: _type3.RoomMessageKey.USER_WAITING_ROOM_JOINED
               }, false);
-              return _context3.abrupt("return", [_type.FcrRoomType.Waitingroom, this._waitingRoomControl]);
-            case 19:
+              return _context3.abrupt("return", _roomControl);
+            case 21:
             case "end":
               return _context3.stop();
           }
@@ -359,10 +374,11 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
             case 12:
               room.addObserver(this._mainRoomObserver);
               room.getUserControl().addObserver(this._mainRoomUserObserver);
+              this._waitingRoomManager.setMainRoomControl(room);
               this._initMainRoomState(room);
-              this._mainRoomControl = room;
+              this._currentRoomControl = room;
               return _context4.abrupt("return", room);
-            case 17:
+            case 18:
             case "end":
               return _context4.stop();
           }
@@ -377,12 +393,11 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     key: "startLiveStreaming",
     value: function () {
       var _startLiveStreaming = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(params) {
-        var _this$mainRoomControl;
         return _regenerator["default"].wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.next = 2;
-              return (_this$mainRoomControl = this.mainRoomControl) === null || _this$mainRoomControl === void 0 ? void 0 : _this$mainRoomControl.startLiveStreaming(params);
+              return this.currentRoomControl.startLiveStreaming(params);
             case 2:
             case "end":
               return _context5.stop();
@@ -398,12 +413,11 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     key: "stopLiveStreaming",
     value: function () {
       var _stopLiveStreaming = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6() {
-        var _this$mainRoomControl2;
         return _regenerator["default"].wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _context6.next = 2;
-              return (_this$mainRoomControl2 = this.mainRoomControl) === null || _this$mainRoomControl2 === void 0 ? void 0 : _this$mainRoomControl2.stopLiveStreaming();
+              return this.currentRoomControl.stopLiveStreaming();
             case 2:
             case "end":
               return _context6.stop();
@@ -424,12 +438,12 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     key: "startCloudRecording",
     value: function () {
       var _startCloudRecording = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7() {
-        var _this$_mainRoomContro2;
+        var _this$_currentRoomCon3;
         return _regenerator["default"].wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.next = 2;
-              return (_this$_mainRoomContro2 = this._mainRoomControl) === null || _this$_mainRoomContro2 === void 0 ? void 0 : _this$_mainRoomContro2.startCloudRecording({
+              return (_this$_currentRoomCon3 = this._currentRoomControl) === null || _this$_currentRoomCon3 === void 0 ? void 0 : _this$_currentRoomCon3.startCloudRecording({
                 audioProfile: _type3.FcrCloudRecordingAudioProfile.DEFAULT,
                 videoEncoderConfig: {
                   dimensions: {
@@ -456,12 +470,12 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     key: "pauseCloudRecording",
     value: function () {
       var _pauseCloudRecording = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8() {
-        var _this$_mainRoomContro3;
+        var _this$_currentRoomCon4;
         return _regenerator["default"].wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _context8.next = 2;
-              return (_this$_mainRoomContro3 = this._mainRoomControl) === null || _this$_mainRoomContro3 === void 0 ? void 0 : _this$_mainRoomContro3.pauseCloudRecording();
+              return (_this$_currentRoomCon4 = this._currentRoomControl) === null || _this$_currentRoomCon4 === void 0 ? void 0 : _this$_currentRoomCon4.pauseCloudRecording();
             case 2:
             case "end":
               return _context8.stop();
@@ -477,12 +491,12 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     key: "resumeCloudRecording",
     value: function () {
       var _resumeCloudRecording = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9() {
-        var _this$_mainRoomContro4;
+        var _this$_currentRoomCon5;
         return _regenerator["default"].wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.next = 2;
-              return (_this$_mainRoomContro4 = this._mainRoomControl) === null || _this$_mainRoomContro4 === void 0 ? void 0 : _this$_mainRoomContro4.resumeCloudRecording();
+              return (_this$_currentRoomCon5 = this._currentRoomControl) === null || _this$_currentRoomCon5 === void 0 ? void 0 : _this$_currentRoomCon5.resumeCloudRecording();
             case 2:
             case "end":
               return _context9.stop();
@@ -498,12 +512,12 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     key: "stopCloudRecording",
     value: function () {
       var _stopCloudRecording = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee10() {
-        var _this$_mainRoomContro5;
+        var _this$_currentRoomCon6;
         return _regenerator["default"].wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               _context10.next = 2;
-              return (_this$_mainRoomContro5 = this._mainRoomControl) === null || _this$_mainRoomContro5 === void 0 ? void 0 : _this$_mainRoomContro5.stopCloudRecording();
+              return (_this$_currentRoomCon6 = this._currentRoomControl) === null || _this$_currentRoomCon6 === void 0 ? void 0 : _this$_currentRoomCon6.stopCloudRecording();
             case 2:
             case "end":
               return _context10.stop();
@@ -526,63 +540,11 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
       this._observable.removeObserver(observer);
     }
   }, {
-    key: "_judgeWaitingRoomPremissionAndCreateRoomControl",
-    value: function () {
-      var _judgeWaitingRoomPremissionAndCreateRoomControl2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee11() {
-        var _this$_mainRoomContro6, info, isWaitingRoomManager, waitingRoomId, room, _this$_waitingRoomCon;
-        return _regenerator["default"].wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
-            case 0:
-              if (this._mainRoomControl) {
-                _context11.next = 3;
-                break;
-              }
-              this.logger.warn('[waitingroomLog-createWaitingRoom] mainRoomControl is not exist, can not create waiting room');
-              return _context11.abrupt("return");
-            case 3:
-              _this$_mainRoomContro6 = this._mainRoomControl.getPrivilegeControl().getSecurityInfo(_type2.FcrSecurityAction.WaitingRoom), info = _this$_mainRoomContro6.info;
-              isWaitingRoomManager = this._mainRoomControl.getPrivilegeControl().getLocalUserPermissionInfo(_type2.FcrPermissionAction.WaitingRoomOpen).enable;
-              this.logger.info("[waitingroomLog-createWaitingRoom] isWaitingRoomManager: ".concat(isWaitingRoomManager, ", info: ").concat((0, _misc.jsonstring)(info)));
-              if (!isWaitingRoomManager) {
-                _context11.next = 19;
-                break;
-              }
-              if (!info) {
-                _context11.next = 17;
-                break;
-              }
-              waitingRoomId = info.payload.roomUuid;
-              room = this._engine.createWaitingRoomControl(waitingRoomId);
-              this.logger.info("[waitingroomLog-joinWaitingRoomBefore] before waitingRoomManager join waiting room");
-              _context11.next = 13;
-              return room.join(_objectSpread(_objectSpread({}, this._getJoinRoomOption()), {}, {
-                createStreamConfigs: []
-              }));
-            case 13:
-              this.logger.info("[waitingroomLog-joinWaitingRoomAfter] after waitingRoomManager join waiting room");
-              this._waitingRoomControl = room;
-              this._initWaitingRoomState(room);
-              this._observable.notifyObservers('onJoinWaitingRoom', this._waitingRoomControl, true);
-            case 17:
-              _context11.next = 24;
-              break;
-            case 19:
-              this.logger.info('[waitingroomLog-createWaitingRoom] mainRoomControl is not waiting room manager, leave waiting room');
-              (_this$_waitingRoomCon = this._waitingRoomControl) === null || _this$_waitingRoomCon === void 0 || _this$_waitingRoomCon.leave();
-              this._waitingRoomControl = undefined;
-              this._eventProvider.sendEvent(_constant.FcrUIAction.WAITING_ROOM_DESTROYED);
-              this._messageProvider.closeNotification(_type5.FcrUINotificationContentType.WAITING_ROOM);
-            case 24:
-            case "end":
-              return _context11.stop();
-          }
-        }, _callee11, this);
-      }));
-      function _judgeWaitingRoomPremissionAndCreateRoomControl() {
-        return _judgeWaitingRoomPremissionAndCreateRoomControl2.apply(this, arguments);
-      }
-      return _judgeWaitingRoomPremissionAndCreateRoomControl;
-    }()
+    key: "_isWaitingRoomManager",
+    value: function _isWaitingRoomManager() {
+      var isWaitingRoomManager = this.currentRoomControl.getPrivilegeControl().getLocalUserPermissionInfo(_type2.FcrPermissionAction.WaitingRoomOpen).enable;
+      return isWaitingRoomManager;
+    }
   }, {
     key: "_getJoinRoomOption",
     value: function _getJoinRoomOption() {
@@ -615,13 +577,10 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
       this.liveStreamingConfig = roomControl.getLiveStreamingConfig();
       this.cloudRecordingState = roomControl.getCloudRecordingState();
     }
-  }, {
-    key: "_initWaitingRoomState",
-    value: function _initWaitingRoomState(roomControl) {}
   }]);
 }();
 _FcrUIRoomProviderImpl = FcrUIRoomProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIRoomProviderImpl, [[_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "liveStreamingConfig"], [_mobx.observable, 1, "cloudRecordingState"], [_initMainRoomStateDecs, 18, "_initMainRoomState"], [_initWaitingRoomStateDecs, 18, "_initWaitingRoomState"]], []).e, 4);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIRoomProviderImpl, [[_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "liveStreamingConfig"], [_mobx.observable, 1, "cloudRecordingState"], [_initMainRoomStateDecs, 18, "_initMainRoomState"]], []).e, 4);
 _init_liveStreamingState = _applyDecs$e[0];
 _init_liveStreamingConfig = _applyDecs$e[1];
 _init_cloudRecordingState = _applyDecs$e[2];
@@ -668,12 +627,12 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
     this._userObserver = {
       onRemoteUsersJoined: function onRemoteUsersJoined(roomId, events) {
         events.forEach(function (event) {
-          _this2._userMap.set(event.modifiedUser.userId, event.modifiedUser);
+          _this2._userMap.set(event.userInfo.userId, event.userInfo);
         });
       },
       onRemoteUsersLeft: function onRemoteUsersLeft(roomId, events) {
         events.forEach(function (event) {
-          _this2._userMap["delete"](event.modifiedUser.userId);
+          _this2._userMap["delete"](event.userInfo.userId);
         });
       },
       onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
@@ -757,7 +716,7 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
       var securityInfo = event.securityInfo;
       var enable = securityInfo.enable;
       var isPersonalOperation = this._localUser.userId === ((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId);
-      var toastType = isPersonalOperation ? 'normal' : 'info';
+      var toastType = isPersonalOperation ? 'normal' : enable ? 'info' : 'error';
       var operator = isPersonalOperation ? (0, _i18n.transI18n)('fmt_settings_labels_you') : (((_event$operatorUser2 = event.operatorUser) === null || _event$operatorUser2 === void 0 ? void 0 : _event$operatorUser2.userRole) === _type3.FcrUserRole.HOST ? (0, _i18n.transI18n)('fmt_role_host') : (0, _i18n.transI18n)('fmt_role_cohost')) + " ".concat((_this$privilegeOperat = this.privilegeOperator) === null || _this$privilegeOperat === void 0 ? void 0 : _this$privilegeOperat.userName, " ");
       if (((_securityInfo$info = securityInfo.info) === null || _securityInfo$info === void 0 ? void 0 : _securityInfo$info.action) === _type2.FcrSecurityAction.JoinWithMuteAudio) {
         if (enable) {
@@ -769,24 +728,15 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
           });
         }
       } else if (((_securityInfo$info2 = securityInfo.info) === null || _securityInfo$info2 === void 0 ? void 0 : _securityInfo$info2.action) === _type2.FcrSecurityAction.StartAudio) {
-        var _this$_sharedInterpre;
-        var toastMessage = enable ? (0, _i18n.transI18n)('fmt_settings_tips_allowedselfunmuting', {
-          reason1: operator
-        }) : (0, _i18n.transI18n)('fmt_settings_tips_disabledselfunmuting', {
-          reason1: operator
-        });
-        if (!((_this$_sharedInterpre = this._sharedInterpreterDataSource) !== null && _this$_sharedInterpre !== void 0 && _this$_sharedInterpre.interpreterInfo)) {
+        var toastMessage = enable ? (0, _i18n.transI18n)('fmt_settings_tips_allowedselfunmuting') : (0, _i18n.transI18n)('fmt_settings_tips_disabledselfunmuting');
+        if (!this._sharedInterpreterDataSource.localInterpreterUserInfo) {
           this._messageProvider.showToast({
             type: toastType,
             message: toastMessage
           });
         }
       } else if (((_securityInfo$info3 = securityInfo.info) === null || _securityInfo$info3 === void 0 ? void 0 : _securityInfo$info3.action) === _type2.FcrSecurityAction.StartVideo) {
-        var _toastMessage = enable ? (0, _i18n.transI18n)('fmt_settings_tips_videoenabled', {
-          reason1: operator
-        }) : (0, _i18n.transI18n)('fmt_settings_tips_disabledvideo', {
-          reason1: operator
-        });
+        var _toastMessage = enable ? (0, _i18n.transI18n)('fmt_settings_tips_videoenabled') : (0, _i18n.transI18n)('fmt_settings_tips_disabledvideo');
         this._messageProvider.showToast({
           type: toastType,
           message: _toastMessage
@@ -838,7 +788,6 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
             onCancel: function onCancel() {
               _this3._dialogProvider.closeDialog(dialogKey);
             },
-            width: 400,
             height: 160
           });
         }
@@ -890,8 +839,8 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
   }, {
     key: "_handleUserRoleChangeToast",
     value: function _handleUserRoleChangeToast(targetUser) {
-      var _this$_mainRoomContro7;
-      var localUser = (_this$_mainRoomContro7 = this._mainRoomControl) === null || _this$_mainRoomContro7 === void 0 ? void 0 : _this$_mainRoomContro7.getUserControl().getLocalUser();
+      var _this$_mainRoomContro;
+      var localUser = (_this$_mainRoomContro = this._mainRoomControl) === null || _this$_mainRoomContro === void 0 ? void 0 : _this$_mainRoomContro.getUserControl().getLocalUser();
       var oldUser = this._userMap.get(targetUser.userId);
       var isSelf = targetUser.userId === localUser.userId;
 
@@ -973,8 +922,8 @@ var FcrUIWaitingRoomControlProviderImpl = exports.FcrUIWaitingRoomControlProvide
         _this4._waitingRoomControl = undefined;
       }
     });
-    if (roomProvider.waitingRoomControl) {
-      this._setWaitingRoomControl(roomProvider.waitingRoomControl);
+    if (roomProvider.currentRoomControl) {
+      this._setWaitingRoomControl(roomProvider.currentRoomControl);
     }
   }
   return (0, _createClass2["default"])(FcrUIWaitingRoomControlProviderImpl, [{

package/lib/providers/screen-share-provider.d.ts

@@ -2,6 +2,7 @@ import { FcrUIDeviceProvider } from './device-provider';
 import { FcrUIDisplayCaptureSource, FcrUIWindowCaptureSource } from '../modules/share-screen/types';
 import { FcrUIDialogProvider } from './dialog-provider';
 import { FcrUIRoomProvider } from './room-provider';
+import { FcrUserInfo } from 'fcr-core/lib/type';
 interface FcrUIScreenShareObserver {
     /**
      * 本地屏幕开启采集
@@ -23,6 +24,15 @@ export interface FcrUIScreenShareProvider {
      * 可共享屏幕列表
      */
     get screenCaptureSources(): FcrUIDisplayCaptureSource[];
+    /**
+     * 是否正在共享屏幕
+     */
+    get isSharingScreen(): boolean;
+    /**
+     * 是否是抢占流
+     */
+    get isSeizeStream(): boolean;
+    get screenSharingOwner(): FcrUserInfo | undefined;
     /**
      * 开始屏幕共享
      */
@@ -49,14 +59,23 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _controlBarDialogId;
+    private _streamControlObserver;
     accessor applicationCaptureSources: FcrUIWindowCaptureSource[];
     accessor screenCaptureSources: FcrUIDisplayCaptureSource[];
     accessor shareSelectionDialogId: string;
+    accessor isSharingScreen: boolean;
+    accessor isSeizeStream: boolean;
+    accessor screenSharingOwner: FcrUserInfo | undefined;
     constructor(_deviceProvider: FcrUIDeviceProvider, _dialogProvider: FcrUIDialogProvider, _roomProvider: FcrUIRoomProvider);
+    private _handleStreamAdded;
+    private _handleStreamUpdated;
+    private _handleStreamRemoved;
+    private _handleStreamPublic;
     addObserver(observer: FcrUIScreenShareObserver): void;
     removeObserver(observer: FcrUIScreenShareObserver): void;
     startShareWhiteboard(): void;
     stopShareWhiteboard(): void;
+    release(): void;
     startShareScreen(): void;
     stopShareScreen(): void;
     private _closeControlBar;