fcr-ui-scene 3.3.1 → 3.4.1

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

@@ -9,16 +9,16 @@ 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 _securityStore = require("../../common/security-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, securityStore, deviceStore, uiModule, App;
+  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:
@@ -40,10 +40,21 @@ window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default
         });
       case 9:
         uiEventStore = new _eventStore.FcrUIEventStore();
-        securityStore = new _securityStore.FcrSecurityStore(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), roomControl.getRoomSessionControl(), uiEventStore);
-        deviceStore = new _deviceStore.FcrDeviceStore(userName, engine.getDesktopMediaControl());
-        uiModule = new _.SettingUIModule({
+        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',
@@ -52,12 +63,10 @@ window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default
             language: 'zh-CN',
             inviteLink: ''
           },
-          uiEventStore: uiEventStore,
-          deviceStore: deviceStore,
-          monitorControl: engine.getMonitorControl(),
-          streamControl: roomControl.getStreamControl(),
-          roomControl: roomControl
-        });
+          parameters: null,
+          deviceStreamStore: null
+        };
+        uiModule = new _.SettingUIModule(config);
         App = (0, _root.hot)(function () {
           (0, _hooks.useUnmount)(function () {
             uiModule.release();

package/lib/modules/setting/index.js

@@ -19,6 +19,7 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
@@ -35,6 +36,8 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -53,11 +56,12 @@ var _decorator = require("agora-foundation/lib/decorator");
 var _base = require("../../base");
 require("./index.css");
 var _view = require("./view");
-var _context = require("./context");
-var _store = _interopRequireDefault(require("./store"));
+var _store = _interopRequireWildcard(require("./store"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _SettingUIModule;
 var _initProto;
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
@@ -78,7 +82,7 @@ var SettingUIModule = exports.SettingUIModule = /*#__PURE__*/function (_UIModule
   return (0, _createClass2["default"])(SettingUIModule, [{
     key: "getComponent",
     value: function getComponent() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.StoreContext.Provider, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: this._store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.DeviceSettingsView, {})
       });

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

@@ -16,7 +16,7 @@ var _useNamespace = require("../common/useNamespace");
 var _classnames = _interopRequireDefault(require("classnames"));
 require("./index.css");
 var _mobxReact = require("mobx-react");
-var _context = require("../context");
+var _store = require("../store");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -31,7 +31,7 @@ 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)(_context.StoreContext),
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
     setting = _useContext.setting,
     setSetting = _useContext.setSetting;
   var iconSize = 48;

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

@@ -36,7 +36,7 @@ require("core-js/modules/esnext.iterator.reduce.js");
 var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobxReact = require("mobx-react");
-var _context = require("../context");
+var _store = require("../store");
 var _tabs = require("agora-ui-foundation/lib/components/tabs");
 require("./index.css");
 var _useNamespace = require("../common/useNamespace");
@@ -66,7 +66,7 @@ var State = exports.State = (0, _mobxReact.observer)(function () {
     label: t('fmt_internalsetting_labels_currency'),
     key: 'universal'
   }, {
-    label: 'audiovisual',
+    label: t('fmt_internalsetting_labels_audiovisual'),
     key: 'audiovisual'
   }];
   var _useState = (0, _react.useState)('universal'),
@@ -76,7 +76,7 @@ var State = exports.State = (0, _mobxReact.observer)(function () {
   var handleChange = function handleChange(key) {
     setActiveKey(key);
   };
-  var _useContext = (0, _react.useContext)(_context.StoreContext),
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
     networkState = _useContext.networkState,
     performanceState = _useContext.performanceState,
     microphoneVolumeDb = _useContext.microphoneVolumeDb,

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

@@ -12,13 +12,13 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobxReact = require("mobx-react");
 var _useNamespace = require("../common/useNamespace");
 var _react = require("react");
-var _context2 = require("../context");
+var _store = require("../store");
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 var StorageSettings = exports.StorageSettings = (0, _mobxReact.observer)(function () {
   var ns = (0, _useNamespace.useNamespace)('device-settings-storage');
   var t = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_context2.StoreContext),
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
     recordingPath = _useContext.setting.recordingPath,
     setSetting = _useContext.setSetting;
   var editRecordingPath = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {

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

@@ -1,14 +1,11 @@
-import { FcrAiDenoiseLevel, FcrDesktopMediaControl, FcrMonitorControl, FcrStreamControl } from 'agora-edu-core';
-import { FcrBeautyOptions } from 'agora-edu-core/lib/media-control/type';
-import { FcrPerformanceInfo } from 'agora-edu-core/lib/type';
+import { FcrAiDenoiseLevel } from 'fcr-core';
+import { FcrBeautyOptions } from 'fcr-core/lib/media-control/type';
+import { FcrPerformanceInfo } from 'fcr-core/lib/type';
 import { AgoraRtcNetworkStats } from 'agora-rte-sdk';
-import { FcrUIEventStore } from '../../common/event-store';
 import { HighlightElement } from '../../utilities/constant';
 import { DEFAULT_BEAUTY_VALUE } from 'agora-ui-foundation/lib/components/local-video-player';
-import { FcrUISceneConfig } from '../../type';
+import { FcrUISceneConfig, StoreConfig } from '../../type';
 import { VirtualBackground } from '../device-pretest/assets/virtual-backdound-resources';
-import { FcrDeviceStore } from '../../common/device-store';
-import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
 export interface DeviceItem {
     text: string;
     value: string;
@@ -47,9 +44,6 @@ export interface CustomSetting {
     audioVoiceChanger: boolean;
     spotlightEnabled: boolean;
 }
-export interface StoreConfig {
-    userName: string;
-}
 export { DEFAULT_BEAUTY_VALUE };
 export type BeautyKey = 'none' | 'smoothnessLevel' | 'lighteningLevel' | 'lighteningLevel';
 export default class SettingStore {
@@ -70,6 +64,7 @@ export default class SettingStore {
     private _volumeIndicationInterval;
     private _cameraTrack?;
     private _useDefaultAudioEchoCancellation;
+    private _streamInfoList;
     accessor loudestStreamVolumeLevel: number;
     accessor microphoneVolumeLevel: number;
     accessor isWifiConnected: boolean;
@@ -80,18 +75,18 @@ export default class SettingStore {
         memoryOtherAppUsageRatio: number;
         memoryOtherAppUsageInKbytes: number;
     };
-    accessor localAudioStreamMap: Map<string, import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcLocalAudioStats>;
-    accessor remoteAudioStreamMap: Map<string, import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcRemoteAudioStats>;
+    accessor localAudioStreamMap: Map<string, import("agora-rte-sdk").AgoraRtcLocalAudioStats>;
+    accessor remoteAudioStreamMap: Map<string, import("agora-rte-sdk").AgoraRtcRemoteAudioStats>;
     accessor localVideoStreamMap: Map<string, import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcLocalTrackStats & {
         sendFrameRate: number;
-        dimensions: import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcDimensions;
+        dimensions: import("agora-rte-sdk").AgoraRtcDimensions;
         frameRate: number;
         bitrate: number;
     } & {
         isScreenStream: boolean;
     }>;
     accessor remoteVideoStreamMap: Map<string, import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcRemoteTrackStats & {
-        dimensions: import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcDimensions;
+        dimensions: import("agora-rte-sdk").AgoraRtcDimensions;
         frameRate: number;
     } & {
         isScreenStream: boolean;
@@ -103,28 +98,28 @@ export default class SettingStore {
     accessor getSystemInfoTimer: NodeJS.Timeout | null;
     get maxVideoSendInfo(): (import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcLocalTrackStats & {
         sendFrameRate: number;
-        dimensions: import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcDimensions;
+        dimensions: import("agora-rte-sdk").AgoraRtcDimensions;
         frameRate: number;
         bitrate: number;
     } & {
         isScreenStream: boolean;
     }) | null;
     get maxVideoReceiveInfo(): (import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcRemoteTrackStats & {
-        dimensions: import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcDimensions;
+        dimensions: import("agora-rte-sdk").AgoraRtcDimensions;
         frameRate: number;
     } & {
         isScreenStream: boolean;
     }) | null;
     get sendScreenShareInfo(): (import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcLocalTrackStats & {
         sendFrameRate: number;
-        dimensions: import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcDimensions;
+        dimensions: import("agora-rte-sdk").AgoraRtcDimensions;
         frameRate: number;
         bitrate: number;
     } & {
         isScreenStream: boolean;
     }) | null;
     get receiveScreenShareInfo(): (import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcRemoteTrackStats & {
-        dimensions: import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcDimensions;
+        dimensions: import("agora-rte-sdk").AgoraRtcDimensions;
         frameRate: number;
     } & {
         isScreenStream: boolean;
@@ -153,20 +148,13 @@ export default class SettingStore {
     get currentIsMirror(): boolean;
     get microphoneDetecting(): boolean;
     get speakerDetecting(): boolean;
-    constructor({ mediaControl, config, uiEventStore, deviceStore, monitorControl, streamControl, roomControl, }: {
-        mediaControl: FcrDesktopMediaControl;
-        config: FcrUISceneConfig;
-        uiEventStore: FcrUIEventStore;
-        monitorControl: FcrMonitorControl;
-        streamControl: FcrStreamControl;
-        roomControl: FcrBaseRoomControl;
-        deviceStore: FcrDeviceStore;
-    });
+    constructor({ mediaControl, config, uiEventStore, deviceStore, streamControl, roomControl, parameters, engine, }: StoreConfig);
     enableVirtualBackground(enable: boolean, source?: VirtualBackground): void;
     setEditBeautyKey(key: BeautyKey): void;
     enableBeautyEffect(enable: boolean): void;
     private _initReactions;
     private _disposeReactions;
+    private _setupAudioVolumeAnalyzerTask;
     setCameraDevice(id: string): void;
     setMicrophoneDevice(deviceId: string): void;
     stopSpeakerTest(): void;
@@ -205,6 +193,7 @@ export default class SettingStore {
     private _onRemoteAudioStatsUpdated;
     private _onLocalVideoStatsUpdated;
     private _onRemoteVideoStatsUpdated;
+    private _onStreamsAdded;
     private _onStreamsUpdated;
     private _onStreamsRemoved;
     private _onPerformanceUpdated;
@@ -213,3 +202,4 @@ export default class SettingStore {
     private _onAudioVolumeUpdated;
     private _preHandleSetting;
 }
+export declare const StoreContext: import("react").Context<SettingStore>;