fcr-ui-scene 3.7.2 → 3.7.4

package/lib/utilities/debug.d.ts

@@ -0,0 +1,4 @@
+import type { BrowserWindow } from 'electron';
+export declare const getAllBrowserWindows: () => BrowserWindow[];
+export declare const printAllBrowserWindows: () => void;
+export declare const openDevToolsForWindow: (index: number) => void;

package/lib/utilities/debug.js

@@ -0,0 +1,40 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.printAllBrowserWindows = exports.openDevToolsForWindow = exports.getAllBrowserWindows = 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");
+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 getAllBrowserWindows = exports.getAllBrowserWindows = function getAllBrowserWindows() {
+  var windows = window.require('@electron/remote').BrowserWindow.getAllWindows();
+  return windows;
+};
+var printAllBrowserWindows = exports.printAllBrowserWindows = function printAllBrowserWindows() {
+  var windows = window.require('@electron/remote').BrowserWindow.getAllWindows();
+  windows.forEach(function (window, index) {
+    console.log("Window Index:, ".concat(index, " ID: ").concat(window.id, ", Title: ").concat(window.getTitle(), ", URL: ").concat(window.webContents.getURL()));
+  });
+};
+var openDevToolsForWindow = exports.openDevToolsForWindow = function openDevToolsForWindow(index) {
+  var windows = window.require('@electron/remote').BrowserWindow.getAllWindows();
+  var win = windows[index];
+  if (win) {
+    win.webContents.openDevTools({
+      mode: 'detach'
+    });
+    console.log("Opened DevTools for window, title: ".concat(win.getTitle()));
+  }
+};
+
+// @ts-ignore
+window._getAllBrowserWindows = getAllBrowserWindows;
+// @ts-ignore
+window._printAllBrowserWindows = printAllBrowserWindows;
+// @ts-ignore
+window._openDevToolsForWindow = openDevToolsForWindow;

package/lib/utilities/default-config.d.ts

@@ -6,6 +6,7 @@ export declare const cameraVideoHighStreamEncoderConfig: {
     };
     frameRate: number;
     bitrate: number;
