fcr-ui-scene 3.8.2 → 3.9.0

package/lib-es/creator/index.js

@@ -74,7 +74,7 @@ import { FcrUISceneSwitch } from '../ui-scene-switch';
 import validateParams from '../utilities/validate-params';
 import { fcrUISceneConfigSchema, fcrUISceneCallbackSchema, fcrUISceneFailureCallbackSchema, fcrRenderViewSchema } from '../schema';
 import { bound, trace } from 'agora-foundation/lib/decorator';
-import { FcrRegion } from 'fcr-core';
+import { FcrCoreEngineConfig, FcrRegion } from 'fcr-core';
 import { getDualCameraVideoStreamConfig, getDualScreenVideoStreamConfig, isOpenDefaultCamera, isOpenDefaultMicrophone } from '../utilities/parameters';
 import { cameraVideoHighStreamEncoderConfig, cameraVideoLowStreamEncoderConfig, isCameraDualStreamModeEnabled, isScreenDualStreamModeEnabled, mergeDefaultDualStreamConfig, screenCaptureHighStreamEncoderConfig } from '../utilities/default-config';
 import { jsonstring } from 'fcr-core/lib/imports';
@@ -87,11 +87,12 @@ import { DialogUIModule } from '../modules/dialog';
 import { FcrUIGlobalNode } from '../base';
 import { FcrUIDialogKey } from '../utilities/constant';
 import { EventToastUIModule } from '../modules/event-toast';
-import { ConfirmDialog, windowConfig as confirmDialogWindowConfig } from '../modules/dialog/dialogs/confirm';
+import { ConfirmDialog, electronWindowConfig as confirmDialogWindowConfig } from '../modules/dialog/dialogs/confirm';
 import { SettingUIModule } from '../modules/setting';
-import DeviceSettingDialog, { windowConfig as settingDialogWindowConfig } from '../modules/dialog/dialogs/device-setting';
-import { ToastDialog, windowConfig as toastDialogWindowConfig } from '../modules/dialog/dialogs/toast';
-import { isWindows } from '../utilities/platform';
+import DeviceSettingDialog, { electronWindowConfig as settingDialogWindowConfig, webDialogConfig as settingWebDialogConfig } from '../modules/dialog/dialogs/device-setting';
+import { ToastDialog, electronWindowConfig as toastDialogWindowConfig } from '../modules/dialog/dialogs/toast';
+import { isWindows } from 'agora-foundation/lib/utilities/env';
+import { SystemPreferenceDialog, electronSystemPreferenceWindowConfig } from '../modules/dialog/dialogs/system-preference';
 import { jsx as _jsx } from "react/jsx-runtime";
 _ref = (_launchDecs = [trace, validateParams(fcrUISceneConfigSchema, fcrUISceneCallbackSchema, fcrUISceneCallbackSchema, fcrUISceneFailureCallbackSchema, fcrRenderViewSchema)], "logger");
 export var FcrUISceneCreator = /*#__PURE__*/function () {
@@ -315,7 +316,7 @@ export var FcrUISceneCreator = /*#__PURE__*/function () {
     key: "closeSetting",
     value: function closeSetting() {
       this._precheckState();
-      this._objectManager.getObject(FcrUIObjectKeys.P_DIALOG_PROVIDER).openDialog(FcrUIDialogKey.SETTINGS);
+      this._objectManager.getObject(FcrUIObjectKeys.P_DIALOG_PROVIDER).closeDialog(FcrUIDialogKey.SETTINGS);
     }
   }, {
     key: "release",
@@ -327,6 +328,7 @@ export var FcrUISceneCreator = /*#__PURE__*/function () {
       }
       this._globalNode.unmount();
       this._globalNode.nodeWillInactive();
+      this.closeSetting();
       this._providerInitializer.onCreatorRelease();
       this._released = true;
     }
@@ -460,7 +462,7 @@ export var FcrUISceneCreator = /*#__PURE__*/function () {
             params: params
           }, dialogId);
         },
