fcr-ui-scene 3.6.4-rc.1 → 3.7.0

package/lib/modules/setting/index.d.ts

@@ -1,7 +1,7 @@
 import { FcrUINode, UIModule } from '../../base';
 import { FcrStreamControl, FcrUserControl } from 'fcr-core';
 import { FcrUIDeviceProvider } from '../../providers/device-provider';
-import { FcrUICurrentRoomControlProvider } from '../../providers/room-provider';
+import { FcrUIRoomProvider } from '../../providers/room-provider';
 import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
 import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
@@ -11,11 +11,9 @@ import { FcrUIMessageProvider } from '../../providers/message-provider';
 import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUILocalStorageProviderImpl } from '../../providers/local-storage-provider';
-import { FcrUIUserSettingStorageProviderImpl } from '../../providers/user-setting-storage-provider';
 export declare class SettingUIModule extends UIModule {
     private _store?;
     deviceProvider?: FcrUIDeviceProvider;
-    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
     monitorProvider?: FcrUIMonitorProvider;
     userControl?: FcrUserControl;
     streamControl?: FcrStreamControl;
@@ -26,7 +24,7 @@ export declare class SettingUIModule extends UIModule {
     dialogProvider?: FcrUIDialogProvider;
     sharedSettingDataSource?: FcrUISharedSettingDataSource;
     localStorageProvider?: FcrUILocalStorageProviderImpl;
-    userSettingStorageProvider?: FcrUIUserSettingStorageProviderImpl;
+    roomProvider?: FcrUIRoomProvider;
     constructor(parentNode: FcrUINode, rootNode: FcrUINode);
     onNodeWillActive(): void;
     onNodeWillInactive(): void;

package/lib/modules/setting/index.js

@@ -80,26 +80,17 @@ var SettingUIModule = exports.SettingUIModule = /*#__PURE__*/function (_UIModule
   return (0, _createClass2["default"])(SettingUIModule, [{
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      var _this$currentRoomCont, _this$currentRoomCont2, _this$sharedConfigDat;
-      this.streamControl = (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl.getStreamControl();
-      this.userControl = (_this$currentRoomCont2 = this.currentRoomControlProvider) === null || _this$currentRoomCont2 === void 0 ? void 0 : _this$currentRoomCont2.currentRoomControl.getUserControl();
-      if (this.deviceProvider && this.currentRoomControlProvider && this.streamControl && this.eventProvider && this.monitorProvider && (_this$sharedConfigDat = this.sharedConfigDataSource) !== null && _this$sharedConfigDat !== void 0 && _this$sharedConfigDat.sceneConfig && this.sharedConfigDataSource.settingConfig && this.sharedLayoutDataSource && this.messageProvider && this.dialogProvider && this.sharedSettingDataSource && this.userSettingStorageProvider) {
-        var _this$sharedConfigDat2, _this$sharedConfigDat3, _this$userControl;
+      if (this.deviceProvider && this.eventProvider && this.monitorProvider && this.sharedConfigDataSource && this.messageProvider && this.dialogProvider && this.sharedSettingDataSource && this.sharedLayoutDataSource) {
         this._store = new _store["default"]({
-          uiEventStore: this.eventProvider,
-          monitorControl: this.monitorProvider,
-          deviceStore: this.deviceProvider,
-          streamControl: this.streamControl,
-          roomControl: this.currentRoomControlProvider.currentRoomControl,
-          config: (_this$sharedConfigDat2 = this.sharedConfigDataSource) === null || _this$sharedConfigDat2 === void 0 ? void 0 : _this$sharedConfigDat2.sceneConfig,
-          parameters: (_this$sharedConfigDat3 = this.sharedConfigDataSource) === null || _this$sharedConfigDat3 === void 0 ? void 0 : _this$sharedConfigDat3.creatorConfig.parameters,
+          eventProvider: this.eventProvider,
+          monitorProvider: this.monitorProvider,
+          deviceProvider: this.deviceProvider,
+          roomProvider: this.roomProvider,
+          sharedConfigDataSource: this.sharedConfigDataSource,
           sharedLayoutDataSource: this.sharedLayoutDataSource,
           messageProvider: this.messageProvider,
           sharedSettingDataSource: this.sharedSettingDataSource,
-          dialogProvider: this.dialogProvider,
-          settingConfig: this.sharedConfigDataSource.settingConfig,
-          userId: (_this$userControl = this.userControl) === null || _this$userControl === void 0 ? void 0 : _this$userControl.getLocalUser().userId,
-          userSettingStorageProvider: this.userSettingStorageProvider
+          dialogProvider: this.dialogProvider
         });
       }
     }

package/lib/modules/setting/minutes-settings/minutes-settings.js

@@ -14,7 +14,6 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _useNamespace = require("../common/useNamespace");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _mobxReact = require("mobx-react");
-var _store = require("../store");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 require("./index.css");
@@ -30,9 +29,6 @@ var MinutesSettings = exports.MinutesSettings = (0, _mobxReact.observer)(functio
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     agent = _useState4[0],
     setAgent = _useState4[1];
-  var _useContext = (0, _react.useContext)(_store.StoreContext),
-    setting = _useContext.setting,
-    setSetting = _useContext.setSetting;
   var iconSize = 48;
   var modeList = [{
     text: t('fmt_ai_summary_setting_option_tingwu'),

package/lib/modules/setting/state/index.js

@@ -113,14 +113,14 @@ var State = exports.State = (0, _mobxReact.observer)(function () {
   }, [JSON.stringify(networkState), isWifiConnected]);
   var audioData = (0, _react.useMemo)(function () {
     return [{
-      title: 'bitrate',
+      title: t('fmt_qualitystatistics_label_audio_bit'),
       up: "".concat(networkState.txAudioKBitrate, " kbps"),
       down: "".concat(networkState.rxAudioKBitrate, " kbps")
     }, {
-      title: 'Mic',
+      title: t('fmt_qualitystatistics_label_audio_mic'),
       text: "".concat(microphoneVolumeDb, " dB")
     }, {
-      title: 'Speaker',
+      title: t('fmt_qualitystatistics_label_audio_speaker'),
       text: "".concat(speakerVolumeDb, " dB")
     }];
   }, [microphoneVolumeDb, speakerVolumeDb, networkState.txAudioKBitrate, networkState.rxAudioKBitrate]);
@@ -188,10 +188,10 @@ var State = exports.State = (0, _mobxReact.observer)(function () {
     }), activeKey === 'audiovisual' && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: ns.b('audiovisual'),
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(DataCard, {
-        title: "Audio",
+        title: t('fmt_qualitystatistics_label_audio'),
         data: audioData
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(DataCard, {
-        title: "Video",
+        title: t('fmt_qualitystatistics_label_video'),
         data: videoData
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(DataCard, {
         title: t('fmt_screenshare_label_screenshare'),

package/lib/modules/setting/store.d.ts

@@ -1,12 +1,10 @@
-import { FcrAiDenoiseLevel, FcrStreamControl } from 'fcr-core';
 import { FcrBeautyOptions } from 'fcr-core/lib/media-control/type';
 import { FcrDeviceInfo, FcrPerformanceInfo } from 'fcr-core/lib/type';
 import { AgoraRtcNetworkStats } from 'agora-rte-sdk';
 import { FcrUIHighlightElement } from '../../utilities/constant';
 import { DEFAULT_BEAUTY_VALUE } from 'agora-ui-foundation/lib/components/local-video-player';
-import { FcrUISceneConfig, FcrUISettingConfig } from '../../type';
+import { FcrUIAiDenoiseLevel } from '../../type';
 import { VirtualBackground } from '../device-pretest/assets/virtual-backdound-resources';
-import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrUIDeviceProvider } from '../../providers/device-provider';
 import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIMonitorProvider } from '../../providers/monitor-provider';
@@ -14,7 +12,9 @@ import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-dat
 import { FcrUIMessageProvider } from '../../providers/message-provider';
 import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
-import { FcrUIUserSettingStorageProviderImpl } from '../../providers/user-setting-storage-provider';
+import { FcrUIRoomProvider } from '../../providers/room-provider';
+import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
+import { FcrUISharedInterpreterDataSource } from '../../shared-data-source/interpreter';
 export interface FcrDeviceObserver {
     onCameraChanged?(cameraId: string): void;
     onMicrophoneChanged?(microphoneId: string): void;
@@ -45,7 +45,7 @@ export interface FcrUICustomSetting {
     displayedMaxAttendees: number;
     autoAdjustmentSpeakerVolume: boolean;
     autoAdjustmentMicrophoneVolume: boolean;
-    noiseReduce: FcrAiDenoiseLevel;
+    noiseReduce: FcrUIAiDenoiseLevel;
     recordingPath: string;
     videoHD: boolean;
     videoLowLight: boolean;
@@ -63,19 +63,18 @@ export interface FcrUICustomSetting {
 export { DEFAULT_BEAUTY_VALUE };
 export type BeautyKey = 'none' | 'smoothnessLevel' | 'lighteningLevel' | 'lighteningLevel';
 export default class SettingStore {
-    protected logger: import("agora-foundation/lib/logger").Logger;
     private _enableRemoteVideoStatsDebugLog;
     private _disposers;
     private _currentDialogId;
-    private _monitorControl;
-    private _streamControl?;
-    private _roomControl?;
-    private _uiEventStore;
-    private _deviceStore;
-    private _sharedLayoutDataSource?;
+    private _monitorProvider;
+    private _currentRoomControl?;
+    private _eventProvider;
+    private _deviceProvider;
+    private _sharedLayoutDataSource;
     private _videoView4Setting?;
     private _settingVideoOpened;
     private _deviceStoreObserver;
+    private _interpreterRoomControl?;
     private _streamVolumeMap;
     private _audioDeviceVolumeRefreshTask?;
     private _volumeIndicationInterval;
@@ -84,14 +83,14 @@ export default class SettingStore {
     private _messageProvider;
     private _dialogProvider;
     private _sharedSettingDataSource;
+    private _sharedConfigDataSource;
+    private _sharedInterpreterDataSource?;
     private _streamInfoList;
-    private _settingConfig;
     private _onEventObserver;
     private _monitorObserver;
     private _roomObserver;
     private _streamObserver;
     accessor loudestStreamVolumeLevel: number;
-    accessor isPreMeetingSettingsStore: boolean;
     accessor microphoneVolumeLevel: number;
     accessor isWifiConnected: boolean;
     accessor dialogConfig: DeviceSettingDialogConfig;
@@ -119,7 +118,6 @@ export default class SettingStore {
     }>;
     accessor systemMemorySize: number;
     accessor systemCpuDesc: string;
-    accessor config: FcrUISceneConfig | undefined;
     accessor getSystemInfoTimer: NodeJS.Timeout | null;
     get maxVideoSendInfo(): (import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcLocalTrackStats & {
         sendFrameRate: number;
@@ -164,7 +162,7 @@ export default class SettingStore {
     get showForceOpenEffectDialog(): boolean;
     get currentVirtualBackgroundName(): string;
     get cameraDeviceList(): DeviceItem[];
-    get microphoneDeviceId(): string;
+    get microphoneDeviceId(): string | null;
     get speakerDeviceId(): string;
     get speakerDeviceList(): DeviceItem[];
     get microphoneDeviceList(): DeviceItem[];
@@ -174,32 +172,39 @@ export default class SettingStore {
     get microphoneDetecting(): boolean;
     get speakerDetecting(): boolean;
     get setting(): FcrUICustomSetting;
-    get settingConfig(): FcrUISettingConfig;
-    private _userId;
-    constructor({ monitorControl, uiEventStore, deviceStore, streamControl, roomControl, config, parameters, sharedLayoutDataSource, messageProvider, dialogProvider, sharedSettingDataSource, settingConfig, userId, userSettingStorageProvider, }: {
-        uiEventStore: FcrUIEventProvider;
-        deviceStore: FcrUIDeviceProvider;
-        streamControl?: FcrStreamControl;
-        roomControl?: FcrBaseRoomControl;
-        monitorControl: FcrUIMonitorProvider;
-        config: FcrUISceneConfig;
-        settingConfig: FcrUISettingConfig;
+    get media(): import("../../type").FcrUIMediaConfig;
+    get isPreMeetingSettingsStore(): boolean;
+    get sceneConfig(): {
+        roomToken: string;
+        roomId: string;
+        userName: string;
+        userRole: import("fcr-core").FcrUserRole;
+        language: string;
+        userProperties?: Record<string, unknown> | undefined;
+        password?: string | undefined;
+        avatar?: string | undefined;
+    };
+    constructor({ monitorProvider, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedLayoutDataSource, messageProvider, dialogProvider, sharedSettingDataSource, sharedInterpreterDataSource, }: {
+        eventProvider: FcrUIEventProvider;
+        deviceProvider: FcrUIDeviceProvider;
+        monitorProvider: FcrUIMonitorProvider;
+        sharedConfigDataSource: FcrUISharedConfigDataSource;
         sharedSettingDataSource: FcrUISharedSettingDataSource;
-        parameters?: Record<string, unknown>;
-        sharedLayoutDataSource?: FcrUISharedLayoutDataSource;
         messageProvider: FcrUIMessageProvider;
         dialogProvider: FcrUIDialogProvider;
-        userSettingStorageProvider: FcrUIUserSettingStorageProviderImpl;
-        userId: string;
+        sharedLayoutDataSource: FcrUISharedLayoutDataSource;
+        roomProvider?: FcrUIRoomProvider;
+        sharedInterpreterDataSource?: FcrUISharedInterpreterDataSource;
     });
     get messageProvider(): FcrUIMessageProvider;
+    initSettingConfig(): void;
     enableVirtualBackground(enable: boolean, source?: VirtualBackground): void;
     setEditBeautyKey(key: BeautyKey): void;
     enableBeautyEffect(enable: boolean): void;
     private _initReactions;
     private _disposeReactions;
     private _setupAudioVolumeAnalyzerTask;
-    setCameraDevice(id: string): void;
+    setCameraDevice(cameraId: string): void;
     setMicrophoneDevice(deviceId: string): void;
     stopSpeakerTest(): void;
     startSpeakerTest(): void;
@@ -245,7 +250,6 @@ export default class SettingStore {
     private _onAudioVolumeUpdated;
     private _preHandleSetting;
     private _setMeetingSettingsToLocalStorage;
-    private _getMeetingSettingsFromLocalStorage;
-    changeMediaSetting(key: keyof typeof this.settingConfig.media, value: any): void;
+    changeMediaSetting(key: keyof typeof this._sharedSettingDataSource.media, value: any): void;
 }
 export declare const StoreContext: import("react").Context<SettingStore>;