fcr-ui-scene 3.6.1 → 3.6.3

package/lib/modules/layout/store.js

@@ -110,7 +110,7 @@ var _view = require("./view");
 var _logger = require("../../utilities/logger");
 var _env = require("agora-foundation/lib/utilities/env");
 var _LayoutStore;
-var _initProto, _participantDecs, _init_participant, _chatDecs, _init_chat, _chatActionDecs, _init_chatAction, _stateBarDecs, _init_stateBar, _actionBarDecs, _init_actionBar, _layersDecs, _init_layers, _whiteboardDecs, _init_whiteboard, _init_collapsed, _init_aside, _init_barHovering, _init_barLocked, _init_barHidden, _init_asideWidth, _init_userVolumeMap, _init_chatRoomState, _init_whiteboardActive, _init_ownerUser, _addPinMessageDecs, _cancelPinMessageDecs, _setWhiteboardActiveDecs, _setAsideWidthDecs, _updateSlotsDecs, _toggleLayoutDecs, _toggleCollapsedDecs, _toggleAsideDecs, _asideWidthChangedDecs, _toggleLayoutBarLockDecs, _toggleLayoutBarHiddenDecs, _resetLockTimerDecs, _setHoveringHandlerDecs, _setHoveringLeaveHandlerDecs, _handleLiveLayoutChangeDecs, _onUserInfoUpdatedDecs, _handleLayoutUpdatedDecs, _init__handleLayoutUpdated, _handleFoldListChangedDecs, _handleMainListLengthChangedDecs, _handleMainListChangedDecs, _setBarHoveringDecs, _handleConnectionUpdatedDecs, _onAudioVolumeUpdatedDecs, _ref;
+var _initProto, _participantDecs, _init_participant, _chatDecs, _init_chat, _chatActionDecs, _init_chatAction, _stateBarDecs, _init_stateBar, _actionBarDecs, _init_actionBar, _layersDecs, _init_layers, _whiteboardDecs, _init_whiteboard, _annotationDecs, _init_annotation, _annotationControlDecs, _init_annotationControl, _init_collapsed, _init_aside, _init_barHovering, _init_barLocked, _init_barHidden, _init_asideWidth, _init_userVolumeMap, _init_chatRoomState, _init_whiteboardActive, _init_ownerUser, _addPinMessageDecs, _cancelPinMessageDecs, _setWhiteboardActiveDecs, _setAsideWidthDecs, _updateSlotsDecs, _toggleLayoutDecs, _toggleCollapsedDecs, _toggleAsideDecs, _asideWidthChangedDecs, _toggleLayoutBarLockDecs, _toggleLayoutBarHiddenDecs, _resetLockTimerDecs, _setHoveringHandlerDecs, _setHoveringLeaveHandlerDecs, _handleLiveLayoutChangeDecs, _onUserInfoUpdatedDecs, _handleLayoutUpdatedDecs, _init__handleLayoutUpdated, _handleFoldListChangedDecs, _handleMainListLengthChangedDecs, _handleMainListChangedDecs, _setBarHoveringDecs, _handleConnectionUpdatedDecs, _onAudioVolumeUpdatedDecs, _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; }
@@ -138,7 +138,9 @@ var _N = /*#__PURE__*/new WeakMap();
 var _O = /*#__PURE__*/new WeakMap();
 var _P = /*#__PURE__*/new WeakMap();
 var _Q = /*#__PURE__*/new WeakMap();
