fcr-ui-scene 3.5.1 → 3.6.0

package/lib/providers/message-provider.js

@@ -1,28 +1,60 @@
 "use strict";
 
 require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.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.iterator.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-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/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.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.constructor.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");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
 require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUIMessageProviderImpl = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.date.now.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -31,8 +63,15 @@ var _constant = require("../utilities/constant");
 var _imports = require("fcr-core/lib/imports");
 var _chat = require("../modules/chat");
 var _logger = require("../utilities/logger");
+var _FcrUIMessageProviderImpl;
+var _initProto;
 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 _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; }
 /**
  * FcrUIMessageProvider 接口定义了一系列用于管理和操作 UI 消息的方法。
  * 这些方法涵盖了显示不同类型消息（如 Toast 提示、通知等）、关闭通知以及管理消息事件观察者的功能。
@@ -40,9 +79,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var FcrUIMessageProviderImpl = exports.FcrUIMessageProviderImpl = /*#__PURE__*/function () {
   function FcrUIMessageProviderImpl() {
     (0, _classCallCheck2["default"])(this, FcrUIMessageProviderImpl);
-    (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+    (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUIMessageProviderImpl'
-    }));
+    })));
     (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
   }
   return (0, _createClass2["default"])(FcrUIMessageProviderImpl, [{
@@ -97,4 +136,7 @@ var FcrUIMessageProviderImpl = exports.FcrUIMessageProviderImpl = /*#__PURE__*/f
     }
   }]);
 }();
+_FcrUIMessageProviderImpl = FcrUIMessageProviderImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMessageProviderImpl, [[_imports.bound, 2, "showToast"]], []).e, 1);
+_initProto = _applyDecs$e[0];
 (0, _base.registerDependency)('messageProvider');

package/lib/providers/privilege-provider.d.ts

