fcr-ui-scene 3.5.1 → 3.6.1

package/lib/shared-data-source/member-data.js

@@ -90,8 +90,8 @@ 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");
 require("core-js/modules/web.timers.js");
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -103,7 +103,7 @@ var _type = require("fcr-core/lib/type");
 var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("../utilities/logger");
 var _FcrUIMemberSharedDataSourceImpl;
-var _initProto, _init_serverPushTotalUserCount, _init__audioVolumeMap, _init__isLocalUserInPstn, _init__interpreterInputLanguageList, _setIsLocalUserInPstnDecs, _forceAddLocalUserWithControlDecs, _handleAllUserCountUpdatedDecs, _handleUserInfoUpdatedDecs, _syncParticipantsDecs, _onAudioVolumeUpdatedDecs, _handleRemoteUserJoinedDecs, _handleRemoteUserLeftDecs, _handleStreamsAddedDecs, _handleStreamsUpdatedDecs, _handleStreamsRemovedDecs, _updateMemberListWithBoardStateDecs, _ref;
+var _initProto, _init__serverPushTotalUserCount, _init__audioVolumeMap, _init__isLocalUserInPstn, _init__interpreterInputLanguageList, _init__localUser, _init_totalUserCount, _updateMemberListWithBoardStateDecs, _setIsLocalUserInPstnDecs, _handleAllUserCountUpdatedDecs, _setTotalUserCountDecs, _handleUserInfoUpdatedDecs, _syncParticipantsDecs, _onAudioVolumeUpdatedDecs, _handleRemoteUserJoinedDecs, _handleRemoteUserLeftDecs, _handleStreamsAddedDecs, _handleStreamsUpdatedDecs, _handleStreamsRemovedDecs, _ref;
 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); }
@@ -120,16 +120,23 @@ var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
-_ref = (_setIsLocalUserInPstnDecs = [_mobx.action, _mobx.action.bound], _forceAddLocalUserWithControlDecs = [_mobx.action, _mobx.action.bound], _handleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _syncParticipantsDecs = (0, _decorator.debounced)(800), _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUserJoinedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUserLeftDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsRemovedDecs = [_mobx.action, _mobx.action.bound], _updateMemberListWithBoardStateDecs = [_mobx.action, _mobx.action.bound], "_dataSource");
+var _E = /*#__PURE__*/new WeakMap();
+var _F = /*#__PURE__*/new WeakMap();
+_ref = (_updateMemberListWithBoardStateDecs = [_mobx.action, _mobx.action.bound], _setIsLocalUserInPstnDecs = [_mobx.action, _mobx.action.bound], _handleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], _setTotalUserCountDecs = [_mobx.action, _mobx.action.bound], _handleUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _syncParticipantsDecs = (0, _decorator.debounced)(800), _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUserJoinedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUserLeftDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsRemovedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUIMemberSharedDataSourceImpl(_mainRoomUserControl, _streamControl, _whiteBoardControl) {
+  function FcrUIMemberSharedDataSourceImpl(_mainRoomUserControl, _streamControl, _screenShareProvider, _whiteBoardControl) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUIMemberSharedDataSourceImpl);
-    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), new _memberListDataSource.FcrUIMemberListDataSourceImpl()));
-    (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUIMemberSharedDataSourceImpl'
-    }));
+    })));
+    (0, _defineProperty2["default"])(this, "_dataSource", new _memberListDataSource.FcrUIMemberListDataSourceImpl());
     (0, _defineProperty2["default"])(this, "_disposers", []);
+    _classPrivateFieldInitSpec(this, _A, _init__serverPushTotalUserCount(this, 1));
+    _classPrivateFieldInitSpec(this, _B, _init__audioVolumeMap(this, new Map()));
+    _classPrivateFieldInitSpec(this, _C, _init__isLocalUserInPstn(this, false));
+    _classPrivateFieldInitSpec(this, _D, _init__interpreterInputLanguageList(this, []));
+    _classPrivateFieldInitSpec(this, _E, _init__localUser(this));
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onRemoteUsersJoined: this._handleRemoteUserJoined,
       onRemoteUsersLeft: this._handleRemoteUserLeft,
