fcr-ui-scene 3.6.2 → 3.6.4-rc.1

package/lib/ui-scene.js

@@ -46,7 +46,6 @@ require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.promise.finally.js");
-require("core-js/modules/esnext.async-iterator.for-each.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");
@@ -89,6 +88,8 @@ var _screenShareData = require("./shared-data-source/screen-share-data");
 var _store = _interopRequireDefault(require("./modules/setting/store"));
 var _monitorProvider = require("./providers/monitor-provider");
 var _uiResources = require("./utilities/ui-resources");
+var _userSettingStorageProvider = require("./providers/user-setting-storage-provider");
+var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
 var _FcrUIDefaultScene;
 var _initProto;
@@ -133,6 +134,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       }
     });
     this._localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
+    this._userSettingStorageProvider = new _userSettingStorageProvider.FcrUIUserSettingStorageProviderImpl();
     var language = (0, _i18n.getLanguage)();
     (0, _tools.setLanguage)(language);
     window.addEventListener('beforeunload', this._handleBeforeUnload);
@@ -174,15 +176,14 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       this._dialogProvider = new _dialogProvider.FcrUIDialogProviderImpl();
       var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
       this._sharedDevicePrivilegeDataSource = new _devicePrivilegeData.FcrUISharedDevicePrivilegeDataSourceImpl();
-      this._deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(this._eventProvider, engine.getDesktopMediaControl(), this._settingConfig.media, this._localStorageProvider);
+      this._deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(this._eventProvider, engine.getDesktopMediaControl(), this._settingConfig.media, this._userSettingStorageProvider);
       this._roomProvider = new _roomProvider.FcrUIRoomProviderImpl(this._eventProvider, this._config, engine, this._messageProvider);
       this._sharedConfigDataSource = new _config2.FcrUISharedConfigDataSourceImpl({
         creatorConfig: this._creatorConfig,
         sceneConfig: this._config,
-        settingConfig: this._settingConfig,
-        localStorageProvider: this._localStorageProvider
+        settingConfig: this._settingConfig
       });
-      this._sharedSettingDataSource = new _setting.FcrUISharedSettingDataSourceImpl(this._creatorConfig, this._localStorageProvider);
+      this._sharedSettingDataSource = new _setting.FcrUISharedSettingDataSourceImpl(this._creatorConfig, this._userSettingStorageProvider);
       this._sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(this._sharedConfigDataSource);
       this._sharedSpeakerSpotlightDataSource = new _speakerSpotlight.FcrUISharedSpeakerSpotlightDataSourceImpl();
       this._sharedVideoWindowDataSource = new _videoWindow.FcrUIVideoWindowDataSourceImpl(this._sharedSettingDataSource);
@@ -379,6 +380,9 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                 observable.notifyObservers('onExited', sceneConfig.roomId, _type.FcrUIExitReason.ABORTED);
               }
             });
+            if ((0, _env.isElectron)() && !window.runtime.browserWindow.isVisible()) {
+              window.runtime.browserWindow.show();
+            }
           }
           if (state === _fcrCore.FcrConnectionState.CONNECTED) {
             uiManager.renderLoading(false);
@@ -400,7 +404,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       var _joinRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(engine, roomControl, deviceProvider, joinRoomCallback) {
         var _this4 = this;
         var p;
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
+        return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               p = engine.login().then(function () {
@@ -409,12 +413,12 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                 return roomControl.handleJoinRoom();
               }).then(/*#__PURE__*/function () {
                 var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(response) {
-                  return _regenerator["default"].wrap(function _callee$(_context) {
+                  return _regenerator["default"].wrap(function (_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
                         joinRoomCallback();
                         return _context.abrupt("return", response);
-                      case 2:
+                      case 1:
                       case "end":
                         return _context.stop();
                     }
@@ -430,7 +434,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                 _this4._observable.notifyObservers('onLaunchFailure', _this4._config.roomId, e);
               });
               return _context2.abrupt("return", p);
-            case 3:
+            case 1:
             case "end":
               return _context2.stop();
           }
@@ -447,7 +451,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       var _renderSceneUI2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(roomControl, uiManager, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, messageProvider, dialogProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareDataSource) {
         var _roomControl$getRoomI;
         var type;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
+        return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               type = (_roomControl$getRoomI = roomControl.getRoomInfo()) === null || _roomControl$getRoomI === void 0 ? void 0 : _roomControl$getRoomI.roomType;
@@ -462,13 +466,13 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
               } else {
                 this._disposers.push(uiManager.renderWaitingSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, dialogProvider, messageProvider, sharedLayoutDataSource, sharedSettingDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareDataSource));
               }
-            case 2:
+            case 1:
             case "end":
               return _context3.stop();
           }
         }, _callee3, this);
       }));
