fcr-ui-scene 3.4.1 → 3.4.2

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

@@ -1,82 +1,121 @@
-"use strict";
+// import { SettingUIModule } from '.';
+// import ReactDOM from 'react-dom';
+// import { hot } from 'react-hot-loader/root';
+// import { useUnmount } from '../../utilities/hooks';
+// import { FcrStreamLatencyLevel, FcrUserRole } from '../../type';
+// import { FcrUIRootNode, registerDependency } from '../../ui-node';
+// import { FcrUIDeviceProviderImpl } from '../../providers/device-provider';
+// import { FcrUIInterpreterProviderImpl } from '../../providers/interpreter-provider';
+// import { FcrUILocalStorageProviderImpl } from '../../providers/local-storage-provider';
+// import { FcrUIMonitorProviderImpl } from '../../providers/monitor-provider';
+// import { FcrUIPrivilegeProviderImpl } from '../../providers/privilege-provider';
+// import { FcrUIRemoteVideoRenderProviderImpl } from '../../providers/renderer-provider';
+// import { FcrUIEventProviderImpl } from '../../providers/event-provider';
+// import { FcrMainRoomControl } from 'fcr-core/lib/room-control/type';
+// import { FcrCoreEngine } from 'fcr-core';
+// import { FcrUISharedConfigDataSourceImpl } from '../../shared-data-source/config';
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-require("core-js/modules/es.array.join.js");
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _ = require(".");
-var _reactDom = _interopRequireDefault(require("react-dom"));
-var _root = require("react-hot-loader/root");
-var _hooks = require("../../utilities/hooks");
-var _eventStore = require("../../common/event-store");
-var _type = require("../../type");
-var _deviceStore = require("../../common/device-store");
-var _roomStore = require("../../common/room-store");
-var _jsxRuntime = require("react/jsx-runtime");
-var App = (0, _root.hot)(function () {
-  return null;
-});
-_reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.querySelector('#root'));
-window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-  var engine, roomId, token, roomControl, userName, uiEventStore, deviceStore, config, uiModule, App;
-  return _regenerator["default"].wrap(function _callee$(_context) {
-    while (1) switch (_context.prev = _context.next) {
-      case 0:
-        engine = window.__DEV_ENGINE__;
-        roomId = window.__DEV_ROOM_ID__;
-        token = window.__DEV_USER_TOKEN__;
-        _context.next = 5;
-        return engine.login();
-      case 5:
-        roomControl = engine.createMainRoomControl(roomId);
-        userName = 'test-user';
-        _context.next = 9;
-        return roomControl.join({
-          userRole: _type.FcrUserRole.HOST,
-          userName: userName,
-          roomToken: token,
-          streamLatency: _type.FcrStreamLatencyLevel.ULTRA_LOW,
-          createStreamConfigs: []
-        });
-      case 9:
-        uiEventStore = new _eventStore.FcrUIEventStore();
-        deviceStore = new _deviceStore.FcrDeviceStore(engine.getDesktopMediaControl(), uiEventStore);
-        config = {
-          mediaControl: engine.getDesktopMediaControl(),
-          roomControl: roomControl,
-          securityStore: null,
-          deviceStore: deviceStore,
-          uiEventStore: uiEventStore,
-          roomStore: new _roomStore.FcrRoomStore(uiEventStore, deviceStore, {}, engine),
-          streamControl: roomControl.getStreamControl(),
-          userControl: roomControl.getUserControl(),
-          privilegeControl: roomControl.getPrivilegeControl(),
-          interpreterControl: roomControl.getInterpreterControl(),
-          chatRoomControl: roomControl.getChatRoomControl(),
-          engine: null,
-          remoteVideoRenderManager: null,
-          config: {
-            roomToken: '',
-            userName: 'lxy',
-            roomId: '',
-            userRole: _type.FcrUserRole.HOST,
-            language: 'zh-CN',
-            inviteLink: ''
-          },
-          parameters: null,
-          deviceStreamStore: null
-        };
-        uiModule = new _.SettingUIModule(config);
-        App = (0, _root.hot)(function () {
-          (0, _hooks.useUnmount)(function () {
-            uiModule.release();
-          });
-          return uiModule.getComponent();
-        });
-        _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.querySelector('#root'));
-      case 15:
-      case "end":
-        return _context.stop();
-    }
-  }, _callee);
-})));
+// const App = hot(() => null);
+// ReactDOM.render(<App />, document.querySelector('#root')!);
+
+// class DevRootNode extends FcrUIRootNode {
+//   constructor() {
+//     super();
+//     this.preRegistDependency();
+//   }
+
+//   private preRegistDependency() {
+//     registerDependency('mediaProvider');
+//     registerDependency('eventProvider');
+//     registerDependency('deviceProvider');
+//     registerDependency('roomProvider');
+//     registerDependency('mainRoomControlProvider');
+//     registerDependency('waitingRoomControlProvider');
+//     registerDependency('currentRoomControlProvider');
+//     registerDependency('monitorProvider');
+//     registerDependency('sharedConfigDataSource');
+//   }
+
+//   bootstrap(engine: FcrCoreEngine, mainRoomControl: FcrMainRoomControl) {
+//     const eventProvider = new FcrUIEventProviderImpl();
+//     const sharedConfigDataSource = new FcrUISharedConfigDataSourceImpl({
+//       settingConfig: {
+//         media: {
+//           autoConnectAudio: false,
+//           microphoneExpectedOff: true,
+//           cameraExpectedOff: true,
+//         },
+//       },
+//       sceneConfig: {
+//         roomToken: '',
+//         userName: 'lxy',
+//         roomId: '',
+//         userRole: FcrUserRole.HOST,
+//         language: 'zh-CN',
+//         inviteLink: '',
+//       },
+//       creatorConfig: {
+//         parameters: null as any,
+//       },
+//     } as unknown as any);
+//     const monitorProvider = new FcrUIMonitorProviderImpl(engine.getMonitorControl());
+//     const deviceProvider = new FcrUIDeviceProviderImpl(
+//       engine.getDesktopMediaControl(),
+//       sharedConfigDataSource,
+//     );
+//     const interpreterProvider = new FcrUIInterpreterProviderImpl();
+//     const localStorageProvider = new FcrUILocalStorageProviderImpl();
+//     const privilegeProvider = new FcrUIPrivilegeProviderImpl(
+//       eventProvider,
+//       mainRoomControl.getPrivilegeControl(),
+//       mainRoomControl.getUserControl(),
+//       mainRoomControl.getStreamControl(),
+//       mainRoomControl.getInterpreterControl(),
+//     );
+
+//     const remoteVideoRenderProvider = new FcrUIRemoteVideoRenderProviderImpl(
+//       mainRoomControl.getStreamControl(),
+//     );
+
+//     const mainRoomControlProvider = {
+//       get mainRoomControl() {
+//         return mainRoomControl;
+//       },
+//     };
+//   }
+// }
+
+// window.__DEV_ENGINE_IS_READY__.then(async () => {
+//   const engine = window.__DEV_ENGINE__;
+//   const roomId = window.__DEV_ROOM_ID__;
+//   const token = window.__DEV_USER_TOKEN__;
+
+//   await engine.login();
+
+//   const roomControl = engine.createMainRoomControl(roomId);
+
+//   const userName = 'test-user';
+
+//   await roomControl.join({
+//     userRole: FcrUserRole.HOST,
+//     userName,
+//     roomToken: token,
+//     streamLatency: FcrStreamLatencyLevel.ULTRA_LOW,
+//     createStreamConfigs: [],
+//   });
+
+//   const _rootNode = new DevRootNode();
+//   _rootNode.bootstrap(engine, roomControl);
+//   const uiModule = new SettingUIModule(_rootNode, _rootNode);
+
+//   const App = hot(() => {
+//     useUnmount(() => {
+//       uiModule?.onNodeWillInactive();
+//     });
+
+//     return uiModule.getComponent() ?? <></>;
+//   });
+
+//   ReactDOM.render(<App />, document.querySelector('#root')!);
+// });
+"use strict";