-        windowConfig: confirmDialogWindowConfig
+        electronWindowConfig: confirmDialogWindowConfig
       }, {
         key: FcrUIDialogKey.TOAST,
         component: function component(_ref3) {
@@ -474,7 +476,7 @@ export var FcrUISceneCreator = /*#__PURE__*/function () {
             children: _this2.eventToastModule.getComponent('global')
           }, dialogId);
         },
-        windowConfig: toastDialogWindowConfig
+        electronWindowConfig: toastDialogWindowConfig
       }, {
         key: FcrUIDialogKey.SETTINGS,
         component: function component(_ref4) {
@@ -484,10 +486,24 @@ export var FcrUISceneCreator = /*#__PURE__*/function () {
           return /*#__PURE__*/_jsx(DeviceSettingDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            children: _this2.settingModule.getComponent(params)
+            children: _this2.settingModule.getComponent()
           }, dialogId);
         },
-        windowConfig: settingDialogWindowConfig
+        electronWindowConfig: settingDialogWindowConfig,
+        webDialogConfig: settingWebDialogConfig
+      }, {
+        key: FcrUIDialogKey.SYSTEM_PREFERENCE,
+        component: function component(_ref5) {
+          var dialogKey = _ref5.dialogKey,
+            dialogId = _ref5.dialogId,
+            params = _ref5.params;
+          return /*#__PURE__*/_jsx(SystemPreferenceDialog, {
+            dialogKey: dialogKey,
+            dialogId: dialogId,
+            params: params
+          }, dialogId);
+        },
+        electronWindowConfig: electronSystemPreferenceWindowConfig
       }]);
     }
   }, {
@@ -508,7 +524,7 @@ export var FcrUISceneCreator = /*#__PURE__*/function () {
         highVideoEncoderConfig: screenCaptureHighStreamEncoderConfig,
         enableDualStreamMode: isScreenDualStreamModeEnabled()
       };
-      var config = {
+      var config = new FcrCoreEngineConfig({
         appId: this._config.appId,
         userId: this._config.userId,
         parameters: filteredParameters,
@@ -516,7 +532,7 @@ export var FcrUISceneCreator = /*#__PURE__*/function () {
         region: FcrRegion.CN,
         dualCameraVideoStreamConfig: dualCameraVideoStreamConfig,
         dualScreenVideoStreamConfig: dualScreenVideoStreamConfig
-      };
+      });
       return config;
     }
   }, {

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

@@ -47,6 +47,9 @@ import { createLogger } from '../utilities/logger';
 import { FcrUISharedWidgetDataSourceImpl } from '../shared-data/widget-data';
 import { FcrUISttProviderImpl } from '../providers/stt-provider/stt-provider';
 import { FcrUISharedSttSettingDataSourceImpl } from '../shared-data/stt-setting.ts';
+import { FcrUIAnnotationProviderImpl } from '../providers/annotation/provider.browser';
+import { FcrUISharedUserAudioVolumeDataSourceImpl } from '../shared-data/user-audio-volume';
+import { FcrUIUserAudioVolumeProviderImpl } from '../providers/user-audio-volume-provider';
 export var FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
   function FcrUIBrowserProviderInitializer(args) {
     _classCallCheck(this, FcrUIBrowserProviderInitializer);
@@ -83,7 +86,7 @@ export var FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
       objectManager.setObject(FcrUIObjectKeys.P_DIALOG_PROVIDER, dialogProvider);
       var deviceProvider = new FcrUIDeviceProviderImpl(
       // TODO: renderer does not available in browser env
-      null, facilityProvider, messageProvider, engine.getDesktopMediaControl(), sharedSettingDataSource);
+      null, facilityProvider, messageProvider, engine.getDesktopMediaControl(), sharedSettingDataSource, dialogProvider);
       objectManager.setObject(FcrUIObjectKeys.P_DEVICE_PROVIDER, deviceProvider);
       var sharedConfigDataSource = new FcrUISharedConfigDataSourceImpl({
         creatorConfig: config
@@ -170,7 +173,8 @@ export var FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
       objectManager.setObject(FcrUIObjectKeys.P_SESSION_PROVIDER, sessionProvider);
       var sharedDevicePrivilegeDataSource = new FcrUISharedDevicePrivilegeDataSourceImpl();
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE, sharedDevicePrivilegeDataSource);
-      var deviceStreamProvider = new FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, interpreterProvider, sharedInterpreterDataSource);
+      var facilityProvider = objectManager.getObject(FcrUIObjectKeys.P_FACILITY_PROVIDER);
+      var deviceStreamProvider = new FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, interpreterProvider, sharedInterpreterDataSource, facilityProvider);
       objectManager.setObject(FcrUIObjectKeys.P_DEVICE_STREAM_PROVIDER, deviceStreamProvider);
       var waitingRoomControlProvider = new FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider);
       objectManager.setObject(FcrUIObjectKeys.P_WAITING_ROOM_CONTROL_PROVIDER, waitingRoomControlProvider);
