fcr-ui-scene 3.3.1 → 3.4.0

package/lib/electron/main.js

@@ -12,11 +12,12 @@ var _window = require("./window");
 var _screenshot = require("./plugins/screenshot");
 var _logger = require("./logger");
 var _meetingState = require("./plugins/meeting-state");
+var _devtoolShortcut = require("./plugins/devtool-shortcut");
 var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
   var logger = (0, _logger.getLogger)();
   mainWindow.webContents.addListener('did-create-window', function (window, details) {
     logger.info("browser window is opened, frameName: ".concat(details.frameName));
-    var builtinFrameNames = ['device-setting', 'chat', 'live-streaming', 'participant', 'screen-selection', 'invite', 'video-window', 'confirm-dialog', 'connection-gateway', 'whiteboard', 'progress-dialog', 'operation-waiting-room', 'operation-waiting-room-remove', 'operation-waiting-room-removeAll', 'operation-waiting-room-admitAll'];
+    var builtinFrameNames = ['device-settings', 'chat', 'live-streaming', 'participant', 'share-screen-selection', 'invite', 'video-window', 'confirm', 'connection-gateway', 'whiteboard', 'progress-dialog', 'operation-waiting-room', 'operation-waiting-room', 'interpreter-setting', 'waiting-room-single-remove', 'waiting-room-all-remove', 'waiting-room-all-admit', 'control-bar', 'show-toast', 'system-preference'];
     if (!builtinFrameNames.includes(details.frameName)) {
       logger.info("frameName [".concat(details.frameName, "] is not in builtinFrameNames, ignore it"));
       return;
@@ -46,8 +47,19 @@ var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
       mainWindow.reload();
     }, 1000);
   });
+  mainWindow.on('enter-full-screen', function () {
+    mainWindow.webContents.send('custom-event', {
+      action: 'ENTER_FULL_SCREEN'
+    });
+  });
+  mainWindow.on('leave-full-screen', function () {
+    mainWindow.webContents.send('custom-event', {
+      action: 'LEAVE_FULL_SCREEN'
+    });
+  });
   (0, _screenshot.listenScreenshot)(mainWindow);
   (0, _meetingState.listenMeetingState)(mainWindow);
+  (0, _devtoolShortcut.listenDevToolShortcut)(mainWindow);
 };
 var attachEventOnMethod = function attachEventOnMethod(browserWindow, method, action) {
   var func = browserWindow[method];

package/lib/electron/plugins/devtool-shortcut.d.ts

@@ -0,0 +1,2 @@
+import { BrowserWindow } from 'electron';
+export declare const listenDevToolShortcut: (window: BrowserWindow) => void;

package/lib/electron/plugins/devtool-shortcut.js

@@ -0,0 +1,19 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.listenDevToolShortcut = void 0;
+var _electron = require("electron");
+var _logger = require("../logger");
+var listenDevToolShortcut = exports.listenDevToolShortcut = function listenDevToolShortcut(window) {
+  _electron.globalShortcut.register('CommandOrControl+Shift+X', function () {
+    if (window.isFocused()) {
+      (0, _logger.getLogger)().info('CommandOrControl+Shift+X is pressed');
+      window.webContents.openDevTools({
+        mode: 'detach'
+      });
+    }
+  });
+};

package/lib/electron/preload.js

@@ -18,7 +18,6 @@ window.runtime = {
   showItemInFolder: _injections.showItemInFolder,
   screen: _injections.screen,
   launch: _injections.launch,
-  setAlwaysOnTop: _injections.setAlwaysOnTop,
   quitApp: _injections.quitApp,
   getLaunchOptions: _injections.getLaunchOptions,
   getSystemMemorySize: _injections.getSystemMemorySize,
@@ -27,11 +26,14 @@ window.runtime = {
   getAssetUrl: _injections.getAssetUrl,
   getRendererProcessUsage: _injections.getRendererProcessUsage,
   setFragmentBaseUrl: _injections.setFragmentBaseUrl,
-  getVirtualBgResource: _injections.getVirtualBgResource,
+  getResourceByFileType: _injections.getResourceByFileType,
   fileToBase64: _injections.fileToBase64,
   registerListenerReady: _injections.registerListenerReady,
   releaseSubAllWindowRefs: _injections.releaseSubAllWindowRefs,
   getMediaSourceIdList: _injections.getMediaSourceIdList,
   setInMeetingState: _injections.setInMeetingState,
-  getBundleType: _injections.getBundleType
+  restartApp: _injections.restartApp,
+  getBundleType: _injections.getBundleType,
+  checkMediaPermission: _injections.checkMediaPermission,
+  openSystemPreferences: _injections.openSystemPreferences
 };

package/lib/fragments/control-bar/cloud-recording-buttons.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.CloudRecordingButtons = void 0;
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _type = require("agora-edu-core/lib/type");
+var _type = require("fcr-core/lib/type");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type2 = require("agora-ui-foundation/lib/components/icon/type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");

package/lib/fragments/control-bar/control-bar-store.d.ts

@@ -1,7 +1,7 @@
 import { RendererEventAction } from '../../utilities/constant';
 import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
-import { FcrRecordingState, FcrUserRole, FcrLiveStreamingState, FcrRoomInfo, FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrRecordingState, FcrUserRole, FcrLiveStreamingState, FcrRoomInfo, FcrUserInfo, FcrLineType } from 'fcr-core/lib/type';
 import { ConnectType } from '../../modules/action-bar/type';
 export default class ControlBarStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -31,6 +31,7 @@ export default class ControlBarStore {
     accessor allowUnmuteSelfAudio: boolean;
     accessor isLockRoomEnabled: boolean;
     accessor isWaitingRoomEnabled: boolean;
+    accessor isWaterMarkEnabled: boolean;
     accessor showSecurity: boolean;
     accessor isHost: boolean;
     accessor hasEnableStartScreenSharePermission: boolean;
@@ -52,8 +53,11 @@ export default class ControlBarStore {
     accessor hasStopLiveStreamingPermission: boolean;
     accessor hasStartLiveStreamingPermission: boolean;
     accessor hasWaitingRoomPermission: boolean;
+    accessor hasWatermarkDisablePermission: boolean;
+    accessor hasWatermarkEnablePermission: boolean;
     accessor allApplicationWindows: AgoraRtcWindowInfo[];
     accessor phoneMicEnabled: boolean;
+    accessor isMulti: boolean;
     accessor roomInfo: FcrRoomInfo;
     accessor userName: string;
     accessor inviteLink: string;
@@ -154,6 +158,12 @@ export default class ControlBarStore {
     setLockRoomEnabled(lock: boolean): void;
     updateLockRoomEnabled(lock: boolean): void;
     setWaitingRoomEnabled(allow: boolean): void;
+    setWaterMarkLineType(lineType: FcrLineType): void;
+    setAllowWaterMark(): void;
+    setIsMulti(isMulti: boolean): void;
+    setWaterMarkEnabled(allow: boolean): void;
+    setHasWatermarkDisablePermission(allow: boolean): void;
+    setHasWatermarkEnablePermission(allow: boolean): void;
     setHasStartCloudRecordingPermission(allow: boolean): void;
     setHasWaitingRoomPermission(allow: boolean): void;
     setHasGetLiveStreamingUrlPermission(hasGetLiveStreamingUrlPermission: boolean): void;