package/lib/modules/setting/index.js

@@ -54,9 +54,9 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _decorator = require("agora-foundation/lib/decorator");
 var _base = require("../../base");
-require("./index.css");
 var _view = require("./view");
 var _store = _interopRequireWildcard(require("./store"));
+require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 var _SettingUIModule;
 var _initProto;
@@ -70,28 +70,54 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var SettingUIModule = exports.SettingUIModule = /*#__PURE__*/function (_UIModule) {
-  function SettingUIModule(args) {
+  function SettingUIModule(parentNode, rootNode) {
     var _this;
     (0, _classCallCheck2["default"])(this, SettingUIModule);
-    _this = _callSuper(this, SettingUIModule);
+    _this = _callSuper(this, SettingUIModule, [parentNode, rootNode]);
     (0, _defineProperty2["default"])(_this, "_store", void _initProto(_this));
-    _this._store = new _store["default"](args);
     return _this;
   }
   (0, _inherits2["default"])(SettingUIModule, _UIModule);
   return (0, _createClass2["default"])(SettingUIModule, [{
+    key: "onNodeWillActive",
+    value: function onNodeWillActive() {
+      var _this$currentRoomCont, _this$sharedConfigDat;
+      this.streamControl = (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl.getStreamControl();
+      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) {
+        var _this$sharedConfigDat2, _this$sharedConfigDat3;
+        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,
+          sharedLayoutDataSource: this.sharedLayoutDataSource,
+          messageProvider: this.messageProvider,
+          sharedSettingDataSource: this.sharedSettingDataSource,
+          dialogProvider: this.dialogProvider,
+          settingConfig: this.sharedConfigDataSource.settingConfig
+        });
+      }
+    }
+  }, {
+    key: "onNodeWillInactive",
+    value: function onNodeWillInactive() {
+      var _this$_store;
+      (_this$_store = this._store) === null || _this$_store === void 0 || _this$_store.release();
+    }
+  }, {
     key: "getComponent",
     value: function getComponent() {
+      if (!this._store) {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+      }
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: this._store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.DeviceSettingsView, {})
       });
     }