@@ -223,18 +227,33 @@ export var FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
         sharedSecurityDataSource: sharedSecurityDataSource
       });
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_STT_SETTING_DATA_SOURCE, sharedSttSettingDataSource);
+      var sharedUserAudioVolumeDataSource = new FcrUISharedUserAudioVolumeDataSourceImpl();
+      objectManager.setObject(FcrUIObjectKeys.S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE, sharedUserAudioVolumeDataSource);
       var videoWindowDataSource = new FcrUIVideoWindowDataSourceImpl(sharedSettingDataSource);
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE, videoWindowDataSource);
       var screenShareProvider = new FcrUIScreenShareProviderImpl(objectManager);
       objectManager.setObject(FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER, screenShareProvider);
-      var applistProvider = new FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource, messageProvider, sttProvider, sharedSttSettingDataSource, screenShareProvider, sharedSettingDataSource);
+      var applistProvider = new FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource, messageProvider, sttProvider, sharedSttSettingDataSource, screenShareProvider, sharedSettingDataSource, abilityProvider);
       objectManager.setObject(FcrUIObjectKeys.P_APPLIST_PROVIDER, applistProvider);
       var sharedSpeakerSoptlightDataSource = new FcrUISharedSpeakerSpotlightDataSourceImpl();
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE, sharedSpeakerSoptlightDataSource);
       var localVideoRenderProvider = new FcrUIMainLocalVideoRenderProviderImpl(deviceProvider, screenShareProvider);
       objectManager.setObject(FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER, localVideoRenderProvider);
+      var userAudioVolumeProvider = new FcrUIUserAudioVolumeProviderImpl({
+        audioVolumeData: sharedUserAudioVolumeDataSource,
+        videoWindowData: videoWindowDataSource,
+        settingData: sharedSettingDataSource,
+        interpreterData: sharedInterpreterDataSource,
+        deviceProvider: deviceProvider,
+        screenShareProvider: screenShareProvider,
+        streamControl: streamControl,
+        volumeThreshold: 45
+      });
+      objectManager.setObject(FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER, userAudioVolumeProvider);
       var pinDataSource = new FcrUISharedPinDataSourceImpl(messageProvider, videoWindowDataSource);
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE, pinDataSource);
+      var annotationProvider = new FcrUIAnnotationProviderImpl(objectManager);
+      objectManager.setObject(FcrUIObjectKeys.P_ANNOTATION_PROVIDER, annotationProvider);
     }
   }, {
     key: "onMainSceneRelease",
@@ -266,6 +285,7 @@ export var FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_SECURITY_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_APPLIST_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE);
+      objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
@@ -273,6 +293,8 @@ export var FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
       objectManager.deleteObject(FcrUIObjectKeys.P_WIDGET_PROVIDER);
       objectManager.deleteObject(FcrUIObjectKeys.P_STT_PROVIDER);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_STT_SETTING_DATA_SOURCE);
+      objectManager.deleteObject(FcrUIObjectKeys.P_ANNOTATION_PROVIDER);
+      objectManager.deleteObject(FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER);
       // 其它如有遗漏可补充
     }
   }, {
@@ -302,6 +324,9 @@ export var FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
       var sharedConfigDataSource = objectManager.getObject(FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE);
       var sharedLayoutDataSource = new FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource);
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE, sharedLayoutDataSource);
+      var abilityControl = currentRoomControlProvider.currentRoomControl.getAbilityControl();
+      var abilityProvider = new FcrUIAbilityProviderImpl(abilityControl);
+      objectManager.setObject(FcrUIObjectKeys.P_ABILITY_PROVIDER, abilityProvider);
     }
   }, {
     key: "onWaitingSceneRelease",
@@ -316,6 +341,7 @@ export var FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
       objectManager.deleteObject(FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_CHAT_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE);
+      objectManager.deleteObject(FcrUIObjectKeys.P_ABILITY_PROVIDER);
       // 其它如有遗漏可补充
     }
   }]);

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

