fcr-ui-scene 3.7.9-alpha → 3.8.0

package/lib/modules/participant/type.js

@@ -8,5 +8,7 @@ exports.FcrUISessionKey = void 0;
 var FcrUISessionKey = exports.FcrUISessionKey = /*#__PURE__*/function (FcrUISessionKey) {
   FcrUISessionKey["REQUEST_OPEN_CAMERA"] = "REQUEST_OPEN_CAMERA";
   FcrUISessionKey["REQUEST_OPEN_MICROPHONE"] = "REQUEST_OPEN_MICROPHONE";
+  FcrUISessionKey["REQUEST_OPEN_TRANSCRIBING"] = "REQUEST_OPEN_TRANSCRIBING";
+  FcrUISessionKey["REJECT_OPEN_TRANSCRIBING"] = "REJECT_OPEN_TRANSCRIBING";
   return FcrUISessionKey;
 }({});

package/lib/modules/pc-audio-connect/main-scene/store.d.ts

@@ -12,6 +12,7 @@ export default class ConnectionGatewayStoreMainScene {
     private _dialogProvider;
     private _needShowConfirmDialog;
     private _confirmDialogId;
+    private _sharedSettingDataSource;
     accessor phoneCallState: FcrRoomConnectorSessionState;
     accessor phoneCallReason: FcrRoomConnectorSessionReason;
     accessor connectSession: FcrPhoneConnectorSession | null;

package/lib/modules/pc-audio-connect/main-scene/store.js

@@ -105,6 +105,7 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
     // Optional providers with try-catch
     this._devicePrivilegeProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PRIVILEGE_PROVIDER);
     this._sharedDevicePrivilegeDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
+    this._sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
     // Optional providers may not exist in all scenarios
 
     this._deviceObserver = {
@@ -188,6 +189,10 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
         activeTab: _type3.DeviceSettingTab.AUDIO,
         highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
       };
+      this._sharedSettingDataSource.setDialogConfig({
+        activeTab: _type3.DeviceSettingTab.AUDIO,
+        highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
+      });
     }
   }, {
     key: "release",

package/lib/modules/pc-audio-connect/waiting-scene/store.d.ts

@@ -9,10 +9,12 @@ export default class ConnectionGatewayStore {
     private _sharedDevicePrivilegeDataSource?;
     private _dialogProvider;
     private _needShowConfirmDialog;
+    private _sharedSettingDataSource;
     accessor phoneCallState: FcrRoomConnectorSessionState;
     accessor phoneCallReason: FcrRoomConnectorSessionReason;
     accessor connectSession: FcrPhoneConnectorSession | null;
     accessor calling: boolean;
+    private _roomProvider;
     get connectType(): import("../../../type").FcrUIConnectType;
     get hasNeedMergedStream(): boolean;
     get hasOwnPstnStream(): boolean;

package/lib/modules/pc-audio-connect/waiting-scene/store.js

@@ -62,6 +62,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _objectManager = require("../../../object-manager");
 var _type2 = require("../../../providers/dialog/type");
 var _type3 = require("../../setting/type");
+var _type4 = require("fcr-core/lib/room-control/type");
 var _ConnectionGatewayStore;
 var _initProto, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -80,7 +81,8 @@ var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   function ConnectionGatewayStore(_ref) {
-    var _this = this;
+    var _this$_roomProvider$c,
+      _this = this;
     var objectManager = _ref.objectManager;
     (0, _classCallCheck2["default"])(this, ConnectionGatewayStore);
     (0, _defineProperty2["default"])(this, "_disposers", (_initProto(this), []));
@@ -93,14 +95,12 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     // Get all required objects from objectManager
     this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
     this._deviceProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
-
-    // Optional providers with try-catch
-    try {
+    this._roomProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
+    if (((_this$_roomProvider$c = this._roomProvider.currentRoomControl.getRoomInfo()) === null || _this$_roomProvider$c === void 0 ? void 0 : _this$_roomProvider$c.roomType) === _type4.FcrRoomType.Mainroom) {
       this._devicePrivilegeProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PRIVILEGE_PROVIDER);
       this._sharedDevicePrivilegeDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
-    } catch (_unused) {
-      // Optional providers may not exist in all scenarios
     }
+    this._sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
     this._deviceObserver = {
       onAudioConnected: function onAudioConnected() {
         _this._needShowConfirmDialog = false;
@@ -179,6 +179,10 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
         activeTab: _type3.DeviceSettingTab.AUDIO,
         highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
       });
+      this._sharedSettingDataSource.setDialogConfig({
+        activeTab: _type3.DeviceSettingTab.AUDIO,
+        highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
+      });
     }
   }, {
     key: "closeConnectionDialog",

package/lib/modules/phone-audio-connect/store.d.ts

@@ -7,6 +7,7 @@ export default class ConnectionGatewayStore {
     private _dialogProvider;
     private _failureTimer;
     private _phoneAudioConnectorProvider;
+    private _sharedSettingDataSource;
     accessor rememberMe: boolean;
     accessor rememberedNumberList: ConnectListType[];
     accessor currentRegion: ConnectorRegion;

package/lib/modules/phone-audio-connect/store.js

@@ -106,6 +106,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     this._deviceProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
     this._phoneAudioConnectorProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_PHONE_AUDIO_CONNECTOR_PROVIDER);
     this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
+    this._sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
     this.initRememberedData();
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this._phoneAudioConnectorProvider.accepted;
@@ -220,6 +221,10 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
         activeTab: _type.DeviceSettingTab.AUDIO,
         highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
       });