+    isMirror: boolean;
 };
 export declare const cameraVideoLowStreamEncoderConfig: {
     dimensions: {
@@ -14,6 +15,7 @@ export declare const cameraVideoLowStreamEncoderConfig: {
     };
     frameRate: number;
     bitrate: number;
+    isMirror: boolean;
 };
 export declare const screenCaptureHighStreamEncoderConfig: {
     dimensions: {
@@ -22,6 +24,7 @@ export declare const screenCaptureHighStreamEncoderConfig: {
     };
     frameRate: number;
     bitrate: number;
+    isMirror: boolean;
 };
 export declare const screenCaptureLowStreamEncoderConfig: {
     dimensions: {
@@ -30,6 +33,7 @@ export declare const screenCaptureLowStreamEncoderConfig: {
     };
     frameRate: number;
     bitrate: number;
+    isMirror: boolean;
 };
 export declare let enableCameraDualStreamMode: boolean;
 export declare let enableScreenDualStreamMode: boolean;

package/lib/utilities/default-config.js

@@ -14,7 +14,8 @@ var cameraVideoHighStreamEncoderConfig = exports.cameraVideoHighStreamEncoderCon
     height: 720
   },
   frameRate: 30,
-  bitrate: 1500
+  bitrate: 1500,
+  isMirror: false
 };
 var cameraVideoLowStreamEncoderConfig = exports.cameraVideoLowStreamEncoderConfig = {
   dimensions: {
@@ -22,7 +23,8 @@ var cameraVideoLowStreamEncoderConfig = exports.cameraVideoLowStreamEncoderConfi
     height: 270
   },
   frameRate: 15,
-  bitrate: 350
+  bitrate: 350,
+  isMirror: false
 };
 var screenCaptureHighStreamEncoderConfig = exports.screenCaptureHighStreamEncoderConfig = {
   dimensions: {
@@ -30,7 +32,8 @@ var screenCaptureHighStreamEncoderConfig = exports.screenCaptureHighStreamEncode
     height: 1080
   },
   frameRate: 15,
-  bitrate: 1500
+  bitrate: 1500,
+  isMirror: false
 };
 var screenCaptureLowStreamEncoderConfig = exports.screenCaptureLowStreamEncoderConfig = {
   dimensions: {
@@ -38,7 +41,8 @@ var screenCaptureLowStreamEncoderConfig = exports.screenCaptureLowStreamEncoderC
     height: 240
   },
   frameRate: 15,
-  bitrate: 400
+  bitrate: 400,
+  isMirror: false
 };
 var enableCameraDualStreamMode = exports.enableCameraDualStreamMode = true;
 var enableScreenDualStreamMode = exports.enableScreenDualStreamMode = false;

package/lib/utilities/dialog-utils.d.ts

@@ -50,11 +50,12 @@ export declare function followCorrectDisplay({ browserWindow, dialogKey, extraRe
      */
     extraRefControlbarCondition?: boolean;
     /**
-     * 根据屏幕或者应用主窗口居中显示，默认是 screen，如果需要跟随主窗口，则设置为 main-window,
+     * 根据屏幕或者应用主窗口居中显示，默认是 screen，如果需要跟随主窗口，则设置为 main-window
+     * 如果设置为 false，则不跟随任何窗口，只返回数据, 此设置主要针对 controlbar 弹窗，controlbar 有自己的逻辑
      * 在屏幕共享时，普通 dialog 窗口会以 controlbar 所在的屏幕为基准水平居中对齐
      * 在非屏幕共享状态下，则会以主窗口为基准水平居中对齐
      */
-    follow?: 'screen' | 'main-window';
+    follow?: 'screen' | 'main-window' | false;
     /**
      * 是否是全屏幕覆盖的透明窗口, 此设置主要针对 toast 和 confirm 弹窗
      */

package/lib/utilities/dialog-utils.js

@@ -21,15 +21,19 @@ require("core-js/modules/web.timers.js");
 var _env = require("agora-foundation/lib/utilities/env");
 var _constant = require("./constant");
 var _store = require("../modules/dialog/store");
+var _renderer = require("./renderer");
+var _logger = require("./logger");
 // 修复 windows 无法响应 hover 的问题
 function handleCheckMouseOver(params) {
   if (!(0, _env.isElectron)()) return;
+  var logger = (0, _logger.getLogger)();
   var elem = params.elem,
     browserWindow = params.browserWindow,
     screenBounds = params.screenBounds,
     callback = params.callback,
     newRendererWindow = params.newRendererWindow,
     dialog = params.dialog;
+  var enterHotZoneState = false;
   browserWindow.focus();
   browserWindow.setIgnoreMouseEvents(true);
   var MAX_HEIGHT = 430; // 内容最多的 popover 高度
@@ -91,13 +95,21 @@ function handleCheckMouseOver(params) {
     var barControlBoundary = mouse_x > inside_x1 && mouse_x < inside_x2 && mouse_y > inside_y1 && mouse_y < inside_y2;
     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 (!enterHotZoneState) {
+        enterHotZoneState = true;
+        browserWindow.setIgnoreMouseEvents(false);
+        logger.info('[controlbar] Mouse entered hot zone');
+        // 因为当用户点击其他窗口时，鼠标返回热区窗口会自动聚焦返回到上层，经测试这个注释不会影响现有功能，先注释看有没有其它影响
+        // if (!browserWindow.isFocused()) {
+        //   browserWindow.focus();
+        // }
+      }
     } else {
-      browserWindow.setIgnoreMouseEvents(true);
+      if (enterHotZoneState) {
+        enterHotZoneState = false;
+        browserWindow.setIgnoreMouseEvents(true);
+        logger.info('[controlbar] Mouse left hot zone');
+      }
     }
   }, 50);
   callback === null || callback === void 0 || callback(timerId);
@@ -108,7 +120,7 @@ function getCurrentSharingWorkArea(params) {
   var _window$screen = window.screen,
     availWidth = _window$screen.availWidth,
     availHeight = _window$screen.availHeight;
-  var nearDisplay = (0, _env.isElectron)() ? window.runtime.screen.getDisplayNearestPoint(currentShareBounds) : null;
+  var nearDisplay = (0, _env.isElectron)() ? window.runtime.screen.getDisplayMatching(currentShareBounds) : null;
   var dataStruct = {
     bounds: {
       x: 0,
@@ -158,28 +170,57 @@ function followCorrectDisplay(_ref4) {
   }) : _store.dialogWindows.get(dialogKey) : browserWindow;
   var controlbar = _store.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 nearDisplay = window.runtime.screen.getDisplayMatching(nearestPoint);
   var nearBounds = nearDisplay.bounds;
+
+  // alwaysFollowScreen 为 true 时取屏幕的宽高，否则取 workArea 的宽高
+  var width = alwaysFollowScreen ? Math.floor(nearBounds.width) : Math.floor(nearDisplay.workArea.width);
+  var height = alwaysFollowScreen ? Math.floor(nearBounds.height) : Math.floor(nearDisplay.workArea.height);
   var nearDisplayBounds = {
     x: Math.floor(nearBounds.x),
     y: Math.floor(nearBounds.y),
-    width: Math.floor(nearBounds.width),
-    height: Math.floor(nearBounds.height)
+    width: width,
+    height: height
   };
-  var followBounds = function followBounds(theWindowBounds) {
+  var followWithAlignToCenter = function followWithAlignToCenter(theWindowBounds) {
     var targetBounds = follow === 'screen' || extraRefControlbarCondition ? nearBounds : mainAppWindowBounds;
-    return alwaysFollowScreen ? nearDisplayBounds : {
+    return {
       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()));
+  var setBoundsMethod = function setBoundsMethod(dialog) {
+    if (alwaysFollowScreen) {
+      if ((0, _renderer.isMac)()) {
+        dialog === null || dialog === void 0 || dialog.setBounds(nearDisplayBounds);
+      } else {
+        // windows 在屏幕分辨率差异比较大的时候，无法移动到正确的屏幕，需要调整到一个小的分辨率后再进行移动
+        var x = nearDisplayBounds.x,
+          y = nearDisplayBounds.y;
+        (dialog === null || dialog === void 0 ? void 0 : dialog.isMaximized()) && (dialog === null || dialog === void 0 ? void 0 : dialog.unmaximize());
+        dialog === null || dialog === void 0 || dialog.setBounds({
+          x: x,
+          y: y,
+          width: 800,
+          height: 600
+        });
+        dialog === null || dialog === void 0 || dialog.maximize();
+      }
+    } else {
+      dialog === null || dialog === void 0 || dialog.setBounds(followWithAlignToCenter(dialog.getBounds()));
+    }
+  };
+  if (follow !== false) {
+    Array.isArray(objectDialog) ? objectDialog.forEach(function (dialog) {
+      return setBoundsMethod(dialog);
+    }) : setBoundsMethod(objectDialog);
+  }
   return {
     nearDisplayBounds: nearDisplayBounds,
     nearDisplay: nearDisplay,

package/lib/utilities/meeting-detail.js

@@ -41,7 +41,10 @@ var generateMeetingDetail = exports.generateMeetingDetail = function generateMee
   return parts.join('\n').replace(/^\s*\n/gm, '');
 };
 var generateMeetingDuration = exports.generateMeetingDuration = function generateMeetingDuration(startTime, duration) {
-  if (typeof startTime !== 'number' || duration === 0) {
+  if (typeof startTime !== 'number' || startTime === 0) {
+    return '';
+  }
+  if (typeof duration !== 'number' || duration === 0) {
     return '';
   }
   var durationStamp = (duration || 86400000) * 1000;

package/lib/utilities/package-info.d.ts

@@ -0,0 +1,3 @@
+import packageInfo from '../../package.json';
+export declare const getVersion: () => string;
+export declare const getDependenciesInfo: (packageName: keyof typeof packageInfo.dependencies) => string;

package/lib/utilities/package-info.js

@@ -0,0 +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.getVersion = exports.getDependenciesInfo = void 0;
+var _package = _interopRequireDefault(require("../../package.json"));
+var getVersion = exports.getVersion = function getVersion() {
+  return _package["default"].version;
+};
+var getDependenciesInfo = exports.getDependenciesInfo = function getDependenciesInfo(packageName) {
+  return _package["default"].dependencies[packageName];
+};

package/lib/utilities/renderer-event.d.ts

@@ -1,12 +1,10 @@
-import { title as AnnotationTitle } from '../fragments/annotation/index';
-import { title as AnnotationToolTitle } from '../modules/dialog/dialogs/annotation-tool';
 type RendererEventListener = (event: RendererCustomEvent) => void;
 export declare const addEventListener: (listener: RendererEventListener) => void;
 export declare const removeEventListener: (listener: RendererEventListener) => void;
 export declare const sendEvent: (event: RendererCustomEvent) => void;
 export declare const openLinkInDefaultBrowser: (url: string) => void;
-export declare const getBrowserWindowById: (id: number) => Electron.CrossProcessExports.BrowserWindow | undefined;
-export declare const getControlBarMediaSourceId: () => string | undefined;
-export declare const getVideoWindowMediaSourceId: () => string | undefined;
-export declare const getAnnotationMediaSourceId: (title: typeof AnnotationTitle | typeof AnnotationToolTitle) => string | undefined;
+export declare const getMediaSourcesIdByTitle: (title: string[]) => {
+    windowName: string;
+    windowId: string;
+}[] | undefined;
 export {};

package/lib/utilities/renderer-event.js

@@ -1,19 +1,25 @@
 "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.sendEvent = exports.removeEventListener = exports.openLinkInDefaultBrowser = exports.getVideoWindowMediaSourceId = exports.getControlBarMediaSourceId = exports.getBrowserWindowById = exports.getAnnotationMediaSourceId = exports.addEventListener = void 0;
-require("core-js/modules/es.array.find.js");
+exports.sendEvent = exports.removeEventListener = exports.openLinkInDefaultBrowser = exports.getMediaSourcesIdByTitle = exports.addEventListener = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+require("core-js/modules/es.array.filter.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.object.to-string.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/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.set.add-all.js");
 require("core-js/modules/esnext.set.delete-all.js");
 require("core-js/modules/esnext.set.difference.v2.js");
@@ -67,49 +73,23 @@ var openLinkInDefaultBrowser = exports.openLinkInDefaultBrowser = function openL
     window.open(url);
   }
 };
-var getBrowserWindowById = exports.getBrowserWindowById = function getBrowserWindowById(id) {
-  if (window.runtime) {
-    return window.runtime.getBrowserWindowById(id);
-  } else {
-    console.error('failed to call sendEvent, window.runtime is not available');
-  }
-};
-var getControlBarMediaSourceId = exports.getControlBarMediaSourceId = function getControlBarMediaSourceId() {
-  if (window.runtime) {
-    var mediaSourceList = window.runtime.getMediaSourceIdList();
-    var info = mediaSourceList.find(function (item) {
-      return item.title === 'Control Bar';
-    });
-    if (info) {
-      return info.mediaSourceId;
-    }
-  } else {
-    console.error('failed to call getControlBarMediaSourceId, window.runtime is not available');
-  }
-};
-var getVideoWindowMediaSourceId = exports.getVideoWindowMediaSourceId = function getVideoWindowMediaSourceId() {
-  if (window.runtime) {
-    var mediaSourceList = window.runtime.getMediaSourceIdList();
-    var info = mediaSourceList.find(function (item) {
-      return item.title === 'Video Window';
-    });
-    if (info) {
-      return info.mediaSourceId;
-    }
-  } else {
-    console.error('failed to call getVideoWindowMediaSourceId, window.runtime is not available');
-  }
-};
-var getAnnotationMediaSourceId = exports.getAnnotationMediaSourceId = function getAnnotationMediaSourceId(title) {
+var getMediaSourcesIdByTitle = exports.getMediaSourcesIdByTitle = function getMediaSourcesIdByTitle(title) {
   if (window.runtime) {
     var mediaSourceList = window.runtime.getMediaSourceIdList();
-    var info = mediaSourceList.find(function (item) {
-      return item.title === title;
+    var infos = mediaSourceList.filter(function (item) {
+      return title.includes(item.title);
     });
-    if (info) {
-      return info.mediaSourceId;
+    if (infos.length > 0) {
+      return infos.map(function (item) {
+        var _item$mediaSourceId$s = item.mediaSourceId.split(':'),
+          _item$mediaSourceId$s2 = (0, _slicedToArray2["default"])(_item$mediaSourceId$s, 2),
+          windowId = _item$mediaSourceId$s2[1];
+        var windowName = item.title;
+        return {
+          windowName: windowName,
+          windowId: windowId
+        };
+      });
     }
-  } else {
-    console.error('failed to call getMediaSourceId, window.runtime is not available');
   }
 };

package/lib/utilities/renderer.d.ts

@@ -11,7 +11,7 @@ export declare const isMac: () => boolean;
  * @param browserWindow
  * @param callback
  */
-export declare const handleWillClose: (browserWindow: Electron.BrowserWindow, callback?: () => void) => void;
+export declare const handleWillClose: (browserWindow: Electron.BrowserWindow, callback?: () => Promise<boolean>) => void;
 export declare const releaseSubAllWindowRefs: () => void;
 export declare const setInMeetingState: (state: 0 | 1) => void;
 export declare const restartApp: () => void;

package/lib/utilities/renderer.js

@@ -1,10 +1,13 @@
 "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.setInMeetingState = exports.restartApp = exports.releaseSubAllWindowRefs = exports.open = exports.isWindows = exports.isMac = exports.handleWillClose = exports.close = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 require("core-js/modules/es.array.index-of.js");
 var open = exports.open = function open(path) {
   window.runtime.open(path);
@@ -29,16 +32,47 @@ var isMac = exports.isMac = function isMac() {
  * @param callback
  */
 var handleWillClose = exports.handleWillClose = function handleWillClose(browserWindow) {
-  var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function () {};
-  var _callback = function _callback() {
-    // console.log('browserWindow will-close fired');
-
-    callback();
-    if (!browserWindow.isDestroyed()) {
-      // dont close the window as it will carsh the renderer process of the main window
-      browserWindow.hide();
-    }
-  };
+  var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    return _regenerator["default"].wrap(function (_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", false);
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  var _callback = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var interception;
+      return _regenerator["default"].wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 1;
+            return callback();
+          case 1:
+            interception = _context2.sent;
+            if (!interception) {
+              _context2.next = 2;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 2:
+            if (!browserWindow.isDestroyed()) {
+              // dont close the window as it will carsh the renderer process of the main window
+              browserWindow.hide();
+            }
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function _callback() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   browserWindow.removeAllListeners('will-close');
   browserWindow.addListener(
   // @ts-ignore

package/lib/utilities/shared-storage.d.ts

@@ -0,0 +1,18 @@
+/**
+ * This file is for managing shared storage utilities.
+ */
+import type { FcrConnectionState } from 'fcr-core';
+export declare const setAnnotationEngineState: (state: FcrConnectionState) => void;
+export declare const getAnnotationEngineState: () => FcrConnectionState;
+export declare const setAnnotationRtmAppId: (appId: string) => void;
+export declare const setAnnotationNickName: (nickName: string) => void;
+export declare const getBoardOptions: () => {
+    boardAppId: string;
+    boardId: string;
+    boardRegion: string;
+    boardToken: string;
+    boardUserToken: string;
+    boardUserUuid: string;
+    nickName: string;
+    rtmAppId: string;
+} | undefined;

package/lib/utilities/shared-storage.js

@@ -0,0 +1,63 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.define-properties.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setAnnotationRtmAppId = exports.setAnnotationNickName = exports.setAnnotationEngineState = exports.getBoardOptions = exports.getAnnotationEngineState = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/esnext.json.parse.js");
+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; }
+/**
+ * This file is for managing shared storage utilities.
+ */
+
+var STORAGE_KEY_ANNOTATION_RTM_APP_ID = 'annotation_rtm_app_id';
+var STORAGE_KEY_ANNOTATION_BOARD_OPTIONS = 'annotation_board_options';
+var STORAGE_KEY_ANNOTATION_NICK_NAME = 'annotation_nickname';
+var setAnnotationEngineState = exports.setAnnotationEngineState = function setAnnotationEngineState(state) {
+  localStorage.setItem('annotation_engine_state', JSON.stringify(state));
+};
+var getAnnotationEngineState = exports.getAnnotationEngineState = function getAnnotationEngineState() {
+  var stateStr = localStorage.getItem('annotation_engine_state');
+  if (!stateStr) {
+    return 0;
+  }
+  return JSON.parse(stateStr);
+};
+var setAnnotationRtmAppId = exports.setAnnotationRtmAppId = function setAnnotationRtmAppId(appId) {
+  localStorage.setItem(STORAGE_KEY_ANNOTATION_RTM_APP_ID, appId);
+};
+var setAnnotationNickName = exports.setAnnotationNickName = function setAnnotationNickName(nickName) {
+  localStorage.setItem(STORAGE_KEY_ANNOTATION_NICK_NAME, nickName);
+};
+var getBoardOptions = exports.getBoardOptions = function getBoardOptions() {
+  var boardOptionsStr = localStorage.getItem(STORAGE_KEY_ANNOTATION_BOARD_OPTIONS);
+  var rtmAppId = localStorage.getItem(STORAGE_KEY_ANNOTATION_RTM_APP_ID) || '';
+  var nickName = localStorage.getItem(STORAGE_KEY_ANNOTATION_NICK_NAME) || '';
+  if (boardOptionsStr) {
+    var boardOptions = JSON.parse(boardOptionsStr || '{}');
+    return _objectSpread(_objectSpread({}, boardOptions), {}, {
+      rtmAppId: rtmAppId,
+      nickName: nickName
+    });
+  }
+  return undefined;
+};

package/lib/utilities/tools.js

@@ -219,6 +219,7 @@ width,
  */
 height) {
   var isProvider = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  var logger = (0, _logger.getLogger)();
   /**
    * 如果宽大于高, 则把 boardView 的高度设置为 100vh, 然后获取 boardView 最新的高度
    * 用新的高度计算宽高比为 16:9 的比例下的宽度是否大于原宽度，如果大于等于原宽度，则把 boardView 的高度设置为当前高度
@@ -247,7 +248,7 @@ height) {
     boardView.style.width = "".concat(_newHeight / 9 * 16, "px");
     boardView.style.height = "".concat(_newHeight, "px");
   }
-  console.log('annotation compute area size: ', boardView.style.width, '=====', boardView.style.height);
+  logger.info('annotation compute area size: ', boardView.style.width, '=====', boardView.style.height);
 }
 var getBrowserLanguage = exports.getBrowserLanguage = function getBrowserLanguage() {
   var usrlang = navigator.language;

package/lib/waiting-room-control-manager.js

@@ -29,7 +29,7 @@ var _fcrCore = require("fcr-core");
 var _type = require("fcr-core/lib/room-control/user-control/type");
 var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
 var _imports = require("fcr-core/lib/imports");
-var _type3 = require("agora-rte-sdk/lib/type");
+var _type3 = require("fcr-core/lib/type");
 var _logger = require("./utilities/logger");
 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; }
@@ -178,11 +178,11 @@ var FcrUIWaitingRoomControlManager = exports["default"] = /*#__PURE__*/function
       var config = this._sceneConfig;
       var streams = [{
         streamName: 'default',
-        streamType: _imports.AgoraRteMediaStreamType.BOTH,
-        videoSourceType: _imports.AgoraRteVideoSourceType.CAMERA,
-        audioSourceType: _type3.AgoraRteAudioSourceType.MICROPHONE,
-        videoSourceState: _type3.AgoraRteMediaSourceState.CLOSE,
-        audioSourceState: _type3.AgoraRteMediaSourceState.CLOSE
+        streamType: _type3.FcrStreamType.BOTH,
+        videoSourceType: _type3.FcrVideoSourceType.CAMERA,
+        audioSourceType: _fcrCore.FcrAudioSourceType.MICROPHONE,
+        videoSourceState: _type3.FcrMediaSourceState.CLOSE,
+        audioSourceState: _type3.FcrMediaSourceState.CLOSE
       }];
       if (config.userRole === _type.FcrUserRole.ROBOT) {
         streams = [];