@@ -142,25 +149,26 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
       onStreamVolumeIndicationUpdated: this._onAudioVolumeUpdated,
       onStreamsRemoved: this._handleStreamsRemoved
     });
-    _classPrivateFieldInitSpec(this, _A, _init_serverPushTotalUserCount(this, 1));
-    _classPrivateFieldInitSpec(this, _B, _init__audioVolumeMap(this, new Map()));
-    _classPrivateFieldInitSpec(this, _C, _init__isLocalUserInPstn(this, false));
-    _classPrivateFieldInitSpec(this, _D, _init__interpreterInputLanguageList(this, []));
+    _classPrivateFieldInitSpec(this, _F, _init_totalUserCount(this, 1));
     this._mainRoomUserControl = _mainRoomUserControl;
     this._streamControl = _streamControl;
+    this._screenShareProvider = _screenShareProvider;
     this._whiteBoardControl = _whiteBoardControl;
     this._mainRoomUserControl.addObserver(this._userObserver);
     this._streamControl.addObserver(this._streamsObserver);
+    this._setTotalUserCount();
     this._initUserList();
     this.updateMemberListWithBoardState();
+    this._localUser = this._mainRoomUserControl.getLocalUser();
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.memberList.length;
     }, function () {
-      return _this._syncParticipants();
+      _this._setTotalUserCount();
+      _this._syncParticipants();
     }));
   }
   return (0, _createClass2["default"])(FcrUIMemberSharedDataSourceImpl, [{
-    key: "serverPushTotalUserCount",
+    key: "_serverPushTotalUserCount",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -191,10 +199,26 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
     set: function set(v) {
       _classPrivateFieldSet(_D, this, v);
     }
+  }, {
+    key: "_localUser",
+    get: function get() {
+      return _classPrivateFieldGet(_E, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_E, this, v);
+    }
   }, {
     key: "totalUserCount",
     get: function get() {
-      return this.memberList.length;
+      return _classPrivateFieldGet(_F, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_F, this, v);
+    }
+  }, {
+    key: "localUserId",
+    get: function get() {
+      return this.localUser.userId;
     }
   }, {
     key: "hasOwnPstnStream",
@@ -211,60 +235,15 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
     get: function get() {
       return this._audioVolumeMap;
     }
-  }, {
-    key: "setIsLocalUserInPstn",
-    value: function setIsLocalUserInPstn() {
-      var streams = this._streamControl.getStreamsByUserId(this.localUserId);
-      var pstnStream = streams.find(function (_ref2) {
-        var connectorType = _ref2.connectorType;
-        return connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
-      });
-      this._isLocalUserInPstn = !!pstnStream;
-    }
-  }, {
-    key: "localUserMemberData",
-    get: function get() {
-      var localUserMemberData = this._getLocalUserInPureList();
-      if (!localUserMemberData) {
-        this._forceAddLocalUserWithControl();
-        return this._getLocalUserInPureList();
-      }
-      return localUserMemberData;
-    }
   }, {
     key: "localUser",
     get: function get() {
-      return this.localUserMemberData.userInfo;
-    }
-  }, {
-    key: "_forceAddLocalUserWithControl",
-    value: function _forceAddLocalUserWithControl() {
-      var userInfo = this._mainRoomUserControl.getLocalUser();
-      this._dataSource.add(userInfo, this._streamControl.getStreamsByUserId(userInfo.userId), true);
-    }
-  }, {
-    key: "_handleAllUserCountUpdated",
-    value: function _handleAllUserCountUpdated(_roomId, count) {
-      this.serverPushTotalUserCount = count;
-    }
-  }, {
-    key: "_getLocalUserInPureList",
-    value: function _getLocalUserInPureList() {
-      var _this2 = this;
-      return this.memberList.find(function (user) {
-        return user.userId === _this2._mainRoomUserControl.getLocalUser().userId;
-      });
-    }
-  }, {
-    key: "localUserId",
-    get: function get() {
-      return this.localUser.userId || '';
+      return this._localUser;
     }
   }, {
     key: "localUserRole",
     get: function get() {
-      var _this$localUser$userR;
-      return (_this$localUser$userR = this.localUser.userRole) !== null && _this$localUser$userR !== void 0 ? _this$localUser$userR : _fcrCore.FcrUserRole.PARTICIPANT;
+      return this._localUser.userRole;
     }
   }, {
     key: "localUserRoleString",
@@ -280,9 +259,9 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
   }, {
     key: "remoteMembers",
     get: function get() {
-      var _this3 = this;
+      var _this2 = this;
       return this.memberList.filter(function (user) {
-        return user.userInfo.userId !== _this3.localUserId;
+        return user.userInfo.userId !== _this2.localUserId;
       });
     }
   }, {
@@ -292,17 +271,6 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
         return memberData.userInfo;
       });
     }