+      this._sharedSettingDataSource.setDialogConfig({
+        activeTab: _type.DeviceSettingTab.AUDIO,
+        highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
+      });
     }
   }, {
     key: "closeConnectionDialog",

package/lib/modules/secondary-window/store.d.ts

@@ -1,5 +1,5 @@
 import { VideoWindowDataReturn, WhiteboardToolAction, SecondaryWindowStoreArgs } from './type';
-import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core';
 import { WhiteboardThemeType } from '../whiteboard/type';
 import { FcrVideoTrackRenderer } from '../../shared-context/video-track-render-context';
 export declare class SecondaryWindowStore {
@@ -43,7 +43,6 @@ export declare class SecondaryWindowStore {
     get isBoardShare(): boolean;
     get annotationHasStart(): boolean;
     get isShowToolbar(): boolean;
-    get isSharingWithAudio(): boolean;
     get videoRenderContext(): FcrVideoTrackRenderer;
     get isActive(): boolean;
     get baseUrl(): string;

package/lib/modules/secondary-window/store.js

@@ -302,11 +302,6 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     get: function get() {
       return this._boardShareProvider.boardBarControl.toolbarState.controlEnable || this.isHost;
     }
-  }, {
-    key: "isSharingWithAudio",
-    get: function get() {
-      return this._sharedScreenShareDataSource.isSharingWithAudio;
-    }
   }, {
     key: "videoRenderContext",
     get: function get() {
@@ -465,14 +460,29 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
       if (displaySecondaryWindow) {
         var _displaySecondaryWind = displaySecondaryWindow.workArea,
           x = _displaySecondaryWind.x,
-          y = _displaySecondaryWind.y;
+          y = _displaySecondaryWind.y,
+          width = _displaySecondaryWind.width,
+          height = _displaySecondaryWind.height;
         var secondaryWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.SUB_WINDOW);
         secondaryWindow.setTitle(mainWindowTitle);
-        secondaryWindow.setBounds({
-          x: x,
-          y: y
-        });
-        secondaryWindow.maximize();
+        var windowObserver = {
+          onReady: function onReady() {
+            // @ts-ignore
+            secondaryWindow.rendererWindow.FcrUIMainWindowRenderer = window.FcrUIMainWindowRenderer;
+            secondaryWindow.setPosition(x, y);
+            /**
+             * windows 系统下,窗口存在透明边框, 使用显示器工作区的宽高作为窗口的大小设置后,
+             * 窗口边缘与显示器屏幕边缘存在7像素(windows 不同版本的系统上, 可能存在差异)的空隙.
+             *
+             * 如果使用 maximumSize 来设置窗口的大小, 则不会存在窗口边缘的空隙问题.
+             * 但使用 maximumSize 设置窗口, 有时会导致窗口出现异常(窗口只显示顶部的标题栏, 内容区域透明, 且鼠标点击后直接穿透到窗口后的应用或桌面).
+             * setBounds 方法设置窗口大小和位置时, 也会出现此问题.
+             */
+            secondaryWindow.setSize(width, height);
+            secondaryWindow.removeObserver(windowObserver);
+          }
+        };
+        secondaryWindow.addObserver(windowObserver);
       } else {
         this.logger.error('No secondary display found');
       }
@@ -480,10 +490,8 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "_openSecondaryWindow",
     value: function _openSecondaryWindow() {
-      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SUB_WINDOW, {
-        focus: false
-      });
       this._setSecondaryWindowBounds();
+      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
     }
   }, {
     key: "_closeSecondaryWindow",

package/lib/modules/secondary-window/type.d.ts

@@ -1,6 +1,6 @@
 import { FcrConnectionState, FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrUIVideoWindowData, FcrUIVideoWindowLayoutType } from '../layout/type';
-import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core';
 import { FcrImageData } from 'fcr-core/lib/imports';
 import { FcrUIObjectManager } from '../../object-manager';
 export declare enum FcrUIDisplayDistributionContentType {

package/lib/modules/secondary-window/view.js

@@ -18,7 +18,7 @@ var _memberWindow = require("../components/member-window");
 var _controlBar = require("../components/control-bar");
 var _loading = require("../components/control-bar/components/loading");
 var _toolbar = require("../components/toolbar");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 var _type2 = require("./type");
 var _progress = _interopRequireDefault(require("../components/control-bar/components/progress"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
@@ -64,8 +64,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
     setSpeakerViewSize = store.setSpeakerViewSize,
     interceptedClose = store.interceptedClose,
     setInterceptedClose = store.setInterceptedClose,
-    videoRenderContext = store.videoRenderContext,
-    isSharingWithAudio = store.isSharingWithAudio;
+    videoRenderContext = store.videoRenderContext;
   var videoWindowContainer = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
     if (!interceptedClose) return;
@@ -163,7 +162,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
             setOriginScalc();
             return isCurrentOriginal;
           },
-          isSharingWithAudio: isSharingWithAudio
+          isSharingAudio: videoWindowData.hasLoopbackSharing && videoWindowData.hasMicrophoneAudioStream
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_memberWindow.MemberWindow, {
           onRemovePin: function onRemovePin() {},
           canShowSpeakerSpotlight: true,
@@ -226,7 +225,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       setPopoverOpened: function setPopoverOpened() {
         return setInterceptedClose(false);
       }
-    }), content, (isBoardShare || isScreenShare) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_toolbar.WhiteboardToolbar, {
+    }), content, (isBoardShare || annotationHasStart) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_toolbar.WhiteboardToolbar, {
       offsetTop: 28,
       direction: "vertical",
       container: videoWindowContainer.current || undefined,
@@ -267,19 +266,19 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       undo: function undo() {
         return setWhiteboardTool({
           action: _type2.WhiteboardToolAction.UNDO,
-          tool: _enums.FcrBoardToolType.NONE
+          tool: _fcrCore.FcrBoardToolType.NONE
         });
       },
       redo: function redo() {
         return setWhiteboardTool({
           action: _type2.WhiteboardToolAction.REDO,
-          tool: _enums.FcrBoardToolType.NONE
+          tool: _fcrCore.FcrBoardToolType.NONE
         });
       },
       clean: function clean() {
         return setWhiteboardTool({
           action: _type2.WhiteboardToolAction.CLEAR,
-          tool: _enums.FcrBoardToolType.NONE
+          tool: _fcrCore.FcrBoardToolType.NONE
         });
       },
       onSave: isBoardShare ? saveWhiteboardDraft : undefined,

package/lib/modules/setting/audio-whiteList/audio-device-adaptation.d.ts

@@ -0,0 +1,46 @@
+import { FcrUIAiDenoiseLevel } from '../../../type';
+export interface AudioDeviceAdaptationConfig {
+    /**
+     * WhiteList device ID list
+     */
+    whiteListDeviceIds: string[];
+    /**
+     * WhiteList device configuration (disable 3A)
+     */
+    whiteListConfig: {
+        audioEchoCancellation: boolean;
+        audioAgc: boolean;
+        noiseReduce: number;
+    };
+}
+/**
+ * Audio device whiteList configuration
+ */
+export declare const AUDIO_DEVICE_WHITE_LIST_CONFIG: AudioDeviceAdaptationConfig;
+/**
+ * Audio device configuration for individual device
+ */
+export interface AudioDeviceConfig {
+    audioEchoCancellation: boolean;
+    audioAgc: boolean;
+    noiseReduce: FcrUIAiDenoiseLevel;
+}
+/**
+ * Device profile with name and audio configuration
+ */
+export interface DeviceProfile {
+    deviceName: string;
+    config: AudioDeviceConfig;
+}
+/**
+ * Device-specific audio configurations
+ * Key: deviceId (format: "vendorId:productId")
+ * Value: device profile with name and config
+ */
+export declare const DEVICE_SPECIFIC_CONFIGS: Record<string, DeviceProfile>;
+/**
+ * Get audio configuration for a specific device
+ * @param deviceId Device ID in format "vendorId:productId"
+ * @returns AudioDeviceConfig if device has specific config, undefined otherwise
+ */
+export declare function getDeviceSpecificConfig(deviceId: string): AudioDeviceConfig | undefined;

package/lib/modules/setting/audio-whiteList/audio-device-adaptation.js

@@ -0,0 +1,70 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DEVICE_SPECIFIC_CONFIGS = exports.AUDIO_DEVICE_WHITE_LIST_CONFIG = void 0;
+exports.getDeviceSpecificConfig = getDeviceSpecificConfig;
+var _type = require("../../../type");
+/**
+ * Audio device whiteList configuration
+ */
+var AUDIO_DEVICE_WHITE_LIST_CONFIG = exports.AUDIO_DEVICE_WHITE_LIST_CONFIG = {
+  whiteListDeviceIds: [
+  // Sennheiser-EPOS 20 EPOS EXPAND 20
+  '1395:0380',
+  // Sennheiser-EPOS 80 EPOS EXPAND 80
+  '1395:0093',
+  // Sennheiser-EPOS 80T EPOS EXPAND 80T
+  '1395:00CC',
+  // Poly-p15 Poly Studio P15
+  '095D:9290',
+  // A460 Speakerphone
+  '33F1:10AA',
+  // Huawei-MIC100 Mic 100会议音箱
+  '12D1:2308', //Hamedal Speak A20
+  "1FC9:826B", //Hamedal A21T TEA
+  "2A5F:2005", //HD Audio VA400
+  "33F1:1016"],
+  whiteListConfig: {
+    audioEchoCancellation: false,
+    audioAgc: false,
+    noiseReduce: 4
+  }
+};
+
+/**
+ * Audio device configuration for individual device
+ */
+
+/**
+ * Device profile with name and audio configuration
+ */
+
+/**
+ * Device-specific audio configurations
+ * Key: deviceId (format: "vendorId:productId")
+ * Value: device profile with name and config
+ */
+var DEVICE_SPECIFIC_CONFIGS = exports.DEVICE_SPECIFIC_CONFIGS = {
+  // INNOTRIK I-90
+  '2F9D:0091': {
+    deviceName: 'INNOTRIK I-90',
+    config: {
+      audioEchoCancellation: true,
+      audioAgc: true,
+      noiseReduce: _type.FcrUIAiDenoiseLevel.LOW
+    }
+  }
+};
+
+/**
+ * Get audio configuration for a specific device
+ * @param deviceId Device ID in format "vendorId:productId"
+ * @returns AudioDeviceConfig if device has specific config, undefined otherwise
+ */
+function getDeviceSpecificConfig(deviceId) {
+  var _DEVICE_SPECIFIC_CONF;
+  return (_DEVICE_SPECIFIC_CONF = DEVICE_SPECIFIC_CONFIGS[deviceId]) === null || _DEVICE_SPECIFIC_CONF === void 0 ? void 0 : _DEVICE_SPECIFIC_CONF.config;
+}

package/lib/modules/setting/audio-whiteList/audio-whiteList-manager.d.ts

@@ -0,0 +1,52 @@
+import { FcrUIAiDenoiseLevel } from '../../../type';
+import { AudioDeviceConfig } from './audio-device-adaptation';
+import { FcrDeviceInfo } from 'fcr-core/lib/type';
+/**
+ * The manager delegates device operations and settings management to the implementing class
+ */
+export interface AudioDeviceWhiteListDelegate {
+    getMicrophoneId: () => string;
+    getMicrophoneList: () => FcrDeviceInfo[];
+    enableAudioEchoCancellation: (enable: boolean) => void;
+    enableAudioGainControl: (enable: boolean) => void;
+    setNoiseLevel: (level: FcrUIAiDenoiseLevel) => void;
+    updateSettings: (settings: {
+        audioEchoCancellation?: boolean;
+        noiseReduce?: FcrUIAiDenoiseLevel;
+    }) => void;
+}
+export declare class AudioDeviceWhiteListManager {
+    private logger;
+    private _whiteListDeviceIds;
+    private _whiteListConfig;
+    private _deviceConfigs;
+    private _whiteListDeviceUsed;
+    private _currentDeviceId;
+    private _delegate;
+    constructor(delegate: AudioDeviceWhiteListDelegate);
+    private _initialize;
+    handleMicrophoneListUpdated(microphoneList: FcrDeviceInfo[]): void;
+    handleMicrophoneChanged(microphoneId: string, productId: string | null, vendorId: string | null): void;
+    private _handleDeviceChanged;
+    private _createDeviceConfig;
+    /**
+     * Get device 3A configuration (use current settings if not exists)
+     */
+    private _getDeviceConfig;
+    /**
+     * Update device 3A configuration (save for both white list and non-white list devices)
+     */
+    updateDeviceConfig(config: Partial<AudioDeviceConfig>): void;
+    private _applyAudioConfig;
+    private _applyWhiteListConfig;
+    private _applyDeviceConfig;
+    private _createDeviceIdentifier;
+    private _getDeviceIdentifierFromList;
+    private _isDeviceInWhiteList;
+    private _initializeDeviceConfigsFromList;
+    private _updateDeviceConfigs;
+    private _createConfigForDevice;
+    private _loadFromLocalStorage;
+    private _saveToLocalStorage;
+    release(): void;
+}