fcr-ui-scene 3.7.5 → 3.7.7-rc.1

package/lib/creator/index.js

@@ -113,7 +113,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_registeredWidgetConfigs", new Map([]));
     (0, _defineProperty2["default"])(this, "_released", false);
     (0, _defineProperty2["default"])(this, "_scene", null);
-    (0, _defineProperty2["default"])(this, "_microphoneKeepRecording", false);
+    (0, _defineProperty2["default"])(this, "_microphoneKeepRecording", true);
     (0, _defineProperty2["default"])(this, "_sceneObserver", null);
     (0, _defineProperty2["default"])(this, "_settingModule", null);
     (0, _defineProperty2["default"])(this, "_eventToastModule", null);
@@ -183,11 +183,17 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
             type: _type.FcrUIGlobalNodeEventType.LAUNCH_SUCCESS,
             data: args
           });
-          if ((0, _env.isElectron)()) {
-            var windowProvider = _this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
-            var mainWindow = windowProvider.getCurrentWindow();
-            (0, _focusHelper.focusWindow)(mainWindow);
-          }
+
+          // if (isElectron()) {
+          //   const windowProvider = this._objectManager.getObject<FcrUIWindowProvider>(
+          //     FcrUIObjectKeys.P_WINDOW_PROVIDER,
+          //   );
+
+          //   const mainWindow = windowProvider.getCurrentWindow();
+
+          //   focusWindow(mainWindow);
+          // }
+
           onSuccess.apply(void 0, args);
         },
         onLaunchFailure: function onLaunchFailure() {
@@ -428,7 +434,9 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
       this._globalNode.addSubNode(eventToastModule);
       this._globalNode.addSubNode(settingModule);
       this._globalNode.addToSlot('dialog', dialogModule.getComponent());
-      this._globalNode.addToSlot('toast', eventToastModule.getComponent('local'));
+      if (!(0, _env.isElectron)()) {
+        this._globalNode.addToSlot('toast', eventToastModule.getComponent('global'));
+      }
 
       // other global modules...
 

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

@@ -34,6 +34,7 @@ var _privilegeProvider = require("../providers/privilege-provider");
 var _rendererProvider = require("../providers/renderer-provider");
 var _roomProvider = require("../providers/room-provider/room-provider");
 var _sessionProvider = require("../providers/session-provider");
+var _widgetProvider = require("../providers/widget-provider");
 var _appListData = require("../shared-data/app-list-data");
 var _chatData = require("../shared-data/chat-data");
 var _devicePrivilegeData = require("../shared-data/device-privilege-data");
@@ -51,6 +52,7 @@ var _pinData = require("../shared-data/pin-data");
 var _provider5 = require("../providers/screen-share/provider.browser");
 var _provider6 = require("../providers/board-share/provider.browser");
 var _logger = require("../utilities/logger");
+var _widgetData = require("../shared-data/widget-data");
 var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
   function FcrUIBrowserProviderInitializer(args) {
     (0, _classCallCheck2["default"])(this, FcrUIBrowserProviderInitializer);
@@ -97,6 +99,8 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MONITOR_PROVIDER, monitorProvider);
       var sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE, sharedLayoutDataSource);
+      var sharedWidgetDataSource = new _widgetData.FcrUISharedWidgetDataSourceImpl();
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE, sharedWidgetDataSource);
     }
   }, {
     key: "onCreatorRelease",
@@ -113,6 +117,7 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.CORE_ENGINE);
       if (objectManager.size() > 0) {
         this.logger.error("remaing objects: ".concat(objectManager.keys()));
@@ -133,7 +138,13 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       var dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
       var sharedScreenShareDataSource = new _screenShare.FcrUISharedScreenShareDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_SCREEN_SHARE_DATA_SOURCE, sharedScreenShareDataSource);