-_ref = (_participantDecs = [_mobx.observable, _mobx.observable.ref], _chatDecs = [_mobx.observable, _mobx.observable.ref], _chatActionDecs = [_mobx.observable, _mobx.observable.ref], _stateBarDecs = [_mobx.observable, _mobx.observable.ref], _actionBarDecs = [_mobx.observable, _mobx.observable.ref], _layersDecs = [_mobx.observable, _mobx.observable.ref], _whiteboardDecs = [_mobx.observable, _mobx.observable.ref], _addPinMessageDecs = [_mobx.action, _mobx.action.bound], _cancelPinMessageDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardActiveDecs = [_mobx.action, _mobx.action.bound], _setAsideWidthDecs = [_mobx.action, _mobx.action.bound], _updateSlotsDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutDecs = [_mobx.action, _mobx.action.bound], _toggleCollapsedDecs = [_mobx.action, _mobx.action.bound], _toggleAsideDecs = [_mobx.action, _mobx.action.bound], _asideWidthChangedDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutBarLockDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutBarHiddenDecs = [_mobx.action, _mobx.action.bound], _resetLockTimerDecs = [_mobx.action, _mobx.action.bound], _setHoveringHandlerDecs = [_mobx.action, _mobx.action.bound], _setHoveringLeaveHandlerDecs = [_mobx.action, _mobx.action.bound], _handleLiveLayoutChangeDecs = [_mobx.action, _mobx.action.bound], _onUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleLayoutUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleFoldListChangedDecs = [_mobx.action, _mobx.action.bound], _handleMainListLengthChangedDecs = [_mobx.action, _mobx.action.bound], _handleMainListChangedDecs = [_mobx.action, _mobx.action.bound], _setBarHoveringDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_mobx.action, _mobx.action.bound], _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+var _R = /*#__PURE__*/new WeakMap();
+var _S = /*#__PURE__*/new WeakMap();
+_ref = (_participantDecs = [_mobx.observable, _mobx.observable.ref], _chatDecs = [_mobx.observable, _mobx.observable.ref], _chatActionDecs = [_mobx.observable, _mobx.observable.ref], _stateBarDecs = [_mobx.observable, _mobx.observable.ref], _actionBarDecs = [_mobx.observable, _mobx.observable.ref], _layersDecs = [_mobx.observable, _mobx.observable.ref], _whiteboardDecs = [_mobx.observable, _mobx.observable.ref], _annotationDecs = [_mobx.observable, _mobx.observable.ref], _annotationControlDecs = [_mobx.observable, _mobx.observable.ref], _addPinMessageDecs = [_mobx.action, _mobx.action.bound], _cancelPinMessageDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardActiveDecs = [_mobx.action, _mobx.action.bound], _setAsideWidthDecs = [_mobx.action, _mobx.action.bound], _updateSlotsDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutDecs = [_mobx.action, _mobx.action.bound], _toggleCollapsedDecs = [_mobx.action, _mobx.action.bound], _toggleAsideDecs = [_mobx.action, _mobx.action.bound], _asideWidthChangedDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutBarLockDecs = [_mobx.action, _mobx.action.bound], _toggleLayoutBarHiddenDecs = [_mobx.action, _mobx.action.bound], _resetLockTimerDecs = [_mobx.action, _mobx.action.bound], _setHoveringHandlerDecs = [_mobx.action, _mobx.action.bound], _setHoveringLeaveHandlerDecs = [_mobx.action, _mobx.action.bound], _handleLiveLayoutChangeDecs = [_mobx.action, _mobx.action.bound], _onUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleLayoutUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleFoldListChangedDecs = [_mobx.action, _mobx.action.bound], _handleMainListLengthChangedDecs = [_mobx.action, _mobx.action.bound], _handleMainListChangedDecs = [_mobx.action, _mobx.action.bound], _setBarHoveringDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_mobx.action, _mobx.action.bound], _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var LayoutStore = exports["default"] = /*#__PURE__*/function () {
   function LayoutStore(params) {
     var _this = this;
@@ -159,17 +161,19 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _E, _init_actionBar(this, null));
     _classPrivateFieldInitSpec(this, _F, _init_layers(this, null));
     _classPrivateFieldInitSpec(this, _G, _init_whiteboard(this, null));
+    _classPrivateFieldInitSpec(this, _H, _init_annotation(this, null));
+    _classPrivateFieldInitSpec(this, _I, _init_annotationControl(this, null));
     // State
-    _classPrivateFieldInitSpec(this, _H, _init_collapsed(this, true));
-    _classPrivateFieldInitSpec(this, _I, _init_aside(this, false));
-    _classPrivateFieldInitSpec(this, _J, _init_barHovering(this, true));
-    _classPrivateFieldInitSpec(this, _K, _init_barLocked(this, true));
-    _classPrivateFieldInitSpec(this, _L, _init_barHidden(this, false));
-    _classPrivateFieldInitSpec(this, _M, _init_asideWidth(this, _view.MinAsideWidth));
-    _classPrivateFieldInitSpec(this, _N, _init_userVolumeMap(this, new Map()));
-    _classPrivateFieldInitSpec(this, _O, _init_chatRoomState(this, _type4.FcrChatRoomConnectionState.Disconnected));
-    _classPrivateFieldInitSpec(this, _P, _init_whiteboardActive(this, false));
-    _classPrivateFieldInitSpec(this, _Q, _init_ownerUser(this, undefined));
+    _classPrivateFieldInitSpec(this, _J, _init_collapsed(this, true));
+    _classPrivateFieldInitSpec(this, _K, _init_aside(this, false));
+    _classPrivateFieldInitSpec(this, _L, _init_barHovering(this, true));
+    _classPrivateFieldInitSpec(this, _M, _init_barLocked(this, true));
+    _classPrivateFieldInitSpec(this, _N, _init_barHidden(this, false));
+    _classPrivateFieldInitSpec(this, _O, _init_asideWidth(this, _view.MinAsideWidth));
+    _classPrivateFieldInitSpec(this, _P, _init_userVolumeMap(this, new Map()));
+    _classPrivateFieldInitSpec(this, _Q, _init_chatRoomState(this, _type4.FcrChatRoomConnectionState.Disconnected));
+    _classPrivateFieldInitSpec(this, _R, _init_whiteboardActive(this, false));
+    _classPrivateFieldInitSpec(this, _S, _init_ownerUser(this, undefined));
     (0, _defineProperty2["default"])(this, "getAllowedOperations", (0, _mobxUtils.computedFn)(function (targetRole, isSelf) {
       return _this._privilegeProvider.getAllowedOperations(targetRole, isSelf);
     }));
@@ -191,7 +195,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     this._userControl = roomControl.getUserControl();
     this._streamControl = roomControl.getStreamControl();
     this._chatRoomControl = roomControl.getChatRoomControl();
-    this._whiteBoardControl = roomControl.getBoardControl();
+    this._whiteBoardControl = roomControl.getSharingControl().getBoardControl();
     this._roomControl = roomControl;
     this._sharedLayoutDataSource = params.sharedLayoutDataSource;
     this._eventProvider = params.eventProvider;
@@ -206,6 +210,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     this._screenShareProvider = params.screenShareProvider;
     this._pinDataSource = params.sharedPinDataSource;
     this.chatRoomState = this._chatRoomControl.getConnectionState();
+    this._annotationProvider = params.annotationProvider;
+    this._sharedScreenShareDataSource = params.sharedScreenShareDataSource;
     this._interpreterProvider = params.interpreterProvider;
     this._addListeners();
     //@ts-ignore
@@ -215,7 +221,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     this._handleMainListChanged();
     this._handleMainListLengthChanged();
     this._handleLayoutUpdated(this._videoWindowDataSource.layoutType);
-    this.setWhiteboardActive(this._whiteBoardControl.getBoardActiveInfo().isActive);
+    this.setWhiteboardActive(this._whiteBoardControl.getActivity());
   }
   return (0, _createClass2["default"])(LayoutStore, [{
     key: "participant",
@@ -274,7 +280,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "collapsed",
+    key: "annotation",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -282,7 +288,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "aside",
+    key: "annotationControl",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -290,7 +296,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "barHovering",
+    key: "collapsed",
     get: function get() {
       return _classPrivateFieldGet(_J, this);
     },
@@ -298,7 +304,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "barLocked",
+    key: "aside",
     get: function get() {
       return _classPrivateFieldGet(_K, this);
     },
@@ -306,7 +312,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "barHidden",
+    key: "barHovering",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
@@ -314,7 +320,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "asideWidth",
+    key: "barLocked",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
@@ -322,7 +328,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "userVolumeMap",
+    key: "barHidden",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
@@ -330,7 +336,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "chatRoomState",
+    key: "asideWidth",
     get: function get() {
       return _classPrivateFieldGet(_O, this);
     },
@@ -338,7 +344,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_O, this, v);
     }
   }, {
-    key: "whiteboardActive",
+    key: "userVolumeMap",
     get: function get() {
       return _classPrivateFieldGet(_P, this);
     },
@@ -346,13 +352,29 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_P, this, v);
     }
   }, {
-    key: "ownerUser",
+    key: "chatRoomState",
     get: function get() {
       return _classPrivateFieldGet(_Q, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_Q, this, v);
     }
+  }, {
+    key: "whiteboardActive",
+    get: function get() {
+      return _classPrivateFieldGet(_R, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_R, this, v);
+    }
+  }, {
+    key: "ownerUser",
+    get: function get() {
+      return _classPrivateFieldGet(_S, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_S, this, v);
+    }
   }, {
     key: "streamControl",
     get: function get() {
@@ -403,6 +425,16 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._videoWindowDataSource.manualLayout;
     }
+  }, {
+    key: "scalcValue",
+    get: function get() {
+      return this._annotationProvider.scalcValue;
+    }
+  }, {
+    key: "annotationHasStart",
+    get: function get() {
+      return this._annotationProvider.annotationHasStart;
+    }
   }, {
     key: "sourceList",
     get: function get() {
@@ -578,8 +610,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "isVideoSuspended",
     get: function get() {
-      var isSharingScreen = this._screenShareProvider.isSharingScreen;
-      var shareScreenOwner = this._screenShareProvider.screenSharingOwner;
+      var isSharingScreen = !!this._sharedScreenShareDataSource.isSharingScreen;
+      var shareScreenOwner = this._sharedScreenShareDataSource.screenSharingOwner;
       var isSharingScreenBySelf = this.localUserId === (shareScreenOwner === null || shareScreenOwner === void 0 ? void 0 : shareScreenOwner.userId);
       if ((0, _env.isElectron)() && isSharingScreen && isSharingScreenBySelf) {
         return true;
@@ -917,9 +949,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
           if (isLoneyWindow) {
             this._videoWindowDataSource.removeBoard();
           } else {
-            var _this$_whiteBoardCont = this._whiteBoardControl.getBoardActiveInfo(),
-              ownerUserId = _this$_whiteBoardCont.ownerUserId,
-              isActive = _this$_whiteBoardCont.isActive;
+            var isActive = this._whiteBoardControl.getActivity();
+            var ownerUserId = this._whiteBoardControl.getOwnerId();
             if (isActive) {
               var ownerUser = this._userControl.getUser(ownerUserId);
               this._videoWindowDataSource.addBoard(ownerUser, ownerUserId === this.localUserId, this._privilegeProvider.hasWriteBoardPermission());
@@ -1002,9 +1033,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
         return _this5.whiteboardActive;
       }, function (opened) {
         if (opened) {
-          var _this5$_whiteBoardCon = _this5._whiteBoardControl.getBoardActiveInfo(),
-            ownerUserId = _this5$_whiteBoardCon.ownerUserId,
-            isActive = _this5$_whiteBoardCon.isActive;
+          var isActive = _this5._whiteBoardControl.getActivity();
+          var ownerUserId = _this5._whiteBoardControl.getOwnerId();
           if (isActive) {
             var ownerUser = _this5._userControl.getUser(ownerUserId);
             _this5._videoWindowDataSource.addBoard(ownerUser, ownerUserId === _this5.localUserId);
@@ -1269,7 +1299,7 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _LayoutStore = LayoutStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LayoutStore, [[_participantDecs, 17, "participant"], [_chatDecs, 17, "chat"], [_chatActionDecs, 17, "chatAction"], [_stateBarDecs, 17, "stateBar"], [_actionBarDecs, 17, "actionBar"], [_layersDecs, 17, "layers"], [_whiteboardDecs, 17, "whiteboard"], [_mobx.observable, 1, "collapsed"], [_mobx.observable, 1, "aside"], [_mobx.observable, 1, "barHovering"], [_mobx.observable, 1, "barLocked"], [_mobx.observable, 1, "barHidden"], [_mobx.observable, 1, "asideWidth"], [_mobx.observable, 1, "userVolumeMap"], [_mobx.observable, 1, "chatRoomState"], [_mobx.observable, 1, "whiteboardActive"], [_mobx.observable, 1, "ownerUser"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_mobx.computed, 3, "layout"], [_mobx.computed, 3, "manualLayout"], [_mobx.computed, 3, "sourceList"], [_mobx.computed, 3, "layoutMainList"], [_mobx.computed, 3, "mainList"], [_mobx.computed, 3, "mainListMapByAudioStreamId"], [_mobx.computed, 3, "spotlightStreamId"], [_mobx.computed, 3, "foldList"], [_mobx.computed, 3, "galleryList"], [_mobx.computed, 3, "asideLayout"], [_mobx.computed, 3, "carouselList"], [_mobx.computed, 3, "hasPinnedStream"], [_mobx.computed, 3, "isRobot"], [_mobx.computed, 3, "findSpotlightUser"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "galleryMaxSize"], [_mobx.computed, 3, "isVideoSuspended"], [_mobx.computed, 3, "asideContent"], [_mobx.computed, 3, "participantsRenderAt"], [_mobx.computed, 3, "chatRenderAt"], [_decorator.bound, 2, "getWaterMarkContent"], [_decorator.bound, 2, "hasMutePermission"], [_decorator.bound, 2, "hasUnmutePermission"], [_decorator.bound, 2, "hasRequestStartAudioPermission"], [_decorator.bound, 2, "toggleMainStream"], [_addPinMessageDecs, 18, "addPinMessage"], [_cancelPinMessageDecs, 18, "cancelPinMessage"], [_decorator.bound, 2, "addPin"], [_decorator.bound, 2, "removePin"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "handleSetPinState"], [_setWhiteboardActiveDecs, 18, "setWhiteboardActive"], [_setAsideWidthDecs, 18, "setAsideWidth"], [_updateSlotsDecs, 18, "updateSlots"], [_decorator.bound, 2, "closeParticipantFromAside"], [_decorator.bound, 2, "moveParticipantFromAsideToDialog"], [_decorator.bound, 2, "closeChatFromAside"], [_decorator.bound, 2, "closeAsideChat"], [_decorator.bound, 2, "moveChatFromAsideToDialog"], [_decorator.bound, 2, "openPrivateChat"], [_decorator.bound, 2, "openRenameDialog"], [_toggleLayoutDecs, 18, "toggleLayout"], [_toggleCollapsedDecs, 18, "toggleCollapsed"], [_toggleAsideDecs, 18, "toggleAside"], [_asideWidthChangedDecs, 18, "asideWidthChanged"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_toggleLayoutBarHiddenDecs, 18, "toggleLayoutBarHidden"], [_resetLockTimerDecs, 18, "resetLockTimer"], [_setHoveringHandlerDecs, 18, "setHoveringHandler"], [_setHoveringLeaveHandlerDecs, 18, "setHoveringLeaveHandler"], [_handleLiveLayoutChangeDecs, 18, "handleLiveLayoutChange"], [_onUserInfoUpdatedDecs, 18, "onUserInfoUpdated"], [_decorator.bound, 2, "stopLocalPreview"], [_decorator.bound, 2, "startLocalPreview"], [_decorator.bound, 2, "setAllowChatWithPayload"], [_decorator.bound, 2, "muteAudio"], [_decorator.bound, 2, "sendParticipantEvent"], [_decorator.bound, 2, "onEvent"], [_decorator.bound, 2, "_addListeners"], [_mobx.computed, 3, "_hasVideoStreamUser"], [_handleFoldListChangedDecs, 18, "_handleFoldListChanged"], [_handleMainListLengthChangedDecs, 18, "_handleMainListLengthChanged"], [_handleMainListChangedDecs, 18, "_handleMainListChanged"], [_mobx.action, 2, "_switchToSpeaker"], [_mobx.action, 2, "_switchToGallery"], [_setBarHoveringDecs, 18, "_setBarHovering"], [_decorator.bound, 2, "_initStream"], [_decorator.bound, 2, "_isSetSpotlightEnable"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_decorator.bound, 2, "_handleLiveStreamingStateUpdated"], [_decorator.bound, 2, "_handleStreamAdded"], [_decorator.bound, 2, "_onStreamsAdded"], [_decorator.bound, 2, "_onStreamsUpdated"], [_decorator.bound, 2, "_onStreamsRemoved"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_handleLayoutUpdatedDecs, 16, "_handleLayoutUpdated"]], []).e, 19);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LayoutStore, [[_participantDecs, 17, "participant"], [_chatDecs, 17, "chat"], [_chatActionDecs, 17, "chatAction"], [_stateBarDecs, 17, "stateBar"], [_actionBarDecs, 17, "actionBar"], [_layersDecs, 17, "layers"], [_whiteboardDecs, 17, "whiteboard"], [_annotationDecs, 17, "annotation"], [_annotationControlDecs, 17, "annotationControl"], [_mobx.observable, 1, "collapsed"], [_mobx.observable, 1, "aside"], [_mobx.observable, 1, "barHovering"], [_mobx.observable, 1, "barLocked"], [_mobx.observable, 1, "barHidden"], [_mobx.observable, 1, "asideWidth"], [_mobx.observable, 1, "userVolumeMap"], [_mobx.observable, 1, "chatRoomState"], [_mobx.observable, 1, "whiteboardActive"], [_mobx.observable, 1, "ownerUser"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_mobx.computed, 3, "layout"], [_mobx.computed, 3, "manualLayout"], [_mobx.computed, 3, "scalcValue"], [_mobx.computed, 3, "sourceList"], [_mobx.computed, 3, "layoutMainList"], [_mobx.computed, 3, "mainList"], [_mobx.computed, 3, "mainListMapByAudioStreamId"], [_mobx.computed, 3, "spotlightStreamId"], [_mobx.computed, 3, "foldList"], [_mobx.computed, 3, "galleryList"], [_mobx.computed, 3, "asideLayout"], [_mobx.computed, 3, "carouselList"], [_mobx.computed, 3, "hasPinnedStream"], [_mobx.computed, 3, "isRobot"], [_mobx.computed, 3, "findSpotlightUser"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "galleryMaxSize"], [_mobx.computed, 3, "isVideoSuspended"], [_mobx.computed, 3, "asideContent"], [_mobx.computed, 3, "participantsRenderAt"], [_mobx.computed, 3, "chatRenderAt"], [_decorator.bound, 2, "getWaterMarkContent"], [_decorator.bound, 2, "hasMutePermission"], [_decorator.bound, 2, "hasUnmutePermission"], [_decorator.bound, 2, "hasRequestStartAudioPermission"], [_decorator.bound, 2, "toggleMainStream"], [_addPinMessageDecs, 18, "addPinMessage"], [_cancelPinMessageDecs, 18, "cancelPinMessage"], [_decorator.bound, 2, "addPin"], [_decorator.bound, 2, "removePin"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "handleSetPinState"], [_setWhiteboardActiveDecs, 18, "setWhiteboardActive"], [_setAsideWidthDecs, 18, "setAsideWidth"], [_updateSlotsDecs, 18, "updateSlots"], [_decorator.bound, 2, "closeParticipantFromAside"], [_decorator.bound, 2, "moveParticipantFromAsideToDialog"], [_decorator.bound, 2, "closeChatFromAside"], [_decorator.bound, 2, "closeAsideChat"], [_decorator.bound, 2, "moveChatFromAsideToDialog"], [_decorator.bound, 2, "openPrivateChat"], [_decorator.bound, 2, "openRenameDialog"], [_toggleLayoutDecs, 18, "toggleLayout"], [_toggleCollapsedDecs, 18, "toggleCollapsed"], [_toggleAsideDecs, 18, "toggleAside"], [_asideWidthChangedDecs, 18, "asideWidthChanged"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_toggleLayoutBarHiddenDecs, 18, "toggleLayoutBarHidden"], [_resetLockTimerDecs, 18, "resetLockTimer"], [_setHoveringHandlerDecs, 18, "setHoveringHandler"], [_setHoveringLeaveHandlerDecs, 18, "setHoveringLeaveHandler"], [_handleLiveLayoutChangeDecs, 18, "handleLiveLayoutChange"], [_onUserInfoUpdatedDecs, 18, "onUserInfoUpdated"], [_decorator.bound, 2, "stopLocalPreview"], [_decorator.bound, 2, "startLocalPreview"], [_decorator.bound, 2, "setAllowChatWithPayload"], [_decorator.bound, 2, "muteAudio"], [_decorator.bound, 2, "sendParticipantEvent"], [_decorator.bound, 2, "onEvent"], [_decorator.bound, 2, "_addListeners"], [_mobx.computed, 3, "_hasVideoStreamUser"], [_handleFoldListChangedDecs, 18, "_handleFoldListChanged"], [_handleMainListLengthChangedDecs, 18, "_handleMainListLengthChanged"], [_handleMainListChangedDecs, 18, "_handleMainListChanged"], [_mobx.action, 2, "_switchToSpeaker"], [_mobx.action, 2, "_switchToGallery"], [_setBarHoveringDecs, 18, "_setBarHovering"], [_decorator.bound, 2, "_initStream"], [_decorator.bound, 2, "_isSetSpotlightEnable"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_decorator.bound, 2, "_handleLiveStreamingStateUpdated"], [_decorator.bound, 2, "_handleStreamAdded"], [_decorator.bound, 2, "_onStreamsAdded"], [_decorator.bound, 2, "_onStreamsUpdated"], [_decorator.bound, 2, "_onStreamsRemoved"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_handleLayoutUpdatedDecs, 16, "_handleLayoutUpdated"]], []).e, 21);
 _init_participant = _applyDecs$e[0];
 _init_chat = _applyDecs$e[1];
 _init_chatAction = _applyDecs$e[2];
@@ -1277,17 +1307,19 @@ _init_stateBar = _applyDecs$e[3];
 _init_actionBar = _applyDecs$e[4];
 _init_layers = _applyDecs$e[5];
 _init_whiteboard = _applyDecs$e[6];
-_init_collapsed = _applyDecs$e[7];
-_init_aside = _applyDecs$e[8];
-_init_barHovering = _applyDecs$e[9];
-_init_barLocked = _applyDecs$e[10];
-_init_barHidden = _applyDecs$e[11];
-_init_asideWidth = _applyDecs$e[12];
-_init_userVolumeMap = _applyDecs$e[13];
-_init_chatRoomState = _applyDecs$e[14];
-_init_whiteboardActive = _applyDecs$e[15];
-_init_ownerUser = _applyDecs$e[16];
-_init__handleLayoutUpdated = _applyDecs$e[17];
-_initProto = _applyDecs$e[18];
+_init_annotation = _applyDecs$e[7];
+_init_annotationControl = _applyDecs$e[8];
+_init_collapsed = _applyDecs$e[9];
+_init_aside = _applyDecs$e[10];
+_init_barHovering = _applyDecs$e[11];
+_init_barLocked = _applyDecs$e[12];
+_init_barHidden = _applyDecs$e[13];
+_init_asideWidth = _applyDecs$e[14];
+_init_userVolumeMap = _applyDecs$e[15];
+_init_chatRoomState = _applyDecs$e[16];
+_init_whiteboardActive = _applyDecs$e[17];
+_init_ownerUser = _applyDecs$e[18];
+_init__handleLayoutUpdated = _applyDecs$e[19];
+_initProto = _applyDecs$e[20];
 (0, _defineProperty2["default"])(LayoutStore, "MIN_USERS_TO_ENABLE_SPOTLIGHT", 2);
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

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

@@ -66,6 +66,13 @@ export declare enum FcrUIWindowType {
     BOARD = 2
 }
 export declare enum FcrUILayoutType {
+    /**
+     * 上下布局时，顶部的小窗口类型
+     */
     CAROUSEL = "carousel",
+    /**
+     * 1. 上下布局时，底部的大窗口类型
+     * 2. 网格布局时的窗口类型
+     */
     GALLERY = "gallery"
 }

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

@@ -22,6 +22,7 @@ import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
 import { FcrUIMessageProvider } from '../../providers/message-provider';
 import { FcrUISecuritySharedDataSource } from '../../shared-data-source/security-data';
+import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 export declare class ParticipantUIModule extends UIModule {
     private _store;
     deviceStreamProvider?: FcrUIDeviceStreamProvider;
@@ -46,6 +47,7 @@ export declare class ParticipantUIModule extends UIModule {
     messageProvider?: FcrUIMessageProvider;
     abilityProvider?: FcrUIAbilityProviderImpl;
     sharedSecuritySharedDataSource?: FcrUISecuritySharedDataSource;
+    sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;

package/lib/modules/participant/index.js

@@ -87,7 +87,8 @@ var ParticipantUIModule = exports.ParticipantUIModule = /*#__PURE__*/function (_
         dialogProvider: this.dialogProvider,
         abilityProvider: this.abilityProvider,
         messageProvider: this.messageProvider,
-        sharedSecuritySharedDataSource: this.sharedSecuritySharedDataSource
+        sharedSecuritySharedDataSource: this.sharedSecuritySharedDataSource,
+        sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource
       });
     }
   }, {

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

@@ -28,9 +28,9 @@ import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUIMessageProvider } from '../../providers/message-provider';
 import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
 import { FcrUISecuritySharedDataSource } from '../../shared-data-source/security-data';
+import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 export default class ParticipantStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private _screenSharingState;
     private _roomStore;
     private _chatProvider;
     private _roomControl;
@@ -57,6 +57,7 @@ export default class ParticipantStore {
     private _sharedWaitingRoomDataSource;
     private _sharedMemberDataSource;
     private _sharedChatDataSource;
+    private _sharedScreenShareSharedDataSource;
     private _peerSessionObserver;
     private _dialogProvider;
     private _abilityProvider;
@@ -93,6 +94,7 @@ export default class ParticipantStore {
     get localUserRole(): FcrUserRole;
     get isLocalUserHost(): boolean;
     get enableSpotlight(): boolean;
+    get screenSharingOwner(): FcrUserInfo | undefined;
     get userListSource(): import("./member-list-data-source").FcrUIMemberDataImpl[];
     get spotlightStreamId(): string;
     get mergeUserInfo(): FcrUserInfo | undefined;
@@ -115,7 +117,7 @@ export default class ParticipantStore {
     get isHostKeyEnabled(): boolean;
     get hasInvite(): boolean;
     get checkedStateMap(): import("../../shared-data-source/security-data").FcrSecurityCheckedStateType;
-    constructor({ roomControl, securityStore, uiEventStore, deviceStore, deviceStreamStore, roomStore, sessionProvider, sharedSpeakerSpotlightDataSource, sharedPinDataSource, sharedLayoutDataSource, sharedInterpreterDataSource, sharedSettingDataSource, sharedWaitingRoomDataSource, chatProvider, sharedVideoWindowDataSource, sharedMemberDataSource, sharedChatDataSource, dialogProvider, abilityProvider, messageProvider, sharedSecuritySharedDataSource, }: {
+    constructor({ roomControl, securityStore, uiEventStore, deviceStore, deviceStreamStore, roomStore, sessionProvider, sharedSpeakerSpotlightDataSource, sharedPinDataSource, sharedLayoutDataSource, sharedInterpreterDataSource, sharedSettingDataSource, sharedWaitingRoomDataSource, chatProvider, sharedVideoWindowDataSource, sharedMemberDataSource, sharedChatDataSource, dialogProvider, abilityProvider, messageProvider, sharedSecuritySharedDataSource, sharedScreenShareSharedDataSource, }: {
         roomControl: FcrMainRoomControl;
         securityStore: FcrUIPrivilegeProvider;
         uiEventStore: FcrUIEventProvider;
@@ -137,6 +139,7 @@ export default class ParticipantStore {
         abilityProvider: FcrUIAbilityProviderImpl;
         messageProvider: FcrUIMessageProvider;
         sharedSecuritySharedDataSource: FcrUISecuritySharedDataSource;
+        sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
     });
     release(): void;
     allowedOperations: (userId: string, userRole: FcrUserRole) => string[];

package/lib/modules/participant/store.js

@@ -155,6 +155,7 @@ _ref = (_setCurrentModalDecs = [_mobx.action, _mobx.action.bound], _openParticip
 var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
   function ParticipantStore(_ref2) {
     var _this = this,
+      _this$_roomControl$ge,
       _this$_roomStore;
     var _roomControl = _ref2.roomControl,
       securityStore = _ref2.securityStore,
@@ -176,12 +177,12 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
       dialogProvider = _ref2.dialogProvider,
       abilityProvider = _ref2.abilityProvider,
       messageProvider = _ref2.messageProvider,
-      sharedSecuritySharedDataSource = _ref2.sharedSecuritySharedDataSource;
+      sharedSecuritySharedDataSource = _ref2.sharedSecuritySharedDataSource,
+      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource;
     (0, _classCallCheck2["default"])(this, ParticipantStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ParticipantStore'
     })));
-    (0, _defineProperty2["default"])(this, "_screenSharingState", _fcrCore.FcrMediaSourceState.CLOSE);
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_changeNameDialogKey", []);
     (0, _defineProperty2["default"])(this, "_unmuteAudioTimestamp", new Map());
@@ -302,7 +303,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
         hasVideo = isSelf ? _this._deviceStore.cameraEnabled : hasVideoPublishedAndStarted(defaultStream);
         if (pstnStream) {
           audioDeviceType = 'phone-mic';
-          hasAudio = true;
+          hasAudio = pstnStream.audioSourceState === _fcrCore.FcrMediaSourceState.OPEN;
         } else {
           audioDeviceType = 'computer-mic';
           hasAudio = isSelf ? _this._deviceStore.microphoneEnabled : hasAudioPublishedAndStarted(defaultStream);
@@ -361,11 +362,12 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
     this._sharedVideoWindowDataSource = sharedVideoWindowDataSource;
     this._sharedChatDataSource = sharedChatDataSource;
     this._sharedSecuritySharedDataSource = sharedSecuritySharedDataSource;
+    this._sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
     this.allowUnmute = this._securityStore.allowUnmuteSelfAudio();
     this.joinWithMuteAudio = this._securityStore.allowJoinWithMuteAudio();
     this._uiEventStore.addObserver(this._eventObserver);
     this._peerSessionControl.addObserver(this._peerSessionObserver);
-    this._roomControl.getBoardControl().addObserver(this._whitebaordObderver);
+    (_this$_roomControl$ge = this._roomControl.getSharingControl()) === null || _this$_roomControl$ge === void 0 || _this$_roomControl$ge.getBoardControl().addObserver(this._whitebaordObderver);
     this._roomControl.getPrivilegeControl().addObserver(this._privilegeControlObserver);
     (_this$_roomStore = this._roomStore) === null || _this$_roomStore === void 0 || _this$_roomStore.addObserver(this._roomStoreObserver);
     this._sharedInterpreterDataSource = sharedInterpreterDataSource;
@@ -522,6 +524,11 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedSettingDataSource.setting.spotlightEnabled;
     }
+  }, {
+    key: "screenSharingOwner",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.screenSharingOwner;
+    }
   }, {
     key: "userListSource",
     get: function get() {
@@ -666,7 +673,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
       this._dialogProvider.removeObserver(this._eventObserver);
       this._userControl.removeObserver(this._userObserver);
       this._peerSessionControl.removeObserver(this._peerSessionObserver);
-      this._roomControl.getBoardControl().removeObserver(this._whitebaordObderver);
+      this._roomControl.getSharingControl().getBoardControl().removeObserver(this._whitebaordObderver);
       this._roomControl.getPrivilegeControl().removeObserver(this._privilegeControlObserver);
       this._roomStore.removeObserver(this._roomStoreObserver);
       this._sharedWaitingRoomDataSource.release();
@@ -1252,12 +1259,6 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
       if (action === _constant.FcrUIAction.CHANGE_PARTICIPANT_TAB) {
         this.handleActiveTab(payload);
       }
-      if (action === _constant.FcrUIAction.START_SHARE_SCREEN) {
-        this._screenSharingState = _fcrCore.FcrMediaSourceState.OPEN;
-      }
-      if (action === _constant.FcrUIAction.STOP_SHARE_SCREEN) {
-        this._screenSharingState = _fcrCore.FcrMediaSourceState.CLOSE;
-      }
       if (action === _constant.FcrUIAction.PARTICIPANT_ACTION) {
         this.handlerUserAction(payload.action, payload.userId);
       }
@@ -1283,18 +1284,20 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
     value:
     //  user actions
     function _muteUserAudio(user) {
+      var userStreams = this._streamControl.getStreamsByUserId(user);
+      var hardStream = userStreams.find(function (stream) {
+        return stream.connectorType !== _fcrCore.FcrRoomConnectorType.NONE;
+      });
+      var normalStream = userStreams.find(function (stream) {
+        return stream.videoSourceType === _type2.AgoraRteVideoSourceType.CAMERA;
+      });
       var isSelf = user === this.localUser.userId;
       if (isSelf) {
         this._deviceStreamStore.enableMicrophoneWithPreCheck(false);
-      } else {
-        var targetUsers = this._streamControl.getStreamsByUserId(user);
-        var targetUser = targetUsers.find(function (user) {
-          return user.audioSourceType === _type2.AgoraRteAudioSourceType.MICROPHONE;
-        });
-        if (!targetUser) {
-          return;
-        }
-        this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, targetUser.streamId, {
+      }
+      var targetStream = hardStream !== null && hardStream !== void 0 ? hardStream : normalStream;
+      if (targetStream) {
+        this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, targetStream.streamId, {
           audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOPRIVILEGE,
           videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION
         }));
@@ -1303,10 +1306,17 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_unmuteUserAudio",
     value: function _unmuteUserAudio(userId) {
+      var streamInfos = this._streamControl.getStreamsByUserId(userId);
+      var hardStream = streamInfos.find(function (streamInfo) {
+        return streamInfo.connectorType !== _imports.AgoraRteRoomConnectorType.NONE;
+      });
+      // const normalStream = streamInfos.find(streamInfo => streamInfo.videoSourceType === AgoraRteVideoSourceType.CAMERA);
       var isSelf = userId === this.localUser.userId;
-      if (isSelf) {
+      if (isSelf && !hardStream) {
         this._deviceStreamStore.enableMicrophoneWithPreCheck(true);
-      } else {
+        return;
+      }
+      if (!hardStream) {
         var _this$_unmuteAudioTim;
         var now = Date.now();
         if (now - ((_this$_unmuteAudioTim = this._unmuteAudioTimestamp.get(userId)) !== null && _this$_unmuteAudioTim !== void 0 ? _this$_unmuteAudioTim : 0) <= SESSION_DURATION * 1000) {
@@ -1321,7 +1331,40 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
             sender: this.localUser
           }
         });
+      } else {
+        this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, hardStream.streamId, {
+          audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
+          videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION
+        }));
       }
+
+      // if (streamInfos && streamInfos.length > 0) {
+      //   const streamInfo = streamInfos[0];
+      //   const isNotCommonClientConnectorType =
+      //     streamInfo.connectorType !== AgoraRteRoomConnectorType.NONE;
+      //   if (!isNotCommonClientConnectorType) {
+      //     const now = Date.now();
+      //     if (now - (this._unmuteAudioTimestamp.get(userId) ?? 0) <= SESSION_DURATION * 1000) {
+      //       return;
+      //     }
+      //     this._unmuteAudioTimestamp.set(userId, now);
+      //     this._peerSessionControl.startPeerSession({
+      //       sessionKey: 'REQUEST_OPEN_MICROPHONE',
+      //       receiverId: userId,
+      //       duration: SESSION_DURATION,
+      //       payload: {
+      //         sender: this.localUser,
+      //       },
+      //     });
+      //   } else {
+      //     this._streamControl.updatePublishPrivilegeOfStreams({
+      //       [streamInfo.streamId]: {
+      //         audioPrivilege: FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
+      //         videoPrivilege: FcrStreamPrivilegeOperation.NOOPERATION,
+      //       },
+      //     });
+      //   }
+      // }
     }
   }, {
     key: "_muteUserVideo",
@@ -1380,6 +1423,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
         return u.userId === userId;
       });
       if (userData) {
+        var _this$screenSharingOw;
         var hasPermissionToSendPrivateMessage = this._securityStore.hasPermissionToSendPrivateMessage(userData.userInfo.userRole);
         if (!hasPermissionToSendPrivateMessage) {
           this._messageProvider.showToast({
@@ -1391,14 +1435,18 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
         if (!this._securityStore.permitPrivateChat(userId)) {
           return;
         }
+        this._chatProvider.setPrivateChatTargetUser(userData.userInfo, this.activeTab);
+        if ((0, _env.isElectron)() && ((_this$screenSharingOw = this.screenSharingOwner) === null || _this$screenSharingOw === void 0 ? void 0 : _this$screenSharingOw.userId) === this.localUser.userId) {
+          this._sharedLayoutDataSource.setParticipantsRenderAt('dialog');
+          this._uiEventStore.openDialog(_constant.FcrUIDialogKey.CHAT);
+          return;
+        }
         if (this._sharedLayoutDataSource.chatRenderAt !== 'dialog') {
           this._sharedLayoutDataSource.setAsideLayout({
             chat: true
           });
           this._sharedChatDataSource.activeTab = this.activeTab;
-        }
-        this._chatProvider.setPrivateChatTargetUser(userData.userInfo, this.activeTab);
-        if ((0, _env.isElectron)() && this._screenSharingState === _fcrCore.FcrMediaSourceState.OPEN || this._sharedLayoutDataSource.chatRenderAt === 'dialog') {
+        } else {
           this._uiEventStore.openDialog(_constant.FcrUIDialogKey.CHAT);
         }
       }

package/lib/modules/setting/audio-settings/audio-settings.js

@@ -33,7 +33,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _radio = require("agora-ui-foundation/lib/components/radio");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
-var _switch = require("agora-ui-foundation/lib/components/switch");
 var _volumeIndicator = require("agora-ui-foundation/lib/components/volume-indicator");
 var _slider = require("agora-ui-foundation/lib/components/slider");
 var _i18n = require("agora-ui-foundation/lib/i18n");
@@ -259,22 +258,12 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: ns.e('section-title'),
         children: t('fmt_setting_label_professional')
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: ns.e('switch-wrapper'),
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: ns.e('switch-wrapper-orinalvoise-tip'),
           children: t('fmt_setting_option_orinalvoise')
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: ns.e('switch-wrapper-switch'),
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_switch.FcrSwitch, {
-            value: setting.audioVoiceChanger,
-            onChange: function onChange(v) {
-              setSetting({
-                audioVoiceChanger: v
-              });
-            }
-          })
-        })]
+        })
       }), setting.audioVoiceChanger && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: ns.e('options-section'),
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

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

@@ -11,6 +11,7 @@ import { FcrUIMessageProvider } from '../../providers/message-provider';
 import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUILocalStorageProviderImpl } from '../../providers/local-storage-provider';
+import { FcrUIUserSettingStorageProviderImpl } from '../../providers/user-setting-storage-provider';
 export declare class SettingUIModule extends UIModule {
     private _store?;
     deviceProvider?: FcrUIDeviceProvider;
@@ -25,6 +26,7 @@ export declare class SettingUIModule extends UIModule {
     dialogProvider?: FcrUIDialogProvider;
     sharedSettingDataSource?: FcrUISharedSettingDataSource;
     localStorageProvider?: FcrUILocalStorageProviderImpl;
+    userSettingStorageProvider?: FcrUIUserSettingStorageProviderImpl;
     constructor(parentNode: FcrUINode, rootNode: FcrUINode);
     onNodeWillActive(): void;
     onNodeWillInactive(): void;