fcr-ui-scene 3.8.0-alpha → 3.8.0

package/lib/modules/control-bar/view.js

@@ -57,6 +57,7 @@ var _microphone = require("./components/microphone");
 var _carmera = require("./components/carmera");
 var _boundaryDetector = require("./components/boundary-detector");
 var _appsPopover = require("./components/apps-popover");
+var _hooks = require("./hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; }
@@ -292,7 +293,9 @@ var ControlBar = (0, _mobxReact.observer)(function () {
   var _useContext5 = (0, _react.useContext)(_store.StoreContext),
     draggableArea = _useContext5.draggableArea,
     currentShareDisplayId = _useContext5.currentShareDisplayId,
-    updateWindowBounds = _useContext5.updateWindowBounds;
+    updateWindowBounds = _useContext5.updateWindowBounds,
+    setArea = _useContext5.setArea,
+    removeArea = _useContext5.removeArea;
   var updatePosition = (0, _react.useContext)(_context.DragStateUpdaterContext);
   var _useContext6 = (0, _react.useContext)(_context.ControlBarCalculationUpdaterContext),
     setDimensions = _useContext6.setDimensions,
@@ -349,6 +352,7 @@ var ControlBar = (0, _mobxReact.observer)(function () {
       };
     }
   }, [visibility]);
+  (0, _hooks.usePopoverWatcher)(containerRef, setArea, removeArea);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     ref: containerRef,
     className: rootClassNames,
@@ -465,10 +469,8 @@ var MeetingControlGroup = (0, _mobxReact.observer)(function () {
 var SecurityMenuSection = /*#__PURE__*/(0, _react.memo)(function (_ref4) {
   var hasSecurityPermission = _ref4.hasSecurityPermission;
   if (!hasSecurityPermission) return null;
-  var _useContext0 = (0, _react.useContext)(_store.StoreContext),
-    setPopoverArea = _useContext0.setPopoverArea;
-  var _useContext1 = (0, _react.useContext)(_context.ControlBarCalculationContext),
-    isShareActionNavHidden = _useContext1.isShareActionNavHidden;
+  var _useContext0 = (0, _react.useContext)(_context.ControlBarCalculationContext),
+    isShareActionNavHidden = _useContext0.isShareActionNavHidden;
   var _useState1 = (0, _react.useState)(false),
     _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
     showSecurityPopover = _useState10[0],
@@ -476,19 +478,9 @@ var SecurityMenuSection = /*#__PURE__*/(0, _react.memo)(function (_ref4) {
   var handleVisibilityChange = (0, _react.useCallback)(function (visible) {
     setShowSecurityPopover(visible);
   }, []);
-  var handleBoundariesChanged = (0, _react.useCallback)(function (boundaries) {
-    console.log('SecurityMenu boundaries changed', boundaries);
-    setPopoverArea(boundaries);
-  }, []);
   (0, _react.useEffect)(function () {
     if (isShareActionNavHidden) {
       setShowSecurityPopover(false);
-      setPopoverArea({
-        x: 0,
-        y: 0,
-        width: 0,
-        height: 0
-      });
     }
   }, [isShareActionNavHidden]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
@@ -500,10 +492,7 @@ var SecurityMenuSection = /*#__PURE__*/(0, _react.memo)(function (_ref4) {
       backgroundColor: 'none',
       borderRadius: 'var(--fcr_cornerradius_l)'
     },
-    content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_boundaryDetector.BoundaryDetector, {
-      onBoundariesChanged: handleBoundariesChanged,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {})
-    }),
+    content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {}),
     trigger: "click",
     visible: showSecurityPopover,
     onVisibleChange: handleVisibilityChange,
@@ -519,8 +508,8 @@ var SecurityMenuSection = /*#__PURE__*/(0, _react.memo)(function (_ref4) {
 
 // 参与者区块
 var ParticipantSection = /*#__PURE__*/(0, _react.memo)(function () {
-  var _useContext10 = (0, _react.useContext)(_store.StoreContext),
-    handleOpenParticipant = _useContext10.handleOpenParticipant;
+  var _useContext1 = (0, _react.useContext)(_store.StoreContext),
+    handleOpenParticipant = _useContext1.handleOpenParticipant;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_participants.ParticipantButton, {
     onTooltipButtonClick: handleOpenParticipant
   });
@@ -528,8 +517,8 @@ var ParticipantSection = /*#__PURE__*/(0, _react.memo)(function () {
 
 // 屏幕分享区块
 var ShareScreenSection = /*#__PURE__*/(0, _react.memo)(function () {
-  var _useContext11 = (0, _react.useContext)(_store.StoreContext),
-    handleNewShare = _useContext11.handleNewShare;
+  var _useContext10 = (0, _react.useContext)(_store.StoreContext),
+    handleNewShare = _useContext10.handleNewShare;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareScreenButton.ShareScreenButton, {
     onCreateNewShareButtonClick: handleNewShare
   });
@@ -545,13 +534,12 @@ var MoreActionsSection = (0, _mobxReact.observer)(function () {
     _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
     isShowMeetingDetailPortal = _useState14[0],
     setIsShowMeetingDetailPortal = _useState14[1];
-  var _useContext12 = (0, _react.useContext)(_store.StoreContext),
-    newMessageCount = _useContext12.newMessageCount,
-    hasChatPermission = _useContext12.hasChatPermission,
-    setPopoverArea = _useContext12.setPopoverArea,
-    setAppActionbarPopoverVisible = _useContext12.setAppActionbarPopoverVisible;
-  var _useContext13 = (0, _react.useContext)(_context.ControlBarCalculationContext),
-    isShareActionNavHidden = _useContext13.isShareActionNavHidden;
+  var _useContext11 = (0, _react.useContext)(_store.StoreContext),
+    newMessageCount = _useContext11.newMessageCount,
+    hasChatPermission = _useContext11.hasChatPermission,
+    setAppActionbarPopoverVisible = _useContext11.setAppActionbarPopoverVisible;
+  var _useContext12 = (0, _react.useContext)(_context.ControlBarCalculationContext),
+    isShareActionNavHidden = _useContext12.isShareActionNavHidden;
   (0, _react.useEffect)(function () {
     if (!moreVisible) {
       setIsShowMeetingDetailPortal(false);
@@ -562,33 +550,18 @@ var MoreActionsSection = (0, _mobxReact.observer)(function () {
   }, [moreVisible]);
   var handlePopoverClose = (0, _react.useCallback)(function () {
     setMoreVisible(false);
-    setPopoverArea({
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0
-    });
   }, []);
   var preventDefault = (0, _react.useCallback)(function (e) {
     e.stopPropagation();
     setAppActionbarPopoverVisible(false);
   }, []);
-  var handleBoundariesChanged = (0, _react.useCallback)(function (boundaries) {
-    console.log('More boundaries changed');
-    setPopoverArea(boundaries);
-  }, []);
   var handlerVisibleChange = function handlerVisibleChange(visible) {
     setMoreVisible(visible);
   };
   (0, _react.useEffect)(function () {
     if (isShareActionNavHidden) {
       setMoreVisible(false);
-      setPopoverArea({
-        x: 0,
-        y: 0,
-        width: 0,
-        height: 0
-      });
+      setAppActionbarPopoverVisible(false);
     }
   }, [isShareActionNavHidden]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.FcrBadge, {
@@ -600,12 +573,9 @@ var MoreActionsSection = (0, _mobxReact.observer)(function () {
           visible: moreVisible,
           onButtonClick: handleMoreButtonClick,
           onVisibleChange: handlerVisibleChange,
-          morePopoverContent: isShowMeetingDetailPortal ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingDetails.MeetingDetails, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_boundaryDetector.BoundaryDetector, {
-            onBoundariesChanged: handleBoundariesChanged,
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_moreActions.MorePopoverContent, {
-              closePopover: handlePopoverClose,
-              hasChatPermission: hasChatPermission
-            })
+          morePopoverContent: isShowMeetingDetailPortal ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingDetails.MeetingDetails, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_moreActions.MorePopoverContent, {
+            closePopover: handlePopoverClose,
+            hasChatPermission: hasChatPermission
           })
         })
       })
@@ -615,12 +585,25 @@ var MoreActionsSection = (0, _mobxReact.observer)(function () {
 
 // 音频分享区块
 var ShareAudioSection = (0, _mobxReact.observer)(function () {
-  var _useContext14 = (0, _react.useContext)(_store.StoreContext),
-    setShareWithAudioState = _useContext14.setShareWithAudioState,
-    isSharingWithAudio = _useContext14.isSharingWithAudio,
-    setShareAudioMode = _useContext14.setShareAudioMode,
-    audioShareMode = _useContext14.audioShareMode;
+  var _useContext13 = (0, _react.useContext)(_store.StoreContext),
+    setShareWithAudioState = _useContext13.setShareWithAudioState,
+    isSharingWithAudio = _useContext13.isSharingWithAudio,
+    setShareAudioMode = _useContext13.setShareAudioMode,
+    audioShareMode = _useContext13.audioShareMode;
+  var _useContext14 = (0, _react.useContext)(_context.ControlBarCalculationContext),
+    isShareActionNavHidden = _useContext14.isShareActionNavHidden;
+  var _useState15 = (0, _react.useState)(false),
+    _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
+    popoverVisible = _useState16[0],
+    setPopoverVisible = _useState16[1];
+  (0, _react.useEffect)(function () {
+    if (isShareActionNavHidden) {
+      setPopoverVisible(false);
+    }
+  }, [isShareActionNavHidden]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareAudio.ShareAudio, {
+    popoverVisible: popoverVisible,
+    setPopoverVisible: setPopoverVisible,
     shareWithAudio: isSharingWithAudio,
     currentAudioChannel: audioShareMode,
     toggleShareWithAudio: setShareWithAudioState,

package/lib/modules/dialog/components/confirm/index.js

@@ -127,7 +127,6 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
     return function () {
       clearTimeout(windowFocusTimerRef.current);
       calculateMethods["delete"](confirm);
-      handleConfirmMouseout();
     };
   }, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, bind()), {}, {

package/lib/modules/dialog/components/dialog-container/index.js

@@ -129,6 +129,7 @@ var DialogContainer = exports.DialogContainer = (0, _mobxReact.observer)(functio
     minHeight: minHeight,
     maxWidth: maxWidth,
     maxHeight: maxHeight,
+    bounds: "window",
     onDragStop: function onDragStop(e, d) {
       updatePosition({
         x: d.x,

package/lib/modules/event-toast/index.js

@@ -23,6 +23,8 @@ var _view = require("./view");
 var _store2 = _interopRequireDefault(require("./store.electron"));
 var _store3 = _interopRequireDefault(require("./store.browser"));
 var _type = require("../../type");
+var _objectManager = require("../../object-manager");
+var _type2 = require("fcr-core/lib/room-control/type");
 var _jsxRuntime = require("react/jsx-runtime");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -74,7 +76,11 @@ var EventToastUIModule = exports.EventToastUIModule = /*#__PURE__*/function (_UI
     key: "onNodeReceivedEvent",
     value: function onNodeReceivedEvent(event) {
       if (event.type === _type.FcrUIGlobalNodeEventType.SCENE_MOUNTED) {
-        this.store.handleSceneMounted();
+        var _roomProvider$current;
+        var roomProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
+        if (((_roomProvider$current = roomProvider.currentRoomControl.getRoomInfo()) === null || _roomProvider$current === void 0 ? void 0 : _roomProvider$current.roomType) === _type2.FcrRoomType.Mainroom) {
+          this.store.handleSceneMounted();
+        }
       }
       if (event.type === _type.FcrUIGlobalNodeEventType.SCENE_UNMOUNTED) {
         this.store.handleSceneUnmounted();

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

@@ -9,7 +9,7 @@ import { FcrUIManagedObject } from '../../object-manager';
 import { FcrUIDisplayDistributionContentType, SharingType } from '../secondary-window/type';
 import { FcrUIDialogProvider } from '../../providers/dialog/type';
 export declare abstract class LayoutStoreBase implements FcrLayoutSlots, FcrUIEventObserver, FcrUIManagedObject {
-    protected readonly logger: import("agora-foundation/lib/logger").Logger;
+    private readonly logger;
     private _videoWindowDataSource;
     protected _eventProvider: FcrUIEventProvider;
     private _messageProvider;

package/lib/modules/layout/store.electron.d.ts

@@ -5,7 +5,6 @@ export default class LayoutStoreElectron extends LayoutStoreBase {
     private _screenShareProvider;
     private _windowProvider;
     private _mainWindow;
-    private _renderer;
     get isSharingScreen(): boolean;
     get shareScreenOwnerId(): string;
     get secondaryWindowContentType(): "speaker" | "gallery" | "hidden" | "local-camera" | "remote-camera" | "sharing-screen" | "sharing-screen-with-annotation" | "sharing-whiteboard";

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

@@ -15,6 +15,7 @@ require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.function.metadata.js");
@@ -40,17 +41,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-require("core-js/modules/es.array.concat.js");
-require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.date.to-json.js");
-require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.find.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -64,7 +56,7 @@ var _store = require("./store.base");
 var _type = require("./type");
 var _constant = require("../../utilities/constant");
 var _videoWindow = require("../dialog/dialogs/video-window");
-var _type2 = require("fcr-core/lib/type");
+var _lodash = require("lodash");
 var _LayoutStoreElectron;
 var _initProto;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -89,137 +81,49 @@ var LayoutStoreElectron = exports["default"] = /*#__PURE__*/function (_LayoutSto
     _this._screenShareProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER);
     _this._windowProvider = windowProvider;
     _this._mainWindow = windowProvider.getCurrentWindow();
-    _this._renderer = objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
     _superPropGet((_this, LayoutStoreElectron), "_initialize", _this, 3)([]);
 
     // 进入房间后，如果双屏模式处于激活状态，则需要设置主窗口为窗口最大化
     if (_this._multiDisplayProvider.isActive) {
       _this._multiDisplayProvider.setMainWindowMaximize();
     }
+    var handleMultiDisplayActiveChange = (0, _lodash.debounce)(function (isActive) {
+      var _this$_multiDisplayPr = _this._multiDisplayProvider.displayState,
+        sharingBySelf = _this$_multiDisplayPr.sharingBySelf,
+        isSharingScreen = _this$_multiDisplayPr.isSharingScreen;
+      if (isActive) {
+        // 多屏模式激活时，需要设置主窗口为窗口最大化
+        // 如果自己正在共享屏幕，则关闭 vidoe window 悬浮窗、显示主窗口
+        if (sharingBySelf && isSharingScreen) {
+          _this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+          _this._multiDisplayProvider.showMainWindowInIndexLeastDisplay({
+            isMaximized: true
+          });
+        } else {
+          _this._multiDisplayProvider.setMainWindowMaximize();
+        }
+        return;
+      }
+
+      // 多屏模式从激活状态转变为非激活状态时，
+      // 如果当前是自己在共享屏幕，则隐藏主窗口，打开 vidoe window 悬浮窗
+      // 如果不是自己在共享，则切换布局到演讲者模式
+      // 没屏幕共享时，不做操作
+      if (sharingBySelf && isSharingScreen) {
+        _this._mainWindow.hide();
+        _this._dialogProvider.openDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+        var workarea = _this._screenShareProvider.sharingDisplayBounds;
+        var videoWindow = _this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+        (0, _videoWindow.setVideoWindowDialogPosition)(workarea, videoWindow);
+      } else if (isSharingScreen) {
+        _this.toggleLayout(_type.FcrUIVideoWindowLayoutType.Speaker);
+      }
+    }, 100);
     _this._disposers.push((0, _mobx.reaction)(function () {
       return _this.isMultiDisplayActive;
-    }, /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(isActive) {
-        var _this$_multiDisplayPr, sharingBySelf, isSharingScreen, selectionIdAndType, _selectionIdAndType, id, type, workarea, displayList, display, windowList, window, bounds, _display, videoWindow, _t, _t2;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _this$_multiDisplayPr = _this._multiDisplayProvider.displayState, sharingBySelf = _this$_multiDisplayPr.sharingBySelf, isSharingScreen = _this$_multiDisplayPr.isSharingScreen;
-              if (!isActive) {
-                _context.next = 1;
-                break;
-              }
-              // 多屏模式激活时，需要设置主窗口为窗口最大化
-              // 如果自己正在共享屏幕，则关闭 vidoe window 悬浮窗、显示主窗口
-              if (sharingBySelf && isSharingScreen) {
-                _this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-                _this._multiDisplayProvider.showMainWindowInIndexLeastDisplay({
-                  isMaximized: true
-                });
-              } else {
-                _this._multiDisplayProvider.setMainWindowMaximize();
-              }
-              return _context.abrupt("return");
-            case 1:
-              if (!(sharingBySelf && isSharingScreen)) {
-                _context.next = 16;
-                break;
-              }
-              _this._mainWindow.hide();
-              _this._dialogProvider.openDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-              _context.prev = 2;
-              selectionIdAndType = _this._screenShareProvider.selectionIdAndType;
-              _context.next = 4;
-              break;
-            case 3:
-              _context.prev = 3;
-              _t = _context["catch"](2);
-              _this.logger.warn("get selection id and type error, can not set video window position: ".concat(_t));
-              return _context.abrupt("return");
-            case 4:
-              _selectionIdAndType = selectionIdAndType, id = _selectionIdAndType.id, type = _selectionIdAndType.type;
-              if (!(type === _type2.FcrScreenCaptureType.SCREEN)) {
-                _context.next = 8;
-                break;
-              }
-              _context.next = 5;
-              return _this._screenShareProvider.getDisplayList();
-            case 5:
-              displayList = _context.sent;
-              display = displayList.find(function (item) {
-                return item.id === id;
-              });
-              if (!display) {
-                _context.next = 6;
-                break;
-              }
-              workarea = display.bounds;
-              _context.next = 7;
-              break;
-            case 6:
-              _this.logger.warn("can not find display info for shared screen id: ".concat(id));
-              return _context.abrupt("return");
-            case 7:
-              _context.next = 15;
-              break;
-            case 8:
-              _context.next = 9;
-              return _this._screenShareProvider.getWindowList();
-            case 9:
-              windowList = _context.sent;
-              window = windowList.find(function (item) {
-                return item.id === id;
-              });
-              if (!window) {
-                _context.next = 10;
-                break;
-              }
-              bounds = window.bounds;
-              _context.next = 13;
-              break;
-            case 10:
-              _this.logger.warn("can not find window info for shared window id: ".concat(id));
-
-              // 共享的窗口被隐藏时，尝试使用 selectionBounds 作为位置依据
-              _context.prev = 11;
-              bounds = _this._screenShareProvider.selectionBounds;
-              _context.next = 13;
-              break;
-            case 12:
-              _context.prev = 12;
-              _t2 = _context["catch"](11);
-              _this.logger.warn("get selection bounds error, can not set video window position: ".concat(_t2));
-              return _context.abrupt("return");
-            case 13:
-              _display = _this._renderer.getDisplayMatching(bounds);
-              if (_display) {
-                _context.next = 14;
-                break;
-              }
-              _this.logger.warn("can not find display for shared window id: ".concat(id, ", bounds: ").concat(JSON.stringify(bounds)));
-              return _context.abrupt("return");
-            case 14:
-              workarea = _display.bounds;
-            case 15:
-              videoWindow = _this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-              (0, _videoWindow.setVideoWindowDialogPosition)(workarea, videoWindow);
-              _this.logger.info("set video window position while multi display mode off, workarea: ".concat(JSON.stringify(workarea)));
-              _context.next = 17;
-              break;
-            case 16:
-              if (isSharingScreen) {
-                _this.toggleLayout(_type.FcrUIVideoWindowLayoutType.Speaker);
-              }
-            case 17:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, null, [[2, 3], [11, 12]]);
-      }));
-      return function (_x) {
-        return _ref2.apply(this, arguments);
-      };
-    }()));
+    }, function (isActive) {
+      handleMultiDisplayActiveChange(isActive);
+    }));
     return _this;
   }
   (0, _inherits2["default"])(LayoutStoreElectron, _LayoutStoreBase);

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

@@ -1742,21 +1742,11 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
   }, {
     key: "_setAsHost",
     value: function _setAsHost(userId) {
-      var canSetHost = this.isHostSupportedByPlatform(userId);
-      if (!canSetHost) {
-        this._showToast((0, _i18n.transI18n)('fmt_uimanager_tips_userleaft'), 'error');
-        return;
-      }
       this._showSetHostDialog(userId, _type.FcrUserRole.HOST);
     }
   }, {
     key: "_setAsCoHost",
     value: function _setAsCoHost(userId) {
-      var canSetHost = this.isHostSupportedByPlatform(userId);
-      if (!canSetHost) {
-        this._showToast((0, _i18n.transI18n)('fmt_uimanager_tips_userleaft'), 'error');
-        return;
-      }
       this._showSetHostDialog(userId, _type.FcrUserRole.COHOST);
     }
 
@@ -1769,6 +1759,14 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
     key: "_showSetHostDialog",
     value: function _showSetHostDialog(userId, type) {
       var _this16 = this;
+      if ([_type.FcrUserRole.HOST, _type.FcrUserRole.COHOST].includes(type)) {
+        var canSetHost = this.isHostSupportedByPlatform(userId);
+        if (!canSetHost) {
+          var errorMessage = type === _type.FcrUserRole.HOST ? (0, _i18n.transI18n)('fmt_attendies_toast_cant_sethost') : (0, _i18n.transI18n)('fmt_attendies_toast_cant_setcohost');
+          this._showToast(errorMessage, 'error');
+          return;
+        }
+      }
       var user = this.userMap.get(userId);
       if (!user) {
         this._showToast((0, _i18n.transI18n)('fmt_uimanager_tips_userleaft'), 'error');

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

@@ -491,9 +491,7 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     key: "_openSecondaryWindow",
     value: function _openSecondaryWindow() {
       this._setSecondaryWindowBounds();
-      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SUB_WINDOW, {
-        focus: false
-      });
+      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
     }
   }, {
     key: "_closeSecondaryWindow",

package/lib/modules/setting/audio-whiteList/audio-device-adaptation.d.ts

@@ -1,3 +1,4 @@
+import { FcrUIAiDenoiseLevel } from '../../../type';
 export interface AudioDeviceAdaptationConfig {
     /**
      * WhiteList device ID list
@@ -16,3 +17,30 @@ export interface AudioDeviceAdaptationConfig {
  * Audio device whiteList configuration
  */
 export declare const AUDIO_DEVICE_WHITE_LIST_CONFIG: AudioDeviceAdaptationConfig;
+/**
+ * Audio device configuration for individual device
+ */
+export interface AudioDeviceConfig {
+    audioEchoCancellation: boolean;
+    audioAgc: boolean;
+    noiseReduce: FcrUIAiDenoiseLevel;
+}
+/**
+ * Device profile with name and audio configuration
+ */
+export interface DeviceProfile {
+    deviceName: string;
+    config: AudioDeviceConfig;
+}
+/**
+ * Device-specific audio configurations
+ * Key: deviceId (format: "vendorId:productId")
+ * Value: device profile with name and config
+ */
+export declare const DEVICE_SPECIFIC_CONFIGS: Record<string, DeviceProfile>;
+/**
+ * Get audio configuration for a specific device
+ * @param deviceId Device ID in format "vendorId:productId"
+ * @returns AudioDeviceConfig if device has specific config, undefined otherwise
+ */
+export declare function getDeviceSpecificConfig(deviceId: string): AudioDeviceConfig | undefined;

package/lib/modules/setting/audio-whiteList/audio-device-adaptation.js

@@ -4,7 +4,9 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AUDIO_DEVICE_WHITE_LIST_CONFIG = void 0;
+exports.DEVICE_SPECIFIC_CONFIGS = exports.AUDIO_DEVICE_WHITE_LIST_CONFIG = void 0;
+exports.getDeviceSpecificConfig = getDeviceSpecificConfig;
+var _type = require("../../../type");
 /**
  * Audio device whiteList configuration
  */
@@ -23,12 +25,46 @@ var AUDIO_DEVICE_WHITE_LIST_CONFIG = exports.AUDIO_DEVICE_WHITE_LIST_CONFIG = {
   // Huawei-MIC100 Mic 100会议音箱
   '12D1:2308', //Hamedal Speak A20
   "1FC9:826B", //Hamedal A21T TEA
-  "2A5F:2005",
-  //HD Audio
-  '33F1:1016'],
+  "2A5F:2005", //HD Audio VA400
+  "33F1:1016"],
   whiteListConfig: {
     audioEchoCancellation: false,
     audioAgc: false,
     noiseReduce: 4
   }
-};
+};
+
+/**
+ * Audio device configuration for individual device
+ */
+
+/**
+ * Device profile with name and audio configuration
+ */
+
+/**
+ * Device-specific audio configurations
+ * Key: deviceId (format: "vendorId:productId")
+ * Value: device profile with name and config
+ */
+var DEVICE_SPECIFIC_CONFIGS = exports.DEVICE_SPECIFIC_CONFIGS = {
+  // INNOTRIK I-90
+  '2F9D:0091': {
+    deviceName: 'INNOTRIK I-90',
+    config: {
+      audioEchoCancellation: true,
+      audioAgc: true,
+      noiseReduce: _type.FcrUIAiDenoiseLevel.LOW
+    }
+  }
+};
+
+/**
+ * Get audio configuration for a specific device
+ * @param deviceId Device ID in format "vendorId:productId"
+ * @returns AudioDeviceConfig if device has specific config, undefined otherwise
+ */
+function getDeviceSpecificConfig(deviceId) {
+  var _DEVICE_SPECIFIC_CONF;
+  return (_DEVICE_SPECIFIC_CONF = DEVICE_SPECIFIC_CONFIGS[deviceId]) === null || _DEVICE_SPECIFIC_CONF === void 0 ? void 0 : _DEVICE_SPECIFIC_CONF.config;
+}

package/lib/modules/setting/audio-whiteList/audio-whiteList-manager.d.ts

@@ -1,26 +1,14 @@
 import { FcrUIAiDenoiseLevel } from '../../../type';
+import { AudioDeviceConfig } from './audio-device-adaptation';
 import { FcrDeviceInfo } from 'fcr-core/lib/type';
-/**
- * Audio device configuration
- * Includes audio echo cancellation, automatic gain control, noise reduction and other audio processing parameters
- */
-export interface AudioDeviceConfig {
-    audioEchoCancellation: boolean;
-    audioAgc: boolean;
-    noiseReduce: FcrUIAiDenoiseLevel;
-}
 /**
  * The manager delegates device operations and settings management to the implementing class
  */
 export interface AudioDeviceWhiteListDelegate {
-    getCurrentSetting: () => {
-        audioEchoCancellation: boolean;
-        noiseReduce: FcrUIAiDenoiseLevel;
-    };
     getMicrophoneId: () => string;
     getMicrophoneList: () => FcrDeviceInfo[];
     enableAudioEchoCancellation: (enable: boolean) => void;
-    toggleAgc: (enable: boolean) => void;
+    enableAudioGainControl: (enable: boolean) => void;
     setNoiseLevel: (level: FcrUIAiDenoiseLevel) => void;
     updateSettings: (settings: {
         audioEchoCancellation?: boolean;
@@ -40,6 +28,7 @@ export declare class AudioDeviceWhiteListManager {
     handleMicrophoneListUpdated(microphoneList: FcrDeviceInfo[]): void;
     handleMicrophoneChanged(microphoneId: string, productId: string | null, vendorId: string | null): void;
     private _handleDeviceChanged;
+    private _createDeviceConfig;
     /**
      * Get device 3A configuration (use current settings if not exists)
      */