fcr-ui-scene-mobile 3.4.0 → 3.4.2

package/lib/common/member-list-data-source.d.ts

@@ -16,12 +16,14 @@ export declare class FcrUIMemberDataImpl implements FcrUIMemberData {
 }
 export declare class FcrUIMemberListDataSourceImpl implements FcrUIMemberListDataSource {
     accessor list: FcrUIMemberDataImpl[];
-    resetList(): boolean;
+    resetList(_users: FcrUserInfo[], _streams: Record<string, FcrStreamInfo[]>): boolean;
     add(user: FcrUserInfo, streams: Readonly<FcrStreamInfo[]>, isMySelf: boolean): boolean;
-    update(param: FcrStreamInfo | FcrUserInfo | undefined, isBoardActive?: boolean): boolean;
+    updateStreamInfo(param: FcrStreamInfo | undefined): boolean;
+    updateUserInfo(param: FcrUserInfo | undefined, needSort: boolean): boolean;
     updateWithStreamAdd(stream: FcrStreamInfo): boolean;
     updateWithStreamRemove(stream: FcrStreamInfo): boolean;
     delete(user: FcrUserInfo): boolean;
+    clearAllUserBoardState(): void;
     private _insertEndByPriority;
     private _findInsertEndIndex;
     private _findMemberDataByStream;

package/lib/common/member-list-data-source.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.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
@@ -20,10 +19,8 @@ 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.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.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");
@@ -39,19 +36,18 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof3 = require("@babel/runtime/helpers/typeof");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUIMemberListDataSourceImpl = exports.FcrUIMemberDataImpl = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.find-index.js");
 require("core-js/modules/es.array.find-last-index.js");
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.splice.js");
@@ -59,10 +55,13 @@ 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.async-iterator.find.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.for-each.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.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -73,7 +72,7 @@ var _type2 = require("fcr-core/lib/type");
 var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
 var _type4 = require("agora-rte-sdk/lib/core/scene/type");
 var _FcrUIMemberListDataSourceImpl;
-var _initProto, _init_list, _resetListDecs, _addDecs, _deleteDecs, _insertEndByPriorityDecs, _ref;
+var _initProto, _init_list, _resetListDecs, _addDecs, _deleteDecs, _clearAllUserBoardStateDecs, _insertEndByPriorityDecs, _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); }
@@ -81,11 +80,11 @@ function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("C
 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" == _typeof3(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" == _typeof3(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof3(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof3(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _setFunctionName(e, t, n) { "symbol" == _typeof3(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 ? _typeof3(e) : "null")); return e; }
+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 listLimitedCount = 255;
 var FcrUIMemberDataImpl = exports.FcrUIMemberDataImpl = /*#__PURE__*/function () {
   function FcrUIMemberDataImpl(userInfo, streams, _isMySelf) {
@@ -160,7 +159,7 @@ var FcrUIMemberDataImpl = exports.FcrUIMemberDataImpl = /*#__PURE__*/function ()
   }]);
 }();
 var _A = /*#__PURE__*/new WeakMap();
-_ref = (_resetListDecs = [_mobx.action, _mobx.action.bound], _addDecs = [_mobx.action, _mobx.action.bound], _deleteDecs = [_mobx.action, _mobx.action.bound], _insertEndByPriorityDecs = [_mobx.action, _mobx.action.bound], "list");
+_ref = (_resetListDecs = [_mobx.action, _mobx.action.bound], _addDecs = [_mobx.action, _mobx.action.bound], _deleteDecs = [_mobx.action, _mobx.action.bound], _clearAllUserBoardStateDecs = [_mobx.action, _mobx.action.bound], _insertEndByPriorityDecs = [_mobx.action, _mobx.action.bound], "list");
 var FcrUIMemberListDataSourceImpl = exports.FcrUIMemberListDataSourceImpl = /*#__PURE__*/function () {
   function FcrUIMemberListDataSourceImpl() {
     (0, _classCallCheck2["default"])(this, FcrUIMemberListDataSourceImpl);
@@ -178,7 +177,7 @@ var FcrUIMemberListDataSourceImpl = exports.FcrUIMemberListDataSourceImpl = /*#_
     }
   }, {
     key: "resetList",
-    value: function resetList() {
+    value: function resetList(_users, _streams) {
       return true;
     }
   }, {
@@ -189,43 +188,29 @@ var FcrUIMemberListDataSourceImpl = exports.FcrUIMemberListDataSourceImpl = /*#_
       return true;
     }
   }, {
-    key: "update",
-    value: function update(param, isBoardActive) {
-      if ((0, _typeof2["default"])(param) !== 'object') return false;
-      if ('streamId' in param) {
-        var data = this._findMemberDataByStream(param);
-        if (data) {
-          data.updateStream(param);
-          // 在update时,不对仅麦克风打开的用户进行排序提前
-          if (data.sortingPriority === _type.FcrUIMemberSortingPriority.MICROPHONE_OPEN) {
-            // 用户位置不变,但其他状态可能会变,强行触发一次 participantList 的更新
-            var currentIndex = this.list.findIndex(function (u) {
-              return u.userId === data.userId;
-            });
-            this.list[currentIndex] = data;
-            return true;
-          }
+    key: "updateStreamInfo",
+    value: function updateStreamInfo(param) {
+      if (!param) return false;
+      var data = this._findMemberDataByStream(param);
+      if (data) {
+        data.updateStream(param);
+        this._insertEndByPriority(data, this.list, listLimitedCount);
+      }
+      return true;
+    }
+  }, {
+    key: "updateUserInfo",
+    value: function updateUserInfo(param, needSort) {
+      if (!param) return false;
+      var data = this.list.find(function (s) {
+        return s.userId === param.userId;
+      });
+      if (data) {
+        data.setUserInfo(_objectSpread({}, param));
+        this.list = (0, _toConsumableArray2["default"])(this.list);
+        if (needSort) {
           this._insertEndByPriority(data, this.list, listLimitedCount);
         }
-      } else {
-        var _data = this.list.find(function (s) {
-          return s.userId === param.userId;
-        });
-        if (_data) {
-          _data.setUserInfo(_objectSpread(_objectSpread({}, param), {}, {
-            isBoardActive: isBoardActive
-          }));
-          // 在update时,不对仅麦克风打开的用户进行排序提前
-          if (_data.sortingPriority === _type.FcrUIMemberSortingPriority.MICROPHONE_OPEN) {
-            // 用户位置不变,但其他状态可能会变,强行触发一次 participantList 的更新
-            var _currentIndex = this.list.findIndex(function (u) {
-              return u.userId === _data.userId;
-            });
-            this.list[_currentIndex] = _data;
-            return true;
-          }
-          this._insertEndByPriority(_data, this.list, listLimitedCount);
-        }
       }
       return true;
     }
@@ -260,6 +245,17 @@ var FcrUIMemberListDataSourceImpl = exports.FcrUIMemberListDataSourceImpl = /*#_
       }
       return true;
     }
+  }, {
+    key: "clearAllUserBoardState",
+    value: function clearAllUserBoardState() {
+      this.list.forEach(function (memberData) {
+        var newData = _objectSpread(_objectSpread({}, memberData.userInfo), {
+          isBoardActive: false
+        });
+        memberData.setUserInfo(newData);
+      });
+      this.list = (0, _toConsumableArray2["default"])(this.list);
+    }
   }, {
     key: "_insertEndByPriority",
     value: function _insertEndByPriority(item, list, listLimitedCount) {
@@ -298,7 +294,7 @@ var FcrUIMemberListDataSourceImpl = exports.FcrUIMemberListDataSourceImpl = /*#_
   }]);
 }();
 _FcrUIMemberListDataSourceImpl = FcrUIMemberListDataSourceImpl;
-var _applyDecs$e = _applyDecs(_FcrUIMemberListDataSourceImpl, [[_mobx.observable, 1, "list"], [_resetListDecs, 18, "resetList"], [_addDecs, 18, "add"], [_deleteDecs, 18, "delete"], [_insertEndByPriorityDecs, 18, "_insertEndByPriority"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrUIMemberListDataSourceImpl, [[_mobx.observable, 1, "list"], [_resetListDecs, 18, "resetList"], [_addDecs, 18, "add"], [_deleteDecs, 18, "delete"], [_clearAllUserBoardStateDecs, 18, "clearAllUserBoardState"], [_insertEndByPriorityDecs, 18, "_insertEndByPriority"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 2);
 _init_list = _applyDecs$e2[0];
 _initProto = _applyDecs$e2[1];

package/lib/common/participant-store.js

@@ -10,8 +10,11 @@ require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
+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.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -112,6 +115,8 @@ var _type4 = require("./type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _FcrParticipantStore;
 var _initProto, _init__mainList, _init__participantsWindowActive, _init_currentPerspectiveType, _init_enableParticipantsJoinWithMute, _init_searchText, _init_currentModal, _init_localUserRole, _init_spotlightUserId, _init_enableSpotlight, _init_mergeConfirmDialog, _init_mergeUserId, _init_activeTab, _init_isNewWaitingRoomUserEnter, _init_waitingRoomUserCount, _init_participantCount, _init_requestEquipPopupShow, _init_requestEquipType, _init_requestEquipSenderRole, _setSpotlightUserIdDecs, _setCurrentModalDecs, _setParticipantsWindowActiveDecs, _handlerSearchUserDecs, _getAllowedOperationsDecs, _handlerUserActionDecs, _moveToWaitingRoomByUserIdsDecs, _removeWaitingRoomUserDecs, _kickOutWaitingRoomAllMemberDecs, _moveToMainRoomAllMemberDecs, _handlerRoomControlActionDecs, _handleEventDecs, _moveToMainRoomByUserIdsDecs, _handleActiveTabDecs, _setAsAttendeeDecs, _handleRemoteUserJoinedDecs, _handleRemoteUserLeftDecs, _onUserInfoUpdatedDecs, _onAllUserCountUpdatedDecs, _initUserListDecs, _refreshCurrentPerspectiveTypeDecs, _onPeerSessionReceivedDecs, _updateLocalUserRoleDecs, _setRequestEquipPopupShowDecs, _setRequestEquipTypeDecs, _setRequestEquipSenderRoleDecs, _ref; // import { sendEvent } from '../../utilities/renderer-event';
+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); }
 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; }
@@ -1269,13 +1274,20 @@ var FcrParticipantStore = exports.FcrParticipantStore = /*#__PURE__*/function ()
   }, {
     key: "_updateUserBoardState",
     value: function _updateUserBoardState(modifiedUser) {
-      var _this$_roomControl$ge = this._roomControl.getBoardControl().getBoardActiveInfo(),
-        isActive = _this$_roomControl$ge.isActive,
-        ownerUserId = _this$_roomControl$ge.ownerUserId;
+      var _boardInfo = this._roomControl.getBoardControl().getBoardActiveInfo();
+      var isActive = _boardInfo.isActive,
+        ownerUserId = _boardInfo.ownerUserId;
       if (!ownerUserId && !modifiedUser) return;
       var ownerUser = this._userControl.getUser(ownerUserId);
-      var targetUser = modifiedUser || ownerUser;
-      this._dataSource.update(!isActive ? ownerUser : targetUser, !isActive ? isActive : ownerUserId === (targetUser === null || targetUser === void 0 ? void 0 : targetUser.userId) && isActive);
+      if (!ownerUserId && !ownerUser) {
+        this._dataSource.clearAllUserBoardState();
+      } else {
+        var targetUser = modifiedUser || ownerUser;
+        var mergeInfo = _objectSpread(_objectSpread({}, targetUser), {
+          isBoardActive: isActive
+        });
+        this._dataSource.updateUserInfo(mergeInfo, false);
+      }
     }
   }, {
     key: "_handleRemoteUserJoined",
@@ -1307,13 +1319,12 @@ var FcrParticipantStore = exports.FcrParticipantStore = /*#__PURE__*/function ()
     value: function _onUserInfoUpdated(_roomId, event) {
       var _this$userMap$get7;
       var targetUser = event.modifiedUser;
-      this._updateUserBoardState(targetUser);
-      // this._dataSource.update(targetUser);
       var originUser = (_this$userMap$get7 = this.userMap.get(targetUser.userId)) === null || _this$userMap$get7 === void 0 ? void 0 : _this$userMap$get7.userInfo;
       var _this$_userControl$ge3 = this._userControl.getLocalUser(),
         localUserId = _this$_userControl$ge3.userId,
         localUserRole = _this$_userControl$ge3.userRole;
       var effectSelf = targetUser.userId === localUserId;
+      this._dataSource.updateUserInfo(targetUser, true);
       if ((originUser === null || originUser === void 0 ? void 0 : originUser.userRole) !== targetUser.userRole) {
         // 参会者变管理
         if (targetUser.userRole === _type.FcrUserRole.HOST || targetUser.userRole === _type.FcrUserRole.COHOST) {
@@ -1375,7 +1386,7 @@ var FcrParticipantStore = exports.FcrParticipantStore = /*#__PURE__*/function ()
       var _this10 = this;
       events.forEach(function (e) {
         var modifiedStream = e.modifiedStream;
-        _this10._dataSource.update(modifiedStream);
+        _this10._dataSource.updateStreamInfo(modifiedStream);
       });
     }
   }, {

package/lib/common/security-store.d.ts

@@ -92,7 +92,8 @@ export declare class FcrSecurityStore {
     hasDisallowWriteBoardPermission(): boolean;
     hasAllowScreenShareAndBoardPermission(): boolean;
     hasAllowWaterMarkPermission(): boolean;
-    isMulti: () => boolean;
+    /** 当前是否是多行水印 */
+    isWatermarkMultiRow: () => boolean;
     getAllowedOperations(targetUserRole: FcrUserRole, _isSelf: boolean): string[];
     allowShare(state: FcrSharePermissionState): Promise<void>;
     setAllowWriteBoard(state: FcrSharePermissionState): Promise<void>;

package/lib/common/security-store.js

@@ -346,7 +346,8 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "hasWatermarkDisablePermission", function () {
       return _this._hasPermission(_type3.FcrPermissionAction.RoomDisableWatermark, _type3.FcrPrivilegeUserRole.PARTICIPANT);
     });
-    (0, _defineProperty2["default"])(this, "isMulti", (0, _mobxUtils.computedFn)(function () {
+    /** 当前是否是多行水印 */
+    (0, _defineProperty2["default"])(this, "isWatermarkMultiRow", (0, _mobxUtils.computedFn)(function () {
       var _info$info3;
       var info = _this.securityInfos.find(function (_ref17) {
         var info = _ref17.info;

package/lib/common/type.d.ts

@@ -8,15 +8,6 @@ export declare enum FcrUIMemberSortingPriority {
     MICROPHONE_OPEN = 95,
     NONE = 0
 }
-export interface FcrUIMemberListDataSource {
-    list: FcrUIMemberData[];
-    resetList: (users: FcrUserInfo[], streams: Record<string, FcrStreamInfo[]>) => boolean;
-    add: (user: FcrUserInfo, streams: FcrStreamInfo[], isMySelf: boolean) => boolean;
-    update: (param: FcrStreamInfo | FcrUserInfo) => boolean;
-    updateWithStreamAdd: (stream: FcrStreamInfo) => boolean;
-    updateWithStreamRemove: (stream: FcrStreamInfo) => boolean;
-    delete: (user: FcrUserInfo) => boolean;
-}
 export interface FcrUIMemberData {
     userId: string;
     userInfo: FcrUserInfo & {
@@ -36,10 +27,11 @@ export interface FcrUIMemberListDataSource {
     list: FcrUIMemberData[];
     resetList: (users: FcrUserInfo[], streams: Record<string, FcrStreamInfo[]>) => boolean;
     add: (user: FcrUserInfo, streams: FcrStreamInfo[], isMySelf: boolean) => boolean;
-    update: (param: FcrStreamInfo | FcrUserInfo) => boolean;
     updateWithStreamAdd: (stream: FcrStreamInfo) => boolean;
     updateWithStreamRemove: (stream: FcrStreamInfo) => boolean;
     delete: (user: FcrUserInfo) => boolean;
+    updateStreamInfo: (param: FcrStreamInfo | undefined) => boolean;
+    updateUserInfo: (param: FcrUserInfo | undefined, needSort: boolean) => boolean;
 }
 export interface FcrUIMemberData {
     userId: string;

package/lib/error-fallback.d.ts

@@ -0,0 +1,2 @@
+import { FallbackProps } from 'react-error-boundary';
+export declare const ErrorFallback: ({}: FallbackProps) => import("react/jsx-runtime").JSX.Element;

package/lib/error-fallback.js

@@ -0,0 +1,21 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ErrorFallback = void 0;
+var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/helpers/objectDestructuringEmpty"));
+var _jsxRuntime = require("react/jsx-runtime");
+var ErrorFallback = exports.ErrorFallback = function ErrorFallback(_ref) {
+  (0, _objectDestructuringEmpty2["default"])(_ref);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: "fcr-mobile-full-screen-error",
+    style: {
+      width: '100%',
+      height: '100%',
+      backgroundColor: 'transparent'
+    }
+  });
+};

package/lib/modules/action-bar/more-popup/index.js

@@ -24,7 +24,7 @@ var FcrMobileMorePopup = exports.FcrMobileMorePopup = (0, _mobxReact.observer)(f
     setSetting = settingStore.setSetting;
   var setAllowWaterMark = securityStore.setAllowWaterMark,
     isWaterMarkEnabled = securityStore.isWaterMarkEnabled,
-    isMulti = securityStore.isMulti;
+    isWatermarkMultiRow = securityStore.isWatermarkMultiRow;
   var waterMarkEnabled = isWaterMarkEnabled();
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_popup.FcrPopup, {
     showCloseButton: true,
@@ -105,13 +105,13 @@ var FcrMobileMorePopup = exports.FcrMobileMorePopup = (0, _mobxReact.observer)(f
             }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
               className: "fcr-mobile-more-cfg-card-item-linechoose",
               children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-                className: "fcr-mobile-more-cfg-card-item-btn ".concat(isMulti() ? '' : 'active'),
+                className: "fcr-mobile-more-cfg-card-item-btn ".concat(isWatermarkMultiRow() ? '' : 'active'),
                 onClick: function onClick() {
                   setAllowWaterMark(waterMarkEnabled, _type.FcrLineType.SINGLE_ROW);
                 },
                 children: (0, _i18n.transI18n)('fmt_security_setting_mobile_option_watermark_style_single')
               }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-                className: "fcr-mobile-more-cfg-card-item-btn ".concat(isMulti() ? 'active' : ''),
+                className: "fcr-mobile-more-cfg-card-item-btn ".concat(isWatermarkMultiRow() ? 'active' : ''),
                 onClick: function onClick() {
                   setAllowWaterMark(waterMarkEnabled, _type.FcrLineType.MULTI_ROW);
                 },

package/lib/modules/action-bar/store.d.ts

@@ -9,6 +9,8 @@ import { FcrDeviceStreamStore } from '../../common/device-stream-store';
 import { FcrChatRoomReceiveBaseMessage } from 'fcr-core/lib/room-control/chatroom-control/type';
 import { FcrUserKickedOutType } from 'fcr-core/lib/room-control/user-control/type';
 import { FcrRoomType } from 'fcr-core/lib/room-control/type';
+import { FcrParticipantStore } from '../../common/participant-store';
+import { FcrUIMemberDataImpl } from '../../common/member-list-data-source';
 interface ActionBarStoreArgs {
     roomControl: FcrBaseRoomControl;
     userControl: FcrUserControl;
@@ -18,6 +20,7 @@ interface ActionBarStoreArgs {
     securityStore: FcrSecurityStore;
     streamControl: FcrStreamControl;
     mediaControl: FcrDesktopMediaControl;
+    participantStore: FcrParticipantStore;
 }
 export declare enum MoreMenuType {
     DEFAULT = 0,
@@ -51,7 +54,6 @@ export default class ActionBarStore {
     private _roomObserver;
     private _uiEventObserver;
     private _streamObserver;
-    private _deviceObserver;
     private _observer;
     private _openedDialogIdMap;
     private _participantVisible;
@@ -61,7 +63,7 @@ export default class ActionBarStore {
     private _hideBarArrowTimer;
     private _sharingOwnerUser;
     private _participantTab;
-    accessor users: FcrUserInfo[];
+    private _participantStore?;
     accessor newMessageTooltipVisible: boolean;
     accessor newMessageCount: ChatRoomStoreMap;
     accessor latestMessage: FcrChatRoomReceiveBaseMessage | undefined;
@@ -84,7 +86,8 @@ export default class ActionBarStore {
     accessor popoverOpened: boolean;
     accessor participantsPopoverOpened: boolean;
     constructor(args: ActionBarStoreArgs);
-    get remoteUsers(): FcrUserInfo[];
+    get users(): FcrUIMemberDataImpl[];
+    get remoteUsers(): FcrUIMemberDataImpl[];
     get hasStartScreenSharePermission(): boolean;
     get hasStartLiveStreamingPermission(): boolean;
     get hasEnableStartAudioPermission(): boolean;
@@ -105,7 +108,7 @@ export default class ActionBarStore {
     get isScreenShareAndBoardEnabled(): boolean;
     get isBoardWriteEnabled(): boolean;
     get isWaterMarkEnabled(): boolean;
-    get isMulti(): boolean;
+    get isWatermarkMultiRow(): boolean;
     get isPstnUser(): boolean;
     get cameraEnabled(): boolean;
     get cameraId(): string;
@@ -173,13 +176,10 @@ export default class ActionBarStore {
     kickOutWaitingRoomAllMember(type: FcrUserKickedOutType): Promise<void>;
     moveToMainRoomAllMember(): Promise<void>;
     private _interceptShareScreen;
-    private _handleRemoteUsersJoined;
-    private _handleRemoteUsersLeft;
     private _handleAllUserCountUpdated;
     private _getWaitingRoomUserCount;
     private _handleRemoteWaitingUserLeft;
     private _handleRemoteWaitingUserJoined;
-    private _handleUserInfoUpdated;
     private _handleLiveStreamingStateUpdated;
     private _handleNewMessageEvent;
     private _handleChatVisible;
@@ -191,6 +191,5 @@ export default class ActionBarStore {
     private _handleCloudRecordingStateUpdated;
     private _handleStreamsAddedOrUpdated;
     setParticipantsPopoverOpened(visible: boolean): void;
-    private _handleMicrophoneChanged;
 }
 export {};