fcr-ui-scene 3.5.1 → 3.6.0

package/lib/shared-data-source/screen-share-data-source.d.ts

@@ -0,0 +1,37 @@
+import { CurrentShareBounds } from '../modules/control-bar/types';
+import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
+export interface FcrUIScreenShareDataSource {
+    /**
+     * 是否正在屏幕共享
+     */
+    get isSharingScreen(): boolean;
+    /**
+     * 当前共享屏幕的 bounds
+     */
+    get currentShareBounds(): Electron.Rectangle | CurrentShareBounds | null;
+    /**
+     * 获取当前设置的音效通道
+     */
+    get currentShareAudioProcessingChannel(): AudioProcessingChannel;
+    /**
+     * 设置是否正在屏幕共享
+     */
+    setSharingScreen: (isSharingScreen: boolean) => void;
+    /**
+     * 设置当前共享的屏幕 bounds
+     */
+    setCurrentShareBounds: (currentShareBounds: Electron.Rectangle | CurrentShareBounds) => void;
+    /**
+     * 设置音效通道
+     */
+    setCurrentShareAudioProcessingChannel: (channel: AudioProcessingChannel) => void;
+}
+export declare class FcrUIScreenShareDataSourceImpl implements FcrUIScreenShareDataSource {
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    accessor currentShareAudioProcessingChannel: AudioProcessingChannel;
+    accessor isSharingScreen: boolean;
+    accessor currentShareBounds: CurrentShareBounds | null | Electron.Rectangle;
+    setSharingScreen(isSharingScreen: boolean): void;
+    setCurrentShareBounds(currentShareBounds: Electron.Rectangle | CurrentShareBounds): void;
+    setCurrentShareAudioProcessingChannel(channel: AudioProcessingChannel): void;
+}

package/lib/shared-data-source/screen-share-data-source.js

@@ -0,0 +1,134 @@
+"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.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/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");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUIScreenShareDataSourceImpl = void 0;
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.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 _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 _logger = require("../utilities/logger");
+var _env = require("agora-foundation/lib/utilities/env");
+var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
+var _FcrUIScreenShareDataSourceImpl;
+var _initProto, _init_currentShareAudioProcessingChannel, _init_isSharingScreen, _init_currentShareBounds, _setSharingScreenDecs, _setCurrentShareBoundsDecs, _setCurrentShareAudioProcessingChannelDecs, _ref;
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
+function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
+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; }
+var _A = /*#__PURE__*/new WeakMap();
+var _B = /*#__PURE__*/new WeakMap();
+var _C = /*#__PURE__*/new WeakMap();
+_ref = (_setSharingScreenDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareBoundsDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], "logger");
+var FcrUIScreenShareDataSourceImpl = exports.FcrUIScreenShareDataSourceImpl = /*#__PURE__*/function () {
+  function FcrUIScreenShareDataSourceImpl() {
+    (0, _classCallCheck2["default"])(this, FcrUIScreenShareDataSourceImpl);
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrUIScreenShareDataSourceImpl'
+    })));
+    _classPrivateFieldInitSpec(this, _A, _init_currentShareAudioProcessingChannel(this, _shareAudio.AudioProcessingChannel.MONO));
+    _classPrivateFieldInitSpec(this, _B, _init_isSharingScreen(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init_currentShareBounds(this, (0, _env.isElectron)() ? window.runtime.browserWindow.getBounds() : null));
+  }
+  return (0, _createClass2["default"])(FcrUIScreenShareDataSourceImpl, [{
+    key: "currentShareAudioProcessingChannel",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "isSharingScreen",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "currentShareBounds",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "setSharingScreen",
+    value: function setSharingScreen(isSharingScreen) {
+      this.isSharingScreen = isSharingScreen;
+      this.logger.info("setSharingScreen: ".concat(isSharingScreen));
+    }
+  }, {
+    key: "setCurrentShareBounds",
+    value: function setCurrentShareBounds(currentShareBounds) {
+      this.currentShareBounds = currentShareBounds;
+      this.logger.info("setCurrentShareBounds: ".concat(JSON.stringify(currentShareBounds)));
+    }
+  }, {
+    key: "setCurrentShareAudioProcessingChannel",
+    value: function setCurrentShareAudioProcessingChannel(channel) {
+      this.currentShareAudioProcessingChannel = channel;
+      this.logger.info("setCurrentShareAudioProcessingChannel: ".concat(channel));
+    }
+  }]);
+}();
+_FcrUIScreenShareDataSourceImpl = FcrUIScreenShareDataSourceImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareDataSourceImpl, [[_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "isSharingScreen"], [_mobx.observable, 1, "currentShareBounds"], [_setSharingScreenDecs, 18, "setSharingScreen"], [_setCurrentShareBoundsDecs, 18, "setCurrentShareBounds"], [_setCurrentShareAudioProcessingChannelDecs, 18, "setCurrentShareAudioProcessingChannel"]], []).e, 4);
+_init_currentShareAudioProcessingChannel = _applyDecs$e[0];
+_init_isSharingScreen = _applyDecs$e[1];
+_init_currentShareBounds = _applyDecs$e[2];
+_initProto = _applyDecs$e[3];
+(0, _base.registerDependency)('screenShareDataSource');

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

