npm - fcr-ui-scene - Versions diffs - 3.5.1 → 3.6.1 - Mend

fcr-ui-scene 3.5.1 → 3.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (395) hide show

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

@@ -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 CHANGED Viewed

@@ -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;
@@ -135,7 +135,6 @@ export declare class FcrUIVideoWindowDataSourceImpl implements FcrUIVideoWindowD
     private _findInsertEndIndex;
     private _findCurrentSpeakerSpotlight;
     private _findItemIndexWithWindowId;
-    private _findItemIndexWithUserId;
     private _findItemIndexWithAudioStreamId;
     private _insertBoard;
     private _insertNewData;

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

@@ -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
     });
@@ -639,7 +655,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     key: "onSpotlightRemoved",
     value: function onSpotlightRemoved(streamId) {
       var _this3 = this;
-      var removeSpotlight = function removeSpotlight(streamId, list, limitCount) {
+      var removeSpotlight = function removeSpotlight(streamId, list) {
         var index = _this3._findItemIndexWithWindowId(streamId, list);
         if (index !== -1) {
           var item = list[index];
@@ -651,8 +667,8 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
           }
         }
       };
-      removeSpotlight(streamId, this.mainList, this.mainListLimitedCount);
-      removeSpotlight(streamId, this.foldList, this.foldListLimitedCount);
+      removeSpotlight(streamId, this.mainList);
+      removeSpotlight(streamId, this.foldList);
       this.spotlightStreamId = '';
       this._observer.notifyObservers('onSpotlightRemoved', streamId);
     }
@@ -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;
     }
   }, {
@@ -1075,13 +1092,6 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
         return item.windowId === windowId;
       });
     }
