fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib/base.js

@@ -292,8 +292,8 @@ var FcrBaseUIScene = exports.FcrBaseUIScene = /*#__PURE__*/function (_FcrUIRootN
     key: "_handleUICrash",
     value: function _handleUICrash() {
       if ((0, _env.isElectron)()) {
-        var renderer = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
-        renderer.quitApp();
+        // @ts-ignore
+        window.runtime.quitApp();
       } else {
         window.location.reload();
       }

package/lib/creator/index.js

@@ -91,7 +91,7 @@ var _confirm = require("../modules/dialog/dialogs/confirm");
 var _setting = require("../modules/setting");
 var _deviceSetting = _interopRequireWildcard(require("../modules/dialog/dialogs/device-setting"));
 var _toast = require("../modules/dialog/dialogs/toast");
-var _platform = require("../utilities/platform");
+var _systemPreference = require("../modules/dialog/dialogs/system-preference");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["rtc.microphone.keep.recording"];
 var _FcrUISceneCreator;
@@ -312,9 +312,9 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     value: function openSetting() {
       this._precheckState();
       this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER).openDialog(_constant.FcrUIDialogKey.SETTINGS, {
-        alwaysOnTop: (0, _platform.isWindows)()
+        alwaysOnTop: (0, _env.isWindows)()
       });
-      if ((0, _env.isElectron)() && (0, _platform.isWindows)()) {
+      if ((0, _env.isElectron)() && (0, _env.isWindows)()) {
         var windowProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
         var settingWindow = windowProvider.getWindowById(_constant.FcrUIDialogKey.SETTINGS);
         setTimeout(function () {
@@ -326,7 +326,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     key: "closeSetting",
     value: function closeSetting() {
       this._precheckState();
-      this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER).openDialog(_constant.FcrUIDialogKey.SETTINGS);
+      this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER).closeDialog(_constant.FcrUIDialogKey.SETTINGS);
     }
   }, {
     key: "release",
@@ -338,6 +338,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
       }
       this._globalNode.unmount();
       this._globalNode.nodeWillInactive();
+      this.closeSetting();
       this._providerInitializer.onCreatorRelease();
       this._released = true;
     }
@@ -471,7 +472,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
             params: params
           }, dialogId);
         },
-        windowConfig: _confirm.windowConfig
+        electronWindowConfig: _confirm.electronWindowConfig
       }, {
         key: _constant.FcrUIDialogKey.TOAST,
         component: function component(_ref3) {
@@ -485,7 +486,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
             children: _this2.eventToastModule.getComponent('global')
           }, dialogId);
         },
-        windowConfig: _toast.windowConfig
+        electronWindowConfig: _toast.electronWindowConfig
       }, {
         key: _constant.FcrUIDialogKey.SETTINGS,
         component: function component(_ref4) {
@@ -495,10 +496,24 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_deviceSetting["default"], {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            children: _this2.settingModule.getComponent(params)
+            children: _this2.settingModule.getComponent()
           }, dialogId);
         },
-        windowConfig: _deviceSetting.windowConfig
+        electronWindowConfig: _deviceSetting.electronWindowConfig,
+        webDialogConfig: _deviceSetting.webDialogConfig
+      }, {
+        key: _constant.FcrUIDialogKey.SYSTEM_PREFERENCE,
+        component: function component(_ref5) {
+          var dialogKey = _ref5.dialogKey,
+            dialogId = _ref5.dialogId,
+            params = _ref5.params;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_systemPreference.SystemPreferenceDialog, {
+            dialogKey: dialogKey,
+            dialogId: dialogId,
+            params: params
+          }, dialogId);
+        },
+        electronWindowConfig: _systemPreference.electronSystemPreferenceWindowConfig
       }]);
     }
   }, {
@@ -519,7 +534,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
         highVideoEncoderConfig: _defaultConfig.screenCaptureHighStreamEncoderConfig,
         enableDualStreamMode: (0, _defaultConfig.isScreenDualStreamModeEnabled)()
       };
