fcr-ui-scene 3.7.5 → 3.7.6

package/lib/creator/index.js

@@ -428,7 +428,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();
@@ -246,6 +257,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);
@@ -215,10 +231,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);
@@ -284,6 +299,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,7 @@ 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;
 (0, _main.initialize)();
 var port = (_process$argv$find = process.argv.find(function (arg) {
   return arg.startsWith('--port=');
@@ -102,10 +103,15 @@ ipcClient.addObserver({
           mainWindow.moveTop();
           var platform = _os["default"].platform();
           if (platform === 'win32') {
-            mainWindow.setAlwaysOnTop(true);
+            // getLogger().info('windows_index setAlwaysOnTop in bootstrap-sdk');
+            // mainWindow.setAlwaysOnTop(true, 'pop-up-menu');
             setTimeout(function () {
-              mainWindow.setAlwaysOnTop(false);
-            }, 100);
+              // getLogger().info('windows_index setAlwaysOnTop in bootstrap-sdk');
+              // mainWindow.setAlwaysOnTop(false, 'pop-up-menu');
+              mainWindow.moveTop();
+              mainWindow.show();
+              mainWindow.focus();
+            }, 300);
           }
         }
         break;
@@ -252,10 +258,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 +270,36 @@ _electron.app.addListener('ready', function () {
       data: {}
     });
   });
+  mainWindow.addListener('minimize', function () {
+    (0, _logger.getLogger)().info('windows_release main window minimized');
+    userMinimize = true;
+  });
+  mainWindow.addListener('show', function () {
+    (0, _logger.getLogger)().info('windows_release main window 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]));
+    if (userMinimize) {
+      (0, _logger.getLogger)().info('windows_release main window hidden, but user minimize, ignore this event');
+      return;
+    }
+    if (_eventManager.eventManager.launchState === _struct.FcrUISceneLaunchState.END && _eventManager.eventManager.endReason === _struct.FcrUISceneLaunchEndReason.LAUNCH_SUCCESS) {
+      (0, _logger.getLogger)().info('windows_release main window hidden, but launch state is END, send error Event');
+      ipcClient.sendMessage({
+        cmd: _type.IPCMessageCMD.Error,
+        data: {
+          roomId: _eventManager.eventManager.roomId,
+          errorCode: _until.mainWindowHiddenOnLaunchSuccessErrorCode,
+          message: 'main window hidden on launch success'
+        }
+      });
+      return;
+    }
     if (_eventManager.eventManager.launchState !== _struct.FcrUISceneLaunchState.PROCESSING) {
       return;
     }

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/until.d.ts

@@ -19,10 +19,14 @@ declare enum DetailErrorCode {
     processLaunchFailed = 81,
     mainWindowHidden = 82,
     closeWindowBeforeLaunchSuccess = 83,
-    meetingLaunchProcessing = 84
+    meetingLaunchProcessing = 84,
+    mainWindowHiddenAfterLaunchSuccess = 85,
+    crashed = 86
 }
 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 {};

package/lib/electron/until.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.windowHideErrorCode = exports.meetingLaunchProcessingErrorCode = exports.generaErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = void 0;
+exports.windowHideErrorCode = exports.meetingLaunchProcessingErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = exports.generaErrorCode = exports.crashedErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = void 0;
 // 错误代码枚举定义
 var ServiceErrorCode = /*#__PURE__*/function (ServiceErrorCode) {
   ServiceErrorCode[ServiceErrorCode["FcrUIScene"] = 800] = "FcrUIScene";
@@ -44,6 +44,8 @@ var DetailErrorCode = /*#__PURE__*/function (DetailErrorCode) {
   DetailErrorCode[DetailErrorCode["closeWindowBeforeLaunchSuccess"] = 83] = "closeWindowBeforeLaunchSuccess";
   // 会议启动中
   DetailErrorCode[DetailErrorCode["meetingLaunchProcessing"] = 84] = "meetingLaunchProcessing";
+  DetailErrorCode[DetailErrorCode["mainWindowHiddenAfterLaunchSuccess"] = 85] = "mainWindowHiddenAfterLaunchSuccess";
+  DetailErrorCode[DetailErrorCode["crashed"] = 86] = "crashed";
   return DetailErrorCode;
 }(DetailErrorCode || {}); // 格式：ServiceErrorCode(3位) + UISceneErrorCode(3位) + DetailErrorCode(3位)
 var generaErrorCode = exports.generaErrorCode = function generaErrorCode(serviceCode, uiSceneCode, detailCode) {
@@ -51,4 +53,6 @@ var generaErrorCode = exports.generaErrorCode = function generaErrorCode(service
 };
 var windowHideErrorCode = exports.windowHideErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHidden);
 var closeWindowBeforeLaunchSuccessErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.closeWindowBeforeLaunchSuccess);
-var meetingLaunchProcessingErrorCode = exports.meetingLaunchProcessingErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.meetingLaunchProcessing);
+var meetingLaunchProcessingErrorCode = exports.meetingLaunchProcessingErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.meetingLaunchProcessing);
+var mainWindowHiddenOnLaunchSuccessErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHiddenAfterLaunchSuccess);
+var crashedErrorCode = exports.crashedErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.crashed);