-  }, {
-    key: "_initUserList",
-    value: function _initUserList() {
-      var users = this._mainRoomUserControl.getUsers();
-      for (var _i = 0, _Object$entries = Object.entries(users); _i < _Object$entries.length; _i++) {
-        var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
-          userId = _Object$entries$_i[0],
-          user = _Object$entries$_i[1];
-        this._dataSource.add(user, this._streamControl.getStreamsByUserId(userId), this._mainRoomUserControl.getLocalUser().userId === userId);
-      }
-    }
   }, {
     key: "memberList",
     get: function get() {
@@ -315,11 +283,81 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
         return memberData.userInfo;
       });
     }
+  }, {
+    key: "updateMemberListWithBoardState",
+    value: function updateMemberListWithBoardState() {
+      var _this3 = this;
+      (0, _mobx.runInAction)(function () {
+        if (_this3._whiteBoardControl) {
+          var boardInfo = _this3._whiteBoardControl.getBoardActiveInfo();
+          var isActive = boardInfo.isActive,
+            ownerUserId = boardInfo.ownerUserId;
+          _this3._dataSource.list.forEach(function (user) {
+            var isBoardActive = isActive && user.userId === ownerUserId;
+            user.setUserInfo(_objectSpread(_objectSpread({}, user.userInfo), {}, {
+              isBoardActive: isBoardActive
+            }));
+          });
+          _this3._dataSource.list = (0, _toConsumableArray2["default"])(_this3._dataSource.list);
+        }
+      });
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this._disposers = [];
+      this._mainRoomUserControl.removeObserver(this._userObserver);
+      this._streamControl.removeObserver(this._streamsObserver);
+    }
+  }, {
+    key: "_setIsLocalUserInPstn",
+    value: function _setIsLocalUserInPstn() {
+      var streams = this._streamControl.getStreamsByUserId(this.localUserId);
+      var pstnStream = streams.find(function (_ref2) {
+        var connectorType = _ref2.connectorType;
+        return connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
+      });
+      this._isLocalUserInPstn = !!pstnStream;
+    }
+  }, {
+    key: "_handleAllUserCountUpdated",
+    value: function _handleAllUserCountUpdated(_roomId, count) {
+      this._serverPushTotalUserCount = count;
+    }
+  }, {
+    key: "_setTotalUserCount",
+    value: function _setTotalUserCount() {
+      this.totalUserCount = this._mainRoomUserControl.getAllUserCount();
+    }
+  }, {
+    key: "_initUserList",
+    value: function _initUserList() {
+      var users = this._mainRoomUserControl.getUsers();
+      for (var _i = 0, _Object$entries = Object.entries(users); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
+          userId = _Object$entries$_i[0],
+          user = _Object$entries$_i[1];
+        this._dataSource.add(user, this._streamControl.getStreamsByUserId(userId), this._mainRoomUserControl.getLocalUser().userId === userId);
+      }
+    }
   }, {
     key: "_handleUserInfoUpdated",
     value: function _handleUserInfoUpdated(roomId, event) {
+      var _this$_screenSharePro;
       var targetUser = event.modifiedUser;
+      if (event.modifiedUser.userId === this.localUserId) {
+        this._localUser = this._mainRoomUserControl.getLocalUser();
+      }
       this._dataSource.updateUserInfo(targetUser, true);
+      // 共享屏幕
+      var isModifiySharingScreenUser = this._screenShareProvider.isSharingScreen && ((_this$_screenSharePro = this._screenShareProvider.screenSharingOwner) === null || _this$_screenSharePro === void 0 ? void 0 : _this$_screenSharePro.userId) === targetUser.userId;
+      if (isModifiySharingScreenUser) {
+        this._screenShareProvider.screenSharingOwner = targetUser;
+      }
+      this.updateMemberListWithBoardState();
     }
   }, {
     key: "_syncParticipants",
@@ -329,7 +367,7 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
         _this4.logger.warn('[FcrUIMemberSharedDataSourceImpl] _syncParticipants: start sync');
         var mainRoomUsersCount = _this4._mainRoomUserControl.getAllUserCount();
         var pureListLen = _this4.memberList.length;
-        if (mainRoomUsersCount !== pureListLen || _this4.totalUserCount !== pureListLen) {
+        if (mainRoomUsersCount !== pureListLen) {
           _this4.logger.warn('[FcrUIMemberSharedDataSourceImpl] _syncParticipants: need sync');
           // 有差异,优先进行以userControl内列表的遍历补充
           var controlUserList = _this4._mainRoomUserControl.getUserList();
@@ -383,7 +421,7 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
           var modifiedStream = e.modifiedStream;
           _this7._dataSource.updateWithStreamAdd(modifiedStream);
         });
-        _this7.setIsLocalUserInPstn();
+        _this7._setIsLocalUserInPstn();
       });
     }
   }, {
@@ -395,7 +433,7 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
           var modifiedStream = e.modifiedStream;
           _this8._dataSource.updateStreamInfo(modifiedStream);
         });