-      var config = {
+      var config = new _fcrCore.FcrCoreEngineConfig({
         appId: this._config.appId,
         userId: this._config.userId,
         parameters: filteredParameters,
@@ -527,7 +542,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
         region: _fcrCore.FcrRegion.CN,
         dualCameraVideoStreamConfig: dualCameraVideoStreamConfig,
         dualScreenVideoStreamConfig: dualScreenVideoStreamConfig
-      };
+      });
       return config;
     }
   }, {

package/lib/creator/provider-initializer.browser.js

@@ -55,6 +55,9 @@ var _logger = require("../utilities/logger");
 var _widgetData = require("../shared-data/widget-data");
 var _sttProvider = require("../providers/stt-provider/stt-provider");
 var _sttSetting = require("../shared-data/stt-setting.ts");
+var _provider7 = require("../providers/annotation/provider.browser");
+var _userAudioVolume = require("../shared-data/user-audio-volume");
+var _userAudioVolumeProvider = require("../providers/user-audio-volume-provider");
 var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
   function FcrUIBrowserProviderInitializer(args) {
     (0, _classCallCheck2["default"])(this, FcrUIBrowserProviderInitializer);
@@ -91,7 +94,7 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER, dialogProvider);
       var deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(
       // TODO: renderer does not available in browser env
-      null, facilityProvider, messageProvider, engine.getDesktopMediaControl(), sharedSettingDataSource);
+      null, facilityProvider, messageProvider, engine.getDesktopMediaControl(), sharedSettingDataSource, dialogProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER, deviceProvider);
       var sharedConfigDataSource = new _config.FcrUISharedConfigDataSourceImpl({
         creatorConfig: config
@@ -178,7 +181,8 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER, sessionProvider);
       var sharedDevicePrivilegeDataSource = new _devicePrivilegeData.FcrUISharedDevicePrivilegeDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE, sharedDevicePrivilegeDataSource);
-      var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, interpreterProvider, sharedInterpreterDataSource);
+      var facilityProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_FACILITY_PROVIDER);
+      var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, interpreterProvider, sharedInterpreterDataSource, facilityProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_DEVICE_STREAM_PROVIDER, deviceStreamProvider);
       var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_WAITING_ROOM_CONTROL_PROVIDER, waitingRoomControlProvider);
@@ -231,18 +235,32 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
         sharedSecurityDataSource: sharedSecurityDataSource
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_STT_SETTING_DATA_SOURCE, sharedSttSettingDataSource);
+      var sharedUserAudioVolumeDataSource = new _userAudioVolume.FcrUISharedUserAudioVolumeDataSourceImpl();
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE, sharedUserAudioVolumeDataSource);
       var videoWindowDataSource = new _videoWindow.FcrUIVideoWindowDataSourceImpl(sharedSettingDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE, videoWindowDataSource);
       var screenShareProvider = new _provider5.FcrUIScreenShareProviderImpl(objectManager);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER, screenShareProvider);
-      var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource, messageProvider, sttProvider, sharedSttSettingDataSource, screenShareProvider, sharedSettingDataSource);
+      var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource, messageProvider, sttProvider, sharedSttSettingDataSource, screenShareProvider, sharedSettingDataSource, abilityProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_APPLIST_PROVIDER, applistProvider);
       var sharedSpeakerSoptlightDataSource = new _speakerSpotlight.FcrUISharedSpeakerSpotlightDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE, sharedSpeakerSoptlightDataSource);
       var localVideoRenderProvider = new _rendererProvider.FcrUIMainLocalVideoRenderProviderImpl(deviceProvider, screenShareProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER, localVideoRenderProvider);
+      var userAudioVolumeProvider = new _userAudioVolumeProvider.FcrUIUserAudioVolumeProviderImpl({
+        audioVolumeData: sharedUserAudioVolumeDataSource,
+        videoWindowData: videoWindowDataSource,
+        settingData: sharedSettingDataSource,
+        interpreterData: sharedInterpreterDataSource,
+        deviceProvider: deviceProvider,
+        screenShareProvider: screenShareProvider,
+        streamControl: streamControl
+      });
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER, userAudioVolumeProvider);
       var pinDataSource = new _pinData.FcrUISharedPinDataSourceImpl(messageProvider, videoWindowDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE, pinDataSource);