-      var widgetProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
+      var sharedWidgetDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE);
+      var widgetProvider = new _widgetProvider.FcrUIWidgetProviderImpl({
+        sharedWidgetDataSource: sharedWidgetDataSource,
+        roomProvider: roomProvider,
+        dialogProvider: dialogProvider
+      });
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER, widgetProvider);
       var mainRoomControl = roomProvider.currentRoomControl;
       var sharingControl = mainRoomControl.getSharingControl();
       var streamControl = mainRoomControl.getStreamControl();
@@ -165,8 +176,6 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER, interpreterProvider);
       var currentRoomControlProvider = new _roomProvider.FcrUICurrentRoomControlProviderImpl(mainRoomControl);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER, currentRoomControlProvider);
-      var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER, connectionProvider);
       var sessionProvider = new _sessionProvider.FcrUISessionProviderImpl(engine);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER, sessionProvider);
       var sharedDevicePrivilegeDataSource = new _devicePrivilegeData.FcrUISharedDevicePrivilegeDataSourceImpl();
@@ -225,7 +234,6 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER);
-      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_STREAM_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WAITING_ROOM_CONTROL_PROVIDER);
@@ -246,6 +254,7 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_INTERPRETER_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
       // 其它如有遗漏可补充
     }
   }, {

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

@@ -35,6 +35,7 @@ var _phoneAudioProvider = require("../providers/phone-audio-provider");
 var _rendererProvider = require("../providers/renderer-provider");
 var _roomProvider = require("../providers/room-provider/room-provider");
 var _sessionProvider = require("../providers/session-provider");
+var _widgetProvider = require("../providers/widget-provider");
 var _appListData = require("../shared-data/app-list-data");
 var _chatData = require("../shared-data/chat-data");
 var _devicePrivilegeData = require("../shared-data/device-privilege-data");
@@ -57,6 +58,7 @@ var _speakerSpotlight = require("../shared-data/speaker-spotlight");
 var _pinData = require("../shared-data/pin-data");
 var _logger = require("../utilities/logger");
 var _provider8 = require("../providers/mouse-detect/provider");
+var _widgetData = require("../shared-data/widget-data");
 var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
   function FcrUIElectronProviderInitializer(args) {
     (0, _classCallCheck2["default"])(this, FcrUIElectronProviderInitializer);
@@ -71,12 +73,14 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
     value: function onCreatorInitialize(engineConfig) {
       // initialize all providers and shared data sources
       var objectManager = this._objectManager;
+      var fcrUIMainWindowRenderer = new _secondaryWindow.FcrUIMainWindowRendererImpl();
+
+      // @ts-ignore
+      window.FcrUIMainWindowRenderer = fcrUIMainWindowRenderer;
       var engine = new _fcrCore.FcrCoreEngine(engineConfig);
       this._objectManager.setObject(_objectManager.FcrUIObjectKeys.CORE_ENGINE, engine);
       var renderer = new _renderer.FcrUIRendererWrapper();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER, renderer);
-      var mouseDetectProvider = new _provider8.FcrUIMouseDetectProviderImpl(objectManager);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MOUSE_DETECT_PROVIDER, mouseDetectProvider);
       var localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_LOCAL_STORAGE_PROVIDER, localStorageProvider);
       var facilityProvider = new _provider5.FcrUIElectronFacilityProviderImpl({
@@ -93,6 +97,8 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
         renderer: renderer
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER, windowProvider);
+      var mouseDetectProvider = new _provider8.FcrUIMouseDetectProviderImpl(objectManager);
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MOUSE_DETECT_PROVIDER, mouseDetectProvider);
       var eventProvider = new _eventProvider.FcrUIEventProviderImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_EVENT_PROVIDER, eventProvider);
       var messageProvider = new _provider2.FcrUIMessageProviderImpl();
