fcr-ui-scene 3.3.1 → 3.4.0

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

@@ -1,17 +1,17 @@
-import { DialogKey, UIAction } from '../utilities/constant';
-import { FcrUserInfo } from 'agora-edu-core/lib/type';
+import { DialogKey, RoomType, UIAction } from '../utilities/constant';
+import { FcrUserInfo } from 'fcr-core/lib/type';
 import { DeviceSettingDialogConfig, CustomSetting } from '../modules/setting/store';
 import { FcrUIExitReason } from '../type';
 import { ToastSize } from 'agora-ui-foundation/lib/components/toast';
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
 import { ButtonType } from 'agora-ui-foundation/lib/components/button';
 import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
-import { FcrChatRoomReceiveBaseMessage } from 'agora-edu-core/lib/room-control/chatroom-control/type';
+import { FcrChatRoomReceiveBaseMessage } from 'fcr-core/lib/room-control/chatroom-control/type';
 import React from 'react';
-export interface FcrUIDialogParams {
+export interface FcrUIDialogParams<T> {
     dialogKey: DialogKey;
     dialogId: string;
-    params?: unknown;
+    params?: T extends unknown ? unknown : T;
 }
 export interface FcrUIToastParams {
     type: 'error' | 'warn' | 'info' | 'normal';
@@ -22,7 +22,8 @@ export interface FcrUIToastParams {
     customRootClass?: string;
 }
 export declare enum NotificationContentType {
-    WAITING_ROOM = "WAITING_ROOM"
+    WAITING_ROOM = "WAITING_ROOM",
+    INTERPRETER_STATUS = "INTERPRETER_STATUS"
 }
 export interface FcrNotificationParams {
     duration?: number;
@@ -30,6 +31,7 @@ export interface FcrNotificationParams {
     type: NotificationContentType;
     onOk?: () => void;
     onClose?: () => void;
+    data?: any;
 }
 export interface FcrUIConfirmDialogParams {
     title: string;
@@ -97,11 +99,19 @@ export declare class FcrUIEventStore {
     showNotification(params: FcrNotificationParams): void;
     closeNotification(key: NotificationContentType): void;
     showChatToast(params: FcrUIToastParams): void;
+    /**
+     * 默认同一个 title 或 content 的 confirm 窗口只打开一个实例
+     * @param key 可以通过 key 区分相同 title 或 content 的 confirm 窗口
+     * @param duration 可以通过 duration 配置自动关闭时间
+     * @mulitple 可以通过 mulitple 配置打开多个实例（忽略 key）
+     * */
     openConfirmDialog(params: ConfirmContentProps & {
-        height?: number;
-    }): string;
+        key?: string;
+        duration?: number;
+    }, mulitple?: boolean): string;
     openDialog(dialogKey: DialogKey, instanceId?: string, params?: unknown): string;
     closeDialog(dialogId: string): void;
+    closeConfirm(dialogId: string): void;
     startShareScreen(): void;
     stopShareScreen(): void;
     updateAside(params: FcrUIUpdateAsideParams): void;
@@ -122,14 +132,13 @@ export declare class FcrUIEventStore {
     closeInviteDialog(): void;
     closeWaitingRoomDialog(): void;
     closeRemoveAdmitWaitingRoomDialog(dialogKey: DialogKey): void;
-    closeConfirmDialog(): void;
     exitRoom(reason: FcrUIExitReason, roomType: number): void;
     cloudRecording(action: FcrCloudRecordingParams['action']): void;
     notifySpotlightStreamChanged(params: FcrSpotlightStreamChangedParams): void;
     notifyCustomSettingsChanged(settings: CustomSetting): void;
     addObserver(observer: FcrUIEventObserver): void;
     removeObserver(observer: FcrUIEventObserver): void;
-    notifyChatUpdateTarget(user: FcrUserInfo): void;
+    notifyChatUpdateTarget(user: FcrUserInfo, roomType: RoomType): void;
     notifyChatResetTarget(): void;
     release(): void;
 }

package/lib/common/event-store.js

@@ -34,6 +34,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 var NotificationContentType = exports.NotificationContentType = /*#__PURE__*/function (NotificationContentType) {
   NotificationContentType["WAITING_ROOM"] = "WAITING_ROOM";
+  NotificationContentType["INTERPRETER_STATUS"] = "INTERPRETER_STATUS";
   return NotificationContentType;
 }({});
 var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
@@ -59,7 +60,11 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
   }, {
     key: "showToast",
     value: function showToast(params) {
-      this.sendEvent(_constant.UIAction.SHOW_TOAST, params);
+      this.sendEvent(_constant.UIAction.OPEN_DIALOG, {
+        dialogKey: _constant.DialogKey.SHOW_TOAST,
+        dialogId: "".concat(_constant.DialogKey.SHOW_TOAST, "_").concat(Date.now()),
+        params: params
+      });
     }
   }, {
     key: "showNotification",
@@ -78,11 +83,18 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
         customRootClass: _chat.CHAT_WRAPPER_CLASS
       }));
     }
