fcr-ui-scene 3.6.4 → 3.7.1

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

@@ -6,6 +6,7 @@ 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");
@@ -18,7 +19,6 @@ require("core-js/modules/es.object.define-properties.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.get-own-property-descriptors.js");
-require("core-js/modules/es.object.keys.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
@@ -45,9 +45,8 @@ 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.keys.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");
@@ -59,15 +58,13 @@ 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 _fcrCore = require("fcr-core");
+var _type = require("../type");
 var _parameters = require("../utilities/parameters");
 var _mobx = require("mobx");
 var _base = require("../base");
 var _merge = _interopRequireDefault(require("lodash/merge"));
-var _i18n = require("agora-ui-foundation/lib/i18n");
-var _tools = require("../utilities/tools");
 var _FcrUISharedSettingDataSourceImpl;
-var _initProto, _init__setting, _preHandleSettingDecs, _setSettingDecs, _initSettingDecs, _ref;
+var _initProto, _init__settingConfig, _preHandleSettingDecs, _setSettingDecs, _setMediaDecs, _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); }
@@ -85,31 +82,38 @@ 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], _initSettingDecs = [_mobx.action, _mobx.action.bound], "_creatorConfig");
+_ref = (_preHandleSettingDecs = [_mobx.action, _mobx.action.bound], _setSettingDecs = [_mobx.action, _mobx.action.bound], _setMediaDecs = [_mobx.action, _mobx.action.bound], "_creatorConfig");
 var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl = /*#__PURE__*/function () {
   function FcrUISharedSettingDataSourceImpl(creatorConfig, userSettingStorageProvider) {
     (0, _classCallCheck2["default"])(this, FcrUISharedSettingDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
-    _classPrivateFieldInitSpec(this, _A, _init__setting(this, {
-      shouldDisplayPreviewDialog: true,
-      shouldHideNonVideoParticipants: false,
-      displayedMaxAttendees: 16,
-      autoAdjustmentSpeakerVolume: true,
-      autoAdjustmentMicrophoneVolume: (0, _imports.isElectron)(),
-      noiseReduce: _fcrCore.FcrAiDenoiseLevel.LOW,
-      recordingPath: '',
-      videoHD: false,
-      videoLowLight: false,
-      hardwareForReception: false,
-      videoNoise: false,
-      audioHiFi: false,
-      audioEchoCancellation: true,
-      audioStereo: false,
-      audioVoiceChanger: true,
-      spotlightEnabled: true,
-      isPlaySound: true,
-      language: (0, _tools.getBrowserLanguage)(),
-      shouldHideMyVideo: false
+    _classPrivateFieldInitSpec(this, _A, _init__settingConfig(this, {
+      media: {
+        autoConnectAudio: true,
+        microphoneExpectedOff: true,
+        cameraExpectedOff: true
+      },
+      setting: {
+        shouldDisplayPreviewDialog: true,
+        shouldHideNonVideoParticipants: false,
+        displayedMaxAttendees: 16,
+        autoAdjustmentSpeakerVolume: true,
+        autoAdjustmentMicrophoneVolume: (0, _imports.isElectron)(),
+        noiseReduce: _type.FcrUIAiDenoiseLevel.LOW,
+        recordingPath: '',
+        videoHD: false,
+        videoLowLight: false,
+        hardwareForReception: false,
+        videoNoise: false,
+        audioHiFi: false,
+        audioEchoCancellation: true,
+        audioStereo: false,
+        audioVoiceChanger: true,
+        spotlightEnabled: true,
+        isPlaySound: true,
+        language: 'zh',
+        shouldHideMyVideo: false
+      }
     }));
     (0, _defineProperty2["default"])(this, "_useDefaultAudioEchoCancellation", true);
     this._userSettingStorageProvider = userSettingStorageProvider;
@@ -118,11 +122,11 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
     if (defaultVideoGallerySize) {
       defaultVideoGallerySize = Math.min(Math.max(defaultVideoGallerySize, 16), 25);
     }
-    this._setting.displayedMaxAttendees = defaultVideoGallerySize || 0;
-    this._initSetting();
+    this._settingConfig.setting.displayedMaxAttendees = defaultVideoGallerySize || 0;
+    this.initSettingConfig();
   }
   return (0, _createClass2["default"])(FcrUISharedSettingDataSourceImpl, [{
-    key: "_setting",
+    key: "_settingConfig",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -132,12 +136,25 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
   }, {
     key: "setting",
     get: function get() {
-      return this._setting;
+      return this._settingConfig.setting;
+    }
+  }, {
+    key: "media",
+    get: function get() {
+      return this._settingConfig.media;
+    }
+  }, {
+    key: "settingConfig",
+    get: function get() {
+      return {
+        media: this._createConfigProxy(this._settingConfig.media, 'media'),
+        setting: this._createConfigProxy(this._settingConfig.setting, 'setting')
+      };
     }
   }, {
     key: "_preHandleSetting",
     value: function _preHandleSetting(newSetting) {
-      if (newSetting !== null && newSetting !== void 0 && newSetting.audioVoiceChanger && !this._setting.audioVoiceChanger && this._useDefaultAudioEchoCancellation) {
+      if (newSetting !== null && newSetting !== void 0 && newSetting.audioVoiceChanger && !this._settingConfig.setting.audioVoiceChanger && this._useDefaultAudioEchoCancellation) {
         this._useDefaultAudioEchoCancellation = false;
         return _objectSpread(_objectSpread({}, newSetting), {}, {
           audioEchoCancellation: true
@@ -149,36 +166,54 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
     key: "setSetting",
     value: function setSetting(assignedSetting) {
       var newSetting = this._preHandleSetting(assignedSetting);
-      var userSetting = this._userSettingStorageProvider.read();
-      var localSetting = (userSetting === null || userSetting === void 0 ? void 0 : userSetting.setting) || {};
-      this._userSettingStorageProvider.write({
-        setting: (0, _merge["default"])(this._setting, localSetting, newSetting)
-      });
-      this._setting = newSetting;
+      var setting = this._handleConfig('setting', newSetting);
+      this._settingConfig.setting = setting;
     }
   }, {
-    key: "_initSetting",
-    value: function _initSetting() {
-      var _this = this;
-      var userSetting = this._userSettingStorageProvider.read();
-      var localSetting = userSetting === null || userSetting === void 0 ? void 0 : userSetting.setting;
-      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));
-        });
+    key: "_handleConfig",
+    value: function _handleConfig(type, value) {
+      var config = this._userSettingStorageProvider.read();
+      var localValue = (config === null || config === void 0 ? void 0 : config[type]) || {};
+      var currentValue = this._settingConfig[type];
+      var newValue = (0, _merge["default"])(currentValue, localValue, value);
+      this._userSettingStorageProvider.write((0, _defineProperty2["default"])({}, type, newValue));
+      return newValue;
+    }
+  }, {
+    key: "setMedia",
+    value: function setMedia(media) {
+      var newMedia = this._handleConfig('media', media);
+      this._settingConfig.media = newMedia;
+    }
+  }, {
+    key: "initSettingConfig",
+    value: function initSettingConfig() {
+      var settingConfig = this._userSettingStorageProvider.read();
+      if (!settingConfig || Object.keys(settingConfig).length === 0) {
+        this._userSettingStorageProvider.write(this._settingConfig);
+      } else {
+        this._settingConfig = (0, _merge["default"])(this._settingConfig, settingConfig);
       }
-      (0, _i18n.changeLanguage)(this._setting.language);
+    }
+  }, {
+    key: "_createConfigProxy",
+    value: function _createConfigProxy(config, type) {
+      var _this = this;
+      var handler = {
+        set: function set(target, p, newValue, receiver) {
+          var property = p;
+          target[property] = newValue;
+          var update = (0, _defineProperty2["default"])({}, property, newValue);
+          _this._handleConfig(type, update);
+          return true;
+        }
+      };
+      return new Proxy(config, handler);
     }
   }]);
 }();
 _FcrUISharedSettingDataSourceImpl = FcrUISharedSettingDataSourceImpl;
-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];
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedSettingDataSourceImpl, [[_mobx.observable, 1, "_settingConfig"], [_preHandleSettingDecs, 18, "_preHandleSetting"], [_setSettingDecs, 18, "setSetting"], [_setMediaDecs, 18, "setMedia"]], []).e, 2);
+_init__settingConfig = _applyDecs$e[0];
 _initProto = _applyDecs$e[1];
 (0, _base.registerDependency)('sharedSettingDataSource');

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

@@ -26,6 +26,7 @@ export interface FcrUIVideoWindowDataSource {
     setSpeakerSpotlight(streamId: string): void;
     spotlightStreamId: string;
     shouldHideNonVideoParticipants: boolean;
+    release(): void;
 }
 export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
     private _placement;
@@ -60,6 +61,7 @@ export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
     get videoSourceType(): FcrVideoSourceType.CAMERA | FcrVideoSourceType.SCREEN;
     get audioSourceType(): FcrAudioSourceType;
     get isMySelf(): boolean;
+    get avatar(): string;
     get sortingPriority(): FcrUIVideoWindowMainSortingPriority | FcrUIVideoWindowFoldSortingPriority;
     constructor(type: FcrUIWindowType, { videoStream, audioStream, boardUserInfo, }: {
         videoStream?: FcrStreamUIData;
@@ -127,6 +129,7 @@ export declare class FcrUIVideoWindowDataSourceImpl implements FcrUIVideoWindowD
     clearSpeakerSpotlight(): void;
     addObserver(observer: FcrUIVideoWindowDataSourceObserver): void;
     removeObserver(observer: FcrUIVideoWindowDataSourceObserver): void;
+    release(): void;
     private copyStreamInfo;
     private _syncHasScreenSharing;
     private _insertByPriority;

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

@@ -81,7 +81,7 @@ var _type2 = require("fcr-core/lib/type");
 var _fcrCore = require("fcr-core");
 var _base = require("../base");
 var _FcrUIVideoWindowDataImpl, _FcrUIVideoWindowDataSourceImpl;
-var _initProto, _init__boardUserInfo, _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, _setBoardUserInfoDecs, _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__boardUserInfo, _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, _setBoardUserInfoDecs, _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, _ref5;
 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; }
@@ -280,8 +280,9 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     key: "hasMicrophoneAudioStream",
     get: function get() {
       if (this.audioStreamConnectorType === _fcrCore.FcrRoomConnectorType.NONE) {
-        var _this$_videoStream3;
-        return ((_this$_videoStream3 = this._videoStream) === null || _this$_videoStream3 === void 0 ? void 0 : _this$_videoStream3.audioSourceState) === _fcrCore.FcrMediaSourceState.OPEN;
+        var _ref3 = this._videoStream || {},
+          audioSourceState = _ref3.audioSourceState;
+        return audioSourceState === _fcrCore.FcrMediaSourceState.OPEN;
       } else {
         return true;
       }
@@ -289,8 +290,8 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
   }, {
     key: "hasLoopbackAudioStream",
     get: function get() {
-      var _this$_videoStream4;
-      if (((_this$_videoStream4 = this._videoStream) === null || _this$_videoStream4 === void 0 ? void 0 : _this$_videoStream4.audioSourceType) === _fcrCore.FcrAudioSourceType.LOOPBACK
+      var _this$_videoStream3;
+      if (((_this$_videoStream3 = this._videoStream) === null || _this$_videoStream3 === void 0 ? void 0 : _this$_videoStream3.audioSourceType) === _fcrCore.FcrAudioSourceType.LOOPBACK
       // &&
       // this._videoStream?.audioSourceState === FcrMediaSourceState.OPEN
       ) {
@@ -302,8 +303,11 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
     key: "phoneMicEnabled",
     get: function get() {
       if (this.audioStreamConnectorType === _fcrCore.FcrRoomConnectorType.PSTN) {
-        var _this$_audioStream3, _this$_videoStream5;
-        return ((_this$_audioStream3 = this._audioStream) === null || _this$_audioStream3 === void 0 ? void 0 : _this$_audioStream3.audioSourceState) === _fcrCore.FcrMediaSourceState.OPEN || ((_this$_videoStream5 = this._videoStream) === null || _this$_videoStream5 === void 0 ? void 0 : _this$_videoStream5.streamType) === _fcrCore.FcrStreamType.BOTH;
+        var _ref4 = this._audioStream || {},
+          audioSourceState = _ref4.audioSourceState,
+          streamType = _ref4.streamType;
+        var isAudioStream = streamType === _fcrCore.FcrStreamType.AUDIO || streamType === _fcrCore.FcrStreamType.BOTH;
+        return audioSourceState === _fcrCore.FcrMediaSourceState.OPEN && isAudioStream;
       } else {
         return false;
       }
@@ -311,53 +315,64 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
   }, {
     key: "hasVideoStream",
     get: function get() {
-      var _this$_videoStream6, _this$_videoStream7, _this$_videoStream8;
-      return ((_this$_videoStream6 = this._videoStream) === null || _this$_videoStream6 === void 0 ? void 0 : _this$_videoStream6.videoSourceState) === _fcrCore.FcrMediaSourceState.OPEN && (((_this$_videoStream7 = this._videoStream) === null || _this$_videoStream7 === void 0 ? void 0 : _this$_videoStream7.streamType) === _fcrCore.FcrStreamType.BOTH || ((_this$_videoStream8 = this._videoStream) === null || _this$_videoStream8 === void 0 ? void 0 : _this$_videoStream8.streamType) === _fcrCore.FcrStreamType.VIDEO);
+      var _this$_videoStream4, _this$_videoStream5, _this$_videoStream6;
+      return ((_this$_videoStream4 = this._videoStream) === null || _this$_videoStream4 === void 0 ? void 0 : _this$_videoStream4.videoSourceState) === _fcrCore.FcrMediaSourceState.OPEN && (((_this$_videoStream5 = this._videoStream) === null || _this$_videoStream5 === void 0 ? void 0 : _this$_videoStream5.streamType) === _fcrCore.FcrStreamType.BOTH || ((_this$_videoStream6 = this._videoStream) === null || _this$_videoStream6 === void 0 ? void 0 : _this$_videoStream6.streamType) === _fcrCore.FcrStreamType.VIDEO);
     }
   }, {
     key: "userId",
     get: function get() {
-      var _this$_videoStream9, _this$_audioStream4, _this$_boardUserInfo;
-      return ((_this$_videoStream9 = this._videoStream) === null || _this$_videoStream9 === void 0 ? void 0 : _this$_videoStream9.owner.userId) || ((_this$_audioStream4 = this._audioStream) === null || _this$_audioStream4 === void 0 ? void 0 : _this$_audioStream4.owner.userId) || ((_this$_boardUserInfo = this._boardUserInfo) === null || _this$_boardUserInfo === void 0 ? void 0 : _this$_boardUserInfo.userId) || '';
+      var _this$_videoStream7, _this$_audioStream3, _this$_boardUserInfo;
+      return ((_this$_videoStream7 = this._videoStream) === null || _this$_videoStream7 === void 0 ? void 0 : _this$_videoStream7.owner.userId) || ((_this$_audioStream3 = this._audioStream) === null || _this$_audioStream3 === void 0 ? void 0 : _this$_audioStream3.owner.userId) || ((_this$_boardUserInfo = this._boardUserInfo) === null || _this$_boardUserInfo === void 0 ? void 0 : _this$_boardUserInfo.userId) || '';
     }
   }, {
     key: "userName",
     get: function get() {
-      var _this$_videoStream0, _this$_audioStream5, _this$_boardUserInfo2;
-      return ((_this$_videoStream0 = this._videoStream) === null || _this$_videoStream0 === void 0 ? void 0 : _this$_videoStream0.owner.userName) || ((_this$_audioStream5 = this._audioStream) === null || _this$_audioStream5 === void 0 ? void 0 : _this$_audioStream5.owner.userName) || ((_this$_boardUserInfo2 = this._boardUserInfo) === null || _this$_boardUserInfo2 === void 0 ? void 0 : _this$_boardUserInfo2.userName) || '';
+      var _this$_videoStream8, _this$_audioStream4, _this$_boardUserInfo2;
+      return ((_this$_videoStream8 = this._videoStream) === null || _this$_videoStream8 === void 0 ? void 0 : _this$_videoStream8.owner.userName) || ((_this$_audioStream4 = this._audioStream) === null || _this$_audioStream4 === void 0 ? void 0 : _this$_audioStream4.owner.userName) || ((_this$_boardUserInfo2 = this._boardUserInfo) === null || _this$_boardUserInfo2 === void 0 ? void 0 : _this$_boardUserInfo2.userName) || '';
     }
   }, {
     key: "ownerRoleType",
     get: function get() {
-      var _this$_videoStream1, _this$_audioStream6, _this$_boardUserInfo3;
-      return ((_this$_videoStream1 = this._videoStream) === null || _this$_videoStream1 === void 0 ? void 0 : _this$_videoStream1.owner.userRole) || ((_this$_audioStream6 = this._audioStream) === null || _this$_audioStream6 === void 0 ? void 0 : _this$_audioStream6.owner.userRole) || ((_this$_boardUserInfo3 = this._boardUserInfo) === null || _this$_boardUserInfo3 === void 0 ? void 0 : _this$_boardUserInfo3.userRole) || _type2.FcrUserRole.AUDIENCE;
+      var _this$_videoStream9, _this$_audioStream5, _this$_boardUserInfo3;
+      return ((_this$_videoStream9 = this._videoStream) === null || _this$_videoStream9 === void 0 ? void 0 : _this$_videoStream9.owner.userRole) || ((_this$_audioStream5 = this._audioStream) === null || _this$_audioStream5 === void 0 ? void 0 : _this$_audioStream5.owner.userRole) || ((_this$_boardUserInfo3 = this._boardUserInfo) === null || _this$_boardUserInfo3 === void 0 ? void 0 : _this$_boardUserInfo3.userRole) || _type2.FcrUserRole.AUDIENCE;
     }
   }, {
     key: "videoSourceType",
     get: function get() {
-      var _this$_videoStream10;
-      return ((_this$_videoStream10 = this._videoStream) === null || _this$_videoStream10 === void 0 ? void 0 : _this$_videoStream10.videoSourceType) || _fcrCore.FcrVideoSourceType.CAMERA;
+      var _this$_videoStream0;
+      return ((_this$_videoStream0 = this._videoStream) === null || _this$_videoStream0 === void 0 ? void 0 : _this$_videoStream0.videoSourceType) || _fcrCore.FcrVideoSourceType.CAMERA;
     }
   }, {
     key: "audioSourceType",
     get: function get() {
-      var _this$_audioStream7;
-      return ((_this$_audioStream7 = this._audioStream) === null || _this$_audioStream7 === void 0 ? void 0 : _this$_audioStream7.audioSourceType) || _fcrCore.FcrAudioSourceType.MICROPHONE;
+      var _this$_audioStream6;
+      return ((_this$_audioStream6 = this._audioStream) === null || _this$_audioStream6 === void 0 ? void 0 : _this$_audioStream6.audioSourceType) || _fcrCore.FcrAudioSourceType.MICROPHONE;
     }
   }, {
     key: "isMySelf",
     get: function get() {
       return this._isMySelf;
     }
+  }, {
+    key: "avatar",
+    get: function get() {
+      var _this$_videoStream1;
+      // 如果是pstn没有头像
+      // 其他用户取videoStream的owner的avatar
+      if (this.audioStreamConnectorType === _fcrCore.FcrRoomConnectorType.PSTN) {
+        return '';
+      }
+      return ((_this$_videoStream1 = this._videoStream) === null || _this$_videoStream1 === void 0 ? void 0 : _this$_videoStream1.owner.avatar) || '';
+    }
   }, {
     key: "sortingPriority",
     get: function get() {
       if (this._placement === 'main-list') {
-        var _this$_videoStream11;
+        var _this$_videoStream10;
         if (this.type === _type.FcrUIWindowType.BOARD && this._boardCanEdit) {
           return _type.FcrUIVideoWindowMainSortingPriority.HIGHEST;
         }
-        if (this.isPin || ((_this$_videoStream11 = this._videoStream) === null || _this$_videoStream11 === void 0 ? void 0 : _this$_videoStream11.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN || this.type === _type.FcrUIWindowType.BOARD) {
+        if (this.isPin || ((_this$_videoStream10 = this._videoStream) === null || _this$_videoStream10 === void 0 ? void 0 : _this$_videoStream10.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN || this.type === _type.FcrUIWindowType.BOARD) {
           return _type.FcrUIVideoWindowMainSortingPriority.FOCUS;
         }
         if (this.isSpeakerSpotlight) {
@@ -386,14 +401,14 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
         //   return FcrUIVideoWindowMainSortingPriority.MICROPHONE_OPEN;
         // }
       } else {
-        var _this$_videoStream12;
+        var _this$_videoStream11;
         if (this.isSpeakerSpotlight) {
           return _type.FcrUIVideoWindowFoldSortingPriority.FOCUS;
         }
         if (this.isPin) {
           return _type.FcrUIVideoWindowFoldSortingPriority.PIN;
         }
-        if (((_this$_videoStream12 = this._videoStream) === null || _this$_videoStream12 === void 0 ? void 0 : _this$_videoStream12.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN) {
+        if (((_this$_videoStream11 = this._videoStream) === null || _this$_videoStream11 === void 0 ? void 0 : _this$_videoStream11.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN) {
           return _type.FcrUIVideoWindowFoldSortingPriority.SCREEN_SHARING_STREAM;
         }
         if (this.hasScreenSharing) {
@@ -499,7 +514,7 @@ var FcrUIVideoWindowDataImpl = exports.FcrUIVideoWindowDataImpl = /*#__PURE__*/f
   }]);
 }();
 _FcrUIVideoWindowDataImpl = FcrUIVideoWindowDataImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataImpl, [[_mobx.observable, 1, "_boardUserInfo"], [_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"], [_setBoardUserInfoDecs, 18, "setBoardUserInfo"], [_setSpeakerSpotlightDecs, 18, "setSpeakerSpotlight"], [_setHasScreenSharingDecs, 18, "setHasScreenSharing"], [_setHasLoopbackSharingDecs, 18, "setHasLoopbackSharing"], [_setBoardCanEditDecs, 18, "setBoardCanEdit"]], []).e, 12);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIVideoWindowDataImpl, [[_mobx.observable, 1, "_boardUserInfo"], [_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, "avatar"], [_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"], [_setBoardUserInfoDecs, 18, "setBoardUserInfo"], [_setSpeakerSpotlightDecs, 18, "setSpeakerSpotlight"], [_setHasScreenSharingDecs, 18, "setHasScreenSharing"], [_setHasLoopbackSharingDecs, 18, "setHasLoopbackSharing"], [_setBoardCanEditDecs, 18, "setBoardCanEdit"]], []).e, 12);
 _init__boardUserInfo = _applyDecs$e[0];
 _init__videoStream = _applyDecs$e[1];
 _init__audioStream = _applyDecs$e[2];
@@ -521,11 +536,11 @@ var _F2 = /*#__PURE__*/new WeakMap();
 var _G2 = /*#__PURE__*/new WeakMap();
 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");
+_ref5 = (_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) {
     (0, _classCallCheck2["default"])(this, FcrUIVideoWindowDataSourceImpl);
-    (0, _defineProperty2["default"])(this, _ref3, (_initProto2(this), new _observable.AgoraObservable()));
+    (0, _defineProperty2["default"])(this, _ref5, (_initProto2(this), new _observable.AgoraObservable()));
     (0, _defineProperty2["default"])(this, "_spotlightPool", new FcrUISpeakerSpotlightPool());
     _classPrivateFieldInitSpec(this, _A2, _init_spotlightEnabled(this, true));
     _classPrivateFieldInitSpec(this, _B2, _init_layoutType(this, _type.FcrUIVideoWindowLayoutType.Gallery));
@@ -662,9 +677,9 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
       this.foldList.forEach(function (item) {
         item.setLayoutType(layout);
       });
-      if (layout === _type.FcrUIVideoWindowLayoutType.Gallery) {
-        this.resetList();
-      }
+      // if (layout === FcrUIVideoWindowLayoutType.Gallery) {
+      //   this.resetList();
+      // }
     }
   }, {
     key: "onSpotlightRemoved",
@@ -773,6 +788,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     key: "update",
     value: function update(param) {
       var _this5 = this;
+      console.log('onStreamsAdded update', param);
       var handleStreamInfoUpdated = function handleStreamInfoUpdated(stream, list, limitCount, placement) {
         var existedUserStream = list[_this5._findItemIndexWithWindowId(stream.streamId, list)];
         if (existedUserStream) {
@@ -981,6 +997,11 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     value: function removeObserver(observer) {
       this._observer.removeObserver(observer);
     }
+  }, {
+    key: "release",
+    value: function release() {
+      this._spotlightPool.clear();
+    }
   }, {
     key: "copyStreamInfo",
     value: function copyStreamInfo(stream) {
@@ -1028,7 +1049,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     key: "_insertByPriority",
     value: function _insertByPriority(data, list, limitCount) {
       var insertIndex = -1;
-      if (data.sortingPriority >= _type.FcrUIVideoWindowMainSortingPriority.FOCUS || data.sortingPriority === _type.FcrUIVideoWindowMainSortingPriority.CAMERA_OPEN) {
+      if (data.sortingPriority >= _type.FcrUIVideoWindowMainSortingPriority.FOCUS) {
         insertIndex = this._insertBeginningByPriority(data, list, limitCount);
       } else {
         insertIndex = this._insertEndByPriority(data, list, limitCount);
@@ -1128,6 +1149,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
   }, {
     key: "_insertNewData",
     value: function _insertNewData(stream, list, limitCount, isMySelf, placement) {
+      console.log('onStreamsAdded', stream);
       var videoWindowData = new FcrUIVideoWindowDataImpl(_type.FcrUIWindowType.VIDEO, stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN ? {
         audioStream: stream
       } : {

package/lib/shared-data-source/waiting-room.js

@@ -166,8 +166,10 @@ var FcrUISharedWaitingRoomDataSourceImpl = exports.FcrUISharedWaitingRoomDataSou
     key: "_handleRemoteWaitingUserJoined",
     value: function _handleRemoteWaitingUserJoined(roomId, events) {
       var _this3 = this;
-      this._getWaitingRoomUserCount();
-      this.unReadState = true;
+      var totalWaitingRoomUser = this._getWaitingRoomUserCount();
+      if (totalWaitingRoomUser > 0) {
+        this.unReadState = true;
+      }
       events.forEach(function (event) {
         var userInfo = event.userInfo;
         _this3._addWaitingRoomDataSource(userInfo);