package/lib/fragments/annotation/store.js

@@ -195,6 +195,7 @@ var FragmentAnnotationStore = exports.FragmentAnnotationStore = /*#__PURE__*/fun
               this._cancelCurrentUpdateWindowSizeTimber('send-fragment-close');
               this.currentTool = 'curve';
               // TODO: window
+              this.logger.info('windows_index setAlwaysOnTop in annotation');
               // @ts-ignore
               window.runtime.browserWindow.setAlwaysOnTop(true, 'pop-up-menu');
               this.setIgnore(true);
@@ -370,6 +371,7 @@ var FragmentAnnotationStore = exports.FragmentAnnotationStore = /*#__PURE__*/fun
     key: "show",
     value: function show() {
       // TODO: window
+      this.logger.info('windows_index setAlwaysOnTop in annotation show');
       // @ts-ignore
       window.runtime.browserWindow.setAlwaysOnTop(true, 'pop-up-menu');
 

package/lib/modules/action-bar/components/more/poppover-content.js

@@ -92,7 +92,7 @@ var ScreenShare = (0, _mobxReact.observer)(function (props) {
       type: _type2.FcrIconType.FCR_SCREENSHARING,
       size: 24
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-      children: transI18n('fmt_screenshare_label_screenshare')
+      children: transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare')
     })]
   });
 });

package/lib/modules/action-bar/components/screen-share/index.browser.js

@@ -26,7 +26,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
     visibleMenu = _useState2[0],
     setMenuVisible = _useState2[1];
   var transI18n = (0, _i18n.useI18n)();
-  var title = transI18n('fmt_screenshare_label_screenshare');
+  var title = transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare');
   (0, _react.useEffect)(function () {
     setMenuVisible(false);
   }, [hasStartScreenSharePermission]);
@@ -41,7 +41,9 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
       maxWidth: '370px',
       width: 'fit-content'
     },
-    content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {}),
+    content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {
+      setMenuVisible: setMenuVisible
+    }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
       active: visibleMenu,
       disabled: !hasStartScreenSharePermission,

package/lib/modules/action-bar/components/screen-share/index.electron.js

@@ -33,7 +33,9 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
     if ([_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole)) {
       return {
         active: visibleMenu,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {}),
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {
+          setMenuVisible: setMenuVisible
+        }),
         onClick: function onClick() {
           setMenuVisible(true);
         },
@@ -47,7 +49,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
       return undefined;
     }
   }, [localUserRole, visibleMenu]);