@@ -53,6 +53,9 @@ import { FcrUIMouseDetectProviderImpl } from '../providers/mouse-detect/provider
 import { FcrUISharedWidgetDataSourceImpl } from '../shared-data/widget-data';
 import { FcrUISttProviderImpl } from '../providers/stt-provider/stt-provider';
 import { FcrUISharedSttSettingDataSourceImpl } from '../shared-data/stt-setting.ts';
+import { FcrUIAnnotationProviderImpl } from '../providers/annotation/provider.electron';
+import { FcrUISharedUserAudioVolumeDataSourceImpl } from '../shared-data/user-audio-volume';
+import { FcrUIUserAudioVolumeProviderImpl } from '../providers/user-audio-volume-provider';
 export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
   function FcrUIElectronProviderInitializer(args) {
     _classCallCheck(this, FcrUIElectronProviderInitializer);
@@ -104,7 +107,7 @@ export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
         renderer: renderer
       });
       objectManager.setObject(FcrUIObjectKeys.P_DIALOG_PROVIDER, dialogProvider);
-      var deviceProvider = new FcrUIDeviceProviderImpl(renderer, facilityProvider, messageProvider, engine.getDesktopMediaControl(), sharedSettingDataSource);
+      var deviceProvider = new FcrUIDeviceProviderImpl(renderer, facilityProvider, messageProvider, engine.getDesktopMediaControl(), sharedSettingDataSource, dialogProvider);
       objectManager.setObject(FcrUIObjectKeys.P_DEVICE_PROVIDER, deviceProvider);
       var sharedConfigDataSource = new FcrUISharedConfigDataSourceImpl({
         creatorConfig: this._config
@@ -167,8 +170,6 @@ export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
       var privilegeControl = mainRoomControl.getPrivilegeControl();
       var interpreterControl = mainRoomControl.getInterpreterControl();
       var abilityControl = mainRoomControl.getAbilityControl();
-      var sttControl = mainRoomControl.getSttControl();
-      var roomSessionControl = mainRoomControl.getRoomSessionControl();
       var abilityProvider = new FcrUIAbilityProviderImpl(abilityControl);
       objectManager.setObject(FcrUIObjectKeys.P_ABILITY_PROVIDER, abilityProvider);
       var devicePrivilegeProvider = new FcrUIDevicePrivilegeProviderImpl(privilegeControl, streamControl, userControl, deviceProvider, messageProvider);
@@ -197,7 +198,8 @@ export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
       objectManager.setObject(FcrUIObjectKeys.P_SESSION_PROVIDER, sessionProvider);
       var sharedDevicePrivilegeDataSource = new FcrUISharedDevicePrivilegeDataSourceImpl();
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE, sharedDevicePrivilegeDataSource);
-      var deviceStreamProvider = new FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, interpreterProvider, sharedInterpreterDataSource);
+      var facilityProvider = objectManager.getObject(FcrUIObjectKeys.P_FACILITY_PROVIDER);
+      var deviceStreamProvider = new FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, interpreterProvider, sharedInterpreterDataSource, facilityProvider);
       objectManager.setObject(FcrUIObjectKeys.P_DEVICE_STREAM_PROVIDER, deviceStreamProvider);
       var waitingRoomControlProvider = new FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider);
       objectManager.setObject(FcrUIObjectKeys.P_WAITING_ROOM_CONTROL_PROVIDER, waitingRoomControlProvider);