-  }, {
-    key: "_findItemIndexWithUserId",
-    value: function _findItemIndexWithUserId(userId, list) {
-      return list.findIndex(function (item) {
-        return item.userId === userId;
-      });
-    }
   }, {
     key: "_findItemIndexWithAudioStreamId",
     value: function _findItemIndexWithAudioStreamId(audioStreamId, list) {
@@ -1137,7 +1147,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());

package/lib/translations/enUS.d.ts CHANGED Viewed

@@ -34,6 +34,7 @@ export declare const enUs: {
     fmt_attendies_toast_cant_sethost: string;
     fmt_attendies_toast_cant_setcohost: string;
     fmt_attendies_button_revokehost_error: string;
+    fmt_attendies_toast_cohost_upper_limit: string;
     fmt_attendies_button_rename: string;
     fmt_attendies_options_allowlocalrecord: string;
     fmt_attendies_options_putinwaitingroom: string;
@@ -89,10 +90,11 @@ export declare const enUs: {
     fmt_additional_label_meet_view_all: string;
     fmt_additional_label_change_name_self: string;
     fmt_additional_tips_nickname_change_success: string;
-    fmt_additional_popup_label_change_nickname: string;
     fmt_additional_popup_label_enter_nickname: string;
     fmt_additional_popup_label_enter_nickname_ok: string;
     fmt_additional_label_toast_rename_off: string;
+    fmt_attendies_toast_host_enabled_mute: string;
+    fmt_attendies_toast_host_turned_off_video: string;
     fmt_actionbar_tips_leavemeeting: string;
     fmt_actionbar_tips_locked: string;
     fmt_actionbar_tips_recheckleave: string;
@@ -560,6 +562,21 @@ export declare const enUs: {
     fmt_screenshare_tips_sharing_audio_cancel: string;
     fmt_screenshare_tips_sharing_audio_confirm: string;
     fmt_screenshare_tips_sharing_disabled_tocontact: string;
+    fmt_screenshare_toast_network_error_unable_start_screen_share: string;
+    fmt_screenshare_controlbar_button_annotations: string;
+    fmt_screenshare_controlbar_annotations_options_attendees_annotate: string;
+    fmt_screenshare_controlbar_annotations_options_show_name: string;
+    fmt_screenshare_toast_host_enabled_annotations: string;
+    fmt_screenshare_toast_host_disabled_annotations: string;
+    fmt_screenshare_controlbar_options_clear_all: string;
+    fmt_screenshare_toast_annotations_visible_participants: string;
+    fmt_screenshare_controlbar_button_settings: string;
+    fmt_screenshare_controlbar_settings_label_share_audio_settings: string;
+    fmt_screenshare_controlbar_settings_options_enable_share_audio: string;
+    fmt_screenshare_controlbar_settings_label_annotation_settings: string;
+    fmt_screenshare_controlbar_settings_label_annotation_controls: string;
+    fmt_screenshare_toast_annotation_controls_screen_sharing_disabled: string;
+    fmt_screenshare_tips_host_not_enabled_annotations: string;
     fmt_screenshare_tips_unenabled: string;
     fmt_screenshare_whiteboard_options_changetheme: string;
     fmt_screenshare_tips_alreadyoriginalsize: string;
@@ -877,6 +894,31 @@ export declare const enUs: {
     fmt_internalsetting_room_window_switched: string;
     fmt_internalsetting_labels_Network_type: string;
     fmt_internalsetting_labels_resolving_power: string;
+    fmt_internalsetting_options_play_prompt: string;
+    fmt_internalsetting_labels_audio: string;
+    fmt_internalsetting_labels_hide_video_off: string;
+    fmt_internalsetting_labels_hide_my_video: string;
+    fmt_settings_labels_virtual_background: string;
+    fmt_settings_labels_prompt_tone: string;
+    fmt_meeting_setting_button_meeting_settings: string;
+    fmt_meeting_setting_labels_meeting_settings: string;
+    fmt_meeting_setting_labels_audio_video_settings: string;
+    fmt_meeting_setting_options_mute_participants: string;
+    fmt_meeting_setting_options_disable_video: string;
+    fmt_meeting_setting_labels_Security: string;
+    fmt_meeting_setting_options_enable_waiting_room: string;
+    fmt_meeting_setting_options_jbh: string;
+    fmt_meeting_setting_options_show_time: string;
+    fmt_meeting_setting_options_show_duration: string;
+    fmt_meeting_setting_options_show_information: string;
+    fmt_meeting_setting_labels_advanced: string;
+    fmt_meeting_setting_options_enable_live_streaming: string;
+    fmt_meeting_setting_options_enable_interpretation: string;
+    fmt_meeting_setting_options_generate_meeting_minutes: string;
+    fmt_meeting_setting_toast_enabled_mute: string;
+    fmt_meeting_setting_toast_turned_off_video: string;
+    fmt_meeting_setting_toast_disabled_mute: string;
+    fmt_meeting_setting_toast_turned_on_video: string;
     fmt_settings_labels_sidebar: string;
     fmt_settings_labels_fold: string;
     fmt_settings_labels_theme: string;
@@ -1272,6 +1314,7 @@ export declare const enUs: {
     fmt_premeeting_setting_mobile_option_auto: string;
     fmt_premeeting_setting_mobile_option_bright: string;
     fmt_premeeting_setting_mobile_option_dark: string;
+    fmt_premeeting_setting_option_setting_after_restarting: string;
     fmt_premeeting_setting_mobile_option_region: string;
     fmt_premeeting_setting_mobile_option_developer_mode: string;
     fmt_premeeting_setting_mobile_label_about_us: string;
@@ -1296,6 +1339,8 @@ export declare const enUs: {
     fmt_premeeting_setting_mobile_popup_button_cancel: string;
     fmt_premeeting_setting_mobile_popup_button_log_out: string;
     fmt_premeeting_setting_mobile_button_log_out_confirm: string;
+    fmt_premeeting_setting_button_more_meeting_control: string;
+    fmt_premeeting_setting_checkbox_joining_meeting_connect_audio: string;
     fmt_premeeting_joinroom_mobile_button_upandin: string;
     fmt_premeeting_joinroom_mobile_label_flexible_meeting: string;
     fmt_premeeting_joinroom_mobile_label_enterprise_account: string;
@@ -1357,6 +1402,7 @@ export declare const enUs: {
     fmt_security_mainwindow_label_watermark: string;
     fmt_security_mainwindow_label_toast_unmute_not_allow: string;
     fmt_security_mainwindow_label_toast_name_change_not_allow: string;
+    fmt_security_mainwindow_label_interactive_annotations: string;
     fmt_premeeting_setting_label_settings: string;
     fmt_premeeting_setting_label_normal: string;
     fmt_premeeting_setting_label_voice_motivation: string;
@@ -1413,6 +1459,7 @@ export declare const enUs: {
     fmt_premeeting_setting_label_low: string;
     fmt_premeeting_setting_label_medium: string;
     fmt_premeeting_setting_label_high: string;
+    fmt_premeeting_setting_label_turn_off: string;
     fmt_premeeting_setting_label_professional_audio: string;
     fmt_premeeting_setting_label_enable_stereo: string;
     fmt_premeeting_setting_label_high_fidelity_music_mode: string;