-        _this8.setIsLocalUserInPstn();
+        _this8._setIsLocalUserInPstn();
       });
     }
   }, {
@@ -407,45 +445,18 @@ var FcrUIMemberSharedDataSourceImpl = exports.FcrUIMemberSharedDataSourceImpl =
           var modifiedStream = e.modifiedStream;
           _this9._dataSource.updateWithStreamRemove(modifiedStream);
         });
-        _this9.setIsLocalUserInPstn();
-      });
-    }
-  }, {
-    key: "updateMemberListWithBoardState",
-    value: function updateMemberListWithBoardState() {
-      var _this10 = this;
-      (0, _mobx.runInAction)(function () {
-        if (_this10._whiteBoardControl) {
-          var boardInfo = _this10._whiteBoardControl.getBoardActiveInfo();
-          var isActive = boardInfo.isActive,
-            ownerUserId = boardInfo.ownerUserId;
-          _this10._dataSource.list.forEach(function (user) {
-            var isBoardActive = isActive && user.userId === ownerUserId;
-            user.setUserInfo(_objectSpread(_objectSpread({}, user.userInfo), {}, {
-              isBoardActive: isBoardActive
-            }));
-          });
-          _this10._dataSource.list = (0, _toConsumableArray2["default"])(_this10._dataSource.list);
-        }
+        _this9._setIsLocalUserInPstn();
       });
     }
-  }, {
-    key: "release",
-    value: function release() {
-      this._disposers.forEach(function (disposer) {
-        return disposer();
-      });
-      this._disposers = [];
-      this._mainRoomUserControl.removeObserver(this._userObserver);
-      this._streamControl.removeObserver(this._streamsObserver);
-    }
   }]);
 }();
 _FcrUIMemberSharedDataSourceImpl = FcrUIMemberSharedDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMemberSharedDataSourceImpl, [[_mobx.observable, 1, "serverPushTotalUserCount"], [_mobx.observable, 1, "_audioVolumeMap"], [_mobx.observable, 1, "_isLocalUserInPstn"], [_mobx.observable, 1, "_interpreterInputLanguageList"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "interpreterInputLanguageList"], [_mobx.computed, 3, "audioVolumeMap"], [_setIsLocalUserInPstnDecs, 18, "setIsLocalUserInPstn"], [_forceAddLocalUserWithControlDecs, 18, "_forceAddLocalUserWithControl"], [_handleAllUserCountUpdatedDecs, 18, "_handleAllUserCountUpdated"], [_mobx.computed, 3, "isLocalUserHost"], [_mobx.computed, 3, "remoteMembers"], [_mobx.computed, 3, "remoteMembersUserInfosList"], [_mobx.computed, 3, "memberList"], [_mobx.computed, 3, "memberUserInfoList"], [_handleUserInfoUpdatedDecs, 18, "_handleUserInfoUpdated"], [_syncParticipantsDecs, 2, "_syncParticipants"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_handleRemoteUserJoinedDecs, 18, "_handleRemoteUserJoined"], [_handleRemoteUserLeftDecs, 18, "_handleRemoteUserLeft"], [_handleStreamsAddedDecs, 18, "_handleStreamsAdded"], [_handleStreamsUpdatedDecs, 18, "_handleStreamsUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"], [_updateMemberListWithBoardStateDecs, 18, "updateMemberListWithBoardState"]], []).e, 5);