+
+    /**
+     * 默认同一个 title 或 content 的 confirm 窗口只打开一个实例
+     * @param key 可以通过 key 区分相同 title 或 content 的 confirm 窗口
+     * @param duration 可以通过 duration 配置自动关闭时间
+     * @mulitple 可以通过 mulitple 配置打开多个实例（忽略 key）
+     * */
   }, {
     key: "openConfirmDialog",
-    value: function openConfirmDialog(params) {
+    value: function openConfirmDialog(params, mulitple) {
       var dialogKey = _constant.DialogKey.CONFIRM;
-      var dialogId = "".concat(dialogKey, "_").concat(Date.now());
+      var dialogId = mulitple ? "".concat(dialogKey, "_").concat(Date.now()) : "".concat(dialogKey, "_").concat(params.key || params.title || params.content);
       this.sendEvent(_constant.UIAction.OPEN_DIALOG, {
         dialogKey: dialogKey,
         dialogId: dialogId,
@@ -108,6 +120,14 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
         dialogId: dialogId
       });
     }
+  }, {
+    key: "closeConfirm",
+    value: function closeConfirm(dialogId) {
+      this.sendEvent(_constant.UIAction.CLOSE_DIALOG, {
+        dialogId: dialogId,
+        dialogKey: _constant.DialogKey.CONFIRM
+      });
+    }
   }, {
     key: "startShareScreen",
     value: function startShareScreen() {
@@ -216,11 +236,6 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
     value: function closeRemoveAdmitWaitingRoomDialog(dialogKey) {
       this.sendEvent(_constant.UIAction.CLOSE_REMOVE_ADMIT_WAITING_ROOM_DIALOG, dialogKey);
     }
-  }, {
-    key: "closeConfirmDialog",
-    value: function closeConfirmDialog() {
-      this.closeDialog(_constant.DialogKey.CONFIRM);
-    }
   }, {
     key: "exitRoom",
     value: function exitRoom(reason, roomType) {
@@ -258,8 +273,11 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
     }
   }, {
     key: "notifyChatUpdateTarget",
-    value: function notifyChatUpdateTarget(user) {
-      this.sendEvent(_constant.UIAction.CHAT_UPDATE_TARGET, user);
+    value: function notifyChatUpdateTarget(user, roomType) {
+      this.sendEvent(_constant.UIAction.CHAT_UPDATE_TARGET, {
+        user: user,
+        roomType: roomType
+      });
     }
   }, {
     key: "notifyChatResetTarget",

package/lib/common/remote-renderer.d.ts

@@ -0,0 +1,15 @@
+import { AgoraRtcVideoStreamType } from 'agora-rte-sdk/lib/core/rtc/type';
+import { FcrStreamControl } from 'fcr-core';
+import { FcrVideoRenderConfig } from 'fcr-core/lib/type';
+export declare class FcrRemoteVideoRenderManager {
+    private _streamControl;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private accessor _firstFrameState;
+    private _renderCount;
+    private _streamObserver;
+    constructor(_streamControl: FcrStreamControl);
+    release(): void;
+    startRenderRemoteVideo(streamId: string, streamType: AgoraRtcVideoStreamType, config: FcrVideoRenderConfig, el: HTMLElement): void;
+    stopRenderRemoteVideo(streamId: string, el: HTMLElement): void;
+    isStreamFirstFrameRendered: (streamId: string) => boolean;
+}

package/lib/common/remote-renderer.js

@@ -0,0 +1,138 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.symbol.metadata.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrRemoteVideoRenderManager = void 0;
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.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.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _logger = require("agora-foundation/lib/logger");
+var _mobx = require("mobx");
+var _mobxUtils = require("mobx-utils");
+var _FcrRemoteVideoRenderManager;
+var _initProto, _init__firstFrameState, _startRenderRemoteVideoDecs, _stopRenderRemoteVideoDecs, _ref;
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
+function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
+function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+var _A = /*#__PURE__*/new WeakMap();
+_ref = (_startRenderRemoteVideoDecs = [_mobx.action, _mobx.action.bound], _stopRenderRemoteVideoDecs = [_mobx.action, _mobx.action.bound], "logger");
+var FcrRemoteVideoRenderManager = exports.FcrRemoteVideoRenderManager = /*#__PURE__*/function () {
+  function FcrRemoteVideoRenderManager(_streamControl) {
+    var _this = this;
+    (0, _classCallCheck2["default"])(this, FcrRemoteVideoRenderManager);
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrRemoteVideoRenderManager'
+    })));
+    _classPrivateFieldInitSpec(this, _A, _init__firstFrameState(this, new Map()));
+    (0, _defineProperty2["default"])(this, "_renderCount", new Map());
+    (0, _defineProperty2["default"])(this, "isStreamFirstFrameRendered", (0, _mobxUtils.computedFn)(function (streamId) {
+      return _this._firstFrameState.get(streamId) || false;
+    }));
+    this._streamControl = _streamControl;
+    this._streamObserver = {
+      onFirstRemoteVideoFrameRendered: function onFirstRemoteVideoFrameRendered(roomId, streamId) {
+        _this.logger.debug('onFirstRemoteVideoFrameRendered', roomId, streamId);
+        (0, _mobx.runInAction)(function () {
+          _this._firstFrameState.set(streamId, true);
+        });
+      }
+    };
+    _streamControl.addObserver(this._streamObserver);
+  }
+  return (0, _createClass2["default"])(FcrRemoteVideoRenderManager, [{
+    key: "_firstFrameState",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      this._renderCount.clear();
+      this._firstFrameState.clear();
+      this._streamControl.removeObserver(this._streamObserver);
+    }
+  }, {
+    key: "startRenderRemoteVideo",
+    value: function startRenderRemoteVideo(streamId, streamType, config, el) {
+      this.logger.debug('startRenderRemoteVideo', streamId, streamType, config);
+      var count = this._renderCount.get(streamId);
+      if (count) {
+        this._renderCount.set(streamId, count + 1);
+      } else {
+        this._renderCount.set(streamId, 1);
+      }
+      this._streamControl.startRenderRemoteVideoStream(streamId, streamType, config, el);
+    }
+  }, {
+    key: "stopRenderRemoteVideo",
+    value: function stopRenderRemoteVideo(streamId, el) {
+      this.logger.debug('stopRenderRemoteVideo', streamId);
+      var count = this._renderCount.get(streamId) || 0;
+      if (count - 1 > 0) {
+        this._renderCount.set(streamId, count - 1);
+      } else {
+        this._renderCount["delete"](streamId);
+        this._firstFrameState["delete"](streamId);
+      }
+      this._streamControl.stopRenderRemoteVideoStream(streamId, el);
+    }
+  }]);
+}();
+_FcrRemoteVideoRenderManager = FcrRemoteVideoRenderManager;
+var _applyDecs$e = _applyDecs(_FcrRemoteVideoRenderManager, [[_mobx.observable, 1, "_firstFrameState"], [_mobx.action, 2, "release"], [_startRenderRemoteVideoDecs, 18, "startRenderRemoteVideo"], [_stopRenderRemoteVideoDecs, 18, "stopRenderRemoteVideo"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 2);
+_init__firstFrameState = _applyDecs$e2[0];
+_initProto = _applyDecs$e2[1];
+_applyDecs$e;

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

@@ -4,7 +4,17 @@ import { FcrMainRoomControl, FcrRoomJoinOptions, FcrRoomType, FcrWaitingRoomCont
 import { FcrDeviceStore } from './device-store';
 import { FcrUISceneConfig } from '../type';
 import { FcrInterpreterRoomControl, FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
-type RoomObserver = {
+interface ToggleInterpreterRoom {
+    control: FcrInterpreterRoomControl;
+    language: FcrLanguage;
+    isToggleInterperterRemoteAudio?: boolean;
+}
+export interface LeaveInterpreterRoom extends ToggleInterpreterRoom {
+}
+export interface JoinInterpreterRoom extends ToggleInterpreterRoom {
+    roomJoinOptions: FcrRoomJoinOptions;
+}
+export type FcrRoomObserver = {
     onJoinMainRoom?: (ticket: string) => void;
     onLeaveMainRoom?: () => void;
     onJoinMainRoomFailed?: (error: FcrError) => void;
@@ -13,12 +23,12 @@ type RoomObserver = {
     onJoinWaitingRoomFailed?: (error: FcrError) => void;
     onWaitingRoomLocalUserKickedOut?: (roomId: string) => void;
     onMainRoomLocalUserKickedOut?: (roomId: string) => void;
-    onJoinInterpretingRoom?: (roomControl: FcrInterpreterRoomControl, language: FcrLanguage) => void;
-    onJoinInterpretingRoomSuccess?: (roomControl: FcrInterpreterRoomControl, language: FcrLanguage) => void;
-    onJoinInterpretingRoomFailed?: (roomControl: FcrInterpreterRoomControl, language: FcrLanguage) => void;
-    onLeaveInterpretingRoom?: (roomControl: FcrInterpreterRoomControl, language?: FcrLanguage) => void;
-    onLeaveInterpretingRoomFailed?: (roomControl: FcrInterpreterRoomControl, language?: FcrLanguage) => void;
-    onLeaveInterpretingRoomSuccess?: (roomControl: FcrInterpreterRoomControl, language?: FcrLanguage) => void;
+    onJoinInterpretingRoom?: (param: JoinInterpreterRoom) => void;
+    onJoinInterpretingRoomSuccess?: (param: JoinInterpreterRoom) => void;
+    onJoinInterpretingRoomFailed?: (param: JoinInterpreterRoom) => void;
+    onLeaveInterpretingRoom?: (param: LeaveInterpreterRoom) => void;
+    onLeaveInterpretingRoomFailed?: (param: LeaveInterpreterRoom) => void;
+    onLeaveInterpretingRoomSuccess?: (param: LeaveInterpreterRoom) => void;
 };
 export declare class FcrRoomStore {
     private _uiEventStore;
@@ -35,21 +45,14 @@ export declare class FcrRoomStore {
     private _waitingRoomObserver;
     constructor(_uiEventStore: FcrUIEventStore, _deviceStore: FcrDeviceStore, _sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine);
     release(): void;
-    addObserver(observer: RoomObserver): void;
-    removeObserver(observer: RoomObserver): void;
+    addObserver(observer: FcrRoomObserver): void;
+    removeObserver(observer: FcrRoomObserver): void;
     handleJoinRoom(roomId: string): Promise<readonly [FcrRoomType.Mainroom, FcrMainRoomControl] | readonly [FcrRoomType.Waitingroom, FcrWaitingRoomControl]>;
     handleJoinMainRoom(roomId: string, ticket: string): Promise<FcrMainRoomControl>;
     private _judgeWaitingRoomPremissionAndCreateRoomControl;
     private _destroyWaitingRoom;
     private _getJoinRoomOption;
-    joinInterpreterRoom({ control, roomJoinOptions, language, }: {
-        control: FcrInterpreterRoomControl;
-        roomJoinOptions: FcrRoomJoinOptions;
-        language: FcrLanguage;
-    }): Promise<void>;
-    leaveInterpreterRoom({ control, language, }: {
-        control: FcrInterpreterRoomControl;
-        language?: FcrLanguage;
-    }): Promise<void>;
+    joinInterpreterRoom(param: JoinInterpreterRoom): Promise<void>;
+    leaveInterpreterRoom(param: LeaveInterpreterRoom): Promise<void>;
 }
 export {};

package/lib/common/room-store.js

@@ -21,8 +21,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrRoomStore = void 0;
-require("core-js/modules/es.array.join.js");
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.array.join.js");
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -56,45 +56,53 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
     this._mainRoomObserver = {
       onLocalUserMovedToWaitingRoom: function () {
         var _onLocalUserMovedToWaitingRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(roomId, event) {
-          var roomControl, _roomControl$getPrivi, info, room;
+          var roomControl, _roomControl$getPrivi, info, room, cameraEnabled;
           return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 roomControl = _this._mainRoomControl; //todo
                 if (!roomControl) {
-                  _context.next = 19;
+                  _context.next = 23;
                   break;
                 }
                 _roomControl$getPrivi = roomControl.getPrivilegeControl().getSecurityInfo(_type2.FcrSecurityAction.WaitingRoom), info = _roomControl$getPrivi.info;
                 if (!info) {
-                  _context.next = 19;
+                  _context.next = 23;
                   break;
                 }
                 _context.prev = 4;
-                _context.next = 7;
-                return _this._engine.createRoomControlAndJoin(roomId, _this._getJoinRoomOption());
-              case 7:
-                room = _context.sent;
+                room = _this._engine.createWaitingRoomControl(info.payload.roomUuid);
+                _context.next = 8;
+                return room.join(_objectSpread({}, _this._getJoinRoomOption()));
+              case 8:
                 _this._waitingRoomControl = room;
                 room.addObserver(_this._waitingRoomObserver);
                 room.getUserControl().addObserver(_this._waitingRoomUserObserver);
+                roomControl.getUserControl().removeObserver(_this._mainRoomUserObserver);
+                cameraEnabled = _this._deviceStore.cameraEnabled;
+                if (cameraEnabled) {
+                  _this._deviceStore.setCameraEnabled(false);
+                }
                 _this._observable.notifyObservers('onLeaveMainRoom');
                 _this._uiEventStore.showToast({
                   type: 'error',
                   message: (0, _i18n.transI18n)('fmt_waitingroom_attendie_overview_label__toast_move_to_waitingroom')
                 });
+                if (cameraEnabled) {
+                  _this._deviceStore.setCameraEnabled(true);
+                }
                 _this._observable.notifyObservers('onJoinWaitingRoom', _this._waitingRoomControl);
-                _context.next = 19;
+                _context.next = 23;
                 break;
-              case 16:
-                _context.prev = 16;
+              case 20:
+                _context.prev = 20;
                 _context.t0 = _context["catch"](4);
                 _this._observable.notifyObservers('onJoinWaitingRoomFailed', _context.t0);
-              case 19:
+              case 23:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[4, 16]]);
+          }, _callee, null, [[4, 20]]);
         }));
         function onLocalUserMovedToWaitingRoom(_x, _x2) {
           return _onLocalUserMovedToWaitingRoom.apply(this, arguments);
@@ -250,29 +258,32 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
               _this$_mainRoomContro = this._mainRoomControl.getPrivilegeControl().getSecurityInfo(_type2.FcrSecurityAction.WaitingRoom), info = _this$_mainRoomContro.info;
               isWaitingRoomManager = this._mainRoomControl.getPrivilegeControl().getLocalUserPermissionInfo(_type2.FcrPermissionAction.WaitingRoomOpen).enable;
               if (!isWaitingRoomManager) {
-                _context5.next = 14;
+                _context5.next = 17;
                 break;
               }
               if (!info) {
-                _context5.next = 12;
+                _context5.next = 15;
                 break;
               }
               waitingRoomId = info.payload.roomUuid;
+              this.logger.info("[waitingroomLog-createWaitingRoom] before waitingRoomManager create waiting room");
               room = this._engine.createWaitingRoomControl(waitingRoomId);
-              _context5.next = 10;
+              this.logger.info("[waitingroomLog-joinWaitingRoomBefore] before waitingRoomManager join waiting room");
+              _context5.next = 12;
               return room.join(_objectSpread(_objectSpread({}, this._getJoinRoomOption()), {}, {
                 createStreamConfigs: []
               }));
-            case 10:
+            case 12:
+              this.logger.info("[waitingroomLog-joinWaitingRoomAfter] after waitingRoomManager join waiting room");
               this._waitingRoomControl = room;
               this._observable.notifyObservers('onJoinWaitingRoom', this._waitingRoomControl, true);
-            case 12:
-              _context5.next = 16;
+            case 15:
+              _context5.next = 19;
               break;
-            case 14:
+            case 17:
               this._destroyWaitingRoom();
               this._uiEventStore.sendEvent(_constant.UIAction.WAITING_ROOM_DESTROYED);
-            case 16:
+            case 19:
             case "end":
               return _context5.stop();
           }
@@ -295,8 +306,8 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
     value: function _getJoinRoomOption() {
       var config = this._sceneConfig;
       var streams = [{
-        videoSourceState: this._deviceStore.cameraEnabled ? _type5.AgoraRtcMediaSourceState.STARTED : _type5.AgoraRtcMediaSourceState.STOPPED,
-        audioSourceState: this._deviceStore.microphoneEnabled ? _type5.AgoraRtcMediaSourceState.STARTED : _type5.AgoraRtcMediaSourceState.STOPPED,
+        videoSourceState: this._deviceStore.cameraEnabled ? _type5.AgoraRtcMediaSourceState.OPEN : _type5.AgoraRtcMediaSourceState.CLOSE,
+        audioSourceState: this._deviceStore.microphoneEnabled ? _type5.AgoraRtcMediaSourceState.OPEN : _type5.AgoraRtcMediaSourceState.CLOSE,
         videoSourceId: this._deviceStore.currentDeviceId.cameraDeviceId,
         audioSourceId: this._deviceStore.currentDeviceId.microphoneDeviceId,
         streamName: 'default',
@@ -322,29 +333,27 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
   }, {
     key: "joinInterpreterRoom",
     value: function () {
-      var _joinInterpreterRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(_ref) {
-        var control, roomJoinOptions, language;
+      var _joinInterpreterRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(param) {
+        var control, roomJoinOptions;
         return _regenerator["default"].wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              control = _ref.control, roomJoinOptions = _ref.roomJoinOptions, language = _ref.language;
+              control = param.control, roomJoinOptions = param.roomJoinOptions;
               _context6.prev = 1;
-              this._observable.notifyObservers('onJoinInterpretingRoom', control, language);
+              this._observable.notifyObservers('onJoinInterpretingRoom', param);
               _context6.next = 5;
               return control.join(roomJoinOptions);
             case 5:
-              this.logger.info("[interpreterLog-joinInterpreterRoom] \u52A0\u5165\u8BED\u8A00\u623F\u95F4", {
-                control: control,
-                language: language
-              });
-              this._observable.notifyObservers('onJoinInterpretingRoomSuccess', control, language);
-              _context6.next = 12;
+              this.logger.info("interpreterLog-joinInterpreterRoom succeed");
+              this._observable.notifyObservers('onJoinInterpretingRoomSuccess', param);
+              _context6.next = 13;
               break;
             case 9:
               _context6.prev = 9;
               _context6.t0 = _context6["catch"](1);
-              this._observable.notifyObservers('onJoinInterpretingRoomFailed', control, language);
-            case 12:
+              this.logger.info("interpreterLog-joinInterpreterRoom fail");
+              this._observable.notifyObservers('onJoinInterpretingRoomFailed', param);
+            case 13:
             case "end":
               return _context6.stop();
           }
@@ -358,29 +367,27 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
   }, {
     key: "leaveInterpreterRoom",
     value: function () {
-      var _leaveInterpreterRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(_ref2) {
-        var control, language;
+      var _leaveInterpreterRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(param) {
+        var control;
         return _regenerator["default"].wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              control = _ref2.control, language = _ref2.language;
+              control = param.control;
               _context7.prev = 1;
-              this._observable.notifyObservers('onLeaveInterpretingRoom', control, language);
+              this._observable.notifyObservers('onLeaveInterpretingRoom', param);
               _context7.next = 5;
               return control.leave();
             case 5:
-              this.logger.info("[interpreterLog-leaveInterpreterRoom] \u79BB\u5F00\u8BED\u8A00\u623F\u95F4", {
-                control: control,
-                language: language
-              });
-              this._observable.notifyObservers('onLeaveInterpretingRoomSuccess', control, language);
-              _context7.next = 12;
+              this.logger.info("interpreterLog-leaveInterpreterRoom  succeed");
+              this._observable.notifyObservers('onLeaveInterpretingRoomSuccess', param);
+              _context7.next = 13;
               break;
             case 9:
               _context7.prev = 9;
               _context7.t0 = _context7["catch"](1);
-              this._observable.notifyObservers('onLeaveInterpretingRoomFailed', control, language);
-            case 12:
+              this.logger.info("interpreterLog-leaveInterpreterRoom fail");
+              this._observable.notifyObservers('onLeaveInterpretingRoomFailed', param);
+            case 13:
             case "end":
               return _context7.stop();
           }