@@ -11,6 +11,14 @@ export interface FcrUIPrivilegeProviderObserver {
     onLocalUserSecurityInfosUpdated?: (e: FcrSecurityInfoUpdatedEvent) => void;
 }
 export interface FcrUIPrivilegeProvider {
+    /**
+     * 当前是否不可进行水印的操作
+     */
+    get canOperateWatermark(): boolean;
+    /**
+     * 水印是否是多行
+     */
+    get targetLoadingWatermarkLineTypeIsMulti(): boolean;
     /**
      * 获取最后一次修改权限相关配置的用户信息
      */
@@ -62,6 +70,10 @@ export interface FcrUIPrivilegeProvider {
      * 是否允许用户在进入会议时默认静音
      */
     allowJoinWithMuteAudio(): boolean;
+    /**
+     * 参会是入会时是否关闭摄像头
+     */
+    allowJoinWithMutedVideo(): boolean;
     /**
      * 是否允许共享屏幕
      */
@@ -241,6 +253,10 @@ export interface FcrUIPrivilegeProvider {
      * 是否让用户带音频进入会议
      */
     hasEnableJoinWithAudioPermission(): boolean;
+    /**
+     * 是否让用户带视频进入会议
+     */
+    hasEnableJoinWithVideoPermission(): boolean;
     /**
      * 是否有权限让用户开启屏幕共享
      */
@@ -340,6 +356,11 @@ export interface FcrUIPrivilegeProvider {
      * @param state 是否允许书写或传入状态
      */
     setAllowWriteBoard(state: FcrSharePermissionState | boolean): void;
+    /**
+     * 设置是否允许白板书写是单行/多行
+     * @param state
+     */
+    setAllowWaterMarkLine(isWaterMarkEnabled: boolean, type?: FcrLineType): void;
     /**
      * 是否有权限停止他人屏幕共享
      * @param targetRole 目标角色
@@ -391,6 +412,11 @@ export interface FcrUIPrivilegeProvider {
      * @param enable 是否允许
      */
     setAllowJoinWithMuteAudio(enable: boolean): void;
+    /**
+     * 设置所有用户加入会议时关闭摄像头
+     * @param enable 是否允许
+     */
+    setAllowJoinWithMutedVideo(enable: boolean): void;
     /**
      * 允许或禁止屏幕共享
      * @param state 是否允许
@@ -426,6 +452,9 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     private _disposers;
     private _localUser;
     private _observable;
+    private _watermarkLoadingTimber;
+    accessor canOperateWatermark: boolean;
+    accessor targetLoadingWatermarkLineTypeIsMulti: boolean;
     accessor securityInfos: FcrSecurityInfo[];
     accessor permissionInfos: FcrPermissionInfo[];
     accessor privilegeOperator: FcrUserInfo | undefined;
@@ -443,6 +472,7 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     allowedPublicChatAndDisallowedPrivateChat: () => boolean;
     disallowedPublicChatAndDisallowedPrivateChatToParticipant: () => boolean;
     disallowedAllChat: () => boolean;
+    allowJoinWithMutedVideo: () => boolean;
     allowJoinWithMuteAudio: () => boolean;
     allowShareScreen: () => boolean;
     allowScreenShareAndBoard: () => boolean;
@@ -484,6 +514,7 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     hasEnableChangeNamePermission: () => boolean;
     hasEnableStartVideoPermission: () => boolean;
     hasEnableJoinWithAudioPermission: () => boolean;
+    hasEnableJoinWithVideoPermission: () => boolean;
     hasEnableStartScreenSharePermission: () => boolean;
     hasLockRoomPermission: () => boolean;
     hasWatermarkEnablePermission: () => boolean;
@@ -518,6 +549,7 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     setAllowedPublicChatAndDisallowedPrivateChat: () => void;
     setDisallowedPublicChatAndDisallowedPrivateChatToParticipant: () => void;
     setAllowJoinWithMuteAudio: (enable: boolean) => void;
+    setAllowJoinWithMutedVideo: (enable: boolean) => void;
     setAllowShareScreen: (state: boolean) => void;
     setAllowUnmuteSelfVideo: (enable: boolean) => void;
     setAllowUnmuteSelfAudio: (enable: boolean) => void;
@@ -527,4 +559,5 @@ export declare class FcrUIPrivilegeProviderImpl implements FcrUIPrivilegeProvide
     private _handleSecurityUpdated;
     permitPrivateChat(userId: string): boolean;
     setAllowWaterMark(state: boolean, lineType?: FcrLineType): Promise<void>;
+    setAllowWaterMarkLine(state: boolean, lineType?: FcrLineType): Promise<void>;
 }

package/lib/providers/privilege-provider.js

@@ -64,6 +64,7 @@ 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");
+require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -71,7 +72,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _fcrCore = require("fcr-core");
 var _type = require("fcr-core/lib/type");
-var _decorator = require("agora-foundation/lib/decorator");
 var _mobx = require("mobx");
 var _mobxUtils = require("mobx-utils");
 var _lodash = require("lodash");
@@ -84,7 +84,7 @@ var _base = require("../base");
 var _logger = require("../utilities/logger");
 var _imports = require("fcr-core/lib/imports");
 var _FcrUIPrivilegeProviderImpl;
-var _initProto, _init_securityInfos, _init_permissionInfos, _init_privilegeOperator, _handlePermissionUpdatedDecs, _handleSecurityUpdatedDecs, _ref;
+var _initProto, _init_canOperateWatermark, _init_targetLoadingWatermarkLineTypeIsMulti, _init_securityInfos, _init_permissionInfos, _init_privilegeOperator, _handlePermissionUpdatedDecs, _handleSecurityUpdatedDecs, _setAllowWaterMarkDecs, _setAllowWaterMarkLineDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -98,7 +98,9 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
-_ref = (_handlePermissionUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+var _D = /*#__PURE__*/new WeakMap();
+var _E = /*#__PURE__*/new WeakMap();
+_ref = (_handlePermissionUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], _setAllowWaterMarkDecs = [_mobx.action, _mobx.action.bound], _setAllowWaterMarkLineDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE__*/function () {
   function FcrUIPrivilegeProviderImpl(_privilegeControl, _userControl, _streamControl) {
     var _this = this;
@@ -108,9 +110,12 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     })));
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
-    _classPrivateFieldInitSpec(this, _A, _init_securityInfos(this));
-    _classPrivateFieldInitSpec(this, _B, _init_permissionInfos(this));
-    _classPrivateFieldInitSpec(this, _C, _init_privilegeOperator(this));
+    (0, _defineProperty2["default"])(this, "_watermarkLoadingTimber", null);
+    _classPrivateFieldInitSpec(this, _A, _init_canOperateWatermark(this, true));
+    _classPrivateFieldInitSpec(this, _B, _init_targetLoadingWatermarkLineTypeIsMulti(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init_securityInfos(this));
+    _classPrivateFieldInitSpec(this, _D, _init_permissionInfos(this));
+    _classPrivateFieldInitSpec(this, _E, _init_privilegeOperator(this));
     (0, _defineProperty2["default"])(this, "allowChangeSelfName", (0, _mobxUtils.computedFn)(function () {
       var info = _this.securityInfos.find(function (_ref2) {
         var info = _ref2.info;
@@ -174,24 +179,31 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       var payload = info && info.info && _this.convertSendChatPayload(info.info.payload);
       return !!(!(info !== null && info !== void 0 && info.enable) || payload && !payload["public"] && !payload["private"].host && !payload["private"].cohost && !payload["private"].participant);
     }));
-    (0, _defineProperty2["default"])(this, "allowJoinWithMuteAudio", (0, _mobxUtils.computedFn)(function () {
+    (0, _defineProperty2["default"])(this, "allowJoinWithMutedVideo", (0, _mobxUtils.computedFn)(function () {
       var info = _this.securityInfos.find(function (_ref8) {
         var info = _ref8.info;
-        return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.JoinWithMuteAudio;
+        return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.JoinWithCloseVideo;
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
-    (0, _defineProperty2["default"])(this, "allowShareScreen", (0, _mobxUtils.computedFn)(function () {
+    (0, _defineProperty2["default"])(this, "allowJoinWithMuteAudio", (0, _mobxUtils.computedFn)(function () {
       var info = _this.securityInfos.find(function (_ref9) {
         var info = _ref9.info;
+        return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.JoinWithMuteAudio;
+      });
+      return !!(info !== null && info !== void 0 && info.enable);
+    }));
+    (0, _defineProperty2["default"])(this, "allowShareScreen", (0, _mobxUtils.computedFn)(function () {
+      var info = _this.securityInfos.find(function (_ref10) {
+        var info = _ref10.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.ShareScreen;
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
     (0, _defineProperty2["default"])(this, "allowScreenShareAndBoard", (0, _mobxUtils.computedFn)(function () {
       var _info$info;
-      var info = _this.securityInfos.find(function (_ref10) {
-        var info = _ref10.info;
+      var info = _this.securityInfos.find(function (_ref11) {
+        var info = _ref11.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.Sharing;
       });
       var shareState = info === null || info === void 0 || (_info$info = info.info) === null || _info$info === void 0 ? void 0 : _info$info.payload;
@@ -200,8 +212,8 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     }));
     (0, _defineProperty2["default"])(this, "allowBoardWrite", (0, _mobxUtils.computedFn)(function () {
       var _info$info2, _shareState$board;
-      var info = _this.securityInfos.find(function (_ref11) {
-        var info = _ref11.info;
+      var info = _this.securityInfos.find(function (_ref12) {
+        var info = _ref12.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.Sharing;
       });
       var shareState = info === null || info === void 0 || (_info$info2 = info.info) === null || _info$info2 === void 0 ? void 0 : _info$info2.payload;
@@ -209,36 +221,36 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       return boardWriteState;
     }));
     (0, _defineProperty2["default"])(this, "allowUnmuteSelfVideo", (0, _mobxUtils.computedFn)(function () {
-      var info = _this.securityInfos.find(function (_ref12) {
-        var info = _ref12.info;
+      var info = _this.securityInfos.find(function (_ref13) {
+        var info = _ref13.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.StartVideo;
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
     (0, _defineProperty2["default"])(this, "allowUnmuteSelfAudio", (0, _mobxUtils.computedFn)(function () {
-      var info = _this.securityInfos.find(function (_ref13) {
-        var info = _ref13.info;
+      var info = _this.securityInfos.find(function (_ref14) {
+        var info = _ref14.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.StartAudio;
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
     (0, _defineProperty2["default"])(this, "isLockRoomEnabled", (0, _mobxUtils.computedFn)(function () {
-      var info = _this.securityInfos.find(function (_ref14) {
-        var info = _ref14.info;
+      var info = _this.securityInfos.find(function (_ref15) {
+        var info = _ref15.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.LockedRoom;
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
     (0, _defineProperty2["default"])(this, "isWaitingRoomEnabled", (0, _mobxUtils.computedFn)(function () {
-      var info = _this.securityInfos.find(function (_ref15) {
-        var info = _ref15.info;
+      var info = _this.securityInfos.find(function (_ref16) {
+        var info = _ref16.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.WaitingRoom;
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
     (0, _defineProperty2["default"])(this, "isWaterMarkEnabled", (0, _mobxUtils.computedFn)(function () {
-      var info = _this.securityInfos.find(function (_ref16) {
-        var info = _ref16.info;
+      var info = _this.securityInfos.find(function (_ref17) {
+        var info = _ref17.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.WaterMark;
       });
       return !!(info !== null && info !== void 0 && info.enable);
@@ -348,6 +360,9 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     (0, _defineProperty2["default"])(this, "hasEnableJoinWithAudioPermission", function () {
       return _this._hasPermission(_type2.FcrPermissionAction.StreamEnableJoinWithAudio, _type2.FcrPrivilegeUserRole.PARTICIPANT);
     });
+    (0, _defineProperty2["default"])(this, "hasEnableJoinWithVideoPermission", function () {
+      return _this._hasPermission(_type2.FcrPermissionAction.StreamDisableJoinWithVideo, _type2.FcrPrivilegeUserRole.PARTICIPANT);
+    });
     (0, _defineProperty2["default"])(this, "hasEnableStartScreenSharePermission", function () {
       return _this._hasPermission(_type2.FcrPermissionAction.StreamEnableStartScreenShare, _type2.FcrPrivilegeUserRole.PARTICIPANT);
     });
@@ -414,8 +429,8 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     });
     (0, _defineProperty2["default"])(this, "isMulti", (0, _mobxUtils.computedFn)(function () {
       var _info$info3;
-      var info = _this.securityInfos.find(function (_ref17) {
-        var info = _ref17.info;
+      var info = _this.securityInfos.find(function (_ref18) {
+        var info = _ref18.info;
         return (info === null || info === void 0 ? void 0 : info.action) === _type2.FcrSecurityAction.WaterMark;
       });
       return (info === null || info === void 0 || (_info$info3 = info.info) === null || _info$info3 === void 0 ? void 0 : _info$info3.payload.lineType) === _type.FcrLineType.MULTI_ROW;
@@ -434,10 +449,8 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
         //关闭摄像头权限
         operations.push('stop_video');
       }
-      if (_this.hasPermissionToSendPrivateMessage(targetUserRole)) {
-        //私聊权限
-        operations.push('private_chat');
-      }
+      //私聊权限
+      operations.push('private_chat');
       operations.push('pin');
       if (_this.hasSetRolePermission(targetUserRole, _type2.FcrPrivilegeUserRole.HOST)) {
         //设为主持人权限
@@ -468,7 +481,7 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       return operations;
     });
     (0, _defineProperty2["default"])(this, "allowShare", /*#__PURE__*/function () {
-      var _ref18 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(state) {
+      var _ref19 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(state) {
         var enable;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -485,11 +498,11 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
         }, _callee);
       }));
       return function (_x) {
-        return _ref18.apply(this, arguments);
+        return _ref19.apply(this, arguments);
       };
     }());
     (0, _defineProperty2["default"])(this, "setAllowWriteBoard", /*#__PURE__*/function () {
-      var _ref19 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(state) {
+      var _ref20 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(state) {
         var enable;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -506,7 +519,7 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
         }, _callee2);
       }));
       return function (_x2) {
-        return _ref19.apply(this, arguments);
+        return _ref20.apply(this, arguments);
       };
     }());
     //全体静音
@@ -579,6 +592,9 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     (0, _defineProperty2["default"])(this, "setAllowJoinWithMuteAudio", function (enable) {
       _this._privilegeControl.allowJoinWithMutedAudio(enable, [_type2.FcrPrivilegeUserRole.PARTICIPANT, _type2.FcrPrivilegeUserRole.COHOST]);
     });
+    (0, _defineProperty2["default"])(this, "setAllowJoinWithMutedVideo", function (enable) {
+      _this._privilegeControl.allowJoinWithMutedVideo(enable, [_type2.FcrPrivilegeUserRole.PARTICIPANT, _type2.FcrPrivilegeUserRole.COHOST]);
+    });
     //允许屏幕共享
     (0, _defineProperty2["default"])(this, "setAllowShareScreen", function (state) {
       _this._privilegeControl.allowShare(state, [_type2.FcrPrivilegeUserRole.PARTICIPANT]);
@@ -594,9 +610,9 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     (0, _defineProperty2["default"])(this, "_hasPermission", (0, _mobxUtils.computedFn)(function (action, targetRole) {
       var _this$permissionInfos;
       var convertedRole = targetRole === _type2.FcrPrivilegeUserRole.SELF ? [_this._localUser.userRole, _type2.FcrPrivilegeUserRole.SELF] : [targetRole];
-      var info = (_this$permissionInfos = _this.permissionInfos) === null || _this$permissionInfos === void 0 ? void 0 : _this$permissionInfos.find(function (_ref20) {
+      var info = (_this$permissionInfos = _this.permissionInfos) === null || _this$permissionInfos === void 0 ? void 0 : _this$permissionInfos.find(function (_ref21) {
         var _info$targetRoles;
-        var info = _ref20.info;
+        var info = _ref21.info;
         return (info === null || info === void 0 ? void 0 : info.action) === action && ((info === null || info === void 0 || (_info$targetRoles = info.targetRoles) === null || _info$targetRoles === void 0 ? void 0 : _info$targetRoles.length) === 0 || convertedRole.some(function (role) {
           var _info$targetRoles2;
           return info === null || info === void 0 || (_info$targetRoles2 = info.targetRoles) === null || _info$targetRoles2 === void 0 ? void 0 : _info$targetRoles2.includes(role);
@@ -612,9 +628,9 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
           return _params && _params[key].includes(params[key]);
         });
       };
-      var info = (_this$permissionInfos2 = _this.permissionInfos) === null || _this$permissionInfos2 === void 0 ? void 0 : _this$permissionInfos2.find(function (_ref21) {
+      var info = (_this$permissionInfos2 = _this.permissionInfos) === null || _this$permissionInfos2 === void 0 ? void 0 : _this$permissionInfos2.find(function (_ref22) {
         var _info$targetRoles3, _info$params;
-        var info = _ref21.info;
+        var info = _ref22.info;
         return (info === null || info === void 0 ? void 0 : info.action) === action && ((info === null || info === void 0 || (_info$targetRoles3 = info.targetRoles) === null || _info$targetRoles3 === void 0 ? void 0 : _info$targetRoles3.length) === 0 || convertedRole.some(function (role) {
           var _info$targetRoles4;
           return info === null || info === void 0 || (_info$targetRoles4 = info.targetRoles) === null || _info$targetRoles4 === void 0 ? void 0 : _info$targetRoles4.includes(role);
@@ -638,8 +654,15 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       onLocalUserPermissionInfoDeleted: this._handlePermissionUpdated.bind(this),
       onSecurityInfoUpdated: this._handleSecurityUpdated.bind(this)
     };
+    this.targetLoadingWatermarkLineTypeIsMulti = this.isMulti();
     this._userControl.addObserver(userObserver);
     this._privilegeControl.addObserver(privilegeObserver);
+    this._disposers.push((0, _mobx.reaction)(function () {
+      return _this.isMulti();
+    }, function (isMulti) {
+      _this.canOperateWatermark = true;
+      _this.targetLoadingWatermarkLineTypeIsMulti = isMulti;
+    }));
     this._disposers.push(function () {
       _this._userControl.removeObserver(userObserver);
       _this._privilegeControl.removeObserver(privilegeObserver);
@@ -649,7 +672,7 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
     window.securityStore = this;
   }
   return (0, _createClass2["default"])(FcrUIPrivilegeProviderImpl, [{
-    key: "securityInfos",
+    key: "canOperateWatermark",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -657,7 +680,7 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "permissionInfos",
+    key: "targetLoadingWatermarkLineTypeIsMulti",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -665,13 +688,29 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "privilegeOperator",
+    key: "securityInfos",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_C, this, v);
     }
+  }, {
+    key: "permissionInfos",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
+  }, {
+    key: "privilegeOperator",
+    get: function get() {
+      return _classPrivateFieldGet(_E, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_E, this, v);
+    }
   }, {
     key: "hasSecurityPermission",
     get: function get() {
@@ -779,12 +818,48 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       }
       return setAllowWaterMark;
     }()
+  }, {
+    key: "setAllowWaterMarkLine",
+    value: function () {
+      var _setAllowWaterMarkLine = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(state, lineType) {
+        var _this2 = this;
+        return _regenerator["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (this._watermarkLoadingTimber) {
+                _context4.next = 7;
+                break;
+              }
+              this.targetLoadingWatermarkLineTypeIsMulti = !this.targetLoadingWatermarkLineTypeIsMulti;
+              this.canOperateWatermark = false;
+              this._watermarkLoadingTimber = setTimeout(function () {
+                _this2.canOperateWatermark = true;
+                _this2._watermarkLoadingTimber && clearTimeout(_this2._watermarkLoadingTimber);
+                _this2._watermarkLoadingTimber = null;
+              }, 1000);
+              _context4.next = 6;
+              return this._privilegeControl.allowWatermark(state, [_type2.FcrPrivilegeUserRole.PARTICIPANT], lineType);
+            case 6:
+              return _context4.abrupt("return", _context4.sent);
+            case 7:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function setAllowWaterMarkLine(_x5, _x6) {
+        return _setAllowWaterMarkLine.apply(this, arguments);
+      }
+      return setAllowWaterMarkLine;
+    }()
   }]);
 }();
 _FcrUIPrivilegeProviderImpl = FcrUIPrivilegeProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIPrivilegeProviderImpl, [[_mobx.observable, 1, "securityInfos"], [_mobx.observable, 1, "permissionInfos"], [_mobx.observable, 1, "privilegeOperator"], [_handlePermissionUpdatedDecs, 18, "_handlePermissionUpdated"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"], [_decorator.bound, 2, "setAllowWaterMark"]], []).e, 4);
-_init_securityInfos = _applyDecs$e[0];
-_init_permissionInfos = _applyDecs$e[1];
-_init_privilegeOperator = _applyDecs$e[2];
-_initProto = _applyDecs$e[3];
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIPrivilegeProviderImpl, [[_mobx.observable, 1, "canOperateWatermark"], [_mobx.observable, 1, "targetLoadingWatermarkLineTypeIsMulti"], [_mobx.observable, 1, "securityInfos"], [_mobx.observable, 1, "permissionInfos"], [_mobx.observable, 1, "privilegeOperator"], [_handlePermissionUpdatedDecs, 18, "_handlePermissionUpdated"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"], [_setAllowWaterMarkDecs, 18, "setAllowWaterMark"], [_setAllowWaterMarkLineDecs, 18, "setAllowWaterMarkLine"]], []).e, 6);
+_init_canOperateWatermark = _applyDecs$e[0];
+_init_targetLoadingWatermarkLineTypeIsMulti = _applyDecs$e[1];
+_init_securityInfos = _applyDecs$e[2];
+_init_permissionInfos = _applyDecs$e[3];
+_init_privilegeOperator = _applyDecs$e[4];
+_initProto = _applyDecs$e[5];
 (0, _base.registerDependency)('privilegeProvider');

package/lib/providers/room-provider.d.ts

@@ -7,6 +7,7 @@ import { FcrUIPrivilegeProvider, FcrUIPrivilegeProviderImpl } from './privilege-
 import { FcrUIMessageProvider } from './message-provider';
 import { FcrUIDialogProvider } from './dialog-provider';
 import { FcrUISharedInterpreterDataSource } from '../shared-data-source/interpreter';
+import FcrUIWaitingRoomControlManager from '../waiting-room-control-manager';
 export interface FcrUIMainRoomControlProvider {
     /**
      * 主房间 privilegeProvider
@@ -58,6 +59,7 @@ export interface FcrUIRoomProvider {
      * 云录制状态
      */
     get cloudRecordingState(): FcrRecordingState;
+    getRoomDetailCopyText(): string;
     /**
      * 启动直播
      */
@@ -100,23 +102,24 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     private _messageProvider;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
-    private _waitingRoomManager;
+    private _waitingRoomManager?;
+    private _isFirstJoined;
     private _waitingRoomManagerObserver;
-    private _mainRoomObserver;
-    private _mainRoomUserObserver;
-    private _waitingRoomUserObserver;
-    private _waitingRoomObserver;
+    private _baseRoomControlObserver;
+    private _userControlObserver;
     private _currentRoomControl?;
+    private _roomRouter;
+    private _roomRouterObserver;
     accessor liveStreamingState: FcrLiveStreamingState;
     accessor liveStreamingConfig: FcrLiveStreamingConfig | undefined;
     accessor cloudRecordingState: FcrRecordingState;
     constructor(_eventProvider: FcrUIEventProvider, _sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _messageProvider: FcrUIMessageProvider);
+    getRoomDetailCopyText(): string;
     get currentRoomControl(): FcrBaseRoomControl;
+    get waitingRoomManager(): FcrUIWaitingRoomControlManager;
     release(): void;
-    leaveRoom(): void;
     private _releaseWaitingRoomManager;
-    handleJoinRoom(roomId: string): Promise<FcrWaitingRoomControl | FcrMainRoomControl>;
-    handleJoinMainRoom(roomId: string, ticket: string): Promise<FcrMainRoomControl | undefined>;
+    handleJoinRoom(): Promise<void>;
     startLiveStreaming(params: FcrLiveStreamingConfig): Promise<void>;
     stopLiveStreaming(): Promise<void>;
     exitRoom(): void;
@@ -126,9 +129,8 @@ export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
     stopCloudRecording(): Promise<void>;
     addObserver(observer: FcrUIRoomObserver): void;
     removeObserver(observer: FcrUIRoomObserver): void;
-    private _isWaitingRoomManager;
     private _getJoinRoomOption;
-    private _initMainRoomState;
+    private _initBaseRoomState;
 }
 export declare class FcrUIConnectionProviderImpl implements FcrUIConnectionProvider {
     private _engine;