@@ -100,7 +106,8 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       var sharedConfirmDataSource = new _confirmData.FcrUISharedConfirmDataSourceImpl();
       this._objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIRM_DATA_SOURCE, sharedConfirmDataSource);
       var dialogProvider = new _provider.FcrUIElectronDialogProviderImpl({
-        windowProvider: windowProvider
+        windowProvider: windowProvider,
+        renderer: renderer
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER, dialogProvider);
       var deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(renderer, facilityProvider, messageProvider, engine.getDesktopMediaControl(), sharedSettingDataSource);
@@ -113,6 +120,8 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MONITOR_PROVIDER, monitorProvider);
       var sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE, sharedLayoutDataSource);
+      var sharedWidgetDataSource = new _widgetData.FcrUISharedWidgetDataSourceImpl();
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE, sharedWidgetDataSource);
     }
   }, {
     key: "onCreatorRelease",
@@ -132,6 +141,7 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.CORE_ENGINE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIRM_DATA_SOURCE);
       if (objectManager.size() > 0) {
@@ -152,7 +162,13 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       var sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
       var messageProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
       var dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
-      var widgetProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
+      var sharedWidgetDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE);
+      var widgetProvider = new _widgetProvider.FcrUIWidgetProviderImpl({
+        sharedWidgetDataSource: sharedWidgetDataSource,
+        roomProvider: roomProvider,
+        dialogProvider: dialogProvider
+      });
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER, widgetProvider);
       var windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
       var sharedScreenShareDataSource = new _screenShare.FcrUISharedScreenShareDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_SCREEN_SHARE_DATA_SOURCE, sharedScreenShareDataSource);
@@ -187,8 +203,6 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER, interpreterProvider);
       var currentRoomControlProvider = new _roomProvider.FcrUICurrentRoomControlProviderImpl(mainRoomControl);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER, currentRoomControlProvider);
-      var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER, connectionProvider);
       var sessionProvider = new _sessionProvider.FcrUISessionProviderImpl(engine);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER, sessionProvider);
       var sharedDevicePrivilegeDataSource = new _devicePrivilegeData.FcrUISharedDevicePrivilegeDataSourceImpl();
@@ -215,10 +229,9 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEETING_TIME_DATA_SOURCE, sharedMeetingTimeDataSource);
       var sharedMemberDataSource = new _memberData.FcrUISharedMemberDataSourceImpl(userControl, streamControl, sharedScreenShareDataSource, eventProvider, mainRoomControl.getSharingControl().getBoardControl());
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEMBER_DATA_SOURCE, sharedMemberDataSource);
-      var fcrUIMainWindowRenderer = new _secondaryWindow.FcrUIMainWindowRendererImpl();
 
       // @ts-ignore
-      window.FcrUIMainWindowRenderer = fcrUIMainWindowRenderer;
+      var fcrUIMainWindowRenderer = window.FcrUIMainWindowRenderer;
       var whiteboardProvider = new _provider7.FcrUIBoardShareProviderImpl(objectManager, fcrUIMainWindowRenderer);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_BOARD_SHARE_PROVIDER, whiteboardProvider);
       var sharedSecurityDataSource = new _securityData.FcrUISecurityDataSourceImpl(privilegeProvider, sharedMemberDataSource);
@@ -241,7 +254,6 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
         windowProvider: windowProvider,
         sharingControl: sharingControl,
         whiteboardProvider: whiteboardProvider,