+      var annotationProvider = new _provider7.FcrUIAnnotationProviderImpl(objectManager);
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_ANNOTATION_PROVIDER, annotationProvider);
     }
   }, {
     key: "onMainSceneRelease",
@@ -274,6 +292,7 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_SECURITY_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_APPLIST_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
@@ -281,6 +300,8 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_STT_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_STT_SETTING_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_ANNOTATION_PROVIDER);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER);
       // 其它如有遗漏可补充
     }
   }, {
@@ -310,6 +331,9 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       var sharedConfigDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE);
       var sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE, sharedLayoutDataSource);
+      var abilityControl = currentRoomControlProvider.currentRoomControl.getAbilityControl();
+      var abilityProvider = new _abilityProvider.FcrUIAbilityProviderImpl(abilityControl);
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_ABILITY_PROVIDER, abilityProvider);
     }
   }, {
     key: "onWaitingSceneRelease",
@@ -324,6 +348,7 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_CHAT_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_ABILITY_PROVIDER);
       // 其它如有遗漏可补充
     }
   }]);

package/lib/creator/provider-initializer.electron.js

@@ -61,6 +61,9 @@ var _provider8 = require("../providers/mouse-detect/provider");
 var _widgetData = require("../shared-data/widget-data");
 var _sttProvider = require("../providers/stt-provider/stt-provider");
 var _sttSetting = require("../shared-data/stt-setting.ts");
+var _provider9 = require("../providers/annotation/provider.electron");
+var _userAudioVolume = require("../shared-data/user-audio-volume");
+var _userAudioVolumeProvider = require("../providers/user-audio-volume-provider");
 var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
   function FcrUIElectronProviderInitializer(args) {
     (0, _classCallCheck2["default"])(this, FcrUIElectronProviderInitializer);
@@ -112,7 +115,7 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
         renderer: renderer
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER, dialogProvider);
-      var deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(renderer, facilityProvider, messageProvider, engine.getDesktopMediaControl(), sharedSettingDataSource);
+      var deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(renderer, facilityProvider, messageProvider, engine.getDesktopMediaControl(), sharedSettingDataSource, dialogProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER, deviceProvider);
       var sharedConfigDataSource = new _config.FcrUISharedConfigDataSourceImpl({
         creatorConfig: this._config
@@ -175,8 +178,6 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       var privilegeControl = mainRoomControl.getPrivilegeControl();
       var interpreterControl = mainRoomControl.getInterpreterControl();
       var abilityControl = mainRoomControl.getAbilityControl();
-      var sttControl = mainRoomControl.getSttControl();
-      var roomSessionControl = mainRoomControl.getRoomSessionControl();
       var abilityProvider = new _abilityProvider.FcrUIAbilityProviderImpl(abilityControl);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_ABILITY_PROVIDER, abilityProvider);
       var devicePrivilegeProvider = new _devicePrivilegeProvider.FcrUIDevicePrivilegeProviderImpl(privilegeControl, streamControl, userControl, deviceProvider, messageProvider);
@@ -205,7 +206,8 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER, sessionProvider);
       var sharedDevicePrivilegeDataSource = new _devicePrivilegeData.FcrUISharedDevicePrivilegeDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE, sharedDevicePrivilegeDataSource);
-      var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, interpreterProvider, sharedInterpreterDataSource);
+      var facilityProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_FACILITY_PROVIDER);
+      var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, interpreterProvider, sharedInterpreterDataSource, facilityProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_DEVICE_STREAM_PROVIDER, deviceStreamProvider);
       var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_WAITING_ROOM_CONTROL_PROVIDER, waitingRoomControlProvider);
@@ -260,11 +262,13 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
         sharedSecurityDataSource: sharedSecurityDataSource
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_STT_SETTING_DATA_SOURCE, sharedSttSettingDataSource);
+      var sharedUserAudioVolumeDataSource = new _userAudioVolume.FcrUISharedUserAudioVolumeDataSourceImpl();
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE, sharedUserAudioVolumeDataSource);
       var sharedVideoWindowDataSource = new _videoWindow.FcrUIVideoWindowDataSourceImpl(sharedSettingDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE, sharedVideoWindowDataSource);
       var screenShareProvider = new _provider6.FcrUIScreenShareProviderImpl(objectManager);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER, screenShareProvider);