-  var title = transI18n('fmt_screenshare_label_screenshare');
+  var title = transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare');
   (0, _react.useEffect)(function () {
     setMenuVisible(false);
   }, [hasStartScreenSharePermission]);

package/lib/modules/action-bar/components/screen-share/submenu.d.ts

@@ -1 +1,5 @@
-export declare const SubMenu: () => import("react/jsx-runtime").JSX.Element;
+interface SubMenuProps {
+    setMenuVisible: (visible: boolean) => void;
+}
+export declare const SubMenu: ({ setMenuVisible }: SubMenuProps) => import("react/jsx-runtime").JSX.Element;
+export {};

package/lib/modules/action-bar/components/screen-share/submenu.js

@@ -36,13 +36,13 @@ var _truncate = _interopRequireDefault(require("lodash/truncate"));
 var _jsxRuntime = require("react/jsx-runtime");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
+var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function (_ref) {
+  var setMenuVisible = _ref.setMenuVisible;
   var store = (0, _react.useContext)(_store.ActionBarContext);
   var setAllowScreenShare = store.setAllowScreenShare,
     localUserRole = store.localUserRole,
     openWhiteboard = store.openWhiteboard,
     closeWhiteboard = store.closeWhiteboard,
-    isBoardActive = store.isBoardActive,
     startScreenShare = store.startScreenShare,
     hasStopScreenSharePermission = store.hasStopScreenSharePermission,
     closeShareScreen = store.closeShareScreen,
@@ -55,17 +55,17 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
   // TODO: 使用 memberSharedDataSource.isLocalUserHost
   var hasHostPermission = [_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole);
   var menus = [];
-  var boardOwnerUserName = isBoardActive ? store.boardOwnerUser.userName : '';
+  var boardOwnerUserName = store.isBoardActive ? store.boardOwnerUser.userName : '';
   var isSharingScreen = store.isLocalUserScreenSharing || store.isRemoteUserScreenSharing;
   var boardTitle;
   var boardMenuType;
   var isBoardMenuDisabled;
-  if (!isBoardActive) {
+  if (!store.isBoardActive) {
     boardTitle = t('fmt_screenshare_button_sharewhiteboard');
     boardMenuType = 'primary';
     isBoardMenuDisabled = false;
   } else if (store.isMeSharingBoard) {
-    boardTitle = t('fmt_screenshare_button_chosewhiteboard');
+    boardTitle = t('fmt_whiteboard_button_close');
     boardMenuType = 'danger';
     isBoardMenuDisabled = false;
   } else {
@@ -85,9 +85,10 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
         iconPrimary: 'var(--fcr_ui_scene_icontext1)'
       }
     }),
-    title: isSharingScreen ? t('fmt_screenshare_tips_newsharing') : t('fmt_screenshare_label_screenshare'),
+    title: isSharingScreen ? t('fmt_screenshare_tips_newsharing') : t('fmt_screenshare_controlbar_security_list_participant_screenshare'),
     key: 'allow_attendee_title',
     onButtonClick: function onButtonClick() {
+      setMenuVisible(false);
       startScreenShare();
     }
   }, {
@@ -103,9 +104,11 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     key: 'allow_attendee_title',
     type: boardMenuType,
     onButtonClick: function onButtonClick() {
-      if (!isBoardActive) {
+      if (!store.isBoardActive) {
+        setMenuVisible(false);
         openWhiteboard();
       } else if (store.isMeSharingBoard) {
+        setMenuVisible(false);
         closeWhiteboard();
       } else {
         console.error('isBoardMenuDisabled: true, should not be clickable');
@@ -153,7 +156,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
       shape: "rounded",
       block: true,
       children: t('fmt_screenshare_button_disableshare', {
-        reason1: isBoardActive ? (0, _truncate["default"])(boardOwnerUserName, {
+        reason1: store.isBoardActive ? (0, _truncate["default"])(boardOwnerUserName, {
           length: 8,
           separator: ' '
         }) : t('fmt_actionbar_screenshare_labels_others')