fcr-ui-scene 3.6.2 → 3.6.3

package/lib/ui-scene.js

@@ -89,6 +89,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 +135,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 +177,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 +381,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);
@@ -531,8 +536,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

@@ -131,6 +131,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/setting-config-storage.d.ts

@@ -1,16 +1,15 @@
 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;
     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 _createMediaProxy;

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

@@ -20,32 +20,49 @@ 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 _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");
 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, "_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, [{
@@ -58,49 +75,26 @@ var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/fun
       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 = settingConfig;
       }
-      this._initMediaConfig();
       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: "_createMediaProxy",

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

@@ -359,7 +359,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 +382,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(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -22,19 +22,20 @@
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
     "agora-electron-sdk": "4.3.2-build.145-rc.4",
-    "agora-foundation": "^3.6.2",
-    "agora-ui-foundation": "^3.6.2",
+    "agora-foundation": "^3.6.3",
+    "agora-ui-foundation": "^3.6.3",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "^3.6.2",
+    "fcr-core": "^3.6.3",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
     "mobx": "^6.12.3",
     "mobx-react": "^9.1.1",
     "mobx-utils": "^6.0.8",
+    "node-window-manager": "^2.2.4",
     "pidusage": "^3.0.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -44,7 +45,8 @@
     "react-virtualized": "^9.22.5",
     "systeminformation": "^5.22.11",
     "tinycolor2": "^1.6.0",
-    "winston": "^3.16.0"
+    "winston": "^3.16.0",
+    "winston-daily-rotate-file": "^4.7.1"
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",
@@ -59,7 +61,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "^3.6.2",
+    "agora-toolchain": "^3.6.3",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",