-      var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource, messageProvider, sttProvider, sharedSttSettingDataSource, screenShareProvider, sharedSettingDataSource);
+      var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource, messageProvider, sttProvider, sharedSttSettingDataSource, screenShareProvider, sharedSettingDataSource, abilityProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_APPLIST_PROVIDER, applistProvider);
       var localVideoRenderProvider = new _rendererProvider.FcrUIMainLocalVideoRenderProviderImpl(deviceProvider, screenShareProvider);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER, localVideoRenderProvider);
@@ -281,8 +285,20 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MULTI_DISPLAY_PROVIDER, multiDisplayProvider);
       var sharedSpeakerSoptlightDataSource = new _speakerSpotlight.FcrUISharedSpeakerSpotlightDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE, sharedSpeakerSoptlightDataSource);
+      var userAudioVolumeProvider = new _userAudioVolumeProvider.FcrUIUserAudioVolumeProviderImpl({
+        audioVolumeData: sharedUserAudioVolumeDataSource,
+        videoWindowData: sharedVideoWindowDataSource,
+        settingData: sharedSettingDataSource,
+        interpreterData: sharedInterpreterDataSource,
+        deviceProvider: deviceProvider,
+        screenShareProvider: screenShareProvider,
+        streamControl: streamControl
+      });
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER, userAudioVolumeProvider);
       var pinDataSource = new _pinData.FcrUISharedPinDataSourceImpl(messageProvider, sharedVideoWindowDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE, pinDataSource);
+      var annotationProvider = new _provider9.FcrUIAnnotationProviderImpl(objectManager, fcrUIMainWindowRenderer);
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_ANNOTATION_PROVIDER, annotationProvider);
     }
   }, {
     key: "onMainSceneRelease",
@@ -312,7 +328,9 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_APPLIST_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_MULTI_DISPLAY_PROVIDER);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
@@ -321,6 +339,7 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_STT_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_STT_SETTING_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_ANNOTATION_PROVIDER);
     }
   }, {
     key: "onWaitingSceneInitialize",
@@ -349,6 +368,9 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       var sharedConfigDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE);
       var sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE, sharedLayoutDataSource);
+      var abilityControl = currentRoomControlProvider.currentRoomControl.getAbilityControl();
+      var abilityProvider = new _abilityProvider.FcrUIAbilityProviderImpl(abilityControl);
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_ABILITY_PROVIDER, abilityProvider);
     }
   }, {
     key: "onWaitingSceneRelease",
@@ -362,6 +384,7 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_CHAT_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_ABILITY_PROVIDER);
     }
   }]);
 }();

package/lib/electron/app.js

@@ -26,13 +26,15 @@ require("core-js/modules/web.dom-collections.for-each.js");
 var _window = require("./window");
 var _electron = require("electron");
 var _path = _interopRequireDefault(require("path"));
+var _os = _interopRequireDefault(require("os"));
 var _logger = require("./logger");
 var _child_process = require("child_process");