-  }, {
-    key: "onUnload",
-    value: function onUnload() {
-      this._store.release();
-    }
   }]);
 }(_base.UIModule);
 _SettingUIModule = SettingUIModule;

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

@@ -14,11 +14,11 @@ var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _useNamespace = require("../common/useNamespace");
 var _classnames = _interopRequireDefault(require("classnames"));
-require("./index.css");
 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");
 var _jsxRuntime = require("react/jsx-runtime");
 var MinutesSettings = exports.MinutesSettings = (0, _mobxReact.observer)(function () {
   var ns = (0, _useNamespace.useNamespace)('minutes-settings');

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

@@ -176,18 +176,18 @@ var State = exports.State = (0, _mobxReact.observer)(function () {
           summary: systemCpuDesc,
           rates: [performanceState.cpuAppUsage, performanceState.cpuOtherAppUsage],
           data: ["".concat(performanceState.cpuAppUsage, " %"), "".concat(performanceState.cpuOtherAppUsage, " %")],
-          id: _constant.HighlightElement.CPU_STATE
+          id: _constant.FcrUIHighlightElement.CPU_STATE
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(CPUCard, {
           title: t('fmt_internalsetting_labels_Memory'),
           summary: formatSize(systemMemorySize),
           rates: [performanceState.memoryAppUsageRatio, performanceState.memoryOtherAppUsageRatio],
           data: [formatSize(performanceState.memoryAppUsageInKbytes), formatSize(performanceState.memoryOtherAppUsageInKbytes)],
-          id: _constant.HighlightElement.MEMORY_STATE
+          id: _constant.FcrUIHighlightElement.MEMORY_STATE
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(DataCard, {
         title: t('fmt_internalsetting_labels_Network'),
         data: networkUIData,
-        id: _constant.HighlightElement.NETWORK_STATE
+        id: _constant.FcrUIHighlightElement.NETWORK_STATE
       })]
     }), activeKey === 'audiovisual' && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: ns.b('audiovisual'),

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

@@ -1,11 +1,27 @@
-import { FcrAiDenoiseLevel } from 'fcr-core';
+import { FcrAiDenoiseLevel, FcrStreamControl } from 'fcr-core';
 import { FcrBeautyOptions } from 'fcr-core/lib/media-control/type';
-import { FcrPerformanceInfo } from 'fcr-core/lib/type';
+import { FcrDeviceInfo, FcrPerformanceInfo } from 'fcr-core/lib/type';
 import { AgoraRtcNetworkStats } from 'agora-rte-sdk';
-import { HighlightElement } from '../../utilities/constant';
+import { FcrUIHighlightElement } from '../../utilities/constant';
 import { DEFAULT_BEAUTY_VALUE } from 'agora-ui-foundation/lib/components/local-video-player';
-import { FcrUISceneConfig, StoreConfig } from '../../type';
+import { FcrUISceneConfig, FcrUISettingConfig } 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';
+import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
+import { FcrUIMessageProvider } from '../../providers/message-provider';
+import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+export interface FcrDeviceObserver {
+    onCameraChanged?(cameraId: string): void;
+    onMicrophoneChanged?(microphoneId: string): void;
+    onSpeakerChanged?(speakerId: string): void;
+    onCameraListUpdated?(cameraList: FcrDeviceInfo[]): void;
+    onMicrophoneListUpdated?(microphoneList: FcrDeviceInfo[]): void;
+    onSpeakerListUpdated?(speakerList: FcrDeviceInfo[]): void;
+}
 export interface DeviceItem {
     text: string;
     value: string;
@@ -14,19 +30,15 @@ export declare enum DeviceSettingTab {
     GENERAL = "general",
     AUDIO = "audio",
     VIDEO = "video",
-    STORAGE = "storage",
-    STATE = "state",
-    TRANSLATE = "translate",
-    MINUTES = "minutes"
+    STATE = "state"
 }
 export type VideoActiveTab = 'basic' | 'virtual-background' | 'beauty-filter';
 export interface DeviceSettingDialogConfig {
     activeTab: DeviceSettingTab;
-    highlightSelector: HighlightElement | undefined;
+    highlightSelector: FcrUIHighlightElement | undefined;
     videoActiveTab: VideoActiveTab;
 }
 export interface CustomSetting {
-    shouldTurnOffVideo: boolean;
     shouldDisplayPreviewDialog: boolean;
     shouldHideNonVideoParticipants: boolean;
     displayedMaxAttendees: number;
@@ -50,12 +62,12 @@ export default class SettingStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
     private _currentDialogId;
-    private _mediaControl;
     private _monitorControl;
     private _streamControl;
     private _roomControl;
     private _uiEventStore;
     private _deviceStore;
+    private _sharedLayoutDataSource;
     private _videoView4Setting?;
     private _settingVideoOpened;
     private _deviceStoreObserver;
@@ -64,7 +76,15 @@ export default class SettingStore {
     private _volumeIndicationInterval;
     private _cameraTrack?;
     private _useDefaultAudioEchoCancellation;
+    private _messageProvider?;
+    private _dialogProvider;
+    private _sharedSettingDataSource?;
     private _streamInfoList;
+    private _settingConfig;
+    private _onEventObserver;
+    private _monitorObserver;
+    private _roomObserver;
+    private _streamObserver;
     accessor loudestStreamVolumeLevel: number;
     accessor microphoneVolumeLevel: number;
     accessor isWifiConnected: boolean;
@@ -93,7 +113,6 @@ export default class SettingStore {
     }>;
     accessor systemMemorySize: number;
     accessor systemCpuDesc: string;
-    accessor setting: CustomSetting;
     accessor config: FcrUISceneConfig | undefined;
     accessor getSystemInfoTimer: NodeJS.Timeout | null;
     get maxVideoSendInfo(): (import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcLocalTrackStats & {
@@ -132,7 +151,7 @@ export default class SettingStore {
     get microphoneVolume(): number;
     get isLocalMirrorEnabled(): boolean;
     get isLocalEditBeautyOptions(): boolean;
-    get currentBeautyKey(): import("../../common/device-store").BeautyKey;
+    get currentBeautyKey(): import("../../type").FcrUIBeautyKey;
     get beautyOptions(): import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcBeautyOptions;
     get cameraDeviceId(): string;
     get cameraEnabled(): boolean;
@@ -148,7 +167,22 @@ export default class SettingStore {
     get currentIsMirror(): boolean;
     get microphoneDetecting(): boolean;
     get speakerDetecting(): boolean;
-    constructor({ mediaControl, config, uiEventStore, deviceStore, streamControl, roomControl, parameters, engine, }: StoreConfig);
+    get setting(): CustomSetting;
+    get settingConfig(): FcrUISettingConfig;
+    constructor({ monitorControl, uiEventStore, deviceStore, streamControl, roomControl, config, parameters, sharedLayoutDataSource, messageProvider, dialogProvider, sharedSettingDataSource, settingConfig, }: {
+        uiEventStore: FcrUIEventProvider;
+        deviceStore: FcrUIDeviceProvider;
+        streamControl: FcrStreamControl;
+        roomControl: FcrBaseRoomControl;
+        monitorControl: FcrUIMonitorProvider;
+        config: FcrUISceneConfig;
+        settingConfig: FcrUISettingConfig;
+        sharedSettingDataSource: FcrUISharedSettingDataSource;
+        parameters?: Record<string, unknown>;
+        sharedLayoutDataSource: FcrUISharedLayoutDataSource;
+        messageProvider: FcrUIMessageProvider;
+        dialogProvider: FcrUIDialogProvider;
+    });
     enableVirtualBackground(enable: boolean, source?: VirtualBackground): void;
     setEditBeautyKey(key: BeautyKey): void;
     enableBeautyEffect(enable: boolean): void;