@@ -252,11 +254,13 @@ export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
         sharedSecurityDataSource: sharedSecurityDataSource
       });
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_STT_SETTING_DATA_SOURCE, sharedSttSettingDataSource);
+      var sharedUserAudioVolumeDataSource = new FcrUISharedUserAudioVolumeDataSourceImpl();
+      objectManager.setObject(FcrUIObjectKeys.S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE, sharedUserAudioVolumeDataSource);
       var sharedVideoWindowDataSource = new FcrUIVideoWindowDataSourceImpl(sharedSettingDataSource);
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE, sharedVideoWindowDataSource);
       var screenShareProvider = new FcrUIScreenShareProviderImpl(objectManager);
       objectManager.setObject(FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER, screenShareProvider);
-      var applistProvider = new FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource, messageProvider, sttProvider, sharedSttSettingDataSource, screenShareProvider, sharedSettingDataSource);
+      var applistProvider = new FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource, messageProvider, sttProvider, sharedSttSettingDataSource, screenShareProvider, sharedSettingDataSource, abilityProvider);
       objectManager.setObject(FcrUIObjectKeys.P_APPLIST_PROVIDER, applistProvider);
       var localVideoRenderProvider = new FcrUIMainLocalVideoRenderProviderImpl(deviceProvider, screenShareProvider);
       objectManager.setObject(FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER, localVideoRenderProvider);
@@ -273,8 +277,21 @@ export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
       objectManager.setObject(FcrUIObjectKeys.P_MULTI_DISPLAY_PROVIDER, multiDisplayProvider);
       var sharedSpeakerSoptlightDataSource = new FcrUISharedSpeakerSpotlightDataSourceImpl();
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE, sharedSpeakerSoptlightDataSource);
+      var userAudioVolumeProvider = new FcrUIUserAudioVolumeProviderImpl({
+        audioVolumeData: sharedUserAudioVolumeDataSource,
+        videoWindowData: sharedVideoWindowDataSource,
+        settingData: sharedSettingDataSource,
+        interpreterData: sharedInterpreterDataSource,
+        deviceProvider: deviceProvider,
+        screenShareProvider: screenShareProvider,
+        streamControl: streamControl,
+        volumeThreshold: 35
+      });
+      objectManager.setObject(FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER, userAudioVolumeProvider);
       var pinDataSource = new FcrUISharedPinDataSourceImpl(messageProvider, sharedVideoWindowDataSource);
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE, pinDataSource);
+      var annotationProvider = new FcrUIAnnotationProviderImpl(objectManager, fcrUIMainWindowRenderer);
+      objectManager.setObject(FcrUIObjectKeys.P_ANNOTATION_PROVIDER, annotationProvider);
     }
   }, {
     key: "onMainSceneRelease",
@@ -304,7 +321,9 @@ export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
       objectManager.deleteObject(FcrUIObjectKeys.P_APPLIST_PROVIDER);
       objectManager.deleteObject(FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER);
       objectManager.deleteObject(FcrUIObjectKeys.P_MULTI_DISPLAY_PROVIDER);
+      objectManager.deleteObject(FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE);
+      objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
@@ -313,6 +332,7 @@ export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
       objectManager.deleteObject(FcrUIObjectKeys.P_STT_PROVIDER);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_STT_SETTING_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE);
+      objectManager.deleteObject(FcrUIObjectKeys.P_ANNOTATION_PROVIDER);
     }
   }, {
     key: "onWaitingSceneInitialize",
@@ -341,6 +361,9 @@ export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
       var sharedConfigDataSource = objectManager.getObject(FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE);
       var sharedLayoutDataSource = new FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource);
       objectManager.setObject(FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE, sharedLayoutDataSource);
+      var abilityControl = currentRoomControlProvider.currentRoomControl.getAbilityControl();
+      var abilityProvider = new FcrUIAbilityProviderImpl(abilityControl);
+      objectManager.setObject(FcrUIObjectKeys.P_ABILITY_PROVIDER, abilityProvider);
     }
   }, {
     key: "onWaitingSceneRelease",
@@ -354,6 +377,7 @@ export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
       objectManager.deleteObject(FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_CHAT_DATA_SOURCE);
       objectManager.deleteObject(FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE);
+      objectManager.deleteObject(FcrUIObjectKeys.P_ABILITY_PROVIDER);
     }
   }]);
 }();

package/lib-es/electron/app.js

@@ -17,13 +17,15 @@ import "core-js/modules/web.dom-collections.for-each.js";
 import { open, close, windowOptionsMap, webPreferencesMap, setFragmentBaseUrl, closeAllWindows } from './window';
 import { powerMonitor, screen, BrowserWindow, ipcMain, systemPreferences, desktopCapturer } from 'electron';
 import path from 'path';
+import os from 'os';
 import { getLogger } from './logger';
 import { exec } from 'child_process';
-import { browserWindowIPCHandler } from './window-proxy/main-process-handler';
+import { browserWindowIPCHandler } from './window-proxy/browser-window-proxy-factory';
 var logger = getLogger();
 export var 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');
@@ -170,7 +172,7 @@ export var hookApp = function hookApp(app) {
     });
     ipcMain.handle('checkMediaPermission', /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(_, mediaType) {
-        var result, accessStatus;
+        var result, accessStatus, platform;
         return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -187,7 +189,12 @@ export var hookApp = function hookApp(app) {
             case 1:
               result = false;
               accessStatus = systemPreferences.getMediaAccessStatus(mediaType);
+              platform = os.platform();
               if (!(accessStatus !== 'granted')) {
+                _context.next = 4;
+                break;
+              }
+              if (!(platform === 'darwin')) {
                 _context.next = 3;
                 break;
               }
@@ -195,14 +202,15 @@ export var hookApp = function hookApp(app) {
               return 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();
           }
@@ -219,7 +227,16 @@ export var 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"
       };
-      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.platform() === 'win32') {
+        exec(execMapByWin32[mediaType]);
+      } else {
+        exec(execMap[mediaType]);
+      }
     });
     ipcMain.addListener('open', function (_, entryPath, dialogId) {
       logger.info("ipcMain event: open, entryPath: ".concat(entryPath, ", dialogId: ").concat(dialogId));

package/lib-es/electron/asar-validation.js

@@ -39,13 +39,16 @@ export function validateAsarIntegrity() {
   try {
     var asarPath = path.join(process.resourcesPath, 'app.asar');
     var hashFilePath = path.join(process.resourcesPath, 'asar-hash.enc');
+    logger.info("Validating ASAR integrity at: ".concat(asarPath));
+    logger.info("originalFs methods: ".concat(originalFs));
+    logger.info("Using original-fs for ASAR validation, originalFs.existsSync ".concat(originalFs.existsSync));
 
     // Check if ASAR file exists using original-fs
     if (!originalFs.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.existsSync(hashFilePath)) {
@@ -65,6 +68,7 @@ export function validateAsarIntegrity() {
       return false;
     }
     logger.info("Loading ASAR file at: ".concat(asarPath));
+    logger.info("originalFs.readFileSync: ".concat(originalFs.readFileSync));
 
     // Use original-fs to read ASAR file raw content
     var asarContent = originalFs.readFileSync(asarPath);

package/lib-es/electron/env.js

@@ -1,7 +1,7 @@
 var _process$env$ELECTRON, _process$env$DIST_PAT, _process$env$DIST_IND, _process$env$IPC_PREF;
 export var isDev = process.env.DEV === 'true';
 export var 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';
+export var isVite = process.env.BUILD_TOOL === 'vite';
 export var 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';
 export var 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';
 export var ipcPrefix = (_process$env$IPC_PREF = process.env.IPC_PREFIX) !== null && _process$env$IPC_PREF !== void 0 ? _process$env$IPC_PREF : 'fcr-';

package/lib-es/electron/injections.js

@@ -59,9 +59,10 @@ import _fs from 'fs';
 import _fsp from 'fs/promises';
 import JSZip from 'jszip';
 import path from 'path';
+// import { windowManager } from 'node-window-manager';
 import { AppExitCode } from './exit-codes';
-import { BrowserWindowProxyImpl } from './window-proxy/browser-window-proxy';
-import { devPageUrl, isDev } from './env';
+import { BrowserWindowProxyImpl } from './window-proxy/implementations/browser-window-proxy';
+import { devPageUrl, isDev, isVite } from './env';
 import { md5 } from 'js-md5';
 var USER_SETTING_DATA_FILE_NAME = 'UserSettingData.json';
 var isDevMode = process.env.DEV === 'true';
@@ -130,20 +131,6 @@ export var removeEventListener = function removeEventListener(listener) {
 };
 export var createBrowserWindowProxy = function createBrowserWindowProxy(windowId) {
   var windowProxy = new 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;
 };
 export var setFragmentOptions = function setFragmentOptions(entryPath, windowOptions, webPreferences) {
@@ -175,7 +162,10 @@ export var captureScreen = function captureScreen(options) {
 // };
 
 export var getBaseUrl = function getBaseUrl() {
-  return isDev ? devPageUrl : '.';
+  if (isDev) {
+    return devPageUrl;
+  }
+  return isVite ? '..' : '.';
 };
 export var openRendererWindow = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(frameName, callback, windowOptions) {
@@ -825,6 +815,21 @@ export var getBrowserWindowById = function getBrowserWindowById(windowId) {
   });
   return browserWindow !== null && browserWindow !== void 0 ? browserWindow : null;
 };
+export var 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-es/electron/ipc/type.js

@@ -18,5 +18,6 @@ export var 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-es/electron/main.js

@@ -3,8 +3,8 @@ import "core-js/modules/web.timers.js";
 import { listenScreenshot } from './plugins/screenshot';
 import { getLogger } from './logger';
 import { listenMeetingState } from './plugins/meeting-state';
-// import { FcrUIDialogKey } from '../utilities/constant';
-import { browserWindowIPCHandler } from './window-proxy/main-process-handler';
+import { listenMainWindowDisplaySupport } from './plugins/main-window-display';
+import { browserWindowIPCHandler } from './window-proxy/browser-window-proxy-factory';
 var logger = getLogger();
 export var hookWindow = function hookWindow(mainWindow) {
   // 设置主窗口，所有事件通知都通过主窗口发送
@@ -113,4 +113,5 @@ export var hookWindow = function hookWindow(mainWindow) {
   });
   listenScreenshot(mainWindow);
   listenMeetingState(mainWindow);
+  listenMainWindowDisplaySupport(mainWindow);
 };

package/lib-es/electron/plugins/main-window-display.js

@@ -0,0 +1,16 @@
+import { ipcMain } from 'electron';
+import { getLogger } from '../logger';
+var logger = getLogger();
+
+/**
+ * 主窗口显示支持状态
+ * true: 支持显示主窗口（未屏幕共享）
+ * false: 不支持显示主窗口（正在屏幕共享）
+ */
+export var canShowMainWindow = true;
+export var listenMainWindowDisplaySupport = function listenMainWindowDisplaySupport(window) {
+  ipcMain.addListener('set-main-window-display-support', function (_, isSupported) {
+    canShowMainWindow = isSupported;
+    logger.info("main window display support is ".concat(isSupported ? 'supported' : 'not supported'));
+  });
+};

package/lib-es/electron/preload.js

@@ -1,4 +1,4 @@
-import { openDirectory, openLinkInDefaultBrowser, sendEvent, setFragmentOptions, showItemInFolder, addEventListener, removeEventListener, open, close, captureScreen, getBaseUrl, openRendererWindow, quitApp, getNetworkType, setFragmentBaseUrl, getMediaSourceIdList, restartApp, checkMediaPermission, openSystemPreferences, getUserSettingData, setUserSettingData, getCursorScreenPoint, getDisplayMatching, getAllDisplays, getPrimaryDisplay, getDisplayNearestPoint, fileToBlob, downloadAndExtractResourceFileFromZip, downloadResourceFile, loadBuiltinResources, getSystemCpuInfo, getSystemMemorySize, getCurrentBrowserWindow, createBrowserWindowProxy, getBrowserWindowById } from './injections';
+import { openDirectory, openLinkInDefaultBrowser, sendEvent, setFragmentOptions, showItemInFolder, addEventListener, removeEventListener, open, close, captureScreen, getBaseUrl, openRendererWindow, quitApp, getNetworkType, setFragmentBaseUrl, getMediaSourceIdList, restartApp, checkMediaPermission, openSystemPreferences, getUserSettingData, setUserSettingData, getCursorScreenPoint, getDisplayMatching, getAllDisplays, getPrimaryDisplay, getDisplayNearestPoint, fileToBlob, downloadAndExtractResourceFileFromZip, downloadResourceFile, loadBuiltinResources, getSystemCpuInfo, getSystemMemorySize, getCurrentBrowserWindow, createBrowserWindowProxy, getBrowserWindowById, getWindowInfoList } from './injections';
 var runtime = {
   open: open,
   close: close,
@@ -34,7 +34,8 @@ var runtime = {
   getSystemMemorySize: getSystemMemorySize,
   getCurrentBrowserWindow: getCurrentBrowserWindow,
   createBrowserWindowProxy: createBrowserWindowProxy,
-  getBrowserWindowById: getBrowserWindowById
+  getBrowserWindowById: getBrowserWindowById,
+  getWindowInfoList: getWindowInfoList
 };
 
 // @ts-ignore

package/lib-es/electron/process-manager/index.js

@@ -44,6 +44,7 @@ import { AppExitCode } from '../exit-codes';
 import { DisplayState, FcrUISceneLaunchState as LaunchState, FcrUISceneLaunchEndReason } from '../struct';
 import { closeWindowBeforeLaunchSuccessErrorCode, crashedErrorCode, hangDetectionErrorCode, meetingLaunchProcessingErrorCode, windowHideErrorCode } from '../until';
 import { DEFAULT_TIMEOUT } from './constants';
+import { canShowMainWindow } from '../plugins/main-window-display';
 
 /**
  * ProcessManager 配置
@@ -200,6 +201,9 @@ export var ProcessManager = /*#__PURE__*/function (_EventEmitter) {
         case IPCMessageCMD.GetDependencyVersions:
           this._handleGetDependencyVersions(message.data);
           break;
+        case IPCMessageCMD.ShowMainWindow:
+          this._handleShowMainWindow(message.data);
+          break;
         default:
           this.logger.info("CPP EVENT: Unknown command: ".concat(message.cmd));
           break;
@@ -259,6 +263,11 @@ export var ProcessManager = /*#__PURE__*/function (_EventEmitter) {
           data: data,
           lastInitParams: this.stateManager.lastInitParams
         });
+        if (mainWindow.isMinimized()) {
+          this.stateManager.setRestoringFromMinimize(true);
+          mainWindow.restore();
+          return;
+        }
 
         // Windows 平台特殊处理
         var platform = os.platform();
@@ -361,6 +370,26 @@ export var ProcessManager = /*#__PURE__*/function (_EventEmitter) {
       this.logger.info("CPP EVENT: GetDependencyVersions: ".concat(JSON.stringify(data)));
       this._forwardMessageToRenderer(IPCMessageCMD.GetDependencyVersions, data);
     }
+  }, {
+    key: "_handleShowMainWindow",
+    value: function _handleShowMainWindow(data) {
+      this.logger.info("CPP EVENT: ShowMeetingWindow: ".concat(JSON.stringify(data)));
+      var mainWindow = this.stateManager.mainWindow;
+      if (!mainWindow) {
+        this.logger.error('main window not found,Or it has been destroyed and cannot handle the window closing event.');
+        return;
+      }
+      if (!canShowMainWindow) {
+        this.logger.info('main window display support is not supported, ignore this event');
+        return;
+      }
+      var platform = os.platform();
+      if (platform === 'win32') {
+        this.stateManager.showAndFocusWithAlwaysOnTop();
+      } else {
+        this.stateManager.onlyShowMainWindow();
+      }
+    }
 
     /**
      * 转发消息到渲染进程
@@ -438,6 +467,14 @@ export var ProcessManager = /*#__PURE__*/function (_EventEmitter) {
       this.logger.info('windows_release main window show');
       this.stateManager.setMainWindowDisplayState(DisplayState.SHOW);
       this.stateManager.setUserMinimize(false);
+
+      // 如果是从最小化恢复触发的show事件，不执行focus避免动画期间闪烁
+      if (this.stateManager.isRestoringFromMinimize) {
+        this.logger.info('windows_release main window show: skip focus during restore animation');
+        this.stateManager.setRestoringFromMinimize(false);
+        return;
+      }
+      this.stateManager.setRestoringFromMinimize(false);
       this.stateManager.focusMainWindow();
     }