fcr-ui-scene 3.7.5 → 3.7.7-rc.1

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

@@ -93,15 +93,16 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function (_ParticipantS
   }, {
     key: "_openChangeNameDialog",
     value: function _openChangeNameDialog(userId) {
-      this._operatorRenameUserId = userId;
-      var user = this.userMap.get(this._operatorRenameUserId);
+      this._renamingUserId = userId;
+      var user = this.userMap.get(this._renamingUserId);
       if (!user) {
         this.logger.error('User not found', {
           userId: userId
         });
         return;
       }
-      this._operatorRenameUserName = user.userInfo.userName;
+      this._renamingUserName = user.userInfo.userName;
+      this.newName = user.userInfo.userName;
       this._openDialog(_constant.FcrUIDialogKey.RENAME);
     }
   }, {

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

@@ -91,17 +91,19 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function (_ParticipantS
   }, {
     key: "_openChangeNameDialog",
     value: function _openChangeNameDialog(userId) {
-      this._operatorRenameUserId = userId;
-      var user = this.userMap.get(this._operatorRenameUserId);
+      this._renamingUserId = userId;
+      var user = this.userMap.get(this._renamingUserId);
       if (!user) {
         this.logger.error('User not found', {
           userId: userId
         });
         return;
       }
-      this._operatorRenameUserName = user.userInfo.userName;
+      this._renamingUserName = user.userInfo.userName;
+      this.newName = user.userInfo.userName;
       this._openDialog(_constant.FcrUIDialogKey.RENAME);
       var renameWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.RENAME);
+      this.logger.info('windows_index setAlwaysOnTop in participant openChangeNameDialog');
       renameWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.RENAME_WINDOW_LEVEL);
     }
   }, {

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

@@ -279,6 +279,7 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
               hasOpenMicrophonePrivilege = _context2.sent;
               includeMicrophone = shouldIncludeMicrophone && hasOpenMicrophonePrivilege;
               this._deviceProvider.connectAudio(includeMicrophone);
+              this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONNECTION_GATEWAY);
             case 2:
             case "end":
               return _context2.stop();

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

