fcr-ui-scene 3.5.1 → 3.6.1

package/lib/schema.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "fcrRenderViewSchema", {
     return _schema.fcrRenderViewSchema;
   }
 });
-exports.fcrUserRoleSchema = exports.fcrUISceneFailureCallbackSchema = exports.fcrUISceneConfigSchema = exports.fcrUISceneCallbackSchema = exports.fcrUIResourceSchema = void 0;
+exports.fcrUserRoleSchema = exports.fcrUISceneFailureCallbackSchema = exports.fcrUISceneCreatorConfigSchema = exports.fcrUISceneConfigSchema = exports.fcrUISceneCallbackSchema = exports.fcrUIResourceSchema = void 0;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 var _fcrCore = require("fcr-core");
@@ -21,6 +21,28 @@ var fcrUIResourceSchema = exports.fcrUIResourceSchema = _schema.z.object({
   virtualBackgroundVideos: _schema.stringArraySchema.optional(),
   soundEffectAudios: _schema.stringArraySchema.optional()
 });
+var fcrUISceneCreatorConfigSchema = exports.fcrUISceneCreatorConfigSchema = _schema.z.object({
+  /**
+   * The App ID.
+   */
+  appId: _schema.stringSchema,
+  /**
+   * The ID of the user.
+   */
+  userId: _schema.stringSchema,
+  /**
+   * The token to join the room.
+   */
+  token: _schema.stringSchema,
+  /**
+   * UI Resources such as virtual background images and videos.
+   */
+  resource: fcrUIResourceSchema.optional(),
+  /**
+   * Additional parameters.
+   */
+  parameters: _schema.stringKeyUnknownValueSchema.optional()
+});
 var fcrUISceneConfigSchema = exports.fcrUISceneConfigSchema = _schema.z.object({
   /**
    * The token for authentication.
@@ -42,18 +64,10 @@ var fcrUISceneConfigSchema = exports.fcrUISceneConfigSchema = _schema.z.object({
    * The language of the user interface. Supported languages are: 'en', 'zh'.
    */
   language: _schema.stringSchema,
-  /**
-   * Link to share the room.
-   */
-  inviteLink: _schema.stringSchema,
   /**
    * Flexible properties of the user.
    */
   userProperties: _schema.stringKeyUnknownValueSchema.optional(),
-  /**
-   * UI Resources such as virtual background images and videos.
-   */
-  resource: fcrUIResourceSchema.optional(),
   /**
    * The password for the room.
    */

package/lib/shared-data-source/config.d.ts

@@ -1,3 +1,4 @@
+import { FcrUILocalStorageProvider } from '../providers/local-storage-provider';
 import { FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISettingConfig } from '../type';
 export interface FcrUISharedConfigDataSource {
     get settingConfig(): FcrUISettingConfig;
@@ -5,12 +6,15 @@ export interface FcrUISharedConfigDataSource {
     get sceneConfig(): FcrUISceneConfig;
 }
 export declare class FcrUISharedConfigDataSourceImpl implements FcrUISharedConfigDataSource {
+    private _localStorageProvider;
     settingConfig: FcrUISettingConfig;
     creatorConfig: FcrUISceneCreatorConfig;
     sceneConfig: FcrUISceneConfig;
-    constructor({ settingConfig, creatorConfig, sceneConfig, }: {
+    constructor({ settingConfig, creatorConfig, sceneConfig, localStorageProvider, }: {
         settingConfig: FcrUISettingConfig;
         creatorConfig: FcrUISceneCreatorConfig;
-        sceneConfig: FcrUISceneConfig;
+        sceneConfig?: FcrUISceneConfig;
+        localStorageProvider: FcrUILocalStorageProvider;
     });
+    private _initConfig;
 }

package/lib/shared-data-source/config.js

@@ -1,21 +1,92 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
+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.string.iterator.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");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+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/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUISharedConfigDataSourceImpl = void 0;
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _mobx = require("mobx");
 var _base = require("../base");
-var FcrUISharedConfigDataSourceImpl = exports.FcrUISharedConfigDataSourceImpl = /*#__PURE__*/(0, _createClass2["default"])(function FcrUISharedConfigDataSourceImpl(_ref) {
-  var settingConfig = _ref.settingConfig,
-    creatorConfig = _ref.creatorConfig,
-    sceneConfig = _ref.sceneConfig;
-  (0, _classCallCheck2["default"])(this, FcrUISharedConfigDataSourceImpl);
-  this.settingConfig = settingConfig;
-  this.creatorConfig = creatorConfig;
-  this.sceneConfig = sceneConfig;
-});
+var _store = require("../modules/setting/store");
+var _FcrUISharedConfigDataSourceImpl;
+var _initProto, _initConfigDecs, _ref;
+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)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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; }
+_ref = (_initConfigDecs = [_mobx.action, _mobx.action.bound], "_localStorageProvider");
+var FcrUISharedConfigDataSourceImpl = exports.FcrUISharedConfigDataSourceImpl = /*#__PURE__*/function () {
+  function FcrUISharedConfigDataSourceImpl(_ref2) {
+    var settingConfig = _ref2.settingConfig,
+      creatorConfig = _ref2.creatorConfig,
+      _ref2$sceneConfig = _ref2.sceneConfig,
+      sceneConfig = _ref2$sceneConfig === void 0 ? {} : _ref2$sceneConfig,
+      localStorageProvider = _ref2.localStorageProvider;
+    (0, _classCallCheck2["default"])(this, FcrUISharedConfigDataSourceImpl);
+    (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
+    this.settingConfig = settingConfig;
+    this.creatorConfig = creatorConfig;
+    this.sceneConfig = sceneConfig;
+    this._localStorageProvider = localStorageProvider;
+    this._initConfig();
+  }
+  return (0, _createClass2["default"])(FcrUISharedConfigDataSourceImpl, [{
+    key: "_initConfig",
+    value: function _initConfig() {
+      var localSetting = this._localStorageProvider.read(_store.SETTING_KEY);
+      if (localSetting) {
+        var _localSetting$cameraE, _localSetting$microph, _localSetting$autoCon;
+        this.settingConfig.media = {
+          cameraExpectedOff: (_localSetting$cameraE = localSetting.cameraExpectedOff) !== null && _localSetting$cameraE !== void 0 ? _localSetting$cameraE : this.settingConfig.media.cameraExpectedOff,
+          microphoneExpectedOff: (_localSetting$microph = localSetting.microphoneExpectedOff) !== null && _localSetting$microph !== void 0 ? _localSetting$microph : this.settingConfig.media.microphoneExpectedOff,
+          autoConnectAudio: (_localSetting$autoCon = localSetting.autoConnectAudio) !== null && _localSetting$autoCon !== void 0 ? _localSetting$autoCon : this.settingConfig.media.autoConnectAudio
+        };
+      }
+    }
+  }]);
+}();
+_FcrUISharedConfigDataSourceImpl = FcrUISharedConfigDataSourceImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedConfigDataSourceImpl, [[_initConfigDecs, 18, "_initConfig"]], []).e, 1);
+_initProto = _applyDecs$e[0];
 (0, _base.registerDependency)('sharedConfigDataSource');

package/lib/shared-data-source/meeting-time.js

@@ -57,9 +57,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _i18n = require("agora-ui-foundation/lib/i18n");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _duration = _interopRequireDefault(require("dayjs/plugin/duration"));
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _base = require("../base");
 var _mobx = require("mobx");
 var _FcrUIMeetingTimeSharedDataSourceImpl;
@@ -131,7 +131,7 @@ var FcrUIMeetingTimeSharedDataSourceImpl = exports.FcrUIMeetingTimeSharedDataSou
           var remainTime = scheduleDuration - meetingDuration;
           var currentStatus = remainTime > 600 ? MeetingStatus.NORMAL : remainTime > 0 ? MeetingStatus.SOON_TO_END : MeetingStatus.OVERTIME;
           _this._setStatues(currentStatus);
-          var showHour = meetingDuration / 60 > 120;
+          var showHour = meetingDuration / 60 > 60;
           var h = meetingDuration / 3600;
           var m = showHour ? meetingDuration % 3600 / 60 : meetingDuration / 60;
           var s = meetingDuration % 60;

package/lib/shared-data-source/member-data.d.ts

@@ -4,17 +4,13 @@ import { FcrUserControl } from 'fcr-core/lib/room-control/user-control/type';
 import { FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
 import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control/types';
 import { FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrUIScreenShareProvider } from '../providers/screen-share-provider';
 export interface FcrUIMemberSharedDataSource {
     /**
      * 整个房间的人数。
      * @returns 来自onAllUserCountUpdated 的回调 。
      */
     get totalUserCount(): number;
-    /**
-     * 获取本地用户的数据。
-     * @returns 本地用户的数据，类型为 FcrUIMemberDataImpl。
-     */
-    get localUserMemberData(): FcrUIMemberDataImpl;
     /**
      * 获取本地用户的数据。
      * @returns 本地用户的数据，类型为 FcrUserInfo。
@@ -80,39 +76,41 @@ export interface FcrUIMemberSharedDataSource {
 export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberSharedDataSource {
     private _mainRoomUserControl;
     private _streamControl;
+    private _screenShareProvider;
     private _whiteBoardControl?;
-    private _dataSource;
     protected logger: import("agora-foundation/lib/logger").Logger;
+    private _dataSource;
     private _disposers;
-    private _userObserver;
-    private _streamsObserver;
-    private accessor serverPushTotalUserCount;
+    private accessor _serverPushTotalUserCount;
     private accessor _audioVolumeMap;
     private accessor _isLocalUserInPstn;
     private accessor _interpreterInputLanguageList;
-    constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _whiteBoardControl?: FcrWhiteboardControl | undefined);
-    get totalUserCount(): number;
+    private accessor _localUser;
+    private _userObserver;
+    private _streamsObserver;
+    accessor totalUserCount: number;
+    private get localUserId();
     get hasOwnPstnStream(): boolean;
     get interpreterInputLanguageList(): {
         userId: string;
         language: FcrLanguage;
     }[];
     get audioVolumeMap(): Map<string, number>;
-    setIsLocalUserInPstn(): void;
-    get localUserMemberData(): FcrUIMemberDataImpl;
     get localUser(): FcrUserInfo;
-    private _forceAddLocalUserWithControl;
-    private _handleAllUserCountUpdated;
-    private _getLocalUserInPureList;
-    private get localUserId();
     get localUserRole(): FcrUserRole;
     get localUserRoleString(): "participant" | "host" | "cohost" | "audience" | "observer" | "robot";
     get isLocalUserHost(): boolean;
     get remoteMembers(): FcrUIMemberDataImpl[];
     get remoteMembersUserInfosList(): FcrUserInfo[];
-    private _initUserList;
     get memberList(): FcrUIMemberDataImpl[];
     get memberUserInfoList(): FcrUserInfo[];
+    constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _screenShareProvider: FcrUIScreenShareProvider, _whiteBoardControl?: FcrWhiteboardControl | undefined);
+    updateMemberListWithBoardState(): void;
+    release(): void;
+    private _setIsLocalUserInPstn;
+    private _handleAllUserCountUpdated;
+    private _setTotalUserCount;
+    private _initUserList;
     private _handleUserInfoUpdated;
     private _syncParticipants;
     private _onAudioVolumeUpdated;
@@ -121,6 +119,4 @@ export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberShare
     private _handleStreamsAdded;
     private _handleStreamsUpdated;
     private _handleStreamsRemoved;
-    updateMemberListWithBoardState(): void;
-    release(): void;
 }