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

package/lib/providers/device-provider.js

@@ -25,7 +25,6 @@ require("core-js/modules/es.array.concat.js");
 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.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");
@@ -42,9 +41,7 @@ require("core-js/modules/es.promise.js");
 require("core-js/modules/es.promise.all-settled.js");
 require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.set.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");
@@ -210,13 +207,15 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
     _classPrivateFieldInitSpec(this, _A, _init__microphoneEnabled(this, false));
     _classPrivateFieldInitSpec(this, _B, _init__isMicrophoneWorking(this, false));
     _classPrivateFieldInitSpec(this, _C, _init__microphoneDevice(this, {
-      id: null
+      id: null,
+      name: null
     }));
     _classPrivateFieldInitSpec(this, _D, _init__microphone(this, {
       id: DEFAULT_DEVICE_ID
     }));
     _classPrivateFieldInitSpec(this, _E, _init__speakerDevice(this, {
-      id: null
+      id: null,
+      name: null
     }));
     _classPrivateFieldInitSpec(this, _F, _init__speaker(this, {
       id: DEFAULT_DEVICE_ID
@@ -685,6 +684,14 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
         speakerDeviceId: this._speakerDevice.id || ''
       };
     }
+  }, {
+    key: "currentDeviceName",
+    get: function get() {
+      return {
+        microphoneDeviceName: this._microphoneDevice.name || '',
+        speakerDeviceName: this._speakerDevice.name || ''
+      };
+    }
   }, {
     key: "isAudioConnected",
     get: function get() {
@@ -725,6 +732,8 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
       this._isAudioConnected = false;
       this.setCameraEnabled(false);
       this.setMicrophoneEnabled(false);
+      this.setConnectType(_type2.FcrUIConnectType.NONE);
+      this._observable.notifyObservers('onAudioDisconnected');
     }
   }, {
     key: "release",
@@ -1419,7 +1428,11 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
         var startSelectedSpeakerTest = function startSelectedSpeakerTest() {
           var _this7$soundEffectLis, _this7$soundEffectLis2;
           var soundUrl = (0, _env.isElectron)() ? (_this7$soundEffectLis = _this7.soundEffectList.get('speaker_test')) === null || _this7$soundEffectLis === void 0 ? void 0 : _this7$soundEffectLis.md5Url : (_this7$soundEffectLis2 = _this7.soundEffectList.get('speaker_test')) === null || _this7$soundEffectLis2 === void 0 ? void 0 : _this7$soundEffectLis2.url;
-          _this7._mediaControl.startSelectedSpeakerTest(soundUrl || '', _this7._volumeIndicationInterval);
+          if (!soundUrl) {
+            _this7.logger.error('speaker_test soundUrl is not set');
+            return;
+          }
+          _this7._mediaControl.startSelectedSpeakerTest(soundUrl, _this7._volumeIndicationInterval);
         };
         startSelectedSpeakerTest();
         var sleep = 3000;
@@ -1459,12 +1472,18 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
     key: "_handleMicrophoneIdChanged",
     value: function () {
       var _handleMicrophoneIdChanged2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+        var _this8 = this;
+        var _this$microphoneList$, name;
         return _regenerator["default"].wrap(function (_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (!this.followSystemMicrophoneDevice) {
+                name = ((_this$microphoneList$ = this.microphoneList.find(function (item) {
+                  return item.deviceId === _this8._microphone.id;
+                })) === null || _this$microphoneList$ === void 0 ? void 0 : _this$microphoneList$.deviceName) || null;
                 this._microphoneDevice = {
-                  id: this._microphone.id
+                  id: this._microphone.id,
+                  name: name
                 };
               } else {
                 this._correctSystemSelectedMicrophoneDeviceId();
@@ -1514,12 +1533,18 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
     key: "_handleSpeakerIdChanged",
     value: function () {
       var _handleSpeakerIdChanged2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9() {
+        var _this9 = this;
+        var _this$speakerList$fin, name;
         return _regenerator["default"].wrap(function (_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (!this.followSystemSpeakerDevice) {
+                name = ((_this$speakerList$fin = this.speakerList.find(function (item) {
+                  return item.deviceId === _this9._speaker.id;
+                })) === null || _this$speakerList$fin === void 0 ? void 0 : _this$speakerList$fin.deviceName) || null;
                 this._speakerDevice = {
-                  id: this._speaker.id
+                  id: this._speaker.id,
+                  name: name
                 };
               } else {
                 this._correctSystemSpeakerDeviceId();
@@ -1596,9 +1621,10 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
               return _context1.abrupt("return");
             case 2:
               this.logger.debug("system selected speaker changed : ".concat(defaultDevice.deviceName));
-              this._showSystemSelectedDeviceChangedToast(defaultDevice);
+              this._observable.notifyObservers('onSystemSelectedDeviceChanged', defaultDevice);
               this._speakerDevice = {
-                id: defaultDevice.deviceId
+                id: defaultDevice.deviceId,
+                name: defaultDevice.deviceName
               };
             case 3:
             case "end":
@@ -1635,10 +1661,11 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
               this.logger.error('get system selected speaker device failed');
               return _context10.abrupt("return");
             case 2:
-              this._showSystemSelectedDeviceChangedToast(defaultDevice);
+              this._observable.notifyObservers('onSystemSelectedDeviceChanged', defaultDevice);
               this.logger.debug("system selected microphone changed : ".concat(defaultDevice.deviceName));
               this._microphoneDevice = {
-                id: defaultDevice.deviceId
+                id: defaultDevice.deviceId,
+                name: defaultDevice.deviceName
               };
             case 3:
             case "end":
@@ -1651,40 +1678,6 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
       }
       return _correctSystemSelectedMicrophoneDeviceId;
     }()
-  }, {
-    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
-      });
-    }
   }, {
     key: "_handleSelectedSpeakerVolumeUpdated",
     value: function _handleSelectedSpeakerVolumeUpdated(volume) {
@@ -1703,7 +1696,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
   }, {
     key: "_toggleLocalCameraPreview",
     value: function _toggleLocalCameraPreview(enabled) {
-      var _this8 = this;
+      var _this0 = this;
       var localVideoViewSet = this._localVideoViewSet;
       var cameraTrack = this._cameraVideoTrack;
       if (!cameraTrack) {
@@ -1719,7 +1712,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
         localVideoViewSet.forEach(function (view) {
           cameraTrack.startPreview({
             renderMode: _fcrCore.FcrVideoRenderMode.HIDDEN,
-            isMirror: _this8.currentIsMirror
+            isMirror: _this0.currentIsMirror
           }, view);
         });
       }
@@ -1733,7 +1726,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
     key: "_handleCameraRemoved",
     value: function () {
       var _handleCameraRemoved2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee11() {
-        var _this9 = this;
+        var _this1 = this;
         var currentDeviceExist, defaultDeviceId;
         return _regenerator["default"].wrap(function (_context11) {
           while (1) switch (_context11.prev = _context11.next) {
@@ -1743,7 +1736,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
             case 1:
               currentDeviceExist = this.cameraList.some(function (_ref5) {
                 var deviceId = _ref5.deviceId;
-                return _this9._cameraDevice.id === deviceId;
+                return _this1._cameraDevice.id === deviceId;
               });
               if (!currentDeviceExist) {
                 this.logger.info('[FcrDeviceStore] current speaker does not exist in speaker list, switch to follow system');
@@ -1798,7 +1791,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
     key: "_handleMicrophoneRemoved",
     value: function () {
       var _handleMicrophoneRemoved2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee13() {
-        var _this0 = this;
+        var _this10 = this;
         var currentDeviceExist;
         return _regenerator["default"].wrap(function (_context13) {
           while (1) switch (_context13.prev = _context13.next) {
@@ -1807,7 +1800,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
               return this._handleMicrophoneListUpdated();
             case 1:
               currentDeviceExist = this.microphoneList.find(function (item) {
-                return item.deviceId === _this0._microphoneDevice.id;
+                return item.deviceId === _this10._microphoneDevice.id;
               });
               if (!currentDeviceExist) {
                 this.logger.info('[FcrDeviceStore] current microphone does not exist in microphone list, switch to follow system');
@@ -1858,7 +1851,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
     key: "_handleSpeakerRemoved",
     value: function () {
       var _handleSpeakerRemoved2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee15() {
-        var _this1 = this;
+        var _this11 = this;
         var currentDeviceExist;
         return _regenerator["default"].wrap(function (_context15) {
           while (1) switch (_context15.prev = _context15.next) {
@@ -1868,7 +1861,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
             case 1:
               // 如何设备移除了，应该切到跟随系统
               currentDeviceExist = this.speakerList.find(function (item) {
-                return item.deviceId === _this1._speakerDevice.id;
+                return item.deviceId === _this11._speakerDevice.id;
               });
               if (!currentDeviceExist) {
                 this.logger.info('[FcrDeviceStore] current speaker does not exist in speaker list, switch to follow system');
@@ -2011,7 +2004,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
     key: "_loadBuiltinResources",
     value: function () {
       var _loadBuiltinResources2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee19() {
-        var _this10 = this;
+        var _this12 = this;
         var _yield$this$_renderer, virtualBackgroundImages, virtualBackgroundVideos, soundEffects, newVirtualBackgroundList, images, videos, sounds;
         return _regenerator["default"].wrap(function (_context19) {
           while (1) switch (_context19.prev = _context19.next) {
@@ -2029,7 +2022,7 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
                   name: (0, _tools.getFileNameWithoutExtension)(item),
                   path: item,
                   type: _virtualBackdoundResources.VirtualOption.IMG,
-                  url: URL.createObjectURL(_this10._renderer.fileToBlob(item, 'image'))
+                  url: URL.createObjectURL(_this12._renderer.fileToBlob(item, 'image'))
                 };
               });
               videos = virtualBackgroundVideos.map(function (item) {
@@ -2037,12 +2030,12 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
                   name: (0, _tools.getFileNameWithoutExtension)(item),
                   path: item,
                   type: _virtualBackdoundResources.VirtualOption.VIDEO,
-                  url: URL.createObjectURL(_this10._renderer.fileToBlob(item, 'video'))
+                  url: URL.createObjectURL(_this12._renderer.fileToBlob(item, 'video'))
                 };
               });
               sounds = soundEffects.map(function (item) {
                 return {
-                  url: URL.createObjectURL(_this10._renderer.fileToBlob(item, 'audio')),
+                  url: URL.createObjectURL(_this12._renderer.fileToBlob(item, 'audio')),
                   md5Url: item
                 };
               });
@@ -2052,9 +2045,9 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
               newVirtualBackgroundList = newVirtualBackgroundList.concat(images);
               newVirtualBackgroundList = newVirtualBackgroundList.concat(videos);
               (0, _mobx.runInAction)(function () {
-                _this10._updateVirtualBackgroundList(newVirtualBackgroundList);
+                _this12._updateVirtualBackgroundList(newVirtualBackgroundList);
                 sounds.forEach(function (item) {
-                  _this10.soundEffectList.set((0, _tools.getFileNameWithoutExtension)(item.url), item);
+                  _this12.soundEffectList.set((0, _tools.getFileNameWithoutExtension)(item.url), item);
                 });
               });
             case 2:

package/lib/providers/dialog/provider.base.d.ts

@@ -24,6 +24,7 @@ export declare abstract class FcrUIDialogProviderBase implements FcrUIDialogProv
     get openedConfirms(): FcrUIConfirmDescriptor[];
     get openedDialogs(): FcrUIDialogDescriptor[];
     constructor();
+    abstract setSharingDisplayBounds(bounds: FcrUI.FcrUIRectangle): void;
     closeAllConfirms(): void;
     abstract openDialog(dialogKey: FcrUIDialogKey, params?: Record<string, unknown>): void;
     abstract openDialogWithId(dialogKey: FcrUIDialogKey, dialogId: string, params?: Record<string, unknown>): void;

package/lib/providers/dialog/provider.browser.d.ts

@@ -12,4 +12,5 @@ export declare class FcrUIBrowserDialogProviderImpl extends FcrUIDialogProviderB
     }): string;
     protected openWithKeyAndId(dialogKey: FcrUIDialogKey, dialogId: string, params?: Record<string, unknown>): void;
     protected closeByKeyAndId(dialogKey: FcrUIDialogKey, dialogId: string): void;
+    setSharingDisplayBounds(): void;
 }

package/lib/providers/dialog/provider.browser.js

@@ -3,8 +3,6 @@
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
@@ -38,6 +36,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUIBrowserDialogProviderImpl = void 0;
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.includes.js");
@@ -153,6 +153,11 @@ var FcrUIBrowserDialogProviderImpl = exports.FcrUIBrowserDialogProviderImpl = /*
         this.logger.info("dialog ".concat(dialogKey, "(").concat(dialogId, ") is prevented from closing"));
       }
     }
+  }, {
+    key: "setSharingDisplayBounds",
+    value: function setSharingDisplayBounds() {
+      throw new Error('Method not implemented.');
+    }
   }]);
 }(_provider.FcrUIDialogProviderBase);
 _FcrUIBrowserDialogProviderImpl = FcrUIBrowserDialogProviderImpl;

package/lib/providers/dialog/provider.electron.d.ts

@@ -3,11 +3,14 @@ import { FcrUIDialogProviderBase } from './provider.base';
 import { FcrUIDialogKey } from '../../utilities/constant';
 export declare class FcrUIElectronDialogProviderImpl extends FcrUIDialogProviderBase {
     private _windowProvider;
-    constructor({ windowProvider }: FcrUIElectronProviderConstructor);
+    private _sharingDisplayBounds;
+    private _renderer;
+    constructor({ windowProvider, renderer }: FcrUIElectronProviderConstructor);
     openDialog(dialogKey: FcrUIDialogKey, params?: Record<string, unknown>): void;
     openDialogWithId(dialogKey: FcrUIDialogKey, dialogId: string, params?: Record<string, unknown>): void;
     closeDialog(dialogKey: FcrUIDialogKey): void;
     closeDialogById(dialogId: string): void;
     protected openWithKeyAndId(dialogKey: FcrUIDialogKey, dialogId: string, params?: Record<string, unknown>): void;
     protected closeByKeyAndId(dialogKey: FcrUIDialogKey, dialogId: string): void;
+    setSharingDisplayBounds(bounds: FcrUI.FcrUIRectangle): void;
 }

package/lib/providers/dialog/provider.electron.js

@@ -57,8 +57,10 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("./type");
 var _provider = require("./provider.base");
+var _constant = require("../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
 var _isBoolean = _interopRequireDefault(require("lodash/isBoolean"));
+var _imports = require("fcr-core/lib/imports");
 var _FcrUIElectronDialogProviderImpl;
 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)); }
@@ -71,11 +73,14 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl = /*#__PURE__*/function (_FcrUIDialogProviderB) {
   function FcrUIElectronDialogProviderImpl(_ref) {
     var _this;
-    var windowProvider = _ref.windowProvider;
+    var windowProvider = _ref.windowProvider,
+      renderer = _ref.renderer;
     (0, _classCallCheck2["default"])(this, FcrUIElectronDialogProviderImpl);
     _this = _callSuper(this, FcrUIElectronDialogProviderImpl);
     (0, _defineProperty2["default"])(_this, "_windowProvider", void _initProto(_this));
+    (0, _defineProperty2["default"])(_this, "_sharingDisplayBounds", null);
     _this._windowProvider = windowProvider;
+    _this._renderer = renderer;
     return _this;
   }
   (0, _inherits2["default"])(FcrUIElectronDialogProviderImpl, _FcrUIDialogProviderB);
@@ -121,6 +126,9 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
         this.logger.warn("dialog ".concat(dialogKey, "(").concat(dialogId, ") is already opened"));
         var _window = this._windowProvider.getWindowById(dialogKey, dialogId);
         _window.show(showOptions);
+        if (params !== null && params !== void 0 && params.alwaysOnTop) {
+          _window.setAlwaysOnTop(true, 'pop-up-menu');
+        }
         return;
       }
       var dialogIds = this.dialogKeyMap.get(dialogKey);
@@ -136,6 +144,82 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
       }
       var window = this._windowProvider.getWindowById(dialogKey, dialogId);
       var windowObserver = {
+        onReady: function onReady() {
+          _this2.logger.info("sharing display bounds: ".concat((0, _imports.jsonstring)(_this2._sharingDisplayBounds)));
+          if ([_constant.FcrUIDialogKey.SUB_WINDOW].includes(dialogKey)) {
+            return;
+          }
+          // 获取主屏幕的宽高
+          var bounds = _this2._windowProvider.getCurrentWindow().getBounds();
+          var _this2$_renderer$getD = _this2._renderer.getDisplayMatching(bounds).bounds,
+            mw = _this2$_renderer$getD.width,
+            mh = _this2$_renderer$getD.height,
+            mx = _this2$_renderer$getD.x,
+            my = _this2$_renderer$getD.y;
+          var shareScreenDialogs = [_constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR, _constant.FcrUIDialogKey.VIDEO_WINDOW];
+          var fullScreenDialogs = [_constant.FcrUIDialogKey.TOAST, _constant.FcrUIDialogKey.CONFIRM];
+          var _window$getBounds = window.getBounds(),
+            ww = _window$getBounds.width,
+            wh = _window$getBounds.height;
+          if (shareScreenDialogs.includes(dialogKey)) {
+            return;
+          }
+
+          // 分享主应用所在显示器
+          var x = mx + mw / 2 - ww / 2;
+          var y = my + mh / 2 - wh / 2;
+          if (_this2._sharingDisplayBounds) {
+            var _this2$_sharingDispla = _this2._sharingDisplayBounds,
+              sx = _this2$_sharingDispla.x,
+              sy = _this2$_sharingDispla.y,
+              sw = _this2$_sharingDispla.width,
+              sh = _this2$_sharingDispla.height;
+            if (fullScreenDialogs.includes(dialogKey)) {
+              window.setBounds(_this2._sharingDisplayBounds);
+            } else {
+              // 分享的显示器在左侧
+              if (sx < 0 && Math.abs(sx) >= sw) {
+                x = sx / 2 - ww / 2;
+                y = sh / 2 - wh / 2 + sy;
+                _this2.logger.info("sharing display in the left");
+              }
+
+              // 分享的显示器在右侧
+              else if (sx > 0 && Math.abs(sx) >= mw) {
+                x = sw / 2 - ww / 2 + sx;
+                y = sh / 2 - wh / 2 + sy;
+                _this2.logger.info("sharing display in the right");
+              }
+
+              // 分享的显示器在上面
+              else if (sy < 0 && Math.abs(sy) >= sh) {
+                x = sw / 2 - ww / 2 + sx;
+                y = sy / 2 - wh / 2;
+                _this2.logger.info("sharing display in the top");
+              }
+
+              // 分享的显示器在下面
+              else if (sy > 0 && Math.abs(sy) >= mh) {
+                x = sw / 2 - ww / 2 + sx;
+                y = sy + sh / 2 - wh / 2;
+                _this2.logger.info("sharing display in the bottom");
+              }
+              x = Math.floor(x);
+              y = Math.floor(y);
+              window.setBounds({
+                x: x,
+                y: y
+              });
+            }
+          } else {
+            x = Math.floor(x);
+            y = Math.floor(y);
+            window.setBounds({
+              x: x,
+              y: y
+            });
+          }
+        },
         onClosed: function onClosed() {
           window.removeObserver(windowObserver);
           _this2.dialogKeyMap["delete"](dialogKey);
@@ -157,6 +241,9 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
       window.addObserver(windowObserver);
       window.setPreventClose(true);
       window.show(showOptions);
+      if (params !== null && params !== void 0 && params.alwaysOnTop) {
+        window.setAlwaysOnTop(true, 'pop-up-menu');
+      }
       this.observable.notifyObservers('onDialogOpen', dialogKey, dialogId, params);
     }
   }, {
@@ -168,10 +255,15 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
         window.close();
       }
     }
+  }, {
+    key: "setSharingDisplayBounds",
+    value: function setSharingDisplayBounds(bounds) {
+      this._sharingDisplayBounds = bounds;
+    }
   }]);
 }(_provider.FcrUIDialogProviderBase);
 _FcrUIElectronDialogProviderImpl = FcrUIElectronDialogProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIElectronDialogProviderImpl, [[_decorator.trace, 2, "openDialog"], [_decorator.trace, 2, "openDialogWithId"], [_decorator.trace, 2, "closeDialog"], [_decorator.trace, 2, "closeDialogById"]], [], 0, void 0, _provider.FcrUIDialogProviderBase).e;
+var _applyDecs$e = _applyDecs(_FcrUIElectronDialogProviderImpl, [[_decorator.trace, 2, "openDialog"], [_decorator.trace, 2, "openDialogWithId"], [_decorator.trace, 2, "closeDialog"], [_decorator.trace, 2, "closeDialogById"], [_decorator.trace, 2, "setSharingDisplayBounds"]], [], 0, void 0, _provider.FcrUIDialogProviderBase).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/providers/dialog/type.d.ts

@@ -2,6 +2,7 @@ import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-
 import { FcrUIDialogKey } from '../../utilities/constant';
 import { FcrUIWindowProvider } from '../window/type';
 import { FcrUIDialogInfo } from '../../modules/dialog/type';
+import { FcrUIRendererWrapper } from '../../utilities/renderer';
 export type FcrUIDialogDescriptor = {
     dialogKey: FcrUIDialogKey;
     dialogId: string;
@@ -139,6 +140,11 @@ export interface FcrUIDialogProvider {
      * @param observer - 要移除的观察者对象，类型为 FcrUIDialogObserver。
      */
     removeObserver(observer: FcrUIDialogObserver): void;
+    /**
+     * 设置屏幕共享的 bounds
+     * @param bounds - 屏幕共享的 bounds
+     */
+    setSharingDisplayBounds(bounds: FcrUI.FcrUIRectangle | null): void;
     /**
      * 新增弹窗拦截器
      * @param key - 弹窗拦截器的唯一标识符
@@ -158,4 +164,5 @@ export interface FcrUIDialogProvider {
 }
 export type FcrUIElectronProviderConstructor = {
     windowProvider: FcrUIWindowProvider;
+    renderer: FcrUIRendererWrapper;
 };

package/lib/providers/mouse-detect/provider.d.ts

@@ -6,16 +6,24 @@ export declare class FcrUIMouseDetectProviderImpl implements FcrUIManagedObject,
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _renderer;
-    private _detectAreas;
+    private _windowProvder;
+    private accessor _detectAreas;
     private _isInDetectArea;
     private _task;
     private _detectionOffset;
+    private _isDebug;
+    private _displayId;
+    private _debugWindowObserver;
     constructor(objectManager: FcrUIObjectManager);
+    setDisplayId(displayId: number): void;
     setDetectArea(areaId: FcrUIDetectAreaID, areaList: FcrUI.FcrUIRectangle[]): void;
+    getDetectAreas(areaId: FcrUIDetectAreaID): FcrUI.FcrUIRectangle[];
     deleteDetectArea(areaId: FcrUIDetectAreaID): void;
     setDetectionPositionOffset(offset: FcrUI.FcrUIPoint): void;
     addObserver(observer: FcrUIMouseDetectObserver): void;
     removeObserver(observer: FcrUIMouseDetectObserver): void;
     release(): void;
     private _detect;
+    private _debug;
+    private _setDebugWindowOffset;
 }