@@ -21,7 +21,6 @@ export declare class SecondaryWindowStore {
     private _diffScalcValue;
     private accessor _screenShareScalcValue;
     accessor isSharingWhiteboard: boolean;
-    accessor iframeLoaded: boolean;
     accessor interceptedClose: boolean;
     get secondaryWindowContentType(): "speaker" | "gallery" | "hidden" | "local-camera" | "remote-camera" | "sharing-screen" | "sharing-screen-with-annotation" | "sharing-whiteboard";
     get videoWindowData(): VideoWindowDataReturn<typeof this.secondaryWindowContentType>;
@@ -47,6 +46,7 @@ export declare class SecondaryWindowStore {
     get isSharingWithAudio(): boolean;
     get videoRenderContext(): FcrVideoTrackRenderer;
     get isActive(): boolean;
+    get baseUrl(): string;
     constructor({ objectManager }: SecondaryWindowStoreArgs);
     getContent(): void;
     handleIframeLoad(iframe: HTMLIFrameElement): void;

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

@@ -65,7 +65,7 @@ var _type2 = require("../layout/type");
 var _objectManager = require("../../object-manager");
 var _type3 = require("../../providers/dialog/type");
 var _SecondaryWindowStore;
-var _initProto, _init__screenShareScalcValue, _init_isSharingWhiteboard, _init_iframeLoaded, _init_interceptedClose;
+var _initProto, _init__screenShareScalcValue, _init_isSharingWhiteboard, _init_interceptedClose;
 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; }
@@ -79,7 +79,6 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
-var _D = /*#__PURE__*/new WeakMap();
 var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function () {
   function SecondaryWindowStore(_ref) {
     var _this = this;
@@ -103,8 +102,7 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     (0, _defineProperty2["default"])(this, "_diffScalcValue", 0.5);
     _classPrivateFieldInitSpec(this, _A, _init__screenShareScalcValue(this, 1));
     _classPrivateFieldInitSpec(this, _B, _init_isSharingWhiteboard(this, false));
-    _classPrivateFieldInitSpec(this, _C, _init_iframeLoaded(this, false));
-    _classPrivateFieldInitSpec(this, _D, _init_interceptedClose(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init_interceptedClose(this, false));
     (0, _defineProperty2["default"])(this, "_handleSecondaryWindowClosed", function (dialogKey) {
       if (dialogKey !== _constant.FcrUIDialogKey.SUB_WINDOW) {
         return false;
@@ -160,21 +158,13 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "iframeLoaded",
+    key: "interceptedClose",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_C, this, v);
     }
-  }, {
-    key: "interceptedClose",
-    get: function get() {
-      return _classPrivateFieldGet(_D, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_D, this, v);
-    }
   }, {
     key: "secondaryWindowContentType",
     get: function get() {
@@ -272,17 +262,17 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "connectionState",
     get: function get() {
-      return this._boardShareProvider.connectionState;
+      return this._boardShareProvider.boardBarControl.connectionState;
     }
   }, {
     key: "showLoading",
     get: function get() {
-      return this._boardShareProvider.loading;
+      return this._boardShareProvider.boardBarControl.showLoading;
     }
   }, {
     key: "joinSuccess",
     get: function get() {
-      return this._boardShareProvider.joined;
+      return this._boardShareProvider.boardBarControl.joinSuccess;
     }
   }, {
     key: "isMyBoard",
@@ -327,6 +317,11 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     get: function get() {
       return this._boardShareProvider.isActive;
     }
+  }, {
+    key: "baseUrl",
+    get: function get() {
+      return this._renderer.getBaseUrl();
+    }
   }, {
     key: "getContent",
     value: function getContent() {}
@@ -337,7 +332,6 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
       iframe === null || iframe === void 0 || iframe.addEventListener('load', function () {
         iframe.style.width = '100%';
         iframe.style.height = '100%';
-        _this2.iframeLoaded = true;
         if (!iframe.contentWindow) {
           _this2.logger.error('Iframe has no contentWindow');
           return;
@@ -494,16 +488,14 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "_closeSecondaryWindow",
     value: function _closeSecondaryWindow() {
-      this.iframeLoaded = false;
       this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
     }
   }]);
 }();
 _SecondaryWindowStore = SecondaryWindowStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SecondaryWindowStore, [[_mobx.observable, 1, "_screenShareScalcValue"], [_mobx.observable, 1, "isSharingWhiteboard"], [_mobx.observable, 1, "iframeLoaded"], [_mobx.observable, 1, "interceptedClose"], [_mobx.computed, 3, "videoWindowData"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_mobx.computed, 3, "scalValue"], [_decorator.bound, 2, "handleIframeLoad"], [_decorator.bound, 2, "zoomIn"], [_decorator.bound, 2, "zoomOut"], [_decorator.bound, 2, "fullContainer"], [_decorator.bound, 2, "setInterceptedClose"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "setOriginScalc"], [_decorator.bound, 2, "setSpeakerViewSize"], [_decorator.bound, 2, "setWhiteboardTool"], [_decorator.bound, 2, "saveWhiteboardDraft"], [_decorator.bound, 2, "setProgress"], [_decorator.bound, 2, "setTheme"], [_decorator.bound, 2, "setControlEnable"], [_decorator.bound, 2, "setShowLoading"], [_decorator.bound, 2, "setCommonColors"], [_decorator.bound, 2, "log"]], []).e, 5);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SecondaryWindowStore, [[_mobx.observable, 1, "_screenShareScalcValue"], [_mobx.observable, 1, "isSharingWhiteboard"], [_mobx.observable, 1, "interceptedClose"], [_mobx.computed, 3, "videoWindowData"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_mobx.computed, 3, "scalValue"], [_decorator.bound, 2, "handleIframeLoad"], [_decorator.bound, 2, "zoomIn"], [_decorator.bound, 2, "zoomOut"], [_decorator.bound, 2, "fullContainer"], [_decorator.bound, 2, "setInterceptedClose"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "setOriginScalc"], [_decorator.bound, 2, "setSpeakerViewSize"], [_decorator.bound, 2, "setWhiteboardTool"], [_decorator.bound, 2, "saveWhiteboardDraft"], [_decorator.bound, 2, "setProgress"], [_decorator.bound, 2, "setTheme"], [_decorator.bound, 2, "setControlEnable"], [_decorator.bound, 2, "setShowLoading"], [_decorator.bound, 2, "setCommonColors"], [_decorator.bound, 2, "log"]], []).e, 4);
 _init__screenShareScalcValue = _applyDecs$e[0];
 _init_isSharingWhiteboard = _applyDecs$e[1];
-_init_iframeLoaded = _applyDecs$e[2];
-_init_interceptedClose = _applyDecs$e[3];
-_initProto = _applyDecs$e[4];
+_init_interceptedClose = _applyDecs$e[2];
+_initProto = _applyDecs$e[3];
 var SecondaryWindowStoreContext = exports.SecondaryWindowStoreContext = /*#__PURE__*/(0, _react.createContext)(null);

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

@@ -47,7 +47,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
     isAspectRatioPreserved = store.isAspectRatioPreserved,
     isShowToolbar = store.isShowToolbar,
     isActive = store.isActive,
-    iframeLoaded = store.iframeLoaded,
+    baseUrl = store.baseUrl,
     setOriginScalc = store.setOriginScalc,
     zoomIn = store.zoomIn,
     zoomOut = store.zoomOut,
@@ -104,7 +104,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
   var content = null;
   if (isBoardShare) {
     content = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [showLoading && !iframeLoaded && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.Loading, {
+      children: [showLoading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.Loading, {
         joined: joinSuccess,
         connectionState: connectionState,
         canOperate: canWriteBoard,
@@ -114,7 +114,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       }), toolbarState.progress > 0 && toolbarState.progress < 100 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_progress["default"], {
         title: "".concat((0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_downloading'), "..."),
         progress: toolbarState.progress
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar.WhiteboardControlbar, {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_controlBar.WhiteboardControlbar, {
         onClose: function onClose() {},
         onEnable: function onEnable(enable) {
           setControlEnable(enable);
@@ -127,17 +127,17 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
         sharingType: 'whiteboard',
         ownerUserName: videoWindowData.userName,
         isMyBoard: isActive && store.isMyBoard,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
+        children: [!isShowToolbar && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "whiteboard-action-prevent"
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
           ref: handleIframeLoad,
           allow: "webview",
-          src: "/whiteboard.html?type=whiteboard",
+          src: "".concat(baseUrl, "/whiteboard.html?type=whiteboard"),
           style: {
             width: '100vw',
-            height: '100vh',
-            minWidth: '100vw',
-            minHeight: '100vh'
+            height: 'calc(100vh - 28px)'
           }
-        })
+        })]
       })]
     });
   } else {
@@ -181,7 +181,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       }), secondaryWindowContentType === _type2.FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION && annotationHasStart && /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
         ref: handleIframeLoad,
         allow: "webview",