-var _mainProcessHandler = require("./window-proxy/main-process-handler");
+var _browserWindowProxyFactory = require("./window-proxy/browser-window-proxy-factory");
 var logger = (0, _logger.getLogger)();
 var hookApp = exports.hookApp = function hookApp(app) {
   logger.info("hook app, main process id: ".concat(process.pid));
   app.commandLine.appendSwitch('ignore-certificate-errors');
+  app.commandLine.appendSwitch('--force_high_performance_gpu');
   // app.commandLine.appendSwitch('enable-logging');
   // app.commandLine.appendSwitch('log-level', '0');
   // app.commandLine.appendSwitch('v', '1');
@@ -173,13 +175,13 @@ var hookApp = exports.hookApp = function hookApp(app) {
     _electron.ipcMain.handle('getBrowserWindowId', function (_, frameName) {
       var _browserWindowIPCHand;
       logger.info("ipcMain handle: getBrowserWindowId, frameName: ".concat(frameName));
-      var windowId = (_browserWindowIPCHand = _mainProcessHandler.browserWindowIPCHandler.getWindow(frameName)) === null || _browserWindowIPCHand === void 0 ? void 0 : _browserWindowIPCHand.id;
+      var windowId = (_browserWindowIPCHand = _browserWindowProxyFactory.browserWindowIPCHandler.getWindow(frameName)) === null || _browserWindowIPCHand === void 0 ? void 0 : _browserWindowIPCHand.id;
       logger.info("ipcMain handle: getBrowserWindowId, frameName: ".concat(frameName, ", result: ").concat(windowId));
       return windowId;
     });
     _electron.ipcMain.handle('checkMediaPermission', /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(_, mediaType) {
-        var result, accessStatus;
+        var result, accessStatus, platform;
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -196,7 +198,12 @@ var hookApp = exports.hookApp = function hookApp(app) {
             case 1:
               result = false;
               accessStatus = _electron.systemPreferences.getMediaAccessStatus(mediaType);
+              platform = _os["default"].platform();
               if (!(accessStatus !== 'granted')) {
+                _context.next = 4;
+                break;
+              }
+              if (!(platform === 'darwin')) {
                 _context.next = 3;
                 break;
               }
@@ -204,14 +211,15 @@ var hookApp = exports.hookApp = function hookApp(app) {
               return _electron.systemPreferences.askForMediaAccess(mediaType);
             case 2:
               result = _context.sent;
-              _context.next = 4;
-              break;
             case 3:
-              result = true;
+              _context.next = 5;
+              break;
             case 4:
+              result = true;
+            case 5:
               logger.info("ipcMain handle: checkMediaPermission, mediaType: ".concat(mediaType, ", result: ").concat(result));
               return _context.abrupt("return", result);
-            case 5:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -228,7 +236,16 @@ var hookApp = exports.hookApp = function hookApp(app) {
         microphone: "open x-apple.systempreferences:com.apple.preference.security?Privacy_Microphone",
         sharing: "open x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture"
       };
-      (0, _child_process.exec)(execMap[mediaType]);
+      var execMapByWin32 = {
+        microphone: 'start ms-settings:privacy-microphone',
+        camera: 'start ms-settings:privacy-webcam',
+        sharing: 'start ms-settings:privacy-screen-capture'
+      };
+      if (_os["default"].platform() === 'win32') {
+        (0, _child_process.exec)(execMapByWin32[mediaType]);
+      } else {
+        (0, _child_process.exec)(execMap[mediaType]);
+      }
     });
     _electron.ipcMain.addListener('open', function (_, entryPath, dialogId) {
       logger.info("ipcMain event: open, entryPath: ".concat(entryPath, ", dialogId: ").concat(dialogId));
@@ -250,7 +267,7 @@ var hookApp = exports.hookApp = function hookApp(app) {
     _electron.ipcMain.addListener('initialize', function () {
       logger.info('ipcMain event: initialize');
       (0, _window.closeAllWindows)();
-      _mainProcessHandler.browserWindowIPCHandler.clearAllWindows();
+      _browserWindowProxyFactory.browserWindowIPCHandler.clearAllWindows();
     });
   });
 };

package/lib/electron/asar-validation.js

@@ -48,13 +48,16 @@ function validateAsarIntegrity() {
   try {
     var asarPath = _path["default"].join(process.resourcesPath, 'app.asar');
     var hashFilePath = _path["default"].join(process.resourcesPath, 'asar-hash.enc');
+    logger.info("Validating ASAR integrity at: ".concat(asarPath));
+    logger.info("originalFs methods: ".concat(_originalFs["default"]));
+    logger.info("Using original-fs for ASAR validation, originalFs.existsSync ".concat(_originalFs["default"].existsSync));
 
     // Check if ASAR file exists using original-fs
     if (!_originalFs["default"].existsSync(asarPath)) {
       logger.info('ASAR file not found, assuming unpacked development mode');
       return true;
     }
-
+    logger.info("Checking for hash file at: ".concat(hashFilePath));
     // Read expected hash from hash file or environment variable
     var expectedHash = null;
     if (_originalFs["default"].existsSync(hashFilePath)) {
@@ -74,6 +77,7 @@ function validateAsarIntegrity() {
       return false;
     }
     logger.info("Loading ASAR file at: ".concat(asarPath));
+    logger.info("originalFs.readFileSync: ".concat(_originalFs["default"].readFileSync));
 
     // Use original-fs to read ASAR file raw content
     var asarContent = _originalFs["default"].readFileSync(asarPath);

package/lib/electron/env.d.ts

@@ -1,5 +1,6 @@
 export declare let isDev: boolean;
 export declare let devPageUrl: string;
+export declare const isVite: boolean;
 export declare let distPathPrefix: string;
 export declare let distIndexFileName: string;
 export declare let ipcPrefix: string;

package/lib/electron/env.js

@@ -4,11 +4,11 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isDevToolsDisabled = exports.isDev = exports.ipcPrefix = exports.distPathPrefix = exports.distIndexFileName = exports.devPageUrl = void 0;
+exports.isVite = exports.isDevToolsDisabled = exports.isDev = exports.ipcPrefix = exports.distPathPrefix = exports.distIndexFileName = exports.devPageUrl = void 0;
 var _process$env$ELECTRON, _process$env$DIST_PAT, _process$env$DIST_IND, _process$env$IPC_PREF;
 var isDev = exports.isDev = process.env.DEV === 'true';
 var devPageUrl = exports.devPageUrl = (_process$env$ELECTRON = process.env.ELECTRON_START_URL) !== null && _process$env$ELECTRON !== void 0 ? _process$env$ELECTRON : "http://localhost:3000";
-var isVite = process.env.BUILD_TOOL === 'vite';
+var isVite = exports.isVite = process.env.BUILD_TOOL === 'vite';
 var distPathPrefix = exports.distPathPrefix = isVite ? 'dist/electron/renderer/public' : (_process$env$DIST_PAT = process.env.DIST_PATH_PREFIX) !== null && _process$env$DIST_PAT !== void 0 ? _process$env$DIST_PAT : 'dist';
 var distIndexFileName = exports.distIndexFileName = isVite ? 'index.vite.html' : (_process$env$DIST_IND = process.env.DIST_INDEX_FILE_NAME) !== null && _process$env$DIST_IND !== void 0 ? _process$env$DIST_IND : 'index.html';
 var ipcPrefix = exports.ipcPrefix = (_process$env$IPC_PREF = process.env.IPC_PREFIX) !== null && _process$env$IPC_PREF !== void 0 ? _process$env$IPC_PREF : 'fcr-';

package/lib/electron/injections.d.ts

@@ -2,7 +2,7 @@ import { IpcRendererEvent } from 'electron';
 import { BrowserWindowConstructorOptions } from 'electron/renderer';
 import os from 'os';
 import { NetworkType, RendererCustomEvent } from '../runtime';
-import { BrowserWindowProxyImpl } from './window-proxy/browser-window-proxy';
+import { BrowserWindowProxyImpl } from './window-proxy/implementations/browser-window-proxy';
 import { FcrUiResourceType } from '../type';
 export declare const openDirectory: () => Promise<string | undefined>;
 export declare const showItemInFolder: (path: string) => void;
@@ -56,3 +56,4 @@ export declare const getPrimaryDisplay: () => Electron.Display;
 export declare const getDisplayNearestPoint: (point: Electron.Point) => Electron.Display;
 export declare const getCurrentBrowserWindow: () => Electron.CrossProcessExports.BrowserWindow;
 export declare const getBrowserWindowById: (windowId: string) => Electron.BrowserWindow | null;
+export declare const getWindowInfoList: () => never[];

package/lib/electron/injections.js

@@ -6,7 +6,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.showItemInFolder = exports.setUserSettingData = exports.setFragmentOptions = exports.setFragmentBaseUrl = exports.sendEvent = exports.screen = exports.restartApp = exports.removeEventListener = exports.quitApp = exports.openSystemPreferences = exports.openRendererWindow = exports.openLinkInDefaultBrowser = exports.openDirectory = exports.open = exports.loadBuiltinResources = exports.initialize = exports.getUserSettingData = exports.getSystemMemorySize = exports.getSystemCpuInfo = exports.getPrimaryDisplay = exports.getNetworkType = exports.getMediaSourceIdList = exports.getDisplayNearestPoint = exports.getDisplayMatching = exports.getCursorScreenPoint = exports.getCurrentBrowserWindow = exports.getBrowserWindowById = exports.getBaseUrl = exports.getAllDisplays = exports.fileToBlob = exports.fileToBase64 = exports.downloadResourceFile = exports.downloadAndExtractResourceFileFromZip = exports.createBrowserWindowProxy = exports.close = exports.checkMediaPermission = exports.captureScreen = exports.addEventListener = void 0;
+exports.showItemInFolder = exports.setUserSettingData = exports.setFragmentOptions = exports.setFragmentBaseUrl = exports.sendEvent = exports.screen = exports.restartApp = exports.removeEventListener = exports.quitApp = exports.openSystemPreferences = exports.openRendererWindow = exports.openLinkInDefaultBrowser = exports.openDirectory = exports.open = exports.loadBuiltinResources = exports.initialize = exports.getWindowInfoList = exports.getUserSettingData = exports.getSystemMemorySize = exports.getSystemCpuInfo = exports.getPrimaryDisplay = exports.getNetworkType = exports.getMediaSourceIdList = exports.getDisplayNearestPoint = exports.getDisplayMatching = exports.getCursorScreenPoint = exports.getCurrentBrowserWindow = exports.getBrowserWindowById = exports.getBaseUrl = exports.getAllDisplays = exports.fileToBlob = exports.fileToBase64 = exports.downloadResourceFile = exports.downloadAndExtractResourceFileFromZip = exports.createBrowserWindowProxy = exports.close = exports.checkMediaPermission = exports.captureScreen = exports.addEventListener = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -68,9 +68,11 @@ var _fs2 = _interopRequireDefault(require("fs"));
 var _promises = _interopRequireDefault(require("fs/promises"));
 var _jszip = _interopRequireDefault(require("jszip"));
 var _exitCodes = require("./exit-codes");
-var _browserWindowProxy = require("./window-proxy/browser-window-proxy");
+var _browserWindowProxy = require("./window-proxy/implementations/browser-window-proxy");
 var _env = require("./env");
 var _jsMd = require("js-md5");
+// import { windowManager } from 'node-window-manager';
+
 var USER_SETTING_DATA_FILE_NAME = 'UserSettingData.json';
 var isDevMode = process.env.DEV === 'true';
 var appPath = _remote.app.getAppPath();
@@ -138,20 +140,6 @@ var removeEventListener = exports.removeEventListener = function removeEventList
 };
 var createBrowserWindowProxy = exports.createBrowserWindowProxy = function createBrowserWindowProxy(windowId) {
   var windowProxy = new _browserWindowProxy.BrowserWindowProxyImpl(windowId);
-
-  //
-  // windowProxy.addListener('closed', () => {
-  //   rendererWindows.forEach(({ windowId, disposer }, frameName) => {
-  //     if (windowId === windowProxy.windowId) {
-  //       disposer();
-
-  //       console.log(`delete from rendererWindows by window id: ${windowId}`);
-
-  //       rendererWindows.delete(frameName);
-  //     }
-  //   });
-  // });
-
   return windowProxy;
 };
 var setFragmentOptions = exports.setFragmentOptions = function setFragmentOptions(entryPath, windowOptions, webPreferences) {
@@ -183,7 +171,10 @@ var captureScreen = exports.captureScreen = function captureScreen(options) {
 // };
 
 var getBaseUrl = exports.getBaseUrl = function getBaseUrl() {
-  return _env.isDev ? _env.devPageUrl : '.';
+  if (_env.isDev) {
+    return _env.devPageUrl;
+  }
+  return _env.isVite ? '..' : '.';
 };
 var openRendererWindow = exports.openRendererWindow = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(frameName, callback, windowOptions) {
@@ -833,6 +824,21 @@ var getBrowserWindowById = exports.getBrowserWindowById = function getBrowserWin
   });
   return browserWindow !== null && browserWindow !== void 0 ? browserWindow : null;
 };
+var getWindowInfoList = exports.getWindowInfoList = function getWindowInfoList() {
+  // return windowManager.getWindows().map((window) => {
+  //   const windowInfo = {
+  //     id: window.id,
+  //     getTitle: () => {
+  //       return window.getTitle();
+  //     },
+  //     getBounds: () => {
+  //       return window.getBounds() as Electron.Rectangle;
+  //     },
+  //   } satisfies WindowInfo;
+  //   return windowInfo;
+  // });
+  return [];
+};
 window.addEventListener('DOMContentLoaded', function () {
   initialize();
 });

package/lib/electron/ipc/type.d.ts

@@ -15,5 +15,6 @@ export declare enum IPCMessageCMD {
     SetParameters = "set-parameters",
     RenewUserToken = "renew-user-token",
     ExitUiScene = "exit-ui-scene",
-    GetDependencyVersions = "get-dependency-versions"
+    GetDependencyVersions = "get-dependency-versions",
+    ShowMainWindow = "show-main-window"
 }

package/lib/electron/ipc/type.js

@@ -25,5 +25,6 @@ var IPCMessageCMD = exports.IPCMessageCMD = /*#__PURE__*/function (IPCMessageCMD
   IPCMessageCMD["RenewUserToken"] = "renew-user-token";
   IPCMessageCMD["ExitUiScene"] = "exit-ui-scene";
   IPCMessageCMD["GetDependencyVersions"] = "get-dependency-versions";
+  IPCMessageCMD["ShowMainWindow"] = "show-main-window";
   return IPCMessageCMD;
 }({});

package/lib/electron/ipc-protocol.d.ts

@@ -38,6 +38,7 @@ export declare enum BrowserWindowIPCAction {
  */
 export interface BrowserWindowIPCRequest {
     windowId: string;
+    proxyId: string;
     action: BrowserWindowIPCAction;
     payload?: any;
 }
@@ -56,6 +57,7 @@ export interface BrowserWindowIPCResponse {
  */
 export interface BrowserWindowEventNotification {
     windowId: string;
+    proxyId?: string;
     event: BrowserWindowIPCAction;
     data?: any;
 }

package/lib/electron/main.js

@@ -10,14 +10,13 @@ require("core-js/modules/web.timers.js");
 var _screenshot = require("./plugins/screenshot");
 var _logger = require("./logger");
 var _meetingState = require("./plugins/meeting-state");
-var _mainProcessHandler = require("./window-proxy/main-process-handler");
-// import { FcrUIDialogKey } from '../utilities/constant';
-
+var _mainWindowDisplay = require("./plugins/main-window-display");
+var _browserWindowProxyFactory = require("./window-proxy/browser-window-proxy-factory");
 var logger = (0, _logger.getLogger)();
 var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
   // 设置主窗口，所有事件通知都通过主窗口发送
-  _mainProcessHandler.browserWindowIPCHandler.setMainWindow(mainWindow);
-  _mainProcessHandler.browserWindowIPCHandler.registerWindow("".concat(mainWindow.id), mainWindow, 'main');
+  _browserWindowProxyFactory.browserWindowIPCHandler.setMainWindow(mainWindow);
+  _browserWindowProxyFactory.browserWindowIPCHandler.registerWindow("".concat(mainWindow.id), mainWindow, 'main');
   mainWindow.webContents.addListener('did-create-window', function (window, details) {
     logger.info("browser window is opened, frameName: ".concat(details.frameName, ", windowId: ").concat(window.id));
 
@@ -28,7 +27,7 @@ var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
     //   return;
     // }
 
-    _mainProcessHandler.browserWindowIPCHandler.registerWindow("".concat(window.id), window, details.frameName);
+    _browserWindowProxyFactory.browserWindowIPCHandler.registerWindow("".concat(window.id), window, details.frameName);
 
     // 监听渲染进程崩溃事件
     // window.webContents.addListener('render-process-gone', (event, details) => {
@@ -121,4 +120,5 @@ var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
   });
   (0, _screenshot.listenScreenshot)(mainWindow);
   (0, _meetingState.listenMeetingState)(mainWindow);
+  (0, _mainWindowDisplay.listenMainWindowDisplaySupport)(mainWindow);
 };

package/lib/electron/plugins/main-window-display.d.ts

@@ -0,0 +1,8 @@
+import { BrowserWindow } from 'electron';
+/**
+ * 主窗口显示支持状态
+ * true: 支持显示主窗口（未屏幕共享）
+ * false: 不支持显示主窗口（正在屏幕共享）
+ */
+export declare let canShowMainWindow: boolean;
+export declare const listenMainWindowDisplaySupport: (window: BrowserWindow) => void;