-_init_serverPushTotalUserCount = _applyDecs$e[0];
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMemberSharedDataSourceImpl, [[_mobx.observable, 1, "_serverPushTotalUserCount"], [_mobx.observable, 1, "_audioVolumeMap"], [_mobx.observable, 1, "_isLocalUserInPstn"], [_mobx.observable, 1, "_interpreterInputLanguageList"], [_mobx.observable, 1, "_localUser"], [_mobx.observable, 1, "totalUserCount"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "interpreterInputLanguageList"], [_mobx.computed, 3, "audioVolumeMap"], [_mobx.computed, 3, "isLocalUserHost"], [_mobx.computed, 3, "remoteMembers"], [_mobx.computed, 3, "remoteMembersUserInfosList"], [_mobx.computed, 3, "memberUserInfoList"], [_updateMemberListWithBoardStateDecs, 18, "updateMemberListWithBoardState"], [_setIsLocalUserInPstnDecs, 18, "_setIsLocalUserInPstn"], [_handleAllUserCountUpdatedDecs, 18, "_handleAllUserCountUpdated"], [_setTotalUserCountDecs, 18, "_setTotalUserCount"], [_handleUserInfoUpdatedDecs, 18, "_handleUserInfoUpdated"], [_syncParticipantsDecs, 2, "_syncParticipants"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_handleRemoteUserJoinedDecs, 18, "_handleRemoteUserJoined"], [_handleRemoteUserLeftDecs, 18, "_handleRemoteUserLeft"], [_handleStreamsAddedDecs, 18, "_handleStreamsAdded"], [_handleStreamsUpdatedDecs, 18, "_handleStreamsUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).e, 7);
+_init__serverPushTotalUserCount = _applyDecs$e[0];
 _init__audioVolumeMap = _applyDecs$e[1];
 _init__isLocalUserInPstn = _applyDecs$e[2];
 _init__interpreterInputLanguageList = _applyDecs$e[3];
-_initProto = _applyDecs$e[4];
+_init__localUser = _applyDecs$e[4];
+_init_totalUserCount = _applyDecs$e[5];
+_initProto = _applyDecs$e[6];
 (0, _base.registerDependency)('sharedMemberDataSource');

package/lib/shared-data-source/screen-share-data-source.d.ts

@@ -0,0 +1,37 @@
+import { CurrentShareBounds } from '../modules/control-bar/types';
+import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
+export interface FcrUIScreenShareDataSource {
+    /**
+     * 是否正在屏幕共享
+     */
+    get isSharingScreen(): boolean;
+    /**
+     * 当前共享屏幕的 bounds
+     */
+    get currentShareBounds(): Electron.Rectangle | CurrentShareBounds | null;
+    /**
+     * 获取当前设置的音效通道
+     */
+    get currentShareAudioProcessingChannel(): AudioProcessingChannel;
+    /**
+     * 设置是否正在屏幕共享
+     */
+    setSharingScreen: (isSharingScreen: boolean) => void;
+    /**
+     * 设置当前共享的屏幕 bounds
+     */
+    setCurrentShareBounds: (currentShareBounds: Electron.Rectangle | CurrentShareBounds) => void;
+    /**
+     * 设置音效通道
+     */
+    setCurrentShareAudioProcessingChannel: (channel: AudioProcessingChannel) => void;
+}
+export declare class FcrUIScreenShareDataSourceImpl implements FcrUIScreenShareDataSource {
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    accessor currentShareAudioProcessingChannel: AudioProcessingChannel;
+    accessor isSharingScreen: boolean;
+    accessor currentShareBounds: CurrentShareBounds | null | Electron.Rectangle;
+    setSharingScreen(isSharingScreen: boolean): void;
+    setCurrentShareBounds(currentShareBounds: Electron.Rectangle | CurrentShareBounds): void;
+    setCurrentShareAudioProcessingChannel(channel: AudioProcessingChannel): void;
+}

package/lib/shared-data-source/screen-share-data-source.js

@@ -0,0 +1,134 @@
+"use strict";
+
+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.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");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.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/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUIScreenShareDataSourceImpl = void 0;
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.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.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+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 _mobx = require("mobx");
+var _base = require("../base");
+var _logger = require("../utilities/logger");
+var _env = require("agora-foundation/lib/utilities/env");
+var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
+var _FcrUIScreenShareDataSourceImpl;
+var _initProto, _init_currentShareAudioProcessingChannel, _init_isSharingScreen, _init_currentShareBounds, _setSharingScreenDecs, _setCurrentShareBoundsDecs, _setCurrentShareAudioProcessingChannelDecs, _ref;
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
+function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
+function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+var _A = /*#__PURE__*/new WeakMap();
+var _B = /*#__PURE__*/new WeakMap();
+var _C = /*#__PURE__*/new WeakMap();
+_ref = (_setSharingScreenDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareBoundsDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], "logger");
+var FcrUIScreenShareDataSourceImpl = exports.FcrUIScreenShareDataSourceImpl = /*#__PURE__*/function () {
+  function FcrUIScreenShareDataSourceImpl() {
+    (0, _classCallCheck2["default"])(this, FcrUIScreenShareDataSourceImpl);
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrUIScreenShareDataSourceImpl'
+    })));
+    _classPrivateFieldInitSpec(this, _A, _init_currentShareAudioProcessingChannel(this, _shareAudio.AudioProcessingChannel.MONO));
+    _classPrivateFieldInitSpec(this, _B, _init_isSharingScreen(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init_currentShareBounds(this, (0, _env.isElectron)() ? window.runtime.browserWindow.getBounds() : null));
+  }
+  return (0, _createClass2["default"])(FcrUIScreenShareDataSourceImpl, [{
+    key: "currentShareAudioProcessingChannel",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "isSharingScreen",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "currentShareBounds",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "setSharingScreen",
+    value: function setSharingScreen(isSharingScreen) {
+      this.isSharingScreen = isSharingScreen;
+      this.logger.info("setSharingScreen: ".concat(isSharingScreen));
+    }
+  }, {
+    key: "setCurrentShareBounds",
+    value: function setCurrentShareBounds(currentShareBounds) {
+      this.currentShareBounds = currentShareBounds;
+      this.logger.info("setCurrentShareBounds: ".concat(JSON.stringify(currentShareBounds)));
+    }
+  }, {
+    key: "setCurrentShareAudioProcessingChannel",
+    value: function setCurrentShareAudioProcessingChannel(channel) {
+      this.currentShareAudioProcessingChannel = channel;
+      this.logger.info("setCurrentShareAudioProcessingChannel: ".concat(channel));
+    }
+  }]);
+}();
+_FcrUIScreenShareDataSourceImpl = FcrUIScreenShareDataSourceImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareDataSourceImpl, [[_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "isSharingScreen"], [_mobx.observable, 1, "currentShareBounds"], [_setSharingScreenDecs, 18, "setSharingScreen"], [_setCurrentShareBoundsDecs, 18, "setCurrentShareBounds"], [_setCurrentShareAudioProcessingChannelDecs, 18, "setCurrentShareAudioProcessingChannel"]], []).e, 4);
+_init_currentShareAudioProcessingChannel = _applyDecs$e[0];
+_init_isSharingScreen = _applyDecs$e[1];
+_init_currentShareBounds = _applyDecs$e[2];
+_initProto = _applyDecs$e[3];
+(0, _base.registerDependency)('screenShareDataSource');