-      function _renderSceneUI(_x6, _x7, _x8, _x9, _x10, _x11, _x12, _x13, _x14, _x15, _x16, _x17, _x18, _x19, _x20, _x21) {
+      function _renderSceneUI(_x6, _x7, _x8, _x9, _x0, _x1, _x10, _x11, _x12, _x13, _x14, _x15, _x16, _x17, _x18, _x19) {
         return _renderSceneUI2.apply(this, arguments);
       }
       return _renderSceneUI;
@@ -531,8 +535,8 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
         sharedSettingDataSource: sharedSettingDataSource,
         dialogProvider: dialogProvider,
         settingConfig: sharedConfigDataSource.settingConfig,
-        localStorageProvider: this._localStorageProvider,
-        userId: this._creatorConfig.userId
+        userId: this._creatorConfig.userId,
+        userSettingStorageProvider: this._userSettingStorageProvider
       });
       (_this$_dialogProvider = this._dialogProvider) === null || _this$_dialogProvider === void 0 || _this$_dialogProvider.addObserver({
         onOpenSettingDialog: function onOpenSettingDialog() {

package/lib/utilities/constant.d.ts

@@ -125,7 +125,8 @@ export declare enum FcrUIAction {
     SET_SHARE_WITH_AUDIO = 62,
     CLOSE_VIDEO_WINDOW = 63,
     OPEN_CONFIRM = 64,
-    OPEN_TOP_VIDEO_WINDOW = 65
+    OPEN_TOP_VIDEO_WINDOW = 65,
+    RESET_WHITEBOARD_TOOLBAR_VARS = 66
 }
 export declare enum FcrUIDialogKey {
     DEVICE_SETTINGS = "device-settings",

package/lib/utilities/constant.js

@@ -6,7 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrUIVideoWindowPinType = exports.FcrUIRoomControlType = exports.FcrUIRendererEventAction = exports.FcrUIParticipantType = exports.FcrUIHighlightElement = exports.FcrUIDialogKey = exports.FcrUIAction = void 0;
 var FcrUIRendererEventAction = exports.FcrUIRendererEventAction = /*#__PURE__*/function (FcrUIRendererEventAction) {
+  /**
+   * Indicates that the fragment has been loaded.
+   */
   FcrUIRendererEventAction["FRAGMENT_LOADED"] = "FRAGMENT_LOADED";
+  /**
+   * Indicates that the fragment has been closed.
+   */
   FcrUIRendererEventAction["FRAGMENT_CLOSED"] = "FRAGMENT_CLOSED";
   FcrUIRendererEventAction["POWER_MONITOR_LOCK_SCREEN"] = "POWER_MONITOR_LOCK_SCREEN";
   FcrUIRendererEventAction["POWER_MONITOR_SUSPEND"] = "POWER_MONITOR_SUSPEND";
@@ -74,6 +80,7 @@ var FcrUIAction = exports.FcrUIAction = /*#__PURE__*/function (FcrUIAction) {
   FcrUIAction[FcrUIAction["START_SHARE_SCREEN"] = 6] = "START_SHARE_SCREEN";
   FcrUIAction[FcrUIAction["STOP_SHARE_SCREEN"] = 7] = "STOP_SHARE_SCREEN";
   FcrUIAction[FcrUIAction["TOGGLE_LAYOUT"] = 8] = "TOGGLE_LAYOUT";
+  // LAYOUT_CHANGED,
   FcrUIAction[FcrUIAction["SET_MAIN_SPEAKER"] = 9] = "SET_MAIN_SPEAKER";
   FcrUIAction[FcrUIAction["OPEN_DEVICE_SETTING"] = 10] = "OPEN_DEVICE_SETTING";
   FcrUIAction[FcrUIAction["OPEN_DEVICE_SETTING_DIALOG"] = 11] = "OPEN_DEVICE_SETTING_DIALOG";
@@ -131,6 +138,7 @@ var FcrUIAction = exports.FcrUIAction = /*#__PURE__*/function (FcrUIAction) {
   FcrUIAction[FcrUIAction["CLOSE_VIDEO_WINDOW"] = 63] = "CLOSE_VIDEO_WINDOW";
   FcrUIAction[FcrUIAction["OPEN_CONFIRM"] = 64] = "OPEN_CONFIRM";
   FcrUIAction[FcrUIAction["OPEN_TOP_VIDEO_WINDOW"] = 65] = "OPEN_TOP_VIDEO_WINDOW";
+  FcrUIAction[FcrUIAction["RESET_WHITEBOARD_TOOLBAR_VARS"] = 66] = "RESET_WHITEBOARD_TOOLBAR_VARS";
   return FcrUIAction;
 }({});
 var FcrUIDialogKey = exports.FcrUIDialogKey = /*#__PURE__*/function (FcrUIDialogKey) {

package/lib/utilities/copyText.js

@@ -13,24 +13,24 @@ function copyText(_x) {
 }
 function _copyText() {
   _copyText = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(text) {
-    var textarea;
-    return _regenerator["default"].wrap(function _callee$(_context) {
+    var textarea, _t;
+    return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           if (!('clipboard' in navigator)) {
-            _context.next = 10;
+            _context.next = 4;
             break;
           }
           _context.prev = 1;
-          _context.next = 4;
+          _context.next = 2;
           return navigator.clipboard.writeText(text);
-        case 4:
+        case 2:
           return _context.abrupt("return");
-        case 7:
-          _context.prev = 7;
-          _context.t0 = _context["catch"](1);
-          console.error('navigator.clipboard.writeText catch error:', _context.t0);
-        case 10:
+        case 3:
+          _context.prev = 3;
+          _t = _context["catch"](1);
+          console.error('navigator.clipboard.writeText catch error:', _t);
+        case 4:
           textarea = document.createElement('textarea');
           textarea.setAttribute('readonly', 'readonly');
           textarea.value = text;
@@ -38,11 +38,11 @@ function _copyText() {
           textarea.select();
           document.execCommand('copy');
           document.body.removeChild(textarea);
-        case 17:
+        case 5:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[1, 7]]);
+    }, _callee, null, [[1, 3]]);
   }));
   return _copyText.apply(this, arguments);
 }

package/lib/utilities/hooks.js

@@ -20,8 +20,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _reactUseMeasure = _interopRequireDefault(require("react-use-measure"));
 var theme_ = _interopRequireWildcard(require("agora-ui-foundation/lib/theme/generate"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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); }
 // FIXME: Files in 'lib' are commonjs modules.
 //        There's no variable binding unless you reference the whole module.
 

package/lib/utilities/logger.js

@@ -8,7 +8,6 @@ exports.getLogger = exports.generateLogObserver = exports.createLogger = exports
 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.async-iterator.for-each.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");

package/lib/utilities/parameters.js

@@ -45,6 +45,6 @@ var getDualScreenVideoStreamConfig = exports.getDualScreenVideoStreamConfig = fu
   return parameters === null || parameters === void 0 || (_parameters$scene9 = parameters.scene) === null || _parameters$scene9 === void 0 ? void 0 : _parameters$scene9.dualScreenVideoStreamConfig;
 };
 var getStartScreenSharing = exports.getStartScreenSharing = function getStartScreenSharing(parameters) {
-  var _parameters$scene10;
-  return (0, _valueCheck.isTrueValue)(parameters === null || parameters === void 0 || (_parameters$scene10 = parameters.scene) === null || _parameters$scene10 === void 0 ? void 0 : _parameters$scene10.startScreenSharing);
+  var _parameters$scene0;
+  return (0, _valueCheck.isTrueValue)(parameters === null || parameters === void 0 || (_parameters$scene0 = parameters.scene) === null || _parameters$scene0 === void 0 ? void 0 : _parameters$scene0.startScreenSharing);
 };

package/lib/utilities/privilege.js

@@ -10,11 +10,8 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.some.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
-require("core-js/modules/esnext.iterator.some.js");
 var hasPermissionWithTargetRoleEnabled = exports.hasPermissionWithTargetRoleEnabled = function hasPermissionWithTargetRoleEnabled(permissionInfos, action, targetRole) {
   var info = permissionInfos.find(function (permissionInfo) {
     var _permissionInfo$info;

package/lib/utilities/renderer-event.js

@@ -11,8 +11,6 @@ require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.for-each.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");

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

@@ -1,17 +1,18 @@
 import { FcrUIMediaConfig, FcrUISettingConfig } from '../type';
-import { FcrUILocalStorageProvider } from '../providers/local-storage-provider';
+import { FcrUIUserSettingStorageProvider } from '../providers/user-setting-storage-provider';
 export declare const settingConfigStorageKey = "fcr-ui-setting-config";
 export declare class FcrSettingConfigStorage implements FcrUISettingConfig {
-    private _isElectron;
+    protected logger: import("agora-foundation/lib/logger").Logger;
     private _settingConfig;
-    private _localStorageProvider;
-    constructor({ localStorageProvider }: {
-        localStorageProvider: FcrUILocalStorageProvider;
+    private _userSettingStorageProvider;
+    constructor({ userSettingStorageProvider, }: {
+        userSettingStorageProvider: FcrUIUserSettingStorageProvider;
     });
     get media(): FcrUIMediaConfig;
     set media(media: FcrUIMediaConfig);
-    private _initMediaConfig;
+    get setting(): import("../modules/setting/store").FcrUICustomSetting;
     private _initSettingConfig;
     private _setSettingConfig;
+    private _isMediaObject;
     private _createMediaProxy;
 }

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

@@ -9,8 +9,6 @@ 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.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.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");
@@ -20,32 +18,55 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.settingConfigStorageKey = exports.FcrSettingConfigStorage = void 0;
-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");
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 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");
+var _fcrCore = require("fcr-core");
+var _tools = require("./tools");
+var _merge = _interopRequireDefault(require("lodash/merge"));
+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; }
 var settingConfigStorageKey = exports.settingConfigStorageKey = 'fcr-ui-setting-config';
 var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/function () {
   function FcrSettingConfigStorage(_ref) {
-    var localStorageProvider = _ref.localStorageProvider;
+    var userSettingStorageProvider = _ref.userSettingStorageProvider;
     (0, _classCallCheck2["default"])(this, FcrSettingConfigStorage);
-    (0, _defineProperty2["default"])(this, "_isElectron", false);
+    (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+      prefix: 'FcrSettingConfigStorage'
+    }));
     (0, _defineProperty2["default"])(this, "_settingConfig", {
       media: {
         autoConnectAudio: true,
         microphoneExpectedOff: true,
         cameraExpectedOff: true
+      },
+      setting: {
+        shouldDisplayPreviewDialog: true,
+        shouldHideNonVideoParticipants: false,
+        displayedMaxAttendees: 16,
+        autoAdjustmentSpeakerVolume: true,
+        autoAdjustmentMicrophoneVolume: (0, _env.isElectron)(),
+        noiseReduce: _fcrCore.FcrAiDenoiseLevel.LOW,
+        recordingPath: '',
+        videoHD: false,
+        videoLowLight: false,
+        hardwareForReception: false,
+        videoNoise: false,
+        audioHiFi: false,
+        audioEchoCancellation: true,
+        audioStereo: false,
+        audioVoiceChanger: true,
+        spotlightEnabled: true,
+        isPlaySound: true,
+        language: (0, _tools.getBrowserLanguage)(),
+        shouldHideMyVideo: false
       }
     });
-    this._isElectron = (0, _env.isElectron)();
-    this._localStorageProvider = localStorageProvider;
+    this._userSettingStorageProvider = userSettingStorageProvider;
     this._initSettingConfig();
   }
   return (0, _createClass2["default"])(FcrSettingConfigStorage, [{
@@ -54,53 +75,41 @@ var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/fun
       return this._settingConfig.media;
     },
     set: function set(media) {
+      this._isMediaObject(media);
       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: "setting",
+    get: function get() {
+      return this._settingConfig.setting;
     }
   }, {
     key: "_initSettingConfig",
     value: function _initSettingConfig() {
-      if (this._isElectron) {
-        var settingConfig = window.runtime.getUserSettingData();
-        if (Object.keys(settingConfig).length === 0) {
-          window.runtime.setUserSettingData(this._settingConfig);
-        } else {
-          this._settingConfig = settingConfig;
-        }
+      var settingConfig = this._userSettingStorageProvider.read();
+      if (!settingConfig || Object.keys(settingConfig).length === 0) {
+        this._userSettingStorageProvider.write(this._settingConfig);
       } else {
-        var _settingConfig = this._localStorageProvider.read(settingConfigStorageKey);
-        if (!_settingConfig) return;
-        try {
-          this._settingConfig = JSON.parse(_settingConfig);
-        } catch (e) {
-          this._localStorageProvider.write(settingConfigStorageKey, JSON.stringify(this._settingConfig));
-        }
+        this._settingConfig = (0, _merge["default"])(this._settingConfig, settingConfig);
       }
-      this._initMediaConfig();
+      this._isMediaObject(this._settingConfig.media);
       this._settingConfig.media = this._createMediaProxy(this._settingConfig.media);
     }
   }, {
     key: "_setSettingConfig",
     value: function _setSettingConfig(settingConfig) {
       this._settingConfig = settingConfig;
-      if (this._isElectron) {
-        window.runtime.setUserSettingData(settingConfig);
-      } else {
-        this._localStorageProvider.write(settingConfigStorageKey, JSON.stringify(settingConfig));
+      this._userSettingStorageProvider.write(settingConfig);
+    }
+  }, {
+    key: "_isMediaObject",
+    value: function _isMediaObject(media) {
+      var isMediaObject = media && (0, _typeof2["default"])(media) === 'object';
+      if (!isMediaObject) {
+        this.logger.error('media is not a valid object', media);
       }
+      return isMediaObject;
     }
   }, {
     key: "_createMediaProxy",
@@ -113,7 +122,12 @@ var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/fun
           return true;
         }
       };
-      return new Proxy(media, handler);
+      var isMediaObject = this._isMediaObject(media);
+      return new Proxy(isMediaObject ? media : {
+        autoConnectAudio: true,
+        microphoneExpectedOff: true,
+        cameraExpectedOff: true
+      }, handler);
     }
   }]);
 }();

package/lib/utilities/tools.d.ts

@@ -88,6 +88,7 @@ export declare function followCorrectDisplay({ browserWindow, dialogKey, extraRe
 }): {
     nearDisplayBounds: CurrentShareBounds;
     nearDisplay: Electron.Display;
+    followControlbar: boolean;
 } | undefined;
 export declare function calcAnnotationAreaSize(
 /**

package/lib/utilities/tools.js

@@ -35,13 +35,9 @@ require("core-js/modules/es.string.ends-with.js");
 require("core-js/modules/es.string.match.js");
 require("core-js/modules/es.string.replace.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.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");
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -159,7 +155,7 @@ var waitUntil = exports.waitUntil = /*#__PURE__*/function () {
       logger,
       startTs,
       _args2 = arguments;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
+    return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           intervalMs = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : 100;
@@ -169,32 +165,32 @@ var waitUntil = exports.waitUntil = /*#__PURE__*/function () {
           return _context2.abrupt("return", new Promise(function (resolve) {
             var task = _schedule.AgoraScheduler.shared.addPollingTask(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
               var isTrue;
-              return _regenerator["default"].wrap(function _callee$(_context) {
+              return _regenerator["default"].wrap(function (_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
                     if (!(Date.now() - startTs > timeout)) {
-                      _context.next = 5;
+                      _context.next = 1;
                       break;
                     }
                     logger.warn("[wait-until] predict ".concat(memo, ": timeout"));
                     task.stop();
                     resolve();
                     return _context.abrupt("return");
-                  case 5:
+                  case 1:
                     isTrue = prediction();
                     logger.info("[wait-until] predict ".concat(memo, ": ").concat(isTrue));
                     if (isTrue) {
                       task.stop();
                       resolve();
                     }
-                  case 8:
+                  case 2:
                   case "end":
                     return _context.stop();
                 }
               }, _callee);
             })), intervalMs, false);
           }));
-        case 5:
+        case 1:
         case "end":
           return _context2.stop();
       }
@@ -359,7 +355,7 @@ function followCorrectDisplay(_ref6) {
   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());
+  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);
@@ -382,7 +378,8 @@ function followCorrectDisplay(_ref6) {
   }) : objectDialog === null || objectDialog === void 0 ? void 0 : objectDialog.setBounds(followBounds(objectDialog.getBounds()));
   return {
     nearDisplayBounds: nearDisplayBounds,
-    nearDisplay: nearDisplay
+    nearDisplay: nearDisplay,
+    followControlbar: followControlbar
   };
 }
 function calcAnnotationAreaSize(