-        src: "/whiteboard.html?type=annotation",
+        src: "".concat(baseUrl, "/whiteboard.html?type=annotation"),
         style: {
           width: '100%',
           height: '100%',

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

@@ -177,23 +177,6 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
           value: microphoneVolumeLevel,
           barCount: 13
         })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: ns.e('form-item'),
-        onMouseDown: function onMouseDown(e) {
-          return e.stopPropagation();
-        },
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: ns.e('form-label'),
-          children: t('fmt_internalsetting_label_inputvolume')
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_slider.FcrSlider, {
-          value: microphoneVolume,
-          min: 0,
-          max: 400,
-          step: 1,
-          onChange: setMicrophoneVolume,
-          draggableDom: containerDom
-          // disabled={setting.autoAdjustmentMicrophoneVolume}
-        })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: ns.em('checkbox-wrapper', 'bordered'),
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {

package/lib/modules/setting/index.js

@@ -87,7 +87,7 @@ var SettingUIModule = exports.SettingUIModule = /*#__PURE__*/function (_UIModule
         _this.store.handleExitRoom();
       },
       onRoutingChanged: function onRoutingChanged() {
-        _this.store.handleExitRoom();
+        _this.store.handleExitRoom(true);
         _this.store.handleJoinRoom();
       }
     });

package/lib/modules/setting/state/index.js

@@ -184,7 +184,7 @@ var State = exports.State = (0, _mobxReact.observer)(function () {
         title: t('fmt_qualitystatistics_label_video'),
         data: videoData
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(DataCard, {
-        title: t('fmt_screenshare_label_screenshare'),
+        title: t('fmt_screenshare_controlbar_security_list_participant_screenshare'),
         data: screenShareData
       })]
     })]

package/lib/modules/setting/store.base.d.ts