package/lib/shared-data-source/security-data.d.ts

@@ -4,6 +4,7 @@ export interface FcrSecurityCheckedStateType {
     lockRoom: boolean;
     enableWaitingRoom: boolean;
     enableJoinWithAudio: boolean;
+    joinWithCloseVideo: boolean;
     enableWatermark: boolean;
     shareScreen: boolean;
     shareWhiteboard: boolean;

package/lib/shared-data-source/security-data.js

@@ -106,6 +106,7 @@ var FcrUISecuritySharedDataSourceImpl = exports.FcrUISecuritySharedDataSourceImp
         lockRoom: this._privilegeProvider.isLockRoomEnabled(),
         enableWaitingRoom: this._privilegeProvider.isWaitingRoomEnabled(),
         enableJoinWithAudio: this._privilegeProvider.allowJoinWithMuteAudio(),
+        joinWithCloseVideo: this._privilegeProvider.allowJoinWithMutedVideo(),
         enableWatermark: this._privilegeProvider.isWaterMarkEnabled(),
         shareScreen: this._privilegeProvider.allowScreenShareAndBoard(),
         shareWhiteboard: this._privilegeProvider.allowBoardWrite(),
@@ -133,10 +134,7 @@ var FcrUISecuritySharedDataSourceImpl = exports.FcrUISecuritySharedDataSourceImp
   }, {
     key: "_handleLocalUserSecurityInfosUpdated",
     value: function _handleLocalUserSecurityInfosUpdated(event) {
-      var _event$operatorUser;
-      if (((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId) !== this.localUserId) {
-        this._refreshCheckedStateMap();
-      }
+      this._refreshCheckedStateMap();
     }
   }, {
     key: "release",
@@ -150,7 +148,7 @@ var FcrUISecuritySharedDataSourceImpl = exports.FcrUISecuritySharedDataSourceImp
   }]);
 }();
 _FcrUISecuritySharedDataSourceImpl = FcrUISecuritySharedDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISecuritySharedDataSourceImpl, [[_mobx.observable, 1, "_checkedStateMap"], [_mobx.computed, 3, "localUserId"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"]], []).e, 2);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISecuritySharedDataSourceImpl, [[_mobx.observable, 1, "_checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"]], []).e, 2);
 _init__checkedStateMap = _applyDecs$e[0];
 _initProto = _applyDecs$e[1];
 (0, _base.registerDependency)('sharedSecuritySharedDataSource');

package/lib/shared-data-source/setting.d.ts

@@ -31,4 +31,5 @@ export declare class FcrUISharedSettingDataSourceImpl implements FcrUISharedSett
     get setting(): CustomSetting;
     private _preHandleSetting;
     setSetting(assignedSetting: Partial<CustomSetting>): void;
+    private _initSetting;
 }