-        fcrUIMainWindowRenderer: fcrUIMainWindowRenderer,
         screenShareProvider: screenShareProvider
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MULTI_DISPLAY_PROVIDER, multiDisplayProvider);
@@ -262,7 +274,6 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER);
-      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_STREAM_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WAITING_ROOM_CONTROL_PROVIDER);
@@ -284,6 +295,7 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_INTERPRETER_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
     }
   }, {
     key: "onWaitingSceneInitialize",

package/lib/electron/bootstrap-sdk.js

@@ -48,6 +48,8 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 mainWindow;
 var mainWindowReady = false;
+var userMinimize = false;
+var mainWindowDisplayState = _struct.DisplayState.HIDE;
 (0, _main.initialize)();
 var port = (_process$argv$find = process.argv.find(function (arg) {
   return arg.startsWith('--port=');
@@ -102,10 +104,17 @@ ipcClient.addObserver({
           mainWindow.moveTop();
           var platform = _os["default"].platform();
           if (platform === 'win32') {
-            mainWindow.setAlwaysOnTop(true);
+            (0, _logger.getLogger)().info('windows_index setAlwaysOnTop in bootstrap-sdk');
+            mainWindow.setAlwaysOnTop(true, 'pop-up-menu');
             setTimeout(function () {
-              mainWindow.setAlwaysOnTop(false);
-            }, 100);
+              (0, _logger.getLogger)().info("windows_index set main window in bootstrap-sdk,current display state: ".concat(mainWindowDisplayState));
+              if (mainWindowDisplayState === _struct.DisplayState.SHOW) {
+                mainWindow.moveTop();
+                mainWindow.show();
+                mainWindow.focus();
+              }
+            }, 300);
+            mainWindow.setAlwaysOnTop(false, 'pop-up-menu');
           }
         }
         break;
@@ -252,10 +261,10 @@ _electron.app.addListener('ready', function () {
       cmd: _type.IPCMessageCMD.ExitedMeeting,
       data: {
         roomId: roomId,
-        reason: _struct.FcrUISceneLaunchEndReason.CRASHED
+        reason: _until.crashedErrorCode
       }
     });
-    _eventManager.eventManager.onExitedMeeting(roomId, 'exited-meeting');
+    _eventManager.eventManager.onExitedMeeting(roomId, _struct.FcrUISceneLaunchEndReason.CRASHED);
   });
   mainWindow.webContents.addListener('did-finish-load', function () {
     mainWindowReady = true;
@@ -264,8 +273,47 @@ _electron.app.addListener('ready', function () {
       data: {}
     });
   });
+  mainWindow.addListener('minimize', function () {
+    (0, _logger.getLogger)().info('windows_release main window minimized');
+    mainWindowDisplayState = _struct.DisplayState.MINIMIZE;
+    userMinimize = true;
+  });
+  mainWindow.addListener('show', function () {
+    (0, _logger.getLogger)().info('windows_release main window show');
+    mainWindowDisplayState = _struct.DisplayState.SHOW;
+    mainWindow.focus();
+    userMinimize = false;
+  });
+  mainWindow.addListener('always-on-top-changed', function (event, alwaysOnTop) {
+    (0, _logger.getLogger)().info("windows_index main window always-on-top-changed: ".concat(alwaysOnTop));
+  });
   mainWindow.addListener('hide', function () {
     (0, _logger.getLogger)().info("windows_release main window hidden, current launch state: ".concat(_struct.FcrUISceneLaunchState[_eventManager.eventManager.launchState]));
+    mainWindowDisplayState = _struct.DisplayState.HIDE;
+    if (userMinimize) {
+      (0, _logger.getLogger)().info('windows_release main window hidden, but user minimize, ignore this event');
+      return;
+    }
+
+    // if (
+    //   eventManager.launchState === LaunchState.END &&
+    //   eventManager.endReason === FcrUISceneLaunchEndReason.LAUNCH_SUCCESS
+    // ) {
+    //   getLogger().info(
+    //     'windows_release main window hidden, but launch state is END, send error Event',
+    //   );
+
+    //   ipcClient.sendMessage({
+    //     cmd: IPCMessageCMD.Error,
+    //     data: {
+    //       roomId: eventManager.roomId,
+    //       errorCode: mainWindowHiddenOnLaunchSuccessErrorCode,
+    //       message: 'main window hidden on launch success',
+    //     },
+    //   });
+    //   return;
+    // }
+
     if (_eventManager.eventManager.launchState !== _struct.FcrUISceneLaunchState.PROCESSING) {
       return;
     }
@@ -285,6 +333,7 @@ _electron.app.addListener('ready', function () {
     _electron.app.exit(_exitCodes.AppExitCode.NORMAL_EXIT);
   });
   mainWindow.addListener('close', function (e) {
+    mainWindowDisplayState = _struct.DisplayState.HIDE;
     var closeListenerCount = mainWindow.listenerCount('close');
     (0, _logger.getLogger)().info("windows_release main window close listener count: ".concat(closeListenerCount, ", isInMeeting: ").concat(_meetingState.isInMeeting));
     if (_meetingState.isInMeeting === 0) {
@@ -310,6 +359,14 @@ _electron.app.addListener('ready', function () {
       }, 300);
     }
   });
+  mainWindow.addListener('unresponsive', function () {
+    (0, _logger.getLogger)().warn("main window unresponsive in bootstrap-sdk");
+    handleUnresponsive();
+  });
+  mainWindow.addListener('responsive', function () {
+    (0, _logger.getLogger)().warn("main window responsive in bootstrap-sdk");
+    handleResponsive();
+  });
   if (_env.isDev) {
     mainWindow.webContents.openDevTools({
       mode: 'detach'
@@ -336,4 +393,31 @@ _electron.app.addListener('quit', function (event, exitCode) {
   (0, _logger.getLogger)().info("app quit event triggered with exit code: ".concat(exitCode));
   // 清理 EventManager 资源
   _eventManager.eventManager.dispose();
-});
+});
+var HANG_DETECTION_TIMEOUT = 60 * 1000; // 1分钟（毫s秒）
+var hangDetectionTimer = null;
+function handleUnresponsive() {
+  (0, _logger.getLogger)().warn('Window became unresponsive, starting hang detection timer');
+  clearHangDetectionTimer();
+  hangDetectionTimer = setTimeout(function () {
+    (0, _logger.getLogger)().error('Window has been unresponsive for 1 minute, forcing application exit');
+    _eventManager.eventManager.onExitedMeeting(_eventManager.eventManager.roomId, _struct.FcrUISceneLaunchEndReason.HANG_DETECTION);
+    ipcClient.sendMessage({
+      cmd: _type.IPCMessageCMD.ExitedMeeting,
+      data: {
+        roomId: _eventManager.eventManager.roomId,
+        reason: _until.hangDetectionErrorCode
+      }
+    });
+  }, HANG_DETECTION_TIMEOUT);
+}
+function handleResponsive() {
+  (0, _logger.getLogger)().info('Window became responsive again, clearing hang detection timer');
+  clearHangDetectionTimer();
+}
+function clearHangDetectionTimer() {
+  if (hangDetectionTimer) {
+    clearTimeout(hangDetectionTimer);
+    hangDetectionTimer = null;
+  }
+}

package/lib/electron/injections.d.ts

@@ -19,6 +19,7 @@ export declare const captureScreen: (options?: {
     hideWindow?: boolean;
     alwaysHide?: boolean;
 }) => void;
+export declare const getBaseUrl: () => string;
 export declare const openRendererWindow: (frameName: string, callback: (dom: HTMLElement, windowId: string, newRendererWindow: Window) => void, windowOptions: BrowserWindowConstructorOptions) => Promise<void>;
 export declare const checkMediaPermission: (mediaType: "microphone" | "camera" | "sharing") => Promise<any>;
 export declare const openSystemPreferences: (mediaType: "microphone" | "camera" | "sharing") => void;

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.getResourceByFileType = exports.getPrimaryDisplay = exports.getNetworkType = exports.getMediaSourceIdList = exports.getDisplayNearestPoint = exports.getDisplayMatching = exports.getCursorScreenPoint = exports.getCurrentBrowserWindow = exports.getBrowserWindowById = exports.getAllDisplays = exports.fileToBlob = exports.fileToBase64 = 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.getUserSettingData = exports.getSystemMemorySize = exports.getSystemCpuInfo = exports.getResourceByFileType = 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.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"));
@@ -69,6 +69,7 @@ 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 _env = require("./env");
 // import { windowManager as wm } from 'node-window-manager';
 
 var USER_SETTING_DATA_FILE_NAME = 'UserSettingData.json';
@@ -160,6 +161,9 @@ var captureScreen = exports.captureScreen = function captureScreen(options) {
 //   return wm.getWindows();
 // };
 
+var getBaseUrl = exports.getBaseUrl = function getBaseUrl() {
+  return _env.isDev ? _env.devPageUrl : '.';
+};
 var openRendererWindow = exports.openRendererWindow = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(frameName, callback, windowOptions) {
     var isAlreadyOpened, windowConstructorOptionsString, newRendererWindow, windowId, windowIdStr, htmlTemplate, renderDom, parentWindow, parentHead, parentStyles, parentStyleLinks, stylesLoadedPromises, presetWindoStyle, observer, parentRoot, parentRootStyles, _renderDom;

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

@@ -6,6 +6,7 @@ export declare enum IPCMessageCMD {
     WidgetClicked = "widget-clicked",
     TokenWillExpire = "user-token-will-expire",
     ExitUiSceneFromMainProcess = "exit-ui-scene-from-main-process",
+    Error = "error",
     LaunchMeeting = "launch-meeting",
     InitCreator = "init-creator",
     OpenSetting = "open-setting",

package/lib/electron/ipc/type.js

@@ -14,6 +14,7 @@ var IPCMessageCMD = exports.IPCMessageCMD = /*#__PURE__*/function (IPCMessageCMD
   IPCMessageCMD["WidgetClicked"] = "widget-clicked";
   IPCMessageCMD["TokenWillExpire"] = "user-token-will-expire";
   IPCMessageCMD["ExitUiSceneFromMainProcess"] = "exit-ui-scene-from-main-process";
+  IPCMessageCMD["Error"] = "error";
   // handle
   IPCMessageCMD["LaunchMeeting"] = "launch-meeting";
   IPCMessageCMD["InitCreator"] = "init-creator";

package/lib/electron/preload.js

@@ -15,6 +15,7 @@ var runtime = {
   openDirectory: _injections.openDirectory,
   showItemInFolder: _injections.showItemInFolder,
   quitApp: _injections.quitApp,
+  getBaseUrl: _injections.getBaseUrl,
   getNetworkType: _injections.getNetworkType,
   setFragmentBaseUrl: _injections.setFragmentBaseUrl,
   getMediaSourceIdList: _injections.getMediaSourceIdList,

package/lib/electron/sdk-helper.d.ts

@@ -1 +1,4 @@
 export declare const getBundleType: () => Promise<"JS_BUNDLE" | "NATIVE_BUNDLE">;
+export declare const onUserTokenWillExpire: () => void;
+export declare const onWidgetClicked: (widgetId: string) => void;
+export declare const onExitUiScene: () => void;

package/lib/electron/sdk-helper.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getBundleType = void 0;
+exports.onWidgetClicked = exports.onUserTokenWillExpire = exports.onExitUiScene = exports.getBundleType = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.date.to-string.js");
@@ -119,6 +119,15 @@ var getIsMeetingLaunched = /*#__PURE__*/function () {
 var refreshUserToken = function refreshUserToken(token) {
   _renderer.ipcRenderer.send('refresh-user-token', token);
 };
+var onUserTokenWillExpire = exports.onUserTokenWillExpire = function onUserTokenWillExpire() {
+  _renderer.ipcRenderer.send('user-token-will-expire');
+};
+var onWidgetClicked = exports.onWidgetClicked = function onWidgetClicked(widgetId) {
+  _renderer.ipcRenderer.send('widget-clicked', widgetId);
+};
+var onExitUiScene = exports.onExitUiScene = function onExitUiScene() {
+  _renderer.ipcRenderer.send('exit-ui-scene');
+};
 var cppSdkHelper = {
   getLaunchOptions: getLaunchOptions,
   getBundleType: getBundleType,
@@ -132,10 +141,35 @@ var cppSdkHelper = {
   setParameters: setParameters,
   getIsMeetingLaunched: getIsMeetingLaunched,
   refreshUserToken: refreshUserToken,
-  exitedMeeting: exitedMeeting
+  exitedMeeting: exitedMeeting,
+  onUserTokenWillExpire: onUserTokenWillExpire,
+  onWidgetClicked: onWidgetClicked,
+  onExitUiScene: onExitUiScene,
+  // 需要在 index.html 中设置的回调
+  // onCreatorInit
+  onCreatorInit: function onCreatorInit() {},
+  // onSettingOpen
+  onSettingOpen: function onSettingOpen() {},
+  // onSettingClose
+  onSettingClose: function onSettingClose() {},
+  // onSetParameters
+  onSetParameters: function onSetParameters() {},
+  // onRenewUserToken
+  onRenewUserToken: function onRenewUserToken() {},
+  // onLaunchMeeting
+  onLaunchMeeting: function onLaunchMeeting() {},
+  // exitUiScene
+  exitUiScene: function exitUiScene() {}
 };
+
 // @ts-ignore
 window.cppSdkHelper = cppSdkHelper;
+
+/**
+ * 监听主进程来的事件
+ * 调用渲染进程的方法
+ */
+
 _renderer.ipcRenderer.on(_type.IPCMessageCMD.InitCreator, function (_event, value) {
   if (cppSdkHelper.onCreatorInit) {
     var data = value;
@@ -188,49 +222,49 @@ _renderer.ipcRenderer.on(_type.IPCMessageCMD.ExitUiScene, function (_event, valu
     cppSdkHelper.exitUiScene();
   }
 });
+console.log('windows_release sdk-helper loaded add listener close-window-before-launch-success');
+_renderer.ipcRenderer.on('close-window-before-launch-success', function () {
+  console.log('windows_release Received close-window-before-launch-success event', new Date().toLocaleTimeString());
+  if (cppSdkHelper.exitUiScene) {
+    cppSdkHelper.exitUiScene();
+  }
+});
+
+// demo 发出，fcr-ui-scene 监听
 _renderer.ipcRenderer.on('sdk-ready', function () {
   if (cppSdkHelper.onSDKReady) {
     cppSdkHelper.onSDKReady();
   }
 });
+// demo 发出，fcr-ui-scene 监听
 _renderer.ipcRenderer.on('launch-failure', function (_event, roomId, errorCode) {
   if (cppSdkHelper.onLaunchFailure) {
     cppSdkHelper.onLaunchFailure(roomId, errorCode);
   }
 });
-_renderer.ipcRenderer.on('close-window-before-launch-success', function () {
-  console.log('windows_release Received close-window-before-launch-success event', new Date().toLocaleTimeString());
-  if (cppSdkHelper.exitUiScene) {
-    cppSdkHelper.exitUiScene();
-  }
-});
+
+// demo 发出，fcr-ui-scene 监听
 _renderer.ipcRenderer.on('exited-meeting', function (_event, roomId, reason) {
   if (cppSdkHelper.onExitedMeeting) {
     cppSdkHelper.onExitedMeeting(roomId, reason);
   }
 });
+
+// demo 发出，fcr-ui-scene 监听
 _renderer.ipcRenderer.on('refresh-user-token', function () {
   if (cppSdkHelper.onRefreshUserToken) {
     cppSdkHelper.onRefreshUserToken();
   }
 });
+
+// demo 发出，fcr-ui-scene 监听
 _renderer.ipcRenderer.on('launch-success', function (_event, roomId) {
   if (cppSdkHelper.onLaunchSuccess) {
     cppSdkHelper.onLaunchSuccess(roomId);
   }
 });
 
-// 添加其他可能需要的 IPC 监听器
-_renderer.ipcRenderer.on('widget-clicked', function (_event, widgetId) {
-  if (cppSdkHelper.onWidgetClicked) {
-    cppSdkHelper.onWidgetClicked(widgetId);
-  }
-});
-_renderer.ipcRenderer.on('user-token-will-expire', function () {
-  if (cppSdkHelper.onUserTokenWillExpire) {
-    cppSdkHelper.onUserTokenWillExpire();
-  }
-});
+// demo 发出，fcr-ui-scene 监听
 _renderer.ipcRenderer.on('exit-ui-scene', function () {
   if (cppSdkHelper.onExitUiScene) {
     cppSdkHelper.onExitUiScene();

package/lib/electron/struct.d.ts

@@ -8,5 +8,11 @@ export declare enum FcrUISceneLaunchEndReason {
     LAUNCH_FAILURE = "launchFailure",
     CLOSE_WINDOW = "closeWindow",
     EXITED = "exited",
-    CRASHED = "crashed"
+    CRASHED = "crashed",
+    HANG_DETECTION = "hangDetection"
+}
+export declare enum DisplayState {
+    SHOW = "show",
+    HIDE = "hide",
+    MINIMIZE = "minimize"
 }

package/lib/electron/struct.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUISceneLaunchState = exports.FcrUISceneLaunchEndReason = void 0;
+exports.FcrUISceneLaunchState = exports.FcrUISceneLaunchEndReason = exports.DisplayState = void 0;
 var FcrUISceneLaunchState = exports.FcrUISceneLaunchState = /*#__PURE__*/function (FcrUISceneLaunchState) {
   FcrUISceneLaunchState[FcrUISceneLaunchState["DEFAULT"] = 0] = "DEFAULT";
   FcrUISceneLaunchState[FcrUISceneLaunchState["PROCESSING"] = 1] = "PROCESSING";
@@ -17,5 +17,12 @@ var FcrUISceneLaunchEndReason = exports.FcrUISceneLaunchEndReason = /*#__PURE__*
   FcrUISceneLaunchEndReason["CLOSE_WINDOW"] = "closeWindow";
   FcrUISceneLaunchEndReason["EXITED"] = "exited";
   FcrUISceneLaunchEndReason["CRASHED"] = "crashed";
+  FcrUISceneLaunchEndReason["HANG_DETECTION"] = "hangDetection";
   return FcrUISceneLaunchEndReason;
+}({});
+var DisplayState = exports.DisplayState = /*#__PURE__*/function (DisplayState) {
+  DisplayState["SHOW"] = "show";
+  DisplayState["HIDE"] = "hide";
+  DisplayState["MINIMIZE"] = "minimize";
+  return DisplayState;
 }({});

package/lib/electron/until.d.ts

@@ -19,10 +19,16 @@ declare enum DetailErrorCode {
     processLaunchFailed = 81,
     mainWindowHidden = 82,
     closeWindowBeforeLaunchSuccess = 83,
-    meetingLaunchProcessing = 84
+    meetingLaunchProcessing = 84,
+    mainWindowHiddenAfterLaunchSuccess = 85,
+    crashed = 86,
+    hangDetection = 87
 }
 export declare const generaErrorCode: (serviceCode: ServiceErrorCode, uiSceneCode: UISceneErrorCode, detailCode: DetailErrorCode) => number;
 export declare const windowHideErrorCode: number;
 export declare const closeWindowBeforeLaunchSuccessErrorCode: number;
 export declare const meetingLaunchProcessingErrorCode: number;
+export declare const mainWindowHiddenOnLaunchSuccessErrorCode: number;
+export declare const crashedErrorCode: number;
+export declare const hangDetectionErrorCode: number;
 export {};