fcr-ui-scene 3.5.1 → 3.6.1

package/lib/utilities/logger.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.trace = exports.getLogger = exports.generateLogObserver = exports.createLogger = void 0;
+exports.getLogger = exports.generateLogObserver = exports.createLogger = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.object.to-string.js");
@@ -13,7 +13,7 @@ require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _logger = require("agora-foundation/lib/logger");
-var _decorator = require("agora-foundation/lib/decorator");
+var _misc = require("agora-foundation/lib/utilities/misc");
 var _logSerializer = require("agora-foundation/lib/decorator/log/log-serializer");
 var getLogger = exports.getLogger = function getLogger() {
   return (0, _logger.getLogger)({
@@ -23,11 +23,10 @@ var getLogger = exports.getLogger = function getLogger() {
 var createLogger = exports.createLogger = function createLogger(opts) {
   return (0, _logger.createLogger)({
     label: 'ui-scene',
-    prefix: opts.prefix,
+    prefix: "".concat(opts.prefix, "@").concat((0, _misc.randomString)(5)),
     database: opts.database
   });
 };
-var trace = exports.trace = _decorator.trace.to('ui-scene');
 var generateLogObserver = exports.generateLogObserver = function generateLogObserver(logger, callbackMethods) {
   var observer = {};
   callbackMethods.forEach(function (method) {

package/lib/utilities/renderer.d.ts

@@ -1,16 +1,7 @@
-import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 export declare const open: (path: string) => void;
 export declare const close: (path: string) => void;
 export declare const isWindows: () => boolean;
 export declare const isMac: () => boolean;
-export declare const getCurrentSharingWorkArea: (currentShareId: string, currentShareType: AgoraRtcScreenCaptureType, allApplicationWindows: AgoraRtcWindowInfo[]) => {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-    displayId: number;
-    availTop: number;
-};
 /**
  * handle the will-close event of the browserWindow,
  * callback will be called when:

package/lib/utilities/renderer.js

@@ -4,16 +4,8 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setInMeetingState = exports.restartApp = exports.releaseSubAllWindowRefs = exports.open = exports.isWindows = exports.isMac = exports.handleWillClose = exports.getCurrentSharingWorkArea = exports.close = void 0;
-require("core-js/modules/es.array.concat.js");
-require("core-js/modules/es.array.find.js");
+exports.setInMeetingState = exports.restartApp = exports.releaseSubAllWindowRefs = exports.open = exports.isWindows = exports.isMac = exports.handleWillClose = exports.close = void 0;
 require("core-js/modules/es.array.index-of.js");
-require("core-js/modules/es.number.constructor.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.find.js");
-var _type = require("agora-rte-sdk/lib/core/rtc/type");
 var open = exports.open = function open(path) {
   window.runtime.open(path);
 };
@@ -26,67 +18,6 @@ var isWindows = exports.isWindows = function isWindows() {
 var isMac = exports.isMac = function isMac() {
   return navigator.userAgent.indexOf('Mac') > -1;
 };
-var getCurrentSharingWorkArea = exports.getCurrentSharingWorkArea = function getCurrentSharingWorkArea(currentShareId, currentShareType, allApplicationWindows) {
-  var displays = window.runtime.screen.getAllDisplays();
-  var bounds = {
-    x: 0,
-    y: 0,
-    width: 0,
-    height: 0,
-    displayId: 1,
-    availTop: 0
-  };
-  if (currentShareType === _type.AgoraRtcScreenCaptureType.SCREEN) {
-    var display;
-    if (isWindows()) {
-      display = displays.find(function (display, index) {
-        return index === Number(currentShareId);
-      });
-    } else {
-      display = displays.find(function (display, index) {
-        return display.id === Number(currentShareId);
-      });
-    }
-    if (!display) {
-      console.log("cannot get correct display, use current display. width: ".concat(window.screen.availWidth, ", height: ").concat(window.screen.availHeight));
-      bounds = {
-        x: 0,
-        y: 0,
-        width: window.screen.availWidth,
-        height: window.screen.availHeight,
-        displayId: 0,
-        availTop: 0
-      };
-    } else {
-      bounds = {
-        x: display.bounds.x,
-        y: isWindows() ? 0 : display.bounds.y,
-        width: display.bounds.width,
-        height: display.bounds.height,
-        displayId: display.id,
-        availTop: display.workArea.y
-      };
-    }
-  } else {
-    var _appWindow$bounds$x, _appWindow$bounds, _appWindow$bounds$y, _appWindow$bounds2;
-    var appWindow = allApplicationWindows.find(function (app) {
-      return app.id === currentShareId;
-    });
-    var _display = window.runtime.screen.getDisplayNearestPoint({
-      x: (_appWindow$bounds$x = appWindow === null || appWindow === void 0 || (_appWindow$bounds = appWindow.bounds) === null || _appWindow$bounds === void 0 ? void 0 : _appWindow$bounds.x) !== null && _appWindow$bounds$x !== void 0 ? _appWindow$bounds$x : 0,
-      y: (_appWindow$bounds$y = appWindow === null || appWindow === void 0 || (_appWindow$bounds2 = appWindow.bounds) === null || _appWindow$bounds2 === void 0 ? void 0 : _appWindow$bounds2.y) !== null && _appWindow$bounds$y !== void 0 ? _appWindow$bounds$y : 0
-    });
-    bounds = {
-      x: _display.bounds.x,
-      y: isWindows() ? 0 : _display.bounds.y,
-      width: _display.bounds.width,
-      height: _display.bounds.height,
-      displayId: _display.id,
-      availTop: _display.workArea.y
-    };
-  }
-  return bounds;
-};
 
 /**
  * handle the will-close event of the browserWindow,

package/lib/utilities/screen.js

@@ -1,13 +1,15 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isFullScreen = exports.exitFullScreen = exports.enterFullScreen = void 0;
 var _env = require("agora-foundation/lib/utilities/env");
+var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
 var isFullScreen = exports.isFullScreen = function isFullScreen() {
-  return !!(document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement || (0, _env.isElectron)() && window.runtime.browserWindow.isFullScreen());
+  return !!(document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement || (0, _env.isElectron)() && (0, _isFunction["default"])(window.runtime.browserWindow.isFullScreen) && window.runtime.browserWindow.isFullScreen());
 };
 var enterFullScreen = exports.enterFullScreen = function enterFullScreen() {
   if (isFullScreen()) return;

package/lib/utilities/setting-config-storage.d.ts

@@ -1,11 +1,16 @@
 import { FcrUIMediaConfig, FcrUISettingConfig } from '../type';
+import { FcrUILocalStorageProvider } from '../providers/local-storage-provider';
 export declare const settingConfigStorageKey = "fcr-ui-setting-config";
 export declare class FcrSettingConfigStorage implements FcrUISettingConfig {
     private _isElectron;
     private _settingConfig;
-    constructor();
+    private _localStorageProvider;
+    constructor({ localStorageProvider }: {
+        localStorageProvider: FcrUILocalStorageProvider;
+    });
     get media(): FcrUIMediaConfig;
     set media(media: FcrUIMediaConfig);
+    private _initMediaConfig;
     private _initSettingConfig;
     private _setSettingConfig;
     private _createMediaProxy;

package/lib/utilities/setting-config-storage.js

@@ -28,11 +28,13 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _env = require("agora-foundation/lib/utilities/env");
+var _store = require("../modules/setting/store");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var settingConfigStorageKey = exports.settingConfigStorageKey = 'fcr-ui-setting-config';
 var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/function () {
-  function FcrSettingConfigStorage() {
+  function FcrSettingConfigStorage(_ref) {
+    var localStorageProvider = _ref.localStorageProvider;
     (0, _classCallCheck2["default"])(this, FcrSettingConfigStorage);
     (0, _defineProperty2["default"])(this, "_isElectron", false);
     (0, _defineProperty2["default"])(this, "_settingConfig", {
@@ -43,6 +45,7 @@ var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/fun
       }
     });
     this._isElectron = (0, _env.isElectron)();
+    this._localStorageProvider = localStorageProvider;
     this._initSettingConfig();
   }
   return (0, _createClass2["default"])(FcrSettingConfigStorage, [{
@@ -54,6 +57,19 @@ var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/fun
       this._settingConfig.media = this._createMediaProxy(media);
       this._setSettingConfig(this._settingConfig);
     }
+  }, {
+    key: "_initMediaConfig",
+    value: function _initMediaConfig() {
+      var localSetting = this._localStorageProvider.read(_store.SETTING_KEY);
+      if (localSetting) {
+        var _localSetting$cameraE, _localSetting$microph, _localSetting$autoCon;
+        this._settingConfig.media = {
+          cameraExpectedOff: (_localSetting$cameraE = localSetting.cameraExpectedOff) !== null && _localSetting$cameraE !== void 0 ? _localSetting$cameraE : this._settingConfig.media.cameraExpectedOff,
+          microphoneExpectedOff: (_localSetting$microph = localSetting.microphoneExpectedOff) !== null && _localSetting$microph !== void 0 ? _localSetting$microph : this._settingConfig.media.microphoneExpectedOff,
+          autoConnectAudio: (_localSetting$autoCon = localSetting.autoConnectAudio) !== null && _localSetting$autoCon !== void 0 ? _localSetting$autoCon : this._settingConfig.media.autoConnectAudio
+        };
+      }
+    }
   }, {
     key: "_initSettingConfig",
     value: function _initSettingConfig() {
@@ -65,14 +81,15 @@ var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/fun
           this._settingConfig = settingConfig;
         }
       } else {
-        var _settingConfig = localStorage.getItem(settingConfigStorageKey);
+        var _settingConfig = this._localStorageProvider.read(settingConfigStorageKey);
         if (!_settingConfig) return;
         try {
           this._settingConfig = JSON.parse(_settingConfig);
         } catch (e) {
-          localStorage.setItem(settingConfigStorageKey, JSON.stringify(this._settingConfig));
+          this._localStorageProvider.write(settingConfigStorageKey, JSON.stringify(this._settingConfig));
         }
       }
+      this._initMediaConfig();
       this._settingConfig.media = this._createMediaProxy(this._settingConfig.media);
     }
   }, {
@@ -82,7 +99,7 @@ var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/fun
       if (this._isElectron) {
         window.runtime.setUserSettingData(settingConfig);
       } else {
-        localStorage.setItem(settingConfigStorageKey, JSON.stringify(settingConfig));
+        this._localStorageProvider.write(settingConfigStorageKey, JSON.stringify(settingConfig));
       }
     }
   }, {

package/lib/utilities/tools.d.ts

@@ -1,5 +1,4 @@
 import { FcrUIDialogKey } from './constant';
-import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 import { CurrentShareBounds } from '../modules/control-bar/types';
 export declare const uint8ArrayToImageData: (target: {
     buffer?: Uint8Array;
@@ -15,10 +14,9 @@ declare class LocalStorage {
 export declare const storage: LocalStorage;
 export declare const ASIDE_WIDTH = "aside_width";
 export declare const PARTICIPANT_POSITION = "participant_position";
-export declare const getAssetUrl: (path: string) => string;
 export declare const convertToFixedNumber: (value: number, divisor?: number, fractionDigits?: number) => number;
 export declare const matchVirtualSoundCardPattern: (deviceName: string) => boolean;
-export declare const isResourceZipUrl: (url: string) => boolean;
+export declare const isZipUrl: (url: string) => boolean;
 export declare const isPngOrJpg: (path: string) => boolean;
 export declare const isMp4: (path: string) => boolean;
 export declare const isMp3OrWav: (path: string) => boolean;
@@ -26,6 +24,7 @@ export declare function getFileNameWithoutExtension(filePath: string): string;
 export declare const setLanguage: (language: string) => void;
 export declare const getLanguage: () => string | null;
 export declare const waitUntil: (prediction: () => boolean | Promise<boolean>, memo?: string, intervalMs?: number, timeout?: number) => Promise<void>;
+export declare const renderMeetingName: (meetingName: string) => string;
 export declare const renderMeetingId: (meetingId: string | undefined, roomId: string) => string;
 export declare function handleCheckMouseOver(params: {
     /**
@@ -61,9 +60,34 @@ export type CurrentShareScreenWorkArea = {
     scaleFactor: number;
 };
 export declare function getCurrentSharingWorkArea(params: {
-    currentShareId: string;
-    currentShareType: AgoraRtcScreenCaptureType;
     currentShareBounds: CurrentShareBounds;
-    allApplicationWindows: AgoraRtcWindowInfo[];
 }): CurrentShareScreenWorkArea;
+export declare function followCorrectDisplay({ browserWindow, dialogKey, extraRefControlbarCondition, follow, alwaysFollowScreen, }: {
+    /**
+     * browserWindow 是 Electron 的窗口对象，如果传入，则直接设置 bounds，否则会根据 dialogKey 设置 bounds
+     */
+    browserWindow?: Electron.BrowserWindow;
+    /**
+     * 如果不使用 browserWindow ，则需要传入 dialogKey 设置 bounds，如果 browserWindow 和 dialogKey 都未传入，则抛出错误
+     */
+    dialogKey?: FcrUIDialogKey | FcrUIDialogKey[];
+    /**
+     * 始终 follow control bar 的位置，默认是 true
+     */
+    extraRefControlbarCondition?: boolean;
+    /**
+     * 根据屏幕或者应用主窗口居中显示，默认是 screen，如果需要跟随主窗口，则设置为 main-window,
+     * 在屏幕共享时，普通 dialog 窗口会以 controlbar 所在的屏幕为基准水平居中对齐
+     * 在非屏幕共享状态下，则会以主窗口为基准水平居中对齐
+     */
+    follow?: 'screen' | 'main-window';
+    /**
+     * 是否是全屏幕覆盖的透明窗口, 此设置主要针对 toast 和 confirm 弹窗
+     */
+    alwaysFollowScreen?: boolean;
+}): {
+    nearDisplayBounds: CurrentShareBounds;
+    nearDisplay: Electron.Display;
+} | undefined;
+export declare const getBrowserLanguage: () => "zh" | "en";
 export {};

package/lib/utilities/tools.js

@@ -5,17 +5,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAssetUrl = exports.convertToFixedNumber = exports.PARTICIPANT_POSITION = exports.ASIDE_WIDTH = void 0;
+exports.convertToFixedNumber = exports.PARTICIPANT_POSITION = exports.ASIDE_WIDTH = void 0;
+exports.followCorrectDisplay = followCorrectDisplay;
+exports.getBrowserLanguage = void 0;
 exports.getCurrentSharingWorkArea = getCurrentSharingWorkArea;
 exports.getFileNameWithoutExtension = getFileNameWithoutExtension;
 exports.getLanguage = void 0;
 exports.handleCheckMouseOver = handleCheckMouseOver;
-exports.waitUntil = exports.uint8ArrayToImageData = exports.storage = exports.setLanguage = exports.renderMeetingId = exports.matchVirtualSoundCardPattern = exports.isResourceZipUrl = exports.isPngOrJpg = exports.isMp4 = exports.isMp3OrWav = void 0;
+exports.waitUntil = exports.uint8ArrayToImageData = exports.storage = exports.setLanguage = exports.renderMeetingName = exports.renderMeetingId = exports.matchVirtualSoundCardPattern = exports.isZipUrl = exports.isPngOrJpg = exports.isMp4 = exports.isMp3OrWav = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+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.for-each.js");
-require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.reduce.js");
 require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.date.now.js");
@@ -26,15 +30,15 @@ require("core-js/modules/es.promise.js");
 require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.string.ends-with.js");
-require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.match.js");
 require("core-js/modules/es.string.replace.js");
-require("core-js/modules/esnext.async-iterator.find.js");
+require("core-js/modules/es.string.starts-with.js");
 require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.async-iterator.reduce.js");
 require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.iterator.reduce.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.timers.js");
@@ -45,8 +49,8 @@ var _schedule = require("agora-foundation/lib/schedule");
 var _logger = require("agora-foundation/lib/logger");
 var _platform = require("./platform");
 var _constant = require("./constant");
-var _type = require("agora-rte-sdk/lib/core/rtc/type");
 var _env = require("agora-foundation/lib/utilities/env");
+var _dialogs = require("../modules/dialog/dialogs");
 var uint8ArrayToImageData = exports.uint8ArrayToImageData = function uint8ArrayToImageData(target) {
   var _target$buffer;
   if (!target || !(target !== null && target !== void 0 && (_target$buffer = target.buffer) !== null && _target$buffer !== void 0 && _target$buffer.length)) {
@@ -107,9 +111,6 @@ var LocalStorage = /*#__PURE__*/function () {
 var storage = exports.storage = new LocalStorage();
 var ASIDE_WIDTH = exports.ASIDE_WIDTH = 'aside_width';
 var PARTICIPANT_POSITION = exports.PARTICIPANT_POSITION = 'participant_position';
-var getAssetUrl = exports.getAssetUrl = function getAssetUrl(path) {
-  return window.runtime.getAssetUrl(path);
-};
 var convertToFixedNumber = exports.convertToFixedNumber = function convertToFixedNumber(value) {
   var divisor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100;
   var fractionDigits = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
@@ -122,7 +123,7 @@ var matchVirtualSoundCardPattern = exports.matchVirtualSoundCardPattern = functi
     return prev;
   }, false);
 };
-var isResourceZipUrl = exports.isResourceZipUrl = function isResourceZipUrl(url) {
+var isZipUrl = exports.isZipUrl = function isZipUrl(url) {
   if (!url || typeof url !== 'string') return false;
   var regex = /^https?:\/\/.+\.(zip)(\?.*)?$/i;
   return regex.test(url);
@@ -201,10 +202,14 @@ var waitUntil = exports.waitUntil = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
+var renderMeetingName = exports.renderMeetingName = function renderMeetingName(meetingName) {
+  if (meetingName.length <= 20) return meetingName;
+  return meetingName.slice(0, 20) + '...';
+};
 var renderMeetingId = exports.renderMeetingId = function renderMeetingId(meetingId, roomId) {
   var renderMeetingId = '';
   if (meetingId) {
-    renderMeetingId = meetingId;
+    renderMeetingId = meetingId.replace(/(.{3})/g, '$1 ');
   } else {
     if (roomId.endsWith('-waiting')) {
       renderMeetingId = roomId.slice(0, -8).replace(/(.{3})/g, '$1 ');
@@ -285,9 +290,10 @@ function handleCheckMouseOver(params) {
     var barWrapWithInsideBoundary = mouse_x > bar_x1 && mouse_x < bar_x2 && mouse_y > bar_y1 && mouse_y < bar_y2 - inside_h || barControlBoundary;
     if (dialog === _constant.FcrUIDialogKey.CONTROL_BAR ? barWrapWithInsideBoundary : barWrapBoundary) {
       browserWindow.setIgnoreMouseEvents(false);
-      if (!browserWindow.isFocused()) {
-        browserWindow.focus();
-      }
+      // 因为当用户点击其他窗口时，鼠标返回热区窗口会自动聚焦返回到上层，经测试这个注释不会影响现有功能，先注释看有没有其它影响
+      // if (!browserWindow.isFocused()) {
+      //   browserWindow.focus();
+      // }
     } else {
       browserWindow.setIgnoreMouseEvents(true);
     }
@@ -296,18 +302,10 @@ function handleCheckMouseOver(params) {
   return timerId;
 }
 function getCurrentSharingWorkArea(params) {
-  var currentShareId = params.currentShareId,
-    currentShareType = params.currentShareType,
-    currentShareBounds = params.currentShareBounds,
-    allApplicationWindows = params.allApplicationWindows;
+  var currentShareBounds = params.currentShareBounds;
   var _window$screen = window.screen,
     availWidth = _window$screen.availWidth,
     availHeight = _window$screen.availHeight;
-  var displays = window.runtime.screen.getAllDisplays();
-  var isDisplay = currentShareType === _type.AgoraRtcScreenCaptureType.SCREEN;
-  var appWindow = allApplicationWindows.find(function (app) {
-    return app.id === currentShareId;
-  });
   var nearDisplay = window.runtime.screen.getDisplayNearestPoint(currentShareBounds);
   var dataStruct = {
     bounds: {
@@ -322,24 +320,6 @@ function getCurrentSharingWorkArea(params) {
     },
     scaleFactor: 1
   };
-  var matchBounds = function matchBounds() {
-    return displays.find(function (display) {
-      var x = currentShareBounds.x,
-        y = currentShareBounds.y;
-      var bounds = display.bounds,
-        scaleFactor = display.scaleFactor;
-      var cx = x > 0 ? Math.round(x / scaleFactor) : Math.floor(x / scaleFactor);
-      var cy = y > 0 ? Math.round(y / scaleFactor) : Math.floor(y / scaleFactor);
-      var matchBounds = [cx, x].includes(bounds.x) && [cy, y].includes(bounds.y);
-      return matchBounds;
-    });
-  };
-  var matchIdOrIndex = function matchIdOrIndex() {
-    return displays.find(function (display, index) {
-      var id = (0, _platform.isWindows)() ? index : display.id;
-      return id === Number(currentShareId);
-    });
-  };
   var _ref5 = nearDisplay || dataStruct,
     _ref5$bounds = _ref5.bounds,
     x = _ref5$bounds.x,
@@ -359,4 +339,54 @@ function getCurrentSharingWorkArea(params) {
     // 此算法能确保显示器在不同的上下排列和主次组合时，获取到的偏移值始终正确。
     scaleFactor: scaleFactor
   };
-}
+}
+function followCorrectDisplay(_ref6) {
+  var browserWindow = _ref6.browserWindow,
+    dialogKey = _ref6.dialogKey,
+    _ref6$extraRefControl = _ref6.extraRefControlbarCondition,
+    extraRefControlbarCondition = _ref6$extraRefControl === void 0 ? true : _ref6$extraRefControl,
+    _ref6$follow = _ref6.follow,
+    follow = _ref6$follow === void 0 ? 'screen' : _ref6$follow,
+    _ref6$alwaysFollowScr = _ref6.alwaysFollowScreen,
+    alwaysFollowScreen = _ref6$alwaysFollowScr === void 0 ? false : _ref6$alwaysFollowScr;
+  if (!(0, _env.isElectron)()) return;
+  if (!browserWindow && !dialogKey) throw new Error('browserWindow or dialogKey is required');
+  var objectDialog = dialogKey ? Array.isArray(dialogKey) ? dialogKey.map(function (dialog) {
+    return _dialogs.dialogWindows.get(dialog);
+  }) : _dialogs.dialogWindows.get(dialogKey) : browserWindow;
+  var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
+  var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
+  // 按当前的窗口管理方式，在关闭 controlbar 的时候，controlbar 实际上是隐藏了自己，所以，依然能够通过 controlbar 访问到，所以需要判断是否是 visible 状态
+  var followControlbar = controlbar && (extraRefControlbarCondition || controlbar.isVisible());
+  // 屏幕抢占时，需要判断是否是抢占屏幕，决定是取 controlbar 所在屏幕计算热区，还是以主窗口所在屏幕计算热区，此类条件通过 extraRefControlbarCondition 传入
+  var nearestPoint = followControlbar ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : mainAppWindowBounds;
+  var nearDisplay = window.runtime.screen.getDisplayNearestPoint(nearestPoint);
+  var nearBounds = nearDisplay.bounds;
+  var nearDisplayBounds = {
+    x: Math.floor(nearBounds.x),
+    y: Math.floor(nearBounds.y),
+    width: Math.floor(nearBounds.width),
+    height: Math.floor(nearBounds.height)
+  };
+  var followBounds = function followBounds(theWindowBounds) {
+    var targetBounds = follow === 'screen' || extraRefControlbarCondition ? nearBounds : mainAppWindowBounds;
+    return alwaysFollowScreen ? nearDisplayBounds : {
+      x: Math.floor(targetBounds.x + (targetBounds.width - theWindowBounds.width) / 2),
+      y: Math.floor(targetBounds.y + (targetBounds.height - theWindowBounds.height) / 2)
+    };
+  };
+  Array.isArray(objectDialog) ? objectDialog.forEach(function (dialog) {
+    return dialog === null || dialog === void 0 ? void 0 : dialog.setBounds(followBounds(dialog.getBounds()));
+  }) : objectDialog === null || objectDialog === void 0 ? void 0 : objectDialog.setBounds(followBounds(objectDialog.getBounds()));
+  return {
+    nearDisplayBounds: nearDisplayBounds,
+    nearDisplay: nearDisplay
+  };
+}
+var getBrowserLanguage = exports.getBrowserLanguage = function getBrowserLanguage() {
+  var usrlang = navigator.language;
+  if (usrlang.startsWith('zh')) {
+    return 'zh';
+  }
+  return 'en';
+};

package/lib/utilities/ui-resources.d.ts

@@ -1,3 +1,9 @@
+import { FcrUIResource } from '../type';
 export declare const BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST: string[];
 export declare const BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST: string[];
 export declare const BUILTIN_SOUND_EFFECT_URL_LIST: string[];
+export declare const getNormalDownloadResources: (customResource?: FcrUIResource) => {
+    virtualBackgroundImages: string[];
+    virtualBackgroundVideos: string[];
+    soundEffectAudios: string[];
+};

package/lib/utilities/ui-resources.js

@@ -1,14 +1,27 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = exports.BUILTIN_SOUND_EFFECT_URL_LIST = void 0;
+exports.getNormalDownloadResources = exports.BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = exports.BUILTIN_SOUND_EFFECT_URL_LIST = void 0;
+require("core-js/modules/es.array.concat.js");
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+// Asset types:
+// Electron
+// 1. Built-in assets: packaged with the app, no need to download
+// 2. Built-in asset URLs: which will be downloaded when the app starts
+// 3. User-defined assets: which will be downloaded when the app starts
+// Browser
+// 1. User-defined assets: asset URLs need to be in the same domain as the app
+
 var BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = [
-// electron zip
-'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/virtual_background_images.zip'
-// browser png
+// Built-in assets URL
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/virtual_background_images.zip',
+'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/virtual_background_images_202505231623.zip'
+
+// in browser, images need to be in the same domain as the app
 // 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default1.jpg',
 // 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default2.jpg',
 // 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default3.jpg',
@@ -18,12 +31,37 @@ var BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROU
 // 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default7.jpg',
 ];
 var BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST = [
-// electron zip
-'https://solutions-apaas.agora.io/fcr-ui-scene/video/common/virtual_background_videos.zip'
-// browser png
+// Built-in assets URL
+'https://solutions-apaas.agora.io/fcr-ui-scene/video/common/virtual_background_videos_202505231623.zip'
+// in browser, videos need to be in the same domain as the app
 // 'https://solutions-apaas.agora.io/fcr-ui-scene/video/common/default8.mp4',
 // 'https://solutions-apaas.agora.io/fcr-ui-scene/video/common/default9.mp4',
 ];
-var BUILTIN_SOUND_EFFECT_URL_LIST = exports.BUILTIN_SOUND_EFFECT_URL_LIST = ['https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/sound_effect_audios.zip',
+var BUILTIN_SOUND_EFFECT_URL_LIST = exports.BUILTIN_SOUND_EFFECT_URL_LIST = [
+// Built-in assets URL
+'https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/sound_effect_audios.zip'
+
 // browser mp3
-'https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/remote_user_joined.mp3', 'https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/speaker_test.mp3', 'https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/recording_started.mp3'];
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/remote_user_joined.mp3',
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/speaker_test.mp3',
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/recording_started.mp3',
+];
+var getNormalDownloadResources = exports.getNormalDownloadResources = function getNormalDownloadResources(customResource) {
+  var _ref = customResource !== null && customResource !== void 0 ? customResource : {
+      virtualBackgroundImages: [],
+      virtualBackgroundVideos: [],
+      soundEffectAudios: []
+    },
+    _ref$virtualBackgroun = _ref.virtualBackgroundImages,
+    virtualBackgroundImages = _ref$virtualBackgroun === void 0 ? [] : _ref$virtualBackgroun,
+    _ref$virtualBackgroun2 = _ref.virtualBackgroundVideos,
+    virtualBackgroundVideos = _ref$virtualBackgroun2 === void 0 ? [] : _ref$virtualBackgroun2,
+    _ref$soundEffectAudio = _ref.soundEffectAudios,
+    soundEffectAudios = _ref$soundEffectAudio === void 0 ? [] : _ref$soundEffectAudio;
+  var uiResources = {
+    virtualBackgroundImages: [].concat(BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST, (0, _toConsumableArray2["default"])(virtualBackgroundImages)),
+    virtualBackgroundVideos: [].concat(BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST, (0, _toConsumableArray2["default"])(virtualBackgroundVideos)),
+    soundEffectAudios: [].concat(BUILTIN_SOUND_EFFECT_URL_LIST, (0, _toConsumableArray2["default"])(soundEffectAudios))
+  };
+  return uiResources;
+};

package/lib/waiting-room-control-manager.d.ts

@@ -8,14 +8,14 @@ export interface FcrUIWaitingRoomControlManagerObserver {
 export default class FcrUIWaitingRoomControlManager {
     private _sceneConfig;
     private _engine;
+    private _mainRoomControl;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _waitingRoomControl;
-    private _mainRoomControl?;
     private _isJoining;
-    constructor(_sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine);
-    joinWaitingRoom(): void;
-    leaveWaitingRoom(): void;
+    private _mainRoomUserObserver;
+    constructor(_sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _mainRoomControl: FcrMainRoomControl);
+    private _isWaitingRoomManager;
     private _createAndJoinWaitingRoom;
     private _leaveWaitingRoom;
     private _getMainRoomControlInfo;