@@ -35,6 +35,7 @@ export declare abstract class SettingStoreBase implements FcrUIManagedObject {
     private _monitorObserver;
     private _roomObserver;
     private _streamObserver;
+    private _deviceProviderObserver;
     private _objectManager;
     private _interpreterRoomControlReaction;
     private _streamControl;
@@ -179,7 +180,7 @@ export declare abstract class SettingStoreBase implements FcrUIManagedObject {
     clearGetSystemInfoInterval(): void;
     changeMediaSetting(key: keyof typeof this._sharedSettingDataSource.media, value: any): void;
     handleJoinRoom(): void;
-    handleExitRoom(): void;
+    handleExitRoom(isRoutingChange?: boolean): void;
     private _onNetworkStatsUpdated;
     private _onLocalAudioStatsUpdated;
     private _onRemoteAudioStatsUpdated;
@@ -190,9 +191,11 @@ export declare abstract class SettingStoreBase implements FcrUIManagedObject {
     private _onStreamsRemoved;
     private _onPerformanceUpdated;
     private _handleCameraChanged;
-    private _handleCameraListUpdated;
     private _onAudioVolumeUpdated;
     private _preHandleSetting;
     private _setMeetingSettingsToLocalStorage;
+    private _handleSystemSelectedDeviceChanged;
+    private _showSystemSelectedDeviceChangedToast;
+    private _windows10UnsupportAirPods;
 }
 export declare const StoreContext: import("react").Context<SettingStoreBase>;

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

@@ -16,7 +16,6 @@ require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
-require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/esnext.function.metadata.js");
@@ -41,6 +40,7 @@ require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.from.js");
+require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
@@ -54,7 +54,10 @@ require("core-js/modules/es.object.assign.js");
 require("core-js/modules/es.object.entries.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
@@ -93,6 +96,7 @@ var _roomProvider = require("../../providers/room-provider/room-provider");
 var _type = require("./type");
 var _objectManager = require("../../object-manager");
 var _react = require("react");
+var _env = require("agora-foundation/lib/utilities/env");
 var _SettingStoreBase;
 var _initProto, _init_loudestStreamVolumeLevel, _init_microphoneVolumeLevel, _init_isWifiConnected, _init_dialogConfig, _init_networkState, _init_performanceState, _init_localAudioStreamMap, _init_remoteAudioStreamMap, _init_localVideoStreamMap, _init_remoteVideoStreamMap, _init_systemMemorySize, _init_systemCpuDesc, _init_getSystemInfoTimer, _init_isHiddenStateTab, _setDialogConfigDecs, _setSettingDecs, _clearGetSystemInfoIntervalDecs, _changeMediaSettingDecs, _handleJoinRoomDecs, _handleExitRoomDecs, _onNetworkStatsUpdatedDecs, _onLocalAudioStatsUpdatedDecs, _onRemoteAudioStatsUpdatedDecs, _onLocalVideoStatsUpdatedDecs, _onRemoteVideoStatsUpdatedDecs, _onStreamsAddedDecs, _onStreamsUpdatedDecs, _onStreamsRemovedDecs, _onPerformanceUpdatedDecs, _onAudioVolumeUpdatedDecs, _preHandleSettingDecs, _setMeetingSettingsToLocalStorageDecs, _ref;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -161,7 +165,6 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_settingVideoOpened", false);
     (0, _defineProperty2["default"])(this, "_deviceStoreObserver", {
-      onCameraListUpdated: this._handleCameraListUpdated,
       onCameraChanged: this._handleCameraChanged
     });
     (0, _defineProperty2["default"])(this, "_streamVolumeMap", new Map());
@@ -184,6 +187,9 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
       onStreamsAdded: this._onStreamsAdded,
       onStreamVolumeIndicationUpdated: this._onAudioVolumeUpdated
     });
+    (0, _defineProperty2["default"])(this, "_deviceProviderObserver", {
+      onSystemSelectedDeviceChanged: this._handleSystemSelectedDeviceChanged
+    });
     (0, _defineProperty2["default"])(this, "_interpreterRoomControlReaction", null);
     (0, _defineProperty2["default"])(this, "_streamControl", null);
     _classPrivateFieldInitSpec(this, _A, _init_loudestStreamVolumeLevel(this, 0));
@@ -1079,10 +1085,23 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
       this._interpreterRoomControlReaction = this._createInterpreterRoomControlReaction();
       this._disposers.push(this._interpreterRoomControlReaction);
       this.isHiddenStateTab = false;
+      if (this._deviceProvider.followSystemSpeakerDevice) {
+        this._showSystemSelectedDeviceChangedToast({
+          deviceId: this._deviceProvider.currentDeviceId.speakerDeviceId,
+          deviceName: this._deviceProvider.currentDeviceName.speakerDeviceName
+        });
+      }
+      if (this._deviceProvider.followSystemMicrophoneDevice) {
+        this._showSystemSelectedDeviceChangedToast({
+          deviceId: this._deviceProvider.currentDeviceId.microphoneDeviceId,
+          deviceName: this._deviceProvider.currentDeviceName.microphoneDeviceName
+        });
+      }
+      this._deviceProvider.addObserver(this._deviceProviderObserver);
     }
   }, {
     key: "handleExitRoom",
-    value: function handleExitRoom() {
+    value: function handleExitRoom(isRoutingChange) {
       var _this8 = this,
         _this$_streamControl,
         _this$_currentRoomCon3,
@@ -1097,10 +1116,19 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
       (_this$_streamControl = this._streamControl) === null || _this$_streamControl === void 0 || _this$_streamControl.removeObserver(this._streamObserver);
       (_this$_currentRoomCon3 = this._currentRoomControl) === null || _this$_currentRoomCon3 === void 0 || _this$_currentRoomCon3.removeObserver(this._roomObserver);
       (_this$_interpreterRoo = this._interpreterRoomControl) === null || _this$_interpreterRoo === void 0 || _this$_interpreterRoo.removeObserver(this._roomObserver);
-      this._deviceProvider.resetDevice();
+      if (!isRoutingChange) {
+        this._deviceProvider.resetDevice();
+      }
       this.isHiddenStateTab = true;
       this._currentRoomControl = undefined;
       this._interpreterRoomControl = undefined;
+      this._deviceProvider.removeObserver(this._deviceProviderObserver);
+      this.localAudioStreamMap.clear();
+      this.remoteAudioStreamMap.clear();
+      this.localVideoStreamMap.clear();
+      this.remoteVideoStreamMap.clear();
+      this._streamVolumeMap.clear();
+      this._streamInfoList.clear();
     }
   }, {
     key: "_onNetworkStatsUpdated",
@@ -1235,27 +1263,6 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
         this._deviceProvider.toggleLocalCameraPreview(true);
       }
     }
-  }, {
-    key: "_handleCameraListUpdated",
-    value: function () {
-      var _handleCameraListUpdated2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(cameraList) {
-        return _regenerator["default"].wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              if (cameraList.length > 0) {
-                this._settingVideoOpened && this._deviceProvider.startOrStopCamera(true);
-              }
-            case 1:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function _handleCameraListUpdated(_x) {
-        return _handleCameraListUpdated2.apply(this, arguments);
-      }
-      return _handleCameraListUpdated;
-    }()
   }, {
     key: "_onAudioVolumeUpdated",
     value: function _onAudioVolumeUpdated(roomId, streamId, volume) {
@@ -1277,10 +1284,49 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
     value: function _setMeetingSettingsToLocalStorage(value) {
       this._sharedSettingDataSource.setSetting(value);
     }
+  }, {
+    key: "_handleSystemSelectedDeviceChanged",
+    value: function _handleSystemSelectedDeviceChanged(device) {
+      this._showSystemSelectedDeviceChangedToast(device);
+    }
+  }, {
+    key: "_showSystemSelectedDeviceChangedToast",
+    value: function _showSystemSelectedDeviceChangedToast(defaultDevice) {
+      var message = (0, _i18n.transI18n)('fmt_device_toast_switch_device');
+      message = message.replace('{reason1}', defaultDevice.deviceName);
+      this._messageProvider.showToast({
+        type: 'normal',
+        message: message
+      });
+      this._windows10UnsupportAirPods(defaultDevice);
+    }
+  }, {
+    key: "_windows10UnsupportAirPods",
+    value: function _windows10UnsupportAirPods(defaultDevice) {
+      if (!(0, _env.isWindows)()) {
+        return;
+      }
+      var version = (0, _env.windowsVersion)();
+      if (!version) {
+        return;
+      }
+      version = version.split('.')[0];
+      if (version !== '10') {
+        return;
+      }
+      if (!defaultDevice.deviceName.includes('AirPods')) {
+        return;
+      }
+      var message = "windows 10 maybe not support ".concat(defaultDevice.deviceName);
+      this._messageProvider.showToast({
+        type: 'warn',
+        message: message
+      });
+    }
   }]);
 }();
 _SettingStoreBase = SettingStoreBase;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SettingStoreBase, [[_mobx.observable, 1, "loudestStreamVolumeLevel"], [_mobx.observable, 1, "microphoneVolumeLevel"], [_mobx.observable, 1, "isWifiConnected"], [_mobx.observable, 1, "dialogConfig"], [_mobx.observable, 1, "networkState"], [_mobx.observable, 1, "performanceState"], [_mobx.observable, 1, "localAudioStreamMap"], [_mobx.observable, 1, "remoteAudioStreamMap"], [_mobx.observable, 1, "localVideoStreamMap"], [_mobx.observable, 1, "remoteVideoStreamMap"], [_mobx.observable, 1, "systemMemorySize"], [_mobx.observable, 1, "systemCpuDesc"], [_mobx.observable, 1, "getSystemInfoTimer"], [_mobx.observable, 1, "isHiddenStateTab"], [_mobx.computed, 3, "maxVideoSendInfo"], [_mobx.computed, 3, "maxVideoReceiveInfo"], [_mobx.computed, 3, "sendScreenShareInfo"], [_mobx.computed, 3, "receiveScreenShareInfo"], [_mobx.computed, 3, "microphoneVolumeDb"], [_mobx.computed, 3, "speakerVolumeDb"], [_mobx.computed, 3, "speakerTestVolumeLevel"], [_mobx.computed, 3, "microphoneTestVolumeLevel"], [_mobx.computed, 3, "speakerVolume"], [_mobx.computed, 3, "microphoneVolume"], [_mobx.computed, 3, "isLocalMirrorEnabled"], [_mobx.computed, 3, "isLocalEditBeautyOptions"], [_mobx.computed, 3, "currentBeautyKey"], [_mobx.computed, 3, "beautyOptions"], [_mobx.computed, 3, "cameraDeviceId"], [_mobx.computed, 3, "cameraEnabled"], [_mobx.computed, 3, "showForceOpenEffectDialog"], [_mobx.computed, 3, "currentVirtualBackgroundName"], [_mobx.computed, 3, "cameraDeviceList"], [_mobx.computed, 3, "microphoneDeviceId"], [_mobx.computed, 3, "speakerDeviceId"], [_mobx.computed, 3, "speakerDeviceList"], [_mobx.computed, 3, "microphoneDeviceList"], [_mobx.computed, 3, "enableBeauty"], [_mobx.computed, 3, "virtualBackgroundList"], [_mobx.computed, 3, "currentIsMirror"], [_mobx.computed, 3, "microphoneDetecting"], [_mobx.computed, 3, "speakerDetecting"], [_mobx.computed, 3, "setting"], [_mobx.computed, 3, "media"], [_mobx.computed, 3, "sceneConfig"], [_mobx.computed, 3, "sharedInterpreterDataSource"], [_mobx.computed, 3, "currentRoomControl"], [_mobx.computed, 3, "interpreterRoomControl"], [_decorator.bound, 2, "_syncSystemInfo"], [_decorator.bound, 2, "initSettingConfig"], [_decorator.bound, 2, "enableVirtualBackground"], [_decorator.bound, 2, "setEditBeautyKey"], [_decorator.bound, 2, "enableBeautyEffect"], [_decorator.bound, 2, "_initReactions"], [_decorator.bound, 2, "setCameraDevice"], [_decorator.bound, 2, "setMicrophoneDevice"], [_decorator.bound, 2, "stopSpeakerTest"], [_decorator.bound, 2, "startSpeakerTest"], [_decorator.bound, 2, "setSpeakerDevice"], [_decorator.bound, 2, "setSpeakerVolume"], [_decorator.bound, 2, "setMicrophoneVolume"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "setBeautyOptions"], [_decorator.bound, 2, "toggleLocalMirrorPreview"], [_decorator.bound, 2, "startVideo"], [_decorator.bound, 2, "stopVideo"], [_decorator.bound, 2, "handleForceOpenVideoEffect"], [_decorator.bound, 2, "handleCancelForceOpenVideoEffect"], [_decorator.bound, 2, "toggleLocalMirror"], [_decorator.bound, 2, "setSettingVideoOpened"], [_decorator.bound, 2, "startCameraTest"], [_decorator.bound, 2, "stopCameraTest"], [_decorator.bound, 2, "startMicrophoneTest"], [_decorator.bound, 2, "stopMicrophoneTest"], [_setDialogConfigDecs, 18, "setDialogConfig"], [_setSettingDecs, 18, "setSetting"], [_clearGetSystemInfoIntervalDecs, 18, "clearGetSystemInfoInterval"], [_changeMediaSettingDecs, 18, "changeMediaSetting"], [_handleJoinRoomDecs, 18, "handleJoinRoom"], [_handleExitRoomDecs, 18, "handleExitRoom"], [_onNetworkStatsUpdatedDecs, 18, "_onNetworkStatsUpdated"], [_onLocalAudioStatsUpdatedDecs, 18, "_onLocalAudioStatsUpdated"], [_onRemoteAudioStatsUpdatedDecs, 18, "_onRemoteAudioStatsUpdated"], [_onLocalVideoStatsUpdatedDecs, 18, "_onLocalVideoStatsUpdated"], [_onRemoteVideoStatsUpdatedDecs, 18, "_onRemoteVideoStatsUpdated"], [_onStreamsAddedDecs, 18, "_onStreamsAdded"], [_onStreamsUpdatedDecs, 18, "_onStreamsUpdated"], [_onStreamsRemovedDecs, 18, "_onStreamsRemoved"], [_onPerformanceUpdatedDecs, 18, "_onPerformanceUpdated"], [_decorator.bound, 2, "_handleCameraChanged"], [_decorator.bound, 2, "_handleCameraListUpdated"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_preHandleSettingDecs, 18, "_preHandleSetting"], [_setMeetingSettingsToLocalStorageDecs, 18, "_setMeetingSettingsToLocalStorage"]], []).e, 15);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SettingStoreBase, [[_mobx.observable, 1, "loudestStreamVolumeLevel"], [_mobx.observable, 1, "microphoneVolumeLevel"], [_mobx.observable, 1, "isWifiConnected"], [_mobx.observable, 1, "dialogConfig"], [_mobx.observable, 1, "networkState"], [_mobx.observable, 1, "performanceState"], [_mobx.observable, 1, "localAudioStreamMap"], [_mobx.observable, 1, "remoteAudioStreamMap"], [_mobx.observable, 1, "localVideoStreamMap"], [_mobx.observable, 1, "remoteVideoStreamMap"], [_mobx.observable, 1, "systemMemorySize"], [_mobx.observable, 1, "systemCpuDesc"], [_mobx.observable, 1, "getSystemInfoTimer"], [_mobx.observable, 1, "isHiddenStateTab"], [_mobx.computed, 3, "maxVideoSendInfo"], [_mobx.computed, 3, "maxVideoReceiveInfo"], [_mobx.computed, 3, "sendScreenShareInfo"], [_mobx.computed, 3, "receiveScreenShareInfo"], [_mobx.computed, 3, "microphoneVolumeDb"], [_mobx.computed, 3, "speakerVolumeDb"], [_mobx.computed, 3, "speakerTestVolumeLevel"], [_mobx.computed, 3, "microphoneTestVolumeLevel"], [_mobx.computed, 3, "speakerVolume"], [_mobx.computed, 3, "microphoneVolume"], [_mobx.computed, 3, "isLocalMirrorEnabled"], [_mobx.computed, 3, "isLocalEditBeautyOptions"], [_mobx.computed, 3, "currentBeautyKey"], [_mobx.computed, 3, "beautyOptions"], [_mobx.computed, 3, "cameraDeviceId"], [_mobx.computed, 3, "cameraEnabled"], [_mobx.computed, 3, "showForceOpenEffectDialog"], [_mobx.computed, 3, "currentVirtualBackgroundName"], [_mobx.computed, 3, "cameraDeviceList"], [_mobx.computed, 3, "microphoneDeviceId"], [_mobx.computed, 3, "speakerDeviceId"], [_mobx.computed, 3, "speakerDeviceList"], [_mobx.computed, 3, "microphoneDeviceList"], [_mobx.computed, 3, "enableBeauty"], [_mobx.computed, 3, "virtualBackgroundList"], [_mobx.computed, 3, "currentIsMirror"], [_mobx.computed, 3, "microphoneDetecting"], [_mobx.computed, 3, "speakerDetecting"], [_mobx.computed, 3, "setting"], [_mobx.computed, 3, "media"], [_mobx.computed, 3, "sceneConfig"], [_mobx.computed, 3, "sharedInterpreterDataSource"], [_mobx.computed, 3, "currentRoomControl"], [_mobx.computed, 3, "interpreterRoomControl"], [_decorator.bound, 2, "_syncSystemInfo"], [_decorator.bound, 2, "initSettingConfig"], [_decorator.bound, 2, "enableVirtualBackground"], [_decorator.bound, 2, "setEditBeautyKey"], [_decorator.bound, 2, "enableBeautyEffect"], [_decorator.bound, 2, "_initReactions"], [_decorator.bound, 2, "setCameraDevice"], [_decorator.bound, 2, "setMicrophoneDevice"], [_decorator.bound, 2, "stopSpeakerTest"], [_decorator.bound, 2, "startSpeakerTest"], [_decorator.bound, 2, "setSpeakerDevice"], [_decorator.bound, 2, "setSpeakerVolume"], [_decorator.bound, 2, "setMicrophoneVolume"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "setBeautyOptions"], [_decorator.bound, 2, "toggleLocalMirrorPreview"], [_decorator.bound, 2, "startVideo"], [_decorator.bound, 2, "stopVideo"], [_decorator.bound, 2, "handleForceOpenVideoEffect"], [_decorator.bound, 2, "handleCancelForceOpenVideoEffect"], [_decorator.bound, 2, "toggleLocalMirror"], [_decorator.bound, 2, "setSettingVideoOpened"], [_decorator.bound, 2, "startCameraTest"], [_decorator.bound, 2, "stopCameraTest"], [_decorator.bound, 2, "startMicrophoneTest"], [_decorator.bound, 2, "stopMicrophoneTest"], [_setDialogConfigDecs, 18, "setDialogConfig"], [_setSettingDecs, 18, "setSetting"], [_clearGetSystemInfoIntervalDecs, 18, "clearGetSystemInfoInterval"], [_changeMediaSettingDecs, 18, "changeMediaSetting"], [_handleJoinRoomDecs, 18, "handleJoinRoom"], [_handleExitRoomDecs, 18, "handleExitRoom"], [_onNetworkStatsUpdatedDecs, 18, "_onNetworkStatsUpdated"], [_onLocalAudioStatsUpdatedDecs, 18, "_onLocalAudioStatsUpdated"], [_onRemoteAudioStatsUpdatedDecs, 18, "_onRemoteAudioStatsUpdated"], [_onLocalVideoStatsUpdatedDecs, 18, "_onLocalVideoStatsUpdated"], [_onRemoteVideoStatsUpdatedDecs, 18, "_onRemoteVideoStatsUpdated"], [_onStreamsAddedDecs, 18, "_onStreamsAdded"], [_onStreamsUpdatedDecs, 18, "_onStreamsUpdated"], [_onStreamsRemovedDecs, 18, "_onStreamsRemoved"], [_onPerformanceUpdatedDecs, 18, "_onPerformanceUpdated"], [_decorator.bound, 2, "_handleCameraChanged"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_preHandleSettingDecs, 18, "_preHandleSetting"], [_setMeetingSettingsToLocalStorageDecs, 18, "_setMeetingSettingsToLocalStorage"], [_decorator.bound, 2, "_handleSystemSelectedDeviceChanged"]], []).e, 15);
 _init_loudestStreamVolumeLevel = _applyDecs$e[0];
 _init_microphoneVolumeLevel = _applyDecs$e[1];
 _init_isWifiConnected = _applyDecs$e[2];

package/lib/modules/share-screen/components/selection/index.css

@@ -31,6 +31,10 @@
   -webkit-app-region: no-drag;
 }
 
+.share-selection-window__share-content::--webkit-scrollbar {
+  display: none;
+}
+
 .share-selection-window__header {
   height: 46px;
 }

package/lib/modules/share-screen/store.base.js

@@ -108,6 +108,9 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_dom", null);
     (0, _defineProperty2["default"])(this, "_asyncLock", false);
     (0, _defineProperty2["default"])(this, "_screenShareObserver", {
+      onPrepreScreenCapture: function onPrepreScreenCapture() {
+        _this.dialogProvider.setSharingDisplayBounds(_this.screenShareProvider.sharingDisplayBounds);
+      },
       onScreenShareStarted: function onScreenShareStarted() {
         (0, _mobx.runInAction)(function () {
           _this.isSharing = true;
@@ -117,6 +120,7 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
         (0, _mobx.runInAction)(function () {
           _this.isSharing = false;
         });
+        _this.dialogProvider.setSharingDisplayBounds(null);
         if (reason === _struct.FcrUIScreenShareStopReason.STOPPED_BY_OTHER) {
           _this.messageProvider.showToast({
             type: 'info',
@@ -125,6 +129,9 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
           _this._replaceShareConfirmDialog(operator);
         }
       },
+      onShareSourceReplaced: function onShareSourceReplaced() {
+        _this.dialogProvider.setSharingDisplayBounds(_this.screenShareProvider.sharingDisplayBounds);
+      },
       onScreenShareErrorOccurred: function onScreenShareErrorOccurred(code) {
         if (code === _struct.FcrUIScreenShareErrorCode.NETWORK_DISCONNECTED) {
           if (!_this.facilityProvider.isNetworkConnected) {
@@ -311,7 +318,7 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
     key: "startShareScreen",
     value: function () {
       var _startShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var params, captureType, videoSourceId;
+        var params, captureType, videoSourceId, _t;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -373,15 +380,21 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
               });
             case 6:
               this.dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
+              _context2.next = 8;
+              break;
             case 7:
               _context2.prev = 7;
-              this._asyncLock = false;
-              return _context2.finish(7);
+              _t = _context2["catch"](2);
+              this.screenShareProvider.stopShare();
             case 8:
+              _context2.prev = 8;
+              this._asyncLock = false;
+              return _context2.finish(8);
+            case 9:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[2,, 7, 8]]);
+        }, _callee2, this, [[2, 7, 8, 9]]);
       }));
       function startShareScreen() {
         return _startShareScreen.apply(this, arguments);

package/lib/modules/share-screen/store.electron.js

@@ -170,7 +170,10 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
       } else {
         controlBarWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR);
       }
-      controlBarWindow.setBounds(sharingDisplayBounds);
+
+      // 不在这里控制，在control bar模块中控制
+      // controlBarWindow.setBounds(sharingDisplayBounds);
+
       if (!isMultiDisplayActive) {
         var videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
         (0, _videoWindow.setVideoWindowDialogPosition)(sharingDisplayBounds, videoWindow);
@@ -179,7 +182,7 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
   }, {
     key: "_interceptDialogClose",
     value: function _interceptDialogClose(dialogKey) {
-      if (dialogKey === _constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR || dialogKey === _constant.FcrUIDialogKey.VIDEO_WINDOW) {
+      if (dialogKey === _constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR) {
         return this._isSharing;
       }
       return false;

package/lib/modules/state-bar/layout-config.js

@@ -115,6 +115,12 @@ var LayoutConfig = exports.LayoutConfig = (0, _mobxReact.observer)(function (pro
         return _type.FcrIconType.FCR_TOPWINDOWS;
     }
   }, [layoutView]);
+  (0, _react.useEffect)(function () {
+    // 布局切换功能被禁用时，如果布局切换弹窗已经处于打开状态，则关闭弹窗
+    if (disable && isOpen) {
+      _setIsOpen(false);
+    }
+  }, [disable]);
   var handleSetLayoutView = function handleSetLayoutView(view) {
     _setIsOpen(false);
     toggleLayout(view);

package/lib/modules/state-bar/main-scene/store.base.d.ts

@@ -9,7 +9,9 @@ export declare abstract class StateBarMainSceneStoreBase extends StateBarStoreBa
     private _sharedVideoWindowDataSource;
     private _sharedMemberDataSource;
     private _abilityProvider;
+    private _screenShareProvider;
     constructor(args: StateBarStoreArgs);
+    get isSharingScreen(): boolean;
     get localUser(): import("fcr-core/lib/type").FcrUserInfo;
     get isUserHost(): boolean;
     get isRoomDetailSupported(): boolean;