fcr-ui-scene 3.4.4 → 3.5.0

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

@@ -1,8 +1,10 @@
 import { FcrUIAction, FcrUIDialogKey } from '../utilities/constant';
 import { DeviceSettingDialogConfig } from '../modules/setting/store';
 import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
-interface FcrUIEventObserver {
+export interface FcrUIDialogObserver {
     onEvent?(action: FcrUIAction, payload?: unknown): void;
+    onDialogOpened?(dialogKey: FcrUIDialogKey, dialogId: string, params?: unknown): void;
+    onDialogClosed?(dialogId: string): void;
 }
 export declare enum FcrDialogInterceptorEventName {
     ON_CLOSE = "onClose"
@@ -84,16 +86,16 @@ export interface FcrUIDialogProvider {
      * 添加对话框事件观察者。
      * 观察者可以监听对话框的各种事件，如打开、关闭等。
      *
-     * @param observer - 要添加的观察者对象，类型为 FcrUIEventObserver。
+     * @param observer - 要添加的观察者对象，类型为 FcrUIDialogObserver。
      */
-    addObserver(observer: FcrUIEventObserver): void;
+    addObserver(observer: FcrUIDialogObserver): void;
     /**
      * 移除对话框事件观察者。
      * 移除后，该观察者将不再接收对话框的事件通知。
      *
-     * @param observer - 要移除的观察者对象，类型为 FcrUIEventObserver。
+     * @param observer - 要移除的观察者对象，类型为 FcrUIDialogObserver。
      */
-    removeObserver(observer: FcrUIEventObserver): void;
+    removeObserver(observer: FcrUIDialogObserver): void;
     /**
      * 新增弹窗拦截器
      * @param key - 弹窗拦截器的唯一标识符
@@ -129,7 +131,6 @@ export declare class FcrUIDialogProviderImpl implements FcrUIDialogProvider {
     openDialog(dialogKey: FcrUIDialogKey, instanceId?: string, params?: unknown): string;
     closeDialog(dialogId: string): void;
     closeConfirm(dialogId: string): void;
-    addObserver(observer: FcrUIEventObserver): void;
-    removeObserver(observer: FcrUIEventObserver): void;
+    addObserver(observer: FcrUIDialogObserver): void;
+    removeObserver(observer: FcrUIDialogObserver): void;
 }
-export {};

package/lib/providers/dialog-provider.js

@@ -23,8 +23,6 @@ require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.regexp.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.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -43,8 +41,8 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _base = require("../base");
 var _constant = require("../utilities/constant");
-var _logger = require("agora-foundation/lib/logger");
 var _imports = require("fcr-core/lib/imports");
+var _logger = require("../utilities/logger");
 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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -61,7 +59,9 @@ var FcrDialogInterceptorEventName = exports.FcrDialogInterceptorEventName = /*#_
 var FcrUIDialogProviderImpl = exports.FcrUIDialogProviderImpl = /*#__PURE__*/function () {
   function FcrUIDialogProviderImpl() {
     (0, _classCallCheck2["default"])(this, FcrUIDialogProviderImpl);
-    (0, _defineProperty2["default"])(this, "logger", (0, _logger.getLogger)());
+    (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+      prefix: 'FcrUIDialogProviderImpl'
+    }));
     (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_interceptor", {});
   }
@@ -123,12 +123,12 @@ var FcrUIDialogProviderImpl = exports.FcrUIDialogProviderImpl = /*#__PURE__*/fun
   }, {
     key: "openInviteDialog",
     value: function openInviteDialog() {
-      this.sendEvent(_constant.FcrUIAction.OPEN_INVITE_DIALOG);
+      this.openDialog(_constant.FcrUIDialogKey.INVITE);
     }
   }, {
     key: "closeInviteDialog",
     value: function closeInviteDialog() {
-      this.sendEvent(_constant.FcrUIAction.CLOSE_INVITE_DIALOG);
+      this.closeDialog(_constant.FcrUIDialogKey.INVITE);
     }
   }, {
     key: "closeWaitingRoomDialog",
@@ -172,6 +172,7 @@ var FcrUIDialogProviderImpl = exports.FcrUIDialogProviderImpl = /*#__PURE__*/fun
         dialogId: dialogId,
         params: params
       });
+      this._observable.notifyObservers('onDialogOpened', dialogKey, dialogId, params);
       return dialogId;
     }
   }, {
@@ -180,6 +181,7 @@ var FcrUIDialogProviderImpl = exports.FcrUIDialogProviderImpl = /*#__PURE__*/fun
       this.sendEvent(_constant.FcrUIAction.CLOSE_DIALOG, {
         dialogId: dialogId
       });
+      this._observable.notifyObservers('onDialogClosed', dialogId);
     }
   }, {
     key: "closeConfirm",

package/lib/providers/event-provider.js

@@ -10,8 +10,6 @@ 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/esnext.async-iterator.filter.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.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -28,15 +26,17 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _constant = require("../utilities/constant");
-var _logger = require("agora-foundation/lib/logger");
 var _chat = require("../modules/chat");
 var _base = require("../base");
+var _logger = require("../utilities/logger");
 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; }
 var FcrUIEventProviderImpl = exports.FcrUIEventProviderImpl = /*#__PURE__*/function () {
   function FcrUIEventProviderImpl() {
     (0, _classCallCheck2["default"])(this, FcrUIEventProviderImpl);
-    (0, _defineProperty2["default"])(this, "logger", (0, _logger.getLogger)());
+    (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+      prefix: 'FcrUIEventProviderImpl'
+    }));
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
   }
   return (0, _createClass2["default"])(FcrUIEventProviderImpl, [{

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

@@ -1,15 +1,14 @@
 import { FcrUIJoinInterpreterRoom, FcrUILeaveInterpreterRoom } from '../type';
 import { FcrInterpreterControl, FcrInterpreterUserInfo } from 'fcr-core/lib/room-control/interpreter-control/types';
-import { FcrError, FcrStreamControl } from 'fcr-core';
-import { FcrUIPrivilegeProvider } from './privilege-provider';
+import { FcrError } from 'fcr-core';
 import { FcrInterpreterUsersParams } from 'fcr-core/lib/room-control/interpreter-control/types';
 import { FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
 import { FcrUserControl } from 'fcr-core/lib/room-control/user-control/type';
 import { FcrUISharedInterpreterDataSource, FcrUILanguage } from '../shared-data-source/interpreter';
 import { FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrUIEventProvider } from './event-provider';
-import { FcrUIDeviceProvider } from './device-provider';
 import { FcrUIDevicePrivilegeProvider } from './device-privilege-provider';
+import { FcrUIPrivilegeProvider } from './privilege-provider';
 export type FcrUIInterpreterRoomObserver = {
     /**
      * 开始加入翻译官房间
@@ -177,8 +176,6 @@ interface FcrUIInterpreterProviderImplParams {
     userControl: FcrUserControl;
     sharedInterpreterDataSource: FcrUISharedInterpreterDataSource;
     eventProvider: FcrUIEventProvider;
-    streamControl: FcrStreamControl;
-    deviceProvider: FcrUIDeviceProvider;
     devicePrivilegeProvider: FcrUIDevicePrivilegeProvider;
 }
 export declare class FcrUIInterpreterProviderImpl implements FcrUIInterpreterProvider {
@@ -188,37 +185,21 @@ export declare class FcrUIInterpreterProviderImpl implements FcrUIInterpreterPro
     private _userControl;
     private _sharedInterpreterDataSource;
     private _eventProvider;
-    private _mainStreamControl;
-    private _deviceProvider;
     private _devicePrivilegeProvider;
-    private _languageRoomListByStatus;
-    private _indicateTimerId;
-    private _volumeTimerId;
-    private _hasSubscribedLanguageList;
     private _observerStream;
-    private _observerMicrophoneChanged;
+    private _publishEvent;
     private _observerInterpreter;
     private _retryTask;
     constructor(params: FcrUIInterpreterProviderImplParams);
-    private _publishEvent;
-    private _triggerDvicePrivilege;
-    private _mount;
-    private _update;
-    _unload(): void;
-    private _clearTimer;
-    private _onStreamVolumeIndicationUpdated;
-    private _updateLanguageRoomListByStatus;
     private _clearRetryTaskTimer;
-    private _getRoomInfo;
-    private _bindLocalMicrophoneId;
+    private _refresh;
     private _joinInterpreterRoom;
     private _leaveInterpreterRoom;
-    private _setMainRoomStream;
-    _updateOutputLanguage(language: FcrLanguage | null, isLocalOperation?: boolean): Promise<void>;
-    _updateSubscribeLanguage(languageList: FcrUILanguage[]): Promise<void>;
+    _updateOutputLanguage(language: FcrLanguage | null): Promise<void>;
+    _updateSubscribeLanguage(updateLanguageList: FcrUILanguage[]): Promise<void>;
     setOutputLanguage(language: FcrLanguage, successCallback?: () => void, failureCallback?: (error: FcrError) => void): Promise<boolean>;
     subscribeLanguage(language: FcrUILanguage, successCallback?: () => void, failureCallback?: (error: FcrError) => void): Promise<void>;
-    subscribeExtraOriginLanguage(subscribe: boolean): void;
+    subscribeExtraOriginLanguage(subscribe: boolean): Promise<void>;
     getHasSubscribedLanguageList(): FcrUILanguage[];
     userIsInterpreter(userId: string): boolean;
     getUserOutputLanguage(userId: string): FcrUILanguage;