fcr-ui-scene 3.7.8 → 3.8.0-alpha

package/lib/modules/participant/store.base.js

@@ -117,7 +117,7 @@ var _struct = require("./struct");
 var _i18n2 = require("../../hooks/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 var _ParticipantStoreBase;
-var _initProto, _init__mainList, _init__isChecked, _init__participantsWindowActive, _init_enableParticipantsJoinWithMute, _init_searchText, _init_currentModal, _init_mergeConfirmDialog, _init_mergeUserId, _init_activeTab, _init_interpreterInputLanguageList, _init_newName, _init_allowUnmute, _init_joinWithMuteAudio, _init_showBecomeHostButton, _init__userCount, _setCurrentModalDecs, _setParticipantsWindowActiveDecs, _handlerSearchUserDecs, _openRemoveAdmitWaitingRoomDialogDecs, _setAllowUnmuteDecs, _setAllowJoinWithMuteAudioDecs, _openMuteAllDialogDecs, _handlerRoomControlActionDecs, _moveToMainRoomByUserIdsDecs, _kickOutWaitingRoomAllMemberDecs, _moveToMainRoomAllMemberDecs, _removeWaitingRoomUserDecs, _handleUserCountUpdatedDecs, _handleConfirmChangeNameDecs, _handleCancelChangeNameDecs, _closeChangeNameDialogDecs, _getOutputLanguageDecs, _handlerUserActionDecs, _handleActiveTabDecs, _moveToWaitingRoomByUserIdDecs, _kickOutUserDecs, _onPeerSessionReceivedDecs, _ref;
+var _initProto, _init__isChecked, _init__participantsWindowActive, _init_enableParticipantsJoinWithMute, _init_searchText, _init_currentModal, _init_mergeConfirmDialog, _init_mergeUserId, _init_activeTab, _init_interpreterInputLanguageList, _init_newName, _init_allowUnmute, _init_joinWithMuteAudio, _init_showBecomeHostButton, _init__userCount, _setCurrentModalDecs, _setParticipantsWindowActiveDecs, _handlerSearchUserDecs, _openRemoveAdmitWaitingRoomDialogDecs, _setAllowUnmuteDecs, _setAllowJoinWithMuteAudioDecs, _openMuteAllDialogDecs, _handlerRoomControlActionDecs, _moveToMainRoomByUserIdsDecs, _kickOutWaitingRoomAllMemberDecs, _moveToMainRoomAllMemberDecs, _removeWaitingRoomUserDecs, _handleUserCountUpdatedDecs, _handleConfirmChangeNameDecs, _handleCancelChangeNameDecs, _closeChangeNameDialogDecs, _getOutputLanguageDecs, _handlerUserActionDecs, _handleActiveTabDecs, _moveToWaitingRoomByUserIdDecs, _kickOutUserDecs, _onPeerSessionReceivedDecs, _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); }
@@ -144,7 +144,6 @@ var _K = /*#__PURE__*/new WeakMap();
 var _L = /*#__PURE__*/new WeakMap();
 var _M = /*#__PURE__*/new WeakMap();
 var _N = /*#__PURE__*/new WeakMap();
-var _O = /*#__PURE__*/new WeakMap();
 _ref = (_setCurrentModalDecs = [_mobx.action, _mobx.action.bound], _setParticipantsWindowActiveDecs = [_mobx.action, _mobx.action.bound], _handlerSearchUserDecs = [_mobx.action, _mobx.action.bound], _openRemoveAdmitWaitingRoomDialogDecs = [_mobx.action, _mobx.action.bound], _setAllowUnmuteDecs = [_mobx.action, _mobx.action.bound], _setAllowJoinWithMuteAudioDecs = [_mobx.action, _mobx.action.bound], _openMuteAllDialogDecs = [_mobx.action, _mobx.action.bound], _handlerRoomControlActionDecs = [_mobx.action, _mobx.action.bound], _moveToMainRoomByUserIdsDecs = [_mobx.action, _mobx.action.bound], _kickOutWaitingRoomAllMemberDecs = [_mobx.action, _mobx.action.bound], _moveToMainRoomAllMemberDecs = [_mobx.action, _mobx.action.bound], _removeWaitingRoomUserDecs = [_mobx.action, _mobx.action.bound], _handleUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleConfirmChangeNameDecs = [_mobx.action, _mobx.action.bound], _handleCancelChangeNameDecs = [_mobx.action, _mobx.action.bound], _closeChangeNameDialogDecs = [_mobx.action, _mobx.action.bound], _getOutputLanguageDecs = [_mobx.action, _mobx.action.bound], _handlerUserActionDecs = [_mobx.action, _mobx.action.bound], _handleActiveTabDecs = [_mobx.action, _mobx.action.bound], _moveToWaitingRoomByUserIdDecs = [_mobx.action, _mobx.action.bound], _kickOutUserDecs = [_mobx.action, _mobx.action.bound], _onPeerSessionReceivedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function () {
   // #endregion
@@ -204,21 +203,20 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     });
     (0, _defineProperty2["default"])(this, "_renamingUserId", '');
     (0, _defineProperty2["default"])(this, "_renamingUserName", '');
-    _classPrivateFieldInitSpec(this, _A, _init__mainList(this, []));
-    _classPrivateFieldInitSpec(this, _B, _init__isChecked(this, {}));
-    _classPrivateFieldInitSpec(this, _C, _init__participantsWindowActive(this, false));
-    _classPrivateFieldInitSpec(this, _D, _init_enableParticipantsJoinWithMute(this, false));
-    _classPrivateFieldInitSpec(this, _E, _init_searchText(this, ''));
-    _classPrivateFieldInitSpec(this, _F, _init_currentModal(this, 'modal'));
-    _classPrivateFieldInitSpec(this, _G, _init_mergeConfirmDialog(this, false));
-    _classPrivateFieldInitSpec(this, _H, _init_mergeUserId(this, ''));
-    _classPrivateFieldInitSpec(this, _I, _init_activeTab(this, _type5.FcrUIRoomType.MAIN_ROOM));
-    _classPrivateFieldInitSpec(this, _J, _init_interpreterInputLanguageList(this, []));
-    _classPrivateFieldInitSpec(this, _K, _init_newName(this, ''));
-    _classPrivateFieldInitSpec(this, _L, _init_allowUnmute(this, false));
-    _classPrivateFieldInitSpec(this, _M, _init_joinWithMuteAudio(this, false));
-    _classPrivateFieldInitSpec(this, _N, _init_showBecomeHostButton(this, false));
-    _classPrivateFieldInitSpec(this, _O, _init__userCount(this, 0));
+    _classPrivateFieldInitSpec(this, _A, _init__isChecked(this, {}));
+    _classPrivateFieldInitSpec(this, _B, _init__participantsWindowActive(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init_enableParticipantsJoinWithMute(this, false));
+    _classPrivateFieldInitSpec(this, _D, _init_searchText(this, ''));
+    _classPrivateFieldInitSpec(this, _E, _init_currentModal(this, 'modal'));
+    _classPrivateFieldInitSpec(this, _F, _init_mergeConfirmDialog(this, false));
+    _classPrivateFieldInitSpec(this, _G, _init_mergeUserId(this, ''));
+    _classPrivateFieldInitSpec(this, _H, _init_activeTab(this, _type5.FcrUIRoomType.MAIN_ROOM));
+    _classPrivateFieldInitSpec(this, _I, _init_interpreterInputLanguageList(this, []));
+    _classPrivateFieldInitSpec(this, _J, _init_newName(this, ''));
+    _classPrivateFieldInitSpec(this, _K, _init_allowUnmute(this, false));
+    _classPrivateFieldInitSpec(this, _L, _init_joinWithMuteAudio(this, false));
+    _classPrivateFieldInitSpec(this, _M, _init_showBecomeHostButton(this, false));
+    _classPrivateFieldInitSpec(this, _N, _init__userCount(this, 0));
     (0, _defineProperty2["default"])(this, "allowedOperations", (0, _mobxUtils.computedFn)(function (userId, userRole) {
       return _this.getAllowedOperations(userRole, userId === _this.localUser.userId);
     }));
@@ -305,8 +303,10 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     this._eventProvider.addObserver({
       onEvent: this._handleEvent
     });
-    this.allowUnmute = this._privilegeProvider.allowUnmuteSelfAudio();
-    this.joinWithMuteAudio = this._privilegeProvider.allowJoinWithMuteAudio();
+
+    // TODO: 使用 privilegeProvider 中的值代替
+    this.allowUnmute = this._privilegeProvider.isUnmuteSelfAudioAllowed();
+    this.joinWithMuteAudio = this._privilegeProvider.isJoinWithMutedAudioEnabled();
     this._getOutputLanguage();
     this.showBecomeHostButton = !this._sharedMemberDataSource.memberList.some(function (user) {
       return user.userInfo.userRole === _type.FcrUserRole.HOST;
@@ -316,7 +316,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     this._setupWaitingRoomUserCountListener();
   }
   return (0, _createClass2["default"])(ParticipantStoreBase, [{
-    key: "_mainList",
+    key: "_isChecked",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -324,7 +324,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "_isChecked",
+    key: "_participantsWindowActive",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -332,7 +332,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "_participantsWindowActive",
+    key: "enableParticipantsJoinWithMute",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -340,7 +340,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "enableParticipantsJoinWithMute",
+    key: "searchText",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -348,7 +348,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "searchText",
+    key: "currentModal",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -356,7 +356,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "currentModal",
+    key: "mergeConfirmDialog",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -364,7 +364,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "mergeConfirmDialog",
+    key: "mergeUserId",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -372,7 +372,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "mergeUserId",
+    key: "activeTab",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -380,7 +380,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "activeTab",
+    key: "interpreterInputLanguageList",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -388,7 +388,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "interpreterInputLanguageList",
+    key: "newName",
     get: function get() {
       return _classPrivateFieldGet(_J, this);
     },
@@ -396,7 +396,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "newName",
+    key: "allowUnmute",
     get: function get() {
       return _classPrivateFieldGet(_K, this);
     },
@@ -404,7 +404,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "allowUnmute",
+    key: "joinWithMuteAudio",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
@@ -412,29 +412,21 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "joinWithMuteAudio",
+    key: "showBecomeHostButton",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_M, this, v);
     }
-  }, {
-    key: "showBecomeHostButton",
-    get: function get() {
-      return _classPrivateFieldGet(_N, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_N, this, v);
-    }
   }, {
     key: "_userCount",
     get: // #region getters
     function get() {
-      return _classPrivateFieldGet(_O, this);
+      return _classPrivateFieldGet(_N, this);
     },
     set: function set(v) {
-      _classPrivateFieldSet(_O, this, v);
+      _classPrivateFieldSet(_N, this, v);
     }
   }, {
     key: "renamingUserName",
@@ -536,7 +528,8 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
   }, {
     key: "pinedStreamIds",
     get: function get() {
-      return this._mainList.filter(function (i) {
+      var mainList = this._sharedVideoWindowDataSource.mainList;
+      return mainList.filter(function (i) {
         return i.isPin;
       }).map(function (i) {
         return i.windowId;
@@ -545,7 +538,8 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
   }, {
     key: "hasPinnedStream",
     get: function get() {
-      return this._mainList.some(function (i) {
+      var mainList = this._sharedVideoWindowDataSource.mainList;
+      return mainList.some(function (i) {
         return i.isPin;
       });
     }
@@ -637,7 +631,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
   }, {
     key: "hasWaitingRoomPermission",
     value: function hasWaitingRoomPermission() {
-      return this._privilegeProvider.isWaitingRoomEnabled() && this._privilegeProvider.hasWaitingRoomPermission();
+      return this._privilegeProvider.isWaitingRoomEnabled() && this._privilegeProvider.hasEnableWaitingRoomPermission();
     }
   }, {
     key: "hasUnmutePermission",
@@ -918,8 +912,8 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       var _this8 = this;
       // 使用 runInAction 将所有状态更新包装在一个事务中，避免多次渲染
       (0, _mobx.runInAction)(function () {
-        _this8._privilegeProvider.setAllowJoinWithMuteAudio(JoinWithMuteAudio);
-        _this8._privilegeProvider.setAllowUnmuteSelfAudio(allowUnmute);
+        _this8._privilegeProvider.allowJoinWithMutedAudio(JoinWithMuteAudio);
+        _this8._privilegeProvider.allowStartAudio(allowUnmute);
         _this8._privilegeProvider.muteAll();
         _this8._sharedSecurityDataSource.setCheckedStateMap(_objectSpread(_objectSpread({}, _this8.checkedStateMap), {
           enableJoinWithAudio: JoinWithMuteAudio,
@@ -933,7 +927,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     value: function _unmuteAllAudio() {
       var _this9 = this;
       this._setPrivilegeAndUpdateUI(function () {
-        return _this9._privilegeProvider.setAllowUnmuteSelfAudio(true);
+        return _this9._privilegeProvider.allowStartAudio(true);
       }, {
         unmuteYourself: true
       });
@@ -945,7 +939,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     value: function _enableSelfUnmute(enable) {
       var _this0 = this;
       this._setPrivilegeAndUpdateUI(function () {
-        return _this0._privilegeProvider.setAllowUnmuteSelfAudio(enable);
+        return _this0._privilegeProvider.allowStartAudio(enable);
       }, {
         unmuteYourself: enable
       });
@@ -955,7 +949,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     value: function _enableOpenVideo(enable) {
       var _this1 = this;
       this._setPrivilegeAndUpdateUI(function () {
-        return _this1._privilegeProvider.setAllowUnmuteSelfVideo(enable);
+        return _this1._privilegeProvider.allowStartVideo(enable);
       }, {
         startVideo: enable
       });
@@ -974,7 +968,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
       var _this10 = this;
       this._showToast(enable ? (0, _i18n.transI18n)('fmt_security_tips_lock_meeting_on') : (0, _i18n.transI18n)('fmt_security_tips_lock_meeting_off'), 'info');
       this._setPrivilegeAndUpdateUI(function () {
-        return _this10._privilegeProvider.setLockRoomEnabled(enable);
+        return _this10._privilegeProvider.enableLockedRoom(enable);
       }, {
         lockRoom: enable
       });
@@ -984,7 +978,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     value: function _enableRename(enable) {
       var _this11 = this;
       this._setPrivilegeAndUpdateUI(function () {
-        return _this11._privilegeProvider.setAllowChangeSelfName(enable);
+        return _this11._privilegeProvider.allowChangeUserName(enable);
       }, {
         rename: enable
       });
@@ -996,7 +990,7 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     value: function enableJoinWithMuteAudio(enable) {
       var _this12 = this;
       this._setPrivilegeAndUpdateUI(function () {
-        return _this12._privilegeProvider.setAllowJoinWithMuteAudio(enable);
+        return _this12._privilegeProvider.allowJoinWithMutedAudio(enable);
       }, {
         enableJoinWithAudio: enable
       });
@@ -2337,28 +2331,33 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     value: function _handleEvent(event, payload) {
       switch (event) {
         case _constant.FcrUIAction.PARTICIPANT_ACTION:
-          this.handlerUserAction(payload.action, payload.userId);
+          {
+            var actionPayload = payload;
+            this.handlerUserAction(actionPayload.action, actionPayload.userId);
+            break;
+          }
+        case _constant.FcrUIAction.CHANGE_PARTICIPANT_TAB:
+          this.handleActiveTab(payload);
           break;
       }
     }
   }]);
 }();
 _ParticipantStoreBase = ParticipantStoreBase;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ParticipantStoreBase, [[_mobx.observable, 1, "_mainList"], [_mobx.observable, 1, "_isChecked"], [_mobx.observable, 1, "_participantsWindowActive"], [_mobx.observable, 1, "enableParticipantsJoinWithMute"], [_mobx.observable, 1, "searchText"], [_mobx.observable, 1, "currentModal"], [_mobx.observable, 1, "mergeConfirmDialog"], [_mobx.observable, 1, "mergeUserId"], [_mobx.observable, 1, "activeTab"], [_mobx.observable, 1, "interpreterInputLanguageList"], [_mobx.observable, 1, "newName"], [_mobx.observable, 1, "allowUnmute"], [_mobx.observable, 1, "joinWithMuteAudio"], [_mobx.observable, 1, "showBecomeHostButton"], [_mobx.observable, 1, "_userCount"], [_mobx.computed, 3, "audioVolumeMap"], [_mobx.computed, 3, "userListSource"], [_mobx.computed, 3, "spotlightStreamId"], [_mobx.computed, 3, "mergeUserInfo"], [_mobx.computed, 3, "userMap"], [_mobx.computed, 3, "userCount"], [_mobx.computed, 3, "pinedStreamIds"], [_mobx.computed, 3, "hasPinnedStream"], [_mobx.computed, 3, "userList"], [_mobx.computed, 3, "localMicVolume"], [_mobx.computed, 3, "hasRevokeHostPermission"], [_mobx.computed, 3, "waitingRoomUserCount"], [_mobx.computed, 3, "isNewWaitingRoomUserEnter"], [_decorator.bound, 2, "hasMutePermission"], [_decorator.bound, 2, "hasWaitingRoomPermission"], [_decorator.bound, 2, "hasUnmutePermission"], [_decorator.bound, 2, "hasRequestStartAudioPermission"], [_setCurrentModalDecs, 18, "setCurrentModal"], [_decorator.bound, 2, "closeParticipantsAside"], [_decorator.bound, 2, "closeDialog"], [_setParticipantsWindowActiveDecs, 18, "setParticipantsWindowActive"], [_handlerSearchUserDecs, 18, "handlerSearchUser"], [_decorator.bound, 2, "onInvite"], [_decorator.bound, 2, "setMergeConfirmDialog"], [_decorator.bound, 2, "mergeConfirmDialogOk"], [_openRemoveAdmitWaitingRoomDialogDecs, 18, "openRemoveAdmitWaitingRoomDialog"], [_setAllowUnmuteDecs, 18, "setAllowUnmute"], [_setAllowJoinWithMuteAudioDecs, 18, "setAllowJoinWithMuteAudio"], [_openMuteAllDialogDecs, 18, "openMuteAllDialog"], [_handlerRoomControlActionDecs, 18, "handlerRoomControlAction"], [_decorator.bound, 2, "moveParticipantFromDialogToAside"], [_moveToMainRoomByUserIdsDecs, 18, "moveToMainRoomByUserIds"], [_kickOutWaitingRoomAllMemberDecs, 18, "kickOutWaitingRoomAllMember"], [_moveToMainRoomAllMemberDecs, 18, "moveToMainRoomAllMember"], [_removeWaitingRoomUserDecs, 18, "removeWaitingRoomUser"], [_decorator.bound, 2, "removePin"], [_decorator.bound, 2, "addPin"], [_decorator.bound, 2, "_getPinStreamIdFromUser"], [_handleUserCountUpdatedDecs, 18, "_handleUserCountUpdated"], [_handleConfirmChangeNameDecs, 18, "handleConfirmChangeName"], [_handleCancelChangeNameDecs, 18, "handleCancelChangeName"], [_closeChangeNameDialogDecs, 18, "_closeChangeNameDialog"], [_getOutputLanguageDecs, 18, "_getOutputLanguage"], [_handlerUserActionDecs, 18, "handlerUserAction"], [_handleActiveTabDecs, 18, "handleActiveTab"], [_moveToWaitingRoomByUserIdDecs, 18, "_moveToWaitingRoomByUserId"], [_kickOutUserDecs, 18, "_kickOutUser"], [_onPeerSessionReceivedDecs, 18, "_onPeerSessionReceived"], [_decorator.bound, 2, "_onPeerSessionAccepted"], [_decorator.bound, 2, "_onPeerSessionRejected"], [_decorator.bound, 2, "_handleEvent"]], []).e, 16);
-_init__mainList = _applyDecs$e[0];
-_init__isChecked = _applyDecs$e[1];
-_init__participantsWindowActive = _applyDecs$e[2];
-_init_enableParticipantsJoinWithMute = _applyDecs$e[3];
-_init_searchText = _applyDecs$e[4];
-_init_currentModal = _applyDecs$e[5];
-_init_mergeConfirmDialog = _applyDecs$e[6];
-_init_mergeUserId = _applyDecs$e[7];
-_init_activeTab = _applyDecs$e[8];
-_init_interpreterInputLanguageList = _applyDecs$e[9];
-_init_newName = _applyDecs$e[10];
-_init_allowUnmute = _applyDecs$e[11];
-_init_joinWithMuteAudio = _applyDecs$e[12];
-_init_showBecomeHostButton = _applyDecs$e[13];
-_init__userCount = _applyDecs$e[14];
-_initProto = _applyDecs$e[15];
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ParticipantStoreBase, [[_mobx.observable, 1, "_isChecked"], [_mobx.observable, 1, "_participantsWindowActive"], [_mobx.observable, 1, "enableParticipantsJoinWithMute"], [_mobx.observable, 1, "searchText"], [_mobx.observable, 1, "currentModal"], [_mobx.observable, 1, "mergeConfirmDialog"], [_mobx.observable, 1, "mergeUserId"], [_mobx.observable, 1, "activeTab"], [_mobx.observable, 1, "interpreterInputLanguageList"], [_mobx.observable, 1, "newName"], [_mobx.observable, 1, "allowUnmute"], [_mobx.observable, 1, "joinWithMuteAudio"], [_mobx.observable, 1, "showBecomeHostButton"], [_mobx.observable, 1, "_userCount"], [_mobx.computed, 3, "audioVolumeMap"], [_mobx.computed, 3, "userListSource"], [_mobx.computed, 3, "spotlightStreamId"], [_mobx.computed, 3, "mergeUserInfo"], [_mobx.computed, 3, "userMap"], [_mobx.computed, 3, "userCount"], [_mobx.computed, 3, "pinedStreamIds"], [_mobx.computed, 3, "hasPinnedStream"], [_mobx.computed, 3, "userList"], [_mobx.computed, 3, "localMicVolume"], [_mobx.computed, 3, "hasRevokeHostPermission"], [_mobx.computed, 3, "waitingRoomUserCount"], [_mobx.computed, 3, "isNewWaitingRoomUserEnter"], [_decorator.bound, 2, "hasMutePermission"], [_decorator.bound, 2, "hasWaitingRoomPermission"], [_decorator.bound, 2, "hasUnmutePermission"], [_decorator.bound, 2, "hasRequestStartAudioPermission"], [_setCurrentModalDecs, 18, "setCurrentModal"], [_decorator.bound, 2, "closeParticipantsAside"], [_decorator.bound, 2, "closeDialog"], [_setParticipantsWindowActiveDecs, 18, "setParticipantsWindowActive"], [_handlerSearchUserDecs, 18, "handlerSearchUser"], [_decorator.bound, 2, "onInvite"], [_decorator.bound, 2, "setMergeConfirmDialog"], [_decorator.bound, 2, "mergeConfirmDialogOk"], [_openRemoveAdmitWaitingRoomDialogDecs, 18, "openRemoveAdmitWaitingRoomDialog"], [_setAllowUnmuteDecs, 18, "setAllowUnmute"], [_setAllowJoinWithMuteAudioDecs, 18, "setAllowJoinWithMuteAudio"], [_openMuteAllDialogDecs, 18, "openMuteAllDialog"], [_handlerRoomControlActionDecs, 18, "handlerRoomControlAction"], [_decorator.bound, 2, "moveParticipantFromDialogToAside"], [_moveToMainRoomByUserIdsDecs, 18, "moveToMainRoomByUserIds"], [_kickOutWaitingRoomAllMemberDecs, 18, "kickOutWaitingRoomAllMember"], [_moveToMainRoomAllMemberDecs, 18, "moveToMainRoomAllMember"], [_removeWaitingRoomUserDecs, 18, "removeWaitingRoomUser"], [_decorator.bound, 2, "removePin"], [_decorator.bound, 2, "addPin"], [_decorator.bound, 2, "_getPinStreamIdFromUser"], [_handleUserCountUpdatedDecs, 18, "_handleUserCountUpdated"], [_handleConfirmChangeNameDecs, 18, "handleConfirmChangeName"], [_handleCancelChangeNameDecs, 18, "handleCancelChangeName"], [_closeChangeNameDialogDecs, 18, "_closeChangeNameDialog"], [_getOutputLanguageDecs, 18, "_getOutputLanguage"], [_handlerUserActionDecs, 18, "handlerUserAction"], [_handleActiveTabDecs, 18, "handleActiveTab"], [_moveToWaitingRoomByUserIdDecs, 18, "_moveToWaitingRoomByUserId"], [_kickOutUserDecs, 18, "_kickOutUser"], [_onPeerSessionReceivedDecs, 18, "_onPeerSessionReceived"], [_decorator.bound, 2, "_onPeerSessionAccepted"], [_decorator.bound, 2, "_onPeerSessionRejected"], [_decorator.bound, 2, "_handleEvent"]], []).e, 15);
+_init__isChecked = _applyDecs$e[0];
+_init__participantsWindowActive = _applyDecs$e[1];
+_init_enableParticipantsJoinWithMute = _applyDecs$e[2];
+_init_searchText = _applyDecs$e[3];
+_init_currentModal = _applyDecs$e[4];
+_init_mergeConfirmDialog = _applyDecs$e[5];
+_init_mergeUserId = _applyDecs$e[6];
+_init_activeTab = _applyDecs$e[7];
+_init_interpreterInputLanguageList = _applyDecs$e[8];
+_init_newName = _applyDecs$e[9];
+_init_allowUnmute = _applyDecs$e[10];
+_init_joinWithMuteAudio = _applyDecs$e[11];
+_init_showBecomeHostButton = _applyDecs$e[12];
+_init__userCount = _applyDecs$e[13];
+_initProto = _applyDecs$e[14];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/participant/type.d.ts

@@ -25,7 +25,9 @@ export interface FcrUIMemberData {
 }
 export declare enum FcrUISessionKey {
     REQUEST_OPEN_CAMERA = "REQUEST_OPEN_CAMERA",
-    REQUEST_OPEN_MICROPHONE = "REQUEST_OPEN_MICROPHONE"
+    REQUEST_OPEN_MICROPHONE = "REQUEST_OPEN_MICROPHONE",
+    REQUEST_OPEN_TRANSCRIBING = "REQUEST_OPEN_TRANSCRIBING",
+    REJECT_OPEN_TRANSCRIBING = "REJECT_OPEN_TRANSCRIBING"
 }
 export interface FcrUIRequestOpenDevicePayload {
     sender: FcrUserInfo;

package/lib/modules/participant/type.js

@@ -8,5 +8,7 @@ exports.FcrUISessionKey = void 0;
 var FcrUISessionKey = exports.FcrUISessionKey = /*#__PURE__*/function (FcrUISessionKey) {
   FcrUISessionKey["REQUEST_OPEN_CAMERA"] = "REQUEST_OPEN_CAMERA";
   FcrUISessionKey["REQUEST_OPEN_MICROPHONE"] = "REQUEST_OPEN_MICROPHONE";
+  FcrUISessionKey["REQUEST_OPEN_TRANSCRIBING"] = "REQUEST_OPEN_TRANSCRIBING";
+  FcrUISessionKey["REJECT_OPEN_TRANSCRIBING"] = "REJECT_OPEN_TRANSCRIBING";
   return FcrUISessionKey;
 }({});

package/lib/modules/pc-audio-connect/main-scene/store.d.ts

@@ -12,6 +12,7 @@ export default class ConnectionGatewayStoreMainScene {
     private _dialogProvider;
     private _needShowConfirmDialog;
     private _confirmDialogId;
+    private _sharedSettingDataSource;
     accessor phoneCallState: FcrRoomConnectorSessionState;
     accessor phoneCallReason: FcrRoomConnectorSessionReason;
     accessor connectSession: FcrPhoneConnectorSession | null;

package/lib/modules/pc-audio-connect/main-scene/store.js

@@ -105,6 +105,7 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
     // Optional providers with try-catch
     this._devicePrivilegeProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PRIVILEGE_PROVIDER);
     this._sharedDevicePrivilegeDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
+    this._sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
     // Optional providers may not exist in all scenarios
 
     this._deviceObserver = {
@@ -188,6 +189,10 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
         activeTab: _type3.DeviceSettingTab.AUDIO,
         highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
       };
+      this._sharedSettingDataSource.setDialogConfig({
+        activeTab: _type3.DeviceSettingTab.AUDIO,
+        highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
+      });
     }
   }, {
     key: "release",

package/lib/modules/pc-audio-connect/waiting-scene/store.d.ts

@@ -9,10 +9,12 @@ export default class ConnectionGatewayStore {
     private _sharedDevicePrivilegeDataSource?;
     private _dialogProvider;
     private _needShowConfirmDialog;
+    private _sharedSettingDataSource;
     accessor phoneCallState: FcrRoomConnectorSessionState;
     accessor phoneCallReason: FcrRoomConnectorSessionReason;
     accessor connectSession: FcrPhoneConnectorSession | null;
     accessor calling: boolean;
+    private _roomProvider;
     get connectType(): import("../../../type").FcrUIConnectType;
     get hasNeedMergedStream(): boolean;
     get hasOwnPstnStream(): boolean;

package/lib/modules/pc-audio-connect/waiting-scene/store.js

@@ -62,6 +62,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _objectManager = require("../../../object-manager");
 var _type2 = require("../../../providers/dialog/type");
 var _type3 = require("../../setting/type");
+var _type4 = require("fcr-core/lib/room-control/type");
 var _ConnectionGatewayStore;
 var _initProto, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -80,7 +81,8 @@ var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   function ConnectionGatewayStore(_ref) {
-    var _this = this;
+    var _this$_roomProvider$c,
+      _this = this;
     var objectManager = _ref.objectManager;
     (0, _classCallCheck2["default"])(this, ConnectionGatewayStore);
     (0, _defineProperty2["default"])(this, "_disposers", (_initProto(this), []));
@@ -93,14 +95,12 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     // Get all required objects from objectManager
     this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
     this._deviceProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
-
-    // Optional providers with try-catch
-    try {
+    this._roomProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
+    if (((_this$_roomProvider$c = this._roomProvider.currentRoomControl.getRoomInfo()) === null || _this$_roomProvider$c === void 0 ? void 0 : _this$_roomProvider$c.roomType) === _type4.FcrRoomType.Mainroom) {
       this._devicePrivilegeProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PRIVILEGE_PROVIDER);
       this._sharedDevicePrivilegeDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
-    } catch (_unused) {
-      // Optional providers may not exist in all scenarios
     }
+    this._sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
     this._deviceObserver = {
       onAudioConnected: function onAudioConnected() {
         _this._needShowConfirmDialog = false;
@@ -179,6 +179,10 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
         activeTab: _type3.DeviceSettingTab.AUDIO,
         highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
       });
+      this._sharedSettingDataSource.setDialogConfig({
+        activeTab: _type3.DeviceSettingTab.AUDIO,
+        highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
+      });
     }
   }, {
     key: "closeConnectionDialog",

package/lib/modules/phone-audio-connect/store.d.ts

@@ -7,6 +7,7 @@ export default class ConnectionGatewayStore {
     private _dialogProvider;
     private _failureTimer;
     private _phoneAudioConnectorProvider;
+    private _sharedSettingDataSource;
     accessor rememberMe: boolean;
     accessor rememberedNumberList: ConnectListType[];
     accessor currentRegion: ConnectorRegion;

package/lib/modules/phone-audio-connect/store.js

@@ -106,6 +106,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     this._deviceProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
     this._phoneAudioConnectorProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_PHONE_AUDIO_CONNECTOR_PROVIDER);
     this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
+    this._sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
     this.initRememberedData();
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this._phoneAudioConnectorProvider.accepted;
@@ -220,6 +221,10 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
         activeTab: _type.DeviceSettingTab.AUDIO,
         highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
       });
+      this._sharedSettingDataSource.setDialogConfig({
+        activeTab: _type.DeviceSettingTab.AUDIO,
+        highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
+      });
     }
   }, {
     key: "closeConnectionDialog",

package/lib/modules/secondary-window/store.d.ts

@@ -1,5 +1,5 @@
 import { VideoWindowDataReturn, WhiteboardToolAction, SecondaryWindowStoreArgs } from './type';
-import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core';
 import { WhiteboardThemeType } from '../whiteboard/type';
 import { FcrVideoTrackRenderer } from '../../shared-context/video-track-render-context';
 export declare class SecondaryWindowStore {
@@ -43,7 +43,6 @@ export declare class SecondaryWindowStore {
     get isBoardShare(): boolean;
     get annotationHasStart(): boolean;
     get isShowToolbar(): boolean;
-    get isSharingWithAudio(): boolean;
     get videoRenderContext(): FcrVideoTrackRenderer;
     get isActive(): boolean;
     get baseUrl(): string;

package/lib/modules/secondary-window/store.js

@@ -302,11 +302,6 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     get: function get() {
       return this._boardShareProvider.boardBarControl.toolbarState.controlEnable || this.isHost;
     }
-  }, {
-    key: "isSharingWithAudio",
-    get: function get() {
-      return this._sharedScreenShareDataSource.isSharingWithAudio;
-    }
   }, {
     key: "videoRenderContext",
     get: function get() {
@@ -465,14 +460,29 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
       if (displaySecondaryWindow) {
         var _displaySecondaryWind = displaySecondaryWindow.workArea,
           x = _displaySecondaryWind.x,
-          y = _displaySecondaryWind.y;
+          y = _displaySecondaryWind.y,
+          width = _displaySecondaryWind.width,
+          height = _displaySecondaryWind.height;
         var secondaryWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.SUB_WINDOW);
         secondaryWindow.setTitle(mainWindowTitle);
-        secondaryWindow.setBounds({
-          x: x,
-          y: y
-        });
-        secondaryWindow.maximize();
+        var windowObserver = {
+          onReady: function onReady() {
+            // @ts-ignore
+            secondaryWindow.rendererWindow.FcrUIMainWindowRenderer = window.FcrUIMainWindowRenderer;
+            secondaryWindow.setPosition(x, y);
+            /**
+             * windows 系统下,窗口存在透明边框, 使用显示器工作区的宽高作为窗口的大小设置后,
+             * 窗口边缘与显示器屏幕边缘存在7像素(windows 不同版本的系统上, 可能存在差异)的空隙.
+             *
+             * 如果使用 maximumSize 来设置窗口的大小, 则不会存在窗口边缘的空隙问题.
+             * 但使用 maximumSize 设置窗口, 有时会导致窗口出现异常(窗口只显示顶部的标题栏, 内容区域透明, 且鼠标点击后直接穿透到窗口后的应用或桌面).
+             * setBounds 方法设置窗口大小和位置时, 也会出现此问题.
+             */
+            secondaryWindow.setSize(width, height);
+            secondaryWindow.removeObserver(windowObserver);
+          }
+        };
+        secondaryWindow.addObserver(windowObserver);
       } else {
         this.logger.error('No secondary display found');
       }
@@ -480,10 +490,10 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "_openSecondaryWindow",
     value: function _openSecondaryWindow() {
+      this._setSecondaryWindowBounds();
       this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SUB_WINDOW, {
         focus: false
       });
-      this._setSecondaryWindowBounds();
     }
   }, {
     key: "_closeSecondaryWindow",

package/lib/modules/secondary-window/type.d.ts

@@ -1,6 +1,6 @@
 import { FcrConnectionState, FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrUIVideoWindowData, FcrUIVideoWindowLayoutType } from '../layout/type';
-import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core';
 import { FcrImageData } from 'fcr-core/lib/imports';
 import { FcrUIObjectManager } from '../../object-manager';
 export declare enum FcrUIDisplayDistributionContentType {

package/lib/modules/secondary-window/view.js

@@ -18,7 +18,7 @@ var _memberWindow = require("../components/member-window");
 var _controlBar = require("../components/control-bar");
 var _loading = require("../components/control-bar/components/loading");
 var _toolbar = require("../components/toolbar");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 var _type2 = require("./type");
 var _progress = _interopRequireDefault(require("../components/control-bar/components/progress"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
@@ -64,8 +64,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
     setSpeakerViewSize = store.setSpeakerViewSize,
     interceptedClose = store.interceptedClose,
     setInterceptedClose = store.setInterceptedClose,
-    videoRenderContext = store.videoRenderContext,
-    isSharingWithAudio = store.isSharingWithAudio;
+    videoRenderContext = store.videoRenderContext;
   var videoWindowContainer = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
     if (!interceptedClose) return;
@@ -163,7 +162,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
             setOriginScalc();
             return isCurrentOriginal;
           },
-          isSharingWithAudio: isSharingWithAudio
+          isSharingAudio: videoWindowData.hasLoopbackSharing && videoWindowData.hasMicrophoneAudioStream
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_memberWindow.MemberWindow, {
           onRemovePin: function onRemovePin() {},
           canShowSpeakerSpotlight: true,
@@ -226,7 +225,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       setPopoverOpened: function setPopoverOpened() {
         return setInterceptedClose(false);
       }
-    }), content, (isBoardShare || isScreenShare) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_toolbar.WhiteboardToolbar, {
+    }), content, (isBoardShare || annotationHasStart) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_toolbar.WhiteboardToolbar, {
       offsetTop: 28,
       direction: "vertical",
       container: videoWindowContainer.current || undefined,
@@ -267,19 +266,19 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       undo: function undo() {
         return setWhiteboardTool({
           action: _type2.WhiteboardToolAction.UNDO,
-          tool: _enums.FcrBoardToolType.NONE
+          tool: _fcrCore.FcrBoardToolType.NONE
         });
       },
       redo: function redo() {
         return setWhiteboardTool({
           action: _type2.WhiteboardToolAction.REDO,
-          tool: _enums.FcrBoardToolType.NONE
+          tool: _fcrCore.FcrBoardToolType.NONE
         });
       },
       clean: function clean() {
         return setWhiteboardTool({
           action: _type2.WhiteboardToolAction.CLEAR,
-          tool: _enums.FcrBoardToolType.NONE
+          tool: _fcrCore.FcrBoardToolType.NONE
         });
       },
       onSave: isBoardShare ? saveWhiteboardDraft : undefined,