@@ -4,6 +4,7 @@ export interface FcrSecurityCheckedStateType {
     lockRoom: boolean;
     enableWaitingRoom: boolean;
     enableJoinWithAudio: boolean;
+    joinWithCloseVideo: boolean;
     enableWatermark: boolean;
     shareScreen: boolean;
     shareWhiteboard: boolean;

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

@@ -106,6 +106,7 @@ var FcrUISecuritySharedDataSourceImpl = exports.FcrUISecuritySharedDataSourceImp
         lockRoom: this._privilegeProvider.isLockRoomEnabled(),
         enableWaitingRoom: this._privilegeProvider.isWaitingRoomEnabled(),
         enableJoinWithAudio: this._privilegeProvider.allowJoinWithMuteAudio(),
+        joinWithCloseVideo: this._privilegeProvider.allowJoinWithMutedVideo(),
         enableWatermark: this._privilegeProvider.isWaterMarkEnabled(),
         shareScreen: this._privilegeProvider.allowScreenShareAndBoard(),
         shareWhiteboard: this._privilegeProvider.allowBoardWrite(),
@@ -133,10 +134,7 @@ var FcrUISecuritySharedDataSourceImpl = exports.FcrUISecuritySharedDataSourceImp
   }, {
     key: "_handleLocalUserSecurityInfosUpdated",
     value: function _handleLocalUserSecurityInfosUpdated(event) {
-      var _event$operatorUser;
-      if (((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId) !== this.localUserId) {
-        this._refreshCheckedStateMap();
-      }
+      this._refreshCheckedStateMap();
     }
   }, {
     key: "release",
@@ -150,7 +148,7 @@ var FcrUISecuritySharedDataSourceImpl = exports.FcrUISecuritySharedDataSourceImp
   }]);
 }();
 _FcrUISecuritySharedDataSourceImpl = FcrUISecuritySharedDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISecuritySharedDataSourceImpl, [[_mobx.observable, 1, "_checkedStateMap"], [_mobx.computed, 3, "localUserId"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"]], []).e, 2);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISecuritySharedDataSourceImpl, [[_mobx.observable, 1, "_checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"]], []).e, 2);
 _init__checkedStateMap = _applyDecs$e[0];
 _initProto = _applyDecs$e[1];
 (0, _base.registerDependency)('sharedSecuritySharedDataSource');

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

@@ -31,4 +31,5 @@ export declare class FcrUISharedSettingDataSourceImpl implements FcrUISharedSett
     get setting(): CustomSetting;
     private _preHandleSetting;
     setSetting(assignedSetting: Partial<CustomSetting>): void;
+    private _initSetting;
 }

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

@@ -6,7 +6,6 @@ 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.filter.js");
-require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
@@ -48,7 +47,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUISharedSettingDataSourceImpl = void 0;
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.object.assign.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
@@ -60,13 +61,15 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("agora-rte-sdk/lib/imports");
+var _store = require("../modules/setting/store");
 var _fcrCore = require("fcr-core");
 var _parameters = require("../utilities/parameters");
 var _mobx = require("mobx");
 var _base = require("../base");
-var _localStorageProvider = require("../providers/local-storage-provider");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _tools = require("../utilities/tools");
 var _FcrUISharedSettingDataSourceImpl;
-var _initProto, _init__setting, _preHandleSettingDecs, _setSettingDecs, _ref;
+var _initProto, _init__setting, _preHandleSettingDecs, _setSettingDecs, _initSettingDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -84,10 +87,9 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
  * 通过该接口，可以方便地对自定义设置进行读取和更新操作，适用于管理和维护 UI 相关的共享配置。
  */
 var _A = /*#__PURE__*/new WeakMap();
-_ref = (_preHandleSettingDecs = [_mobx.action, _mobx.action.bound], _setSettingDecs = [_mobx.action, _mobx.action.bound], "_creatorConfig");
+_ref = (_preHandleSettingDecs = [_mobx.action, _mobx.action.bound], _setSettingDecs = [_mobx.action, _mobx.action.bound], _initSettingDecs = [_mobx.action, _mobx.action.bound], "_creatorConfig");
 var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl = /*#__PURE__*/function () {
   function FcrUISharedSettingDataSourceImpl(creatorConfig, localStorageProvider) {
-    var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUISharedSettingDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
     _classPrivateFieldInitSpec(this, _A, _init__setting(this, {
@@ -96,9 +98,9 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
       displayedMaxAttendees: 16,
       autoAdjustmentSpeakerVolume: true,
       autoAdjustmentMicrophoneVolume: (0, _imports.isElectron)(),
-      noiseReduce: _fcrCore.FcrAiDenoiseLevel.AUTO,
+      noiseReduce: _fcrCore.FcrAiDenoiseLevel.MEDIUM,
       recordingPath: '',
-      videoHD: true,
+      videoHD: false,
       videoLowLight: false,
       hardwareForReception: false,
       videoNoise: false,
@@ -106,7 +108,10 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
       audioEchoCancellation: false,
       audioStereo: false,
       audioVoiceChanger: false,
-      spotlightEnabled: true
+      spotlightEnabled: true,
+      isPlaySound: true,
+      language: (0, _tools.getBrowserLanguage)(),
+      shouldHideMyVideo: false
     }));
     (0, _defineProperty2["default"])(this, "_useDefaultAudioEchoCancellation", true);
     this._localStorageProvider = localStorageProvider;
@@ -115,13 +120,8 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
     if (defaultVideoGallerySize) {
       defaultVideoGallerySize = Math.min(Math.max(defaultVideoGallerySize, 16), 25);
     }
-    var readAndSetSetting = function readAndSetSetting(key, defaultValue) {
-      var value = _this._localStorageProvider.read(key);
-      _this._setting[key] = value === null ? defaultValue : Boolean(value);
-    };
-    readAndSetSetting(_localStorageProvider.FcrLocalStorageSettingKey.SpotlightEnabled, true);
-    readAndSetSetting(_localStorageProvider.FcrLocalStorageSettingKey.ShouldHideNonVideoParticipants, false);
     this._setting.displayedMaxAttendees = defaultVideoGallerySize || 0;
+    this._initSetting();
   }
   return (0, _createClass2["default"])(FcrUISharedSettingDataSourceImpl, [{
     key: "_setting",
@@ -151,14 +151,30 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
     key: "setSetting",
     value: function setSetting(assignedSetting) {
       var newSetting = this._preHandleSetting(assignedSetting);
-      this._localStorageProvider.write(_localStorageProvider.FcrLocalStorageSettingKey.SpotlightEnabled, newSetting.spotlightEnabled);
-      this._localStorageProvider.write(_localStorageProvider.FcrLocalStorageSettingKey.ShouldHideNonVideoParticipants, newSetting.shouldHideNonVideoParticipants);
+      var localSetting = this._localStorageProvider.read(_store.SETTING_KEY) || {};
+      this._localStorageProvider.write(_store.SETTING_KEY, _objectSpread(_objectSpread({}, localSetting), newSetting));
       this._setting = newSetting;
     }
+  }, {
+    key: "_initSetting",
+    value: function _initSetting() {
+      var _this = this;
+      var localSetting = this._localStorageProvider.read(_store.SETTING_KEY);
+      if (localSetting) {
+        var settingKeys = ['spotlightEnabled', 'shouldHideNonVideoParticipants', 'shouldHideMyVideo', 'isPlaySound', 'language', 'autoAdjustmentMicrophoneVolume', 'noiseReduce', 'audioVoiceChanger', 'audioHiFi', 'audioEchoCancellation', 'audioStereo', 'videoHD', 'videoLowLight', 'videoNoise', 'hardwareForReception'];
+        settingKeys.forEach(function (key) {
+          var targetKey = key;
+          var localValue = localSetting[targetKey];
+          var value = _this._setting[targetKey];
+          Object.assign(_this._setting, (0, _defineProperty2["default"])({}, targetKey, localValue !== null && localValue !== void 0 ? localValue : value));
+        });
+      }
+      (0, _i18n.changeLanguage)(this._setting.language);
+    }
   }]);
 }();
 _FcrUISharedSettingDataSourceImpl = FcrUISharedSettingDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedSettingDataSourceImpl, [[_mobx.observable, 1, "_setting"], [_preHandleSettingDecs, 18, "_preHandleSetting"], [_setSettingDecs, 18, "setSetting"]], []).e, 2);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedSettingDataSourceImpl, [[_mobx.observable, 1, "_setting"], [_preHandleSettingDecs, 18, "_preHandleSetting"], [_setSettingDecs, 18, "setSetting"], [_initSettingDecs, 18, "_initSetting"]], []).e, 2);
 _init__setting = _applyDecs$e[0];
 _initProto = _applyDecs$e[1];
 (0, _base.registerDependency)('sharedSettingDataSource');

package/lib/shared-data-source/video-window.d.ts

@@ -2,7 +2,6 @@ import { FcrUIVideoWindowData, FcrUIVideoWindowFoldSortingPriority, FcrUIVideoWi
 import { FcrStreamInfo, FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
 import { FcrAudioSourceType, FcrRoomConnectorType, FcrVideoSourceType } from 'fcr-core';
 import { FcrUISharedSettingDataSource } from './setting';
-import { FcrUIEventProvider } from '../providers/event-provider';
 type FcrStreamUIData = Omit<FcrStreamInfo, 'owner'> & {
     owner: FcrUserInfo;
 };
@@ -38,6 +37,7 @@ export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
     private accessor _spotlightEnabled;
     private accessor _isSpeakerSpotlight;
     private accessor _boardCanEdit;
+    private accessor _isFirstCameraOpen;
     needToSort: boolean;
     type: FcrUIWindowType;
     accessor isPin: boolean;
@@ -67,6 +67,7 @@ export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
         boardUserInfo?: FcrUserInfo;
     }, _placement: 'main-list' | 'fold-list', _isMySelf: boolean, layoutType: FcrUIVideoWindowLayoutType | undefined, spotlightEnabled: boolean, canEdit?: boolean);
     setLayoutType(layoutType: FcrUIVideoWindowLayoutType): void;
+    setIsFirstCameraOpen(isFirstCameraOpen: boolean): void;
     setVideoStream(videoStream: FcrStreamUIData | undefined): void;
     setVideoStreamOwnerInfo(userInfo: FcrUserInfo): void;
     setAudioStream(audioStream: FcrStreamUIData | undefined): void;
@@ -92,7 +93,6 @@ export interface FcrUIVideoWindowDataSourceObserver {
 }
 export declare class FcrUIVideoWindowDataSourceImpl implements FcrUIVideoWindowDataSource {
     private _sharedSettingDataSource;
-    private _eventProvider;
     private _observer;
     private _spotlightPool;
     accessor spotlightEnabled: boolean;
@@ -104,7 +104,7 @@ export declare class FcrUIVideoWindowDataSourceImpl implements FcrUIVideoWindowD
     accessor mainList: FcrUIVideoWindowDataImpl[];
     accessor foldList: FcrUIVideoWindowDataImpl[];
     accessor spotlightStreamId: string;
-    constructor(_sharedSettingDataSource: FcrUISharedSettingDataSource, _eventProvider: FcrUIEventProvider);
+    constructor(_sharedSettingDataSource: FcrUISharedSettingDataSource);
     get shouldHideNonVideoParticipants(): boolean;
     setSpotlightEnabled(enabled: boolean): void;
     setLayout(layout: FcrUIVideoWindowLayoutType, manual?: boolean): void;

package/lib/shared-data-source/video-window.js

@@ -85,7 +85,7 @@ var _type2 = require("fcr-core/lib/type");
 var _fcrCore = require("fcr-core");
 var _base = require("../base");
 var _FcrUIVideoWindowDataImpl, _FcrUIVideoWindowDataSourceImpl;
-var _initProto, _init__videoStream, _init__audioStream, _init__spotlightEnabled, _init__isSpeakerSpotlight, _init__boardCanEdit, _init_isPin, _init_hasScreenSharing, _init_hasBoardSharing, _init_hasLoopbackSharing, _setVideoStreamDecs, _setVideoStreamOwnerInfoDecs, _setAudioStreamDecs, _setAudioStreamOwnerInfoDecs, _setPinDecs, _setSpotlightEnabledDecs, _setHasBoardSharingDecs, _setSpeakerSpotlightDecs, _setHasScreenSharingDecs, _setHasLoopbackSharingDecs, _setBoardCanEditDecs, _ref, _initProto2, _init_spotlightEnabled, _init_layoutType, _init_manualLayout, _init_pinLimitedCount, _init_mainListLimitedCount, _init_foldListLimitedCount, _init_mainList, _init_foldList, _init_spotlightStreamId, _setSpotlightEnabledDecs2, _setLayoutDecs, _onSpotlightRemovedDecs, _resetListDecs, _addBoardDecs, _updateBoardDecs, _removeBoardDecs, _mergePstnStreamOrInsertNewDataDecs, _addDecs, _updateDecs, _deleteDecs, _addPinDecs, _updateSpeakerSpotlightPositionDecs, _removePinDecs, _setSpeakerSpotlightDecs2, _toggleMainStreamDecs, _insertBeginningByPriorityDecs, _insertEndByPriorityDecs, _findInsertBeginningIndexDecs, _findInsertEndIndexDecs, _insertBoardDecs, _insertNewDataDecs, _ref3;
+var _initProto, _init__videoStream, _init__audioStream, _init__spotlightEnabled, _init__isSpeakerSpotlight, _init__boardCanEdit, _init__isFirstCameraOpen, _init_isPin, _init_hasScreenSharing, _init_hasBoardSharing, _init_hasLoopbackSharing, _setVideoStreamDecs, _setVideoStreamOwnerInfoDecs, _setAudioStreamDecs, _setAudioStreamOwnerInfoDecs, _setPinDecs, _setSpotlightEnabledDecs, _setHasBoardSharingDecs, _setSpeakerSpotlightDecs, _setHasScreenSharingDecs, _setHasLoopbackSharingDecs, _setBoardCanEditDecs, _ref, _initProto2, _init_spotlightEnabled, _init_layoutType, _init_manualLayout, _init_pinLimitedCount, _init_mainListLimitedCount, _init_foldListLimitedCount, _init_mainList, _init_foldList, _init_spotlightStreamId, _setSpotlightEnabledDecs2, _setLayoutDecs, _onSpotlightRemovedDecs, _resetListDecs, _addBoardDecs, _updateBoardDecs, _removeBoardDecs, _mergePstnStreamOrInsertNewDataDecs, _addDecs, _updateDecs, _deleteDecs, _addPinDecs, _updateSpeakerSpotlightPositionDecs, _removePinDecs, _setSpeakerSpotlightDecs2, _toggleMainStreamDecs, _insertBeginningByPriorityDecs, _insertEndByPriorityDecs, _findInsertBeginningIndexDecs, _findInsertEndIndexDecs, _insertBoardDecs, _insertNewDataDecs, _ref3;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -108,6 +108,7 @@ var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
 var _I = /*#__PURE__*/new WeakMap();
+var _J = /*#__PURE__*/new WeakMap();
 _ref = (_setVideoStreamDecs = [_mobx.action, _mobx.action.bound], _setVideoStreamOwnerInfoDecs = [_mobx.action, _mobx.action.bound], _setAudioStreamDecs = [_mobx.action, _mobx.action.bound], _setAudioStreamOwnerInfoDecs = [_mobx.action, _mobx.action.bound], _setPinDecs = [_mobx.action, _mobx.action.bound], _setSpotlightEnabledDecs = [_mobx.action, _mobx.action.bound], _setHasBoardSharingDecs = [_mobx.action, _mobx.action.bound], _setSpeakerSpotlightDecs = [_mobx.action, _mobx.action.bound], _setHasScreenSharingDecs = [_mobx.action, _mobx.action.bound], _setHasLoopbackSharingDecs = [_mobx.action, _mobx.action.bound], _setBoardCanEditDecs = [_mobx.action, _mobx.action.bound], "_boardUserInfo");
 var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/function () {
   function FcrUIVideoWindowDataImpl(type, _ref2, _placement, _isMySelf) {
@@ -125,11 +126,12 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     _classPrivateFieldInitSpec(this, _C, _init__spotlightEnabled(this, true));
     _classPrivateFieldInitSpec(this, _D, _init__isSpeakerSpotlight(this, false));
     _classPrivateFieldInitSpec(this, _E, _init__boardCanEdit(this, false));
+    _classPrivateFieldInitSpec(this, _F, _init__isFirstCameraOpen(this, false));
     (0, _defineProperty2["default"])(this, "needToSort", false);
-    _classPrivateFieldInitSpec(this, _F, _init_isPin(this, false));
-    _classPrivateFieldInitSpec(this, _G, _init_hasScreenSharing(this, false));
-    _classPrivateFieldInitSpec(this, _H, _init_hasBoardSharing(this, false));
-    _classPrivateFieldInitSpec(this, _I, _init_hasLoopbackSharing(this, false));
+    _classPrivateFieldInitSpec(this, _G, _init_isPin(this, false));
+    _classPrivateFieldInitSpec(this, _H, _init_hasScreenSharing(this, false));
+    _classPrivateFieldInitSpec(this, _I, _init_hasBoardSharing(this, false));
+    _classPrivateFieldInitSpec(this, _J, _init_hasLoopbackSharing(this, false));
     this._placement = _placement;
     this._isMySelf = _isMySelf;
     this.type = type;
@@ -181,7 +183,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "isPin",
+    key: "_isFirstCameraOpen",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -189,7 +191,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "hasScreenSharing",
+    key: "isPin",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -197,7 +199,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "hasBoardSharing",
+    key: "hasScreenSharing",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -205,13 +207,21 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "hasLoopbackSharing",
+    key: "hasBoardSharing",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_I, this, v);
     }
+  }, {
+    key: "hasLoopbackSharing",
+    get: function get() {
+      return _classPrivateFieldGet(_J, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_J, this, v);
+    }
   }, {
     key: "isSpeakerSpotlight",
     get: function get() {
@@ -343,7 +353,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
         if (this.isPin || ((_this$_videoStream13 = this._videoStream) === null || _this$_videoStream13 === void 0 ? void 0 : _this$_videoStream13.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN || this.type === _type.FcrUIWindowType.BOARD) {
           return _type.FcrUIVideoWindowMainSortingPriority.FOCUS;
         }
-        if (this.isSpeakerSpotlight && this._layoutType === _type.FcrUIVideoWindowLayoutType.Speaker) {
+        if (this.isSpeakerSpotlight) {
           return _type.FcrUIVideoWindowMainSortingPriority.SPEAKER_SPOTLIGHT;
         }
         if (this.hasScreenSharing) {
@@ -358,15 +368,16 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
         if (this.ownerRoleType === _type2.FcrUserRole.COHOST) {
           return _type.FcrUIVideoWindowMainSortingPriority.CO_HOST;
         }
-        if (this.hasMicrophoneAudioStream && this.hasVideoStream) {
-          return _type.FcrUIVideoWindowMainSortingPriority.BOTH_OPEN;
-        }
-        if (this.hasVideoStream) {
+        // if (this.hasMicrophoneAudioStream && this.hasVideoStream) {
+        //   return FcrUIVideoWindowMainSortingPriority.BOTH_OPEN;
+        // }
+        var isFirstCameraOpen = this.hasVideoStream && !this._isFirstCameraOpen;
+        if (isFirstCameraOpen) {
           return _type.FcrUIVideoWindowMainSortingPriority.CAMERA_OPEN;
         }
-        if (this.hasMicrophoneAudioStream) {
-          return _type.FcrUIVideoWindowMainSortingPriority.MICROPHONE_OPEN;
-        }
+        // if (this.hasMicrophoneAudioStream) {
+        //   return FcrUIVideoWindowMainSortingPriority.MICROPHONE_OPEN;
+        // }
       } else {
         var _this$_videoStream14;
         if (this.isSpeakerSpotlight) {
@@ -390,15 +401,15 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
         if (this.ownerRoleType === _type2.FcrUserRole.COHOST) {
           return _type.FcrUIVideoWindowFoldSortingPriority.CO_HOST;
         }
-        if (this.hasMicrophoneAudioStream && this.hasVideoStream) {
-          return _type.FcrUIVideoWindowFoldSortingPriority.BOTH_OPEN;
-        }
+        // if (this.hasMicrophoneAudioStream && this.hasVideoStream) {
+        //   return FcrUIVideoWindowFoldSortingPriority.BOTH_OPEN;
+        // }
         if (this.hasVideoStream) {
           return _type.FcrUIVideoWindowFoldSortingPriority.CAMERA_OPEN;
         }
-        if (this.hasMicrophoneAudioStream) {
-          return _type.FcrUIVideoWindowFoldSortingPriority.MICROPHONE_OPEN;
-        }
+        // if (this.hasMicrophoneAudioStream) {
+        //   return FcrUIVideoWindowFoldSortingPriority.MICROPHONE_OPEN;
+        // }
       }
       return _type.FcrUIVideoWindowMainSortingPriority.NONE;
     }
@@ -407,6 +418,11 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     value: function setLayoutType(layoutType) {
       this._layoutType = layoutType;
     }
+  }, {
+    key: "setIsFirstCameraOpen",
+    value: function setIsFirstCameraOpen(isFirstCameraOpen) {
+      this._isFirstCameraOpen = isFirstCameraOpen;
+    }
   }, {
     key: "setVideoStream",
     value: function setVideoStream(videoStream) {
@@ -469,17 +485,18 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
   }]);
 }();
 _FcrUIVideoWindowDataImpl = FcrUIVideoWindowDataImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataImpl, [[_mobx.observable, 1, "_videoStream"], [_mobx.observable, 1, "_audioStream"], [_mobx.observable, 1, "_spotlightEnabled"], [_mobx.observable, 1, "_isSpeakerSpotlight"], [_mobx.observable, 1, "_boardCanEdit"], [_mobx.observable, 1, "isPin"], [_mobx.observable, 1, "hasScreenSharing"], [_mobx.observable, 1, "hasBoardSharing"], [_mobx.observable, 1, "hasLoopbackSharing"], [_mobx.computed, 3, "isSpeakerSpotlight"], [_mobx.computed, 3, "windowId"], [_mobx.computed, 3, "videoStreamId"], [_mobx.computed, 3, "audioStreamId"], [_mobx.computed, 3, "audioStreamConnectorType"], [_mobx.computed, 3, "videoStreamConnectorType"], [_mobx.computed, 3, "hasMicrophoneAudioStream"], [_mobx.computed, 3, "hasLoopbackAudioStream"], [_mobx.computed, 3, "phoneMicEnabled"], [_mobx.computed, 3, "hasVideoStream"], [_mobx.computed, 3, "userId"], [_mobx.computed, 3, "userName"], [_mobx.computed, 3, "ownerRoleType"], [_mobx.computed, 3, "videoSourceType"], [_mobx.computed, 3, "audioSourceType"], [_mobx.computed, 3, "sortingPriority"], [_setVideoStreamDecs, 18, "setVideoStream"], [_setVideoStreamOwnerInfoDecs, 18, "setVideoStreamOwnerInfo"], [_setAudioStreamDecs, 18, "setAudioStream"], [_setAudioStreamOwnerInfoDecs, 18, "setAudioStreamOwnerInfo"], [_setPinDecs, 18, "setPin"], [_setSpotlightEnabledDecs, 18, "setSpotlightEnabled"], [_setHasBoardSharingDecs, 18, "setHasBoardSharing"], [_setSpeakerSpotlightDecs, 18, "setSpeakerSpotlight"], [_setHasScreenSharingDecs, 18, "setHasScreenSharing"], [_setHasLoopbackSharingDecs, 18, "setHasLoopbackSharing"], [_setBoardCanEditDecs, 18, "setBoardCanEdit"]], []).e, 10);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataImpl, [[_mobx.observable, 1, "_videoStream"], [_mobx.observable, 1, "_audioStream"], [_mobx.observable, 1, "_spotlightEnabled"], [_mobx.observable, 1, "_isSpeakerSpotlight"], [_mobx.observable, 1, "_boardCanEdit"], [_mobx.observable, 1, "_isFirstCameraOpen"], [_mobx.observable, 1, "isPin"], [_mobx.observable, 1, "hasScreenSharing"], [_mobx.observable, 1, "hasBoardSharing"], [_mobx.observable, 1, "hasLoopbackSharing"], [_mobx.computed, 3, "isSpeakerSpotlight"], [_mobx.computed, 3, "windowId"], [_mobx.computed, 3, "videoStreamId"], [_mobx.computed, 3, "audioStreamId"], [_mobx.computed, 3, "audioStreamConnectorType"], [_mobx.computed, 3, "videoStreamConnectorType"], [_mobx.computed, 3, "hasMicrophoneAudioStream"], [_mobx.computed, 3, "hasLoopbackAudioStream"], [_mobx.computed, 3, "phoneMicEnabled"], [_mobx.computed, 3, "hasVideoStream"], [_mobx.computed, 3, "userId"], [_mobx.computed, 3, "ownerRoleType"], [_mobx.computed, 3, "videoSourceType"], [_mobx.computed, 3, "audioSourceType"], [_mobx.computed, 3, "sortingPriority"], [_setVideoStreamDecs, 18, "setVideoStream"], [_setVideoStreamOwnerInfoDecs, 18, "setVideoStreamOwnerInfo"], [_setAudioStreamDecs, 18, "setAudioStream"], [_setAudioStreamOwnerInfoDecs, 18, "setAudioStreamOwnerInfo"], [_setPinDecs, 18, "setPin"], [_setSpotlightEnabledDecs, 18, "setSpotlightEnabled"], [_setHasBoardSharingDecs, 18, "setHasBoardSharing"], [_setSpeakerSpotlightDecs, 18, "setSpeakerSpotlight"], [_setHasScreenSharingDecs, 18, "setHasScreenSharing"], [_setHasLoopbackSharingDecs, 18, "setHasLoopbackSharing"], [_setBoardCanEditDecs, 18, "setBoardCanEdit"]], []).e, 11);
 _init__videoStream = _applyDecs$e[0];
 _init__audioStream = _applyDecs$e[1];
 _init__spotlightEnabled = _applyDecs$e[2];
 _init__isSpeakerSpotlight = _applyDecs$e[3];
 _init__boardCanEdit = _applyDecs$e[4];
-_init_isPin = _applyDecs$e[5];
-_init_hasScreenSharing = _applyDecs$e[6];
-_init_hasBoardSharing = _applyDecs$e[7];
-_init_hasLoopbackSharing = _applyDecs$e[8];
-_initProto = _applyDecs$e[9];
+_init__isFirstCameraOpen = _applyDecs$e[5];
+_init_isPin = _applyDecs$e[6];
+_init_hasScreenSharing = _applyDecs$e[7];
+_init_hasBoardSharing = _applyDecs$e[8];
+_init_hasLoopbackSharing = _applyDecs$e[9];
+_initProto = _applyDecs$e[10];
 var _A2 = /*#__PURE__*/new WeakMap();
 var _B2 = /*#__PURE__*/new WeakMap();
 var _C2 = /*#__PURE__*/new WeakMap();
@@ -491,7 +508,7 @@ var _H2 = /*#__PURE__*/new WeakMap();
 var _I2 = /*#__PURE__*/new WeakMap();
 _ref3 = (_setSpotlightEnabledDecs2 = [_mobx.action, _mobx.action.bound], _setLayoutDecs = [_mobx.action, _mobx.action.bound], _onSpotlightRemovedDecs = [_mobx.action, _mobx.action.bound], _resetListDecs = [_mobx.action, _mobx.action.bound], _addBoardDecs = [_mobx.action, _mobx.action.bound], _updateBoardDecs = [_mobx.action, _mobx.action.bound], _removeBoardDecs = [_mobx.action, _mobx.action.bound], _mergePstnStreamOrInsertNewDataDecs = [_mobx.action, _mobx.action.bound], _addDecs = [_mobx.action, _mobx.action.bound], _updateDecs = [_mobx.action, _mobx.action.bound], _deleteDecs = [_mobx.action, _mobx.action.bound], _addPinDecs = [_mobx.action, _mobx.action.bound], _updateSpeakerSpotlightPositionDecs = [_mobx.action, _mobx.action.bound], _removePinDecs = [_mobx.action, _mobx.action.bound], _setSpeakerSpotlightDecs2 = [_mobx.action, _mobx.action.bound], _toggleMainStreamDecs = [_mobx.action, _mobx.action.bound], _insertBeginningByPriorityDecs = [_mobx.action, _mobx.action.bound], _insertEndByPriorityDecs = [_mobx.action, _mobx.action.bound], _findInsertBeginningIndexDecs = [_mobx.action, _mobx.action.bound], _findInsertEndIndexDecs = [_mobx.action, _mobx.action.bound], _insertBoardDecs = [_mobx.action, _mobx.action.bound], _insertNewDataDecs = [_mobx.action, _mobx.action.bound], "_observer");
 var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUIVideoWindowDataSourceImpl(_sharedSettingDataSource, _eventProvider) {
+  function FcrUIVideoWindowDataSourceImpl(_sharedSettingDataSource) {
     (0, _classCallCheck2["default"])(this, FcrUIVideoWindowDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref3, (_initProto2(this), new _observable.AgoraObservable()));
     (0, _defineProperty2["default"])(this, "_spotlightPool", new FcrUISpeakerSpotlightPool());
@@ -505,7 +522,6 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     _classPrivateFieldInitSpec(this, _H2, _init_foldList(this, []));
     _classPrivateFieldInitSpec(this, _I2, _init_spotlightStreamId(this, ''));
     this._sharedSettingDataSource = _sharedSettingDataSource;
-    this._eventProvider = _eventProvider;
     this._spotlightPool.addObserver({
       onRemoved: this.onSpotlightRemoved
     });
@@ -904,11 +920,9 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
         if (existedUserStream) {
           existedUserStream.setSpeakerSpotlight(true);
         }
-        if (_this9.layoutType === _type.FcrUIVideoWindowLayoutType.Speaker || list === _this9.foldList) {
-          var isSpeakerSpotlightSortingPriority = existedUserStream.sortingPriority === (placement === 'main-list' ? _type.FcrUIVideoWindowMainSortingPriority.SPEAKER_SPOTLIGHT : _type.FcrUIVideoWindowFoldSortingPriority.FOCUS);
-          if (isSpeakerSpotlightSortingPriority) {
-            _this9._insertBeginningByPriority(existedUserStream, list, limitCount);
-          }
+        var isSpeakerSpotlightSortingPriority = existedUserStream.sortingPriority === (placement === 'main-list' ? _type.FcrUIVideoWindowMainSortingPriority.SPEAKER_SPOTLIGHT : _type.FcrUIVideoWindowFoldSortingPriority.FOCUS);
+        if (isSpeakerSpotlightSortingPriority) {
+          _this9._insertBeginningByPriority(existedUserStream, list, limitCount);
         }
         list.forEach(function (item) {
           if (item.needToSort) {
@@ -998,11 +1012,14 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     key: "_insertByPriority",
     value: function _insertByPriority(data, list, limitCount) {
       var insertIndex = -1;
-      if (data.sortingPriority >= _type.FcrUIVideoWindowMainSortingPriority.FOCUS) {
+      if (data.sortingPriority >= _type.FcrUIVideoWindowMainSortingPriority.FOCUS || data.sortingPriority === _type.FcrUIVideoWindowMainSortingPriority.CAMERA_OPEN) {
         insertIndex = this._insertBeginningByPriority(data, list, limitCount);
       } else {
         insertIndex = this._insertEndByPriority(data, list, limitCount);
       }
+      if (data.hasVideoStream) {
+        data.setIsFirstCameraOpen(true);
+      }
       return insertIndex;
     }
   }, {
@@ -1137,7 +1154,7 @@ var FcrUISpeakerSpotlightPool = exports.FcrUISpeakerSpotlightPool = /*#__PURE__*
   return (0, _createClass2["default"])(FcrUISpeakerSpotlightPool, [{
     key: "add",
     value: function add(streamId) {
-      if (this.streams.size >= this.limitCount) {
+      if (this.streams.size >= this.limitCount && !this.streams.has(streamId)) {
         return false;
       }
       this.streams.set(streamId, Date.now());