fcr-ui-scene 3.3.0 → 3.4.0

package/lib/modules/connection-gateway/components/computer/index.js

@@ -12,23 +12,23 @@ var _react = require("react");
 var _store = require("../../store");
 require("./index.css");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _deviceStore = require("../../../../common/device-store");
 var _jsxRuntime = require("react/jsx-runtime");
 var ConnectFromComputer = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     openAudioSettings = _useContext.openAudioSettings,
-    closeConnectionDialog = _useContext.closeConnectionDialog,
-    connectType = _useContext.connectType,
     hasPstnStream = _useContext.hasPstnStream,
     connectInfo = _useContext.connectInfo,
     outgoingCall = _useContext.outgoingCall,
     hasOwnPstnStream = _useContext.hasOwnPstnStream,
     hasNeedMergedStream = _useContext.hasNeedMergedStream,
     joinAudioByComputer = _useContext.joinAudioByComputer,
-    stopAudioByComputer = _useContext.stopAudioByComputer;
+    stopAudioByComputer = _useContext.stopAudioByComputer,
+    connectType = _useContext.connectType;
   var transI18n = (0, _i18n.useI18n)();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "connector-computer",
-    children: [connectType === _store.ConnectType.NONE && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
+    children: [connectType === _deviceStore.ConnectType.NONE && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
       size: "XS",
       block: true,
       className: "var(--fcrcornerradiusround) fcr_ui_scene_ramp_brand6",
@@ -39,14 +39,14 @@ var ConnectFromComputer = (0, _mobxReact.observer)(function () {
       children: transI18n('fmt_pstn_label_alreadyin', {
         reason1: connectInfo === null || connectInfo === void 0 ? void 0 : connectInfo.phoneUserId
       })
-    }), connectType === _store.ConnectType.COMPUTER && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
+    }), connectType === _deviceStore.ConnectType.COMPUTER && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
       size: "XS",
       styleType: "danger",
       block: true,
       className: "var(--fcrcornerradiusround)",
       onClick: stopAudioByComputer,
       children: transI18n('fmt_pstn_button_PCaudiostop')
-    }), connectType === _store.ConnectType.PHONE && hasOwnPstnStream && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+    }), connectType === _deviceStore.ConnectType.PHONE && hasOwnPstnStream && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
       content: transI18n('fmt_pstn_tips_alreadyphone'),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
         size: "XS",

package/lib/modules/connection-gateway/components/phone/components/callinfo/index.css

@@ -25,7 +25,7 @@
 }
 
 .connector-phone-call_info-label {
-  width: 62px;
+  width: 97px;
   display: block;
   text-align: right;
   margin-right: 12px;

package/lib/modules/connection-gateway/components/phone/components/callinfo/index.d.ts

@@ -1,4 +1,4 @@
-import { FcrRoomConnectorPhoneInfo } from 'agora-edu-core/lib/room-control/room-connector-control/type';
+import { FcrRoomConnectorPhoneInfo } from 'fcr-core/lib/room-control/room-connector-control/type';
 import { ConnectorRegion } from '../../../../store';
 import './index.css';
 declare function ConnectionInfo(props: {

package/lib/modules/connection-gateway/components/phone/index.js

@@ -21,10 +21,11 @@ var _useing = require("./components/useing");
 var _remeber = require("./components/remeber");
 var _react = require("react");
 var _store = require("../../store");
-var _type = require("agora-edu-core/lib/room-control/room-connector-control/type");
+var _type = require("fcr-core/lib/room-control/room-connector-control/type");
 var _regex = require("../../../../utilities/regex");
 require("./index.css");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _deviceStore = require("../../../../common/device-store");
 var _jsxRuntime = require("react/jsx-runtime");
 var ConnectFromPhone = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
@@ -85,7 +86,7 @@ var ConnectFromPhone = (0, _mobxReact.observer)(function () {
     if (!validateNumberHandler(phone)) return;
     startCall();
   };
-  var isPhoneAudioConnected = connectType === _store.ConnectType.PHONE;
+  var isPhoneAudioConnected = connectType === _deviceStore.ConnectType.PHONE;
   (0, _react.useEffect)(function () {
     setRejected(phoneCallState === _type.FcrRoomConnectorSessionState.END && phoneCallReason === _type.FcrRoomConnectorSessionReason.REJECT);
     setStaticState(phoneCallReason === _type.FcrRoomConnectorSessionReason.NONE && phoneCallState === _type.FcrRoomConnectorSessionState.CALLING);

package/lib/modules/connection-gateway/components/tabs/index.js

@@ -12,6 +12,7 @@ var _mobxReact = require("mobx-react");
 var _store = require("../../store");
 require("./index.css");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _deviceStore = require("../../../../common/device-store");
 var _jsxRuntime = require("react/jsx-runtime");
 var ConnectorTabs = (0, _mobxReact.observer)(function (props) {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
@@ -26,7 +27,7 @@ var ConnectorTabs = (0, _mobxReact.observer)(function (props) {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_tabs.FcrTabs, {
         activeKey: activeTabKey,
         items: [{
-          label: "Computer Audio".concat(connectType === _store.ConnectType.COMPUTER ? "-".concat((0, _i18n.transI18n)('fmt_PSTN_status_connected')) : ''),
+          label: "".concat((0, _i18n.transI18n)('fmt_PSTN_label_pcaudio')).concat(connectType === _deviceStore.ConnectType.COMPUTER ? "-".concat((0, _i18n.transI18n)('fmt_PSTN_status_connected')) : ''),
           key: 'computer'
         }, {
           label: "".concat((0, _i18n.transI18n)('fmt_pstn_options_phoneaudio')).concat(hasOwnPstnStream ? "-".concat((0, _i18n.transI18n)('fmt_PSTN_status_connected')) : ''),

package/lib/modules/connection-gateway/index.d.ts

@@ -1,4 +1,4 @@
-import { FcrBaseRoomControl, FcrDesktopMediaControl } from 'agora-edu-core';
+import { FcrBaseRoomControl, FcrDesktopMediaControl } from 'fcr-core';
 import { UIModule } from '../../base';
 import { FcrUIEventStore } from '../../common/event-store';
 import './index.css';

package/lib/modules/connection-gateway/index.js

@@ -60,7 +60,7 @@ var ConnectionGatewayUIModule = exports.ConnectionGatewayUIModule = /*#__PURE__*
   }, {
     key: "_handleUIEvent",
     value: function _handleUIEvent(action, payload) {
-      if (action === _constant.UIAction.OPEN_DIALOG && payload) {
+      if (action === _constant.UIAction.OPEN_DIALOG && (payload === null || payload === void 0 ? void 0 : payload.dialogKey) === _constant.DialogKey.CONNECTION_GATEWAY) {
         var _payload$params;
         this._store.onTabChange(((_payload$params = payload.params) === null || _payload$params === void 0 ? void 0 : _payload$params.type) || 'computer');
       }

package/lib/modules/connection-gateway/store.d.ts

@@ -1,17 +1,12 @@
-import { FcrDesktopMediaControl } from 'agora-edu-core';
+import { FcrDesktopMediaControl } from 'fcr-core';
 import { FcrUIEventStore } from '../../common/event-store';
-import { FcrPhoneConnectorSession, FcrRoomConnectorPhoneInfo, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'agora-edu-core/lib/room-control/room-connector-control/type';
-import { FcrDeviceStore } from '../../common/device-store';
-import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
+import { FcrPhoneConnectorSession, FcrRoomConnectorPhoneInfo, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'fcr-core/lib/room-control/room-connector-control/type';
+import { ConnectType, FcrDeviceStore } from '../../common/device-store';
+import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
 export declare enum ConnectorRegion {
     CHINA = 1,
     AMERICA = 2
 }
-export declare enum ConnectType {
-    NONE = 0,
-    COMPUTER = 1,
-    PHONE = 2
-}
 type ConnectListType = {
     phone: string;
     zone: string;
@@ -29,7 +24,7 @@ export default class ConnectionGatewayStore {
     private _failureTimer;
     private _accepted;
     private _sessionId;
-    accessor connectType: ConnectType;
+    private _uiEventObserver;
     accessor activeTabKey: string;
     accessor rememberMe: boolean;
     accessor rememberedNumberList: ConnectListType[];
@@ -46,14 +41,13 @@ export default class ConnectionGatewayStore {
     accessor hasPstnStream: boolean;
     accessor hasOwnPstnStream: boolean;
     accessor hasNeedMergedStream: boolean;
+    get connectType(): ConnectType;
     constructor({ roomControl, uiEventStore, deviceStore, mediaControl, }: {
         roomControl: FcrBaseRoomControl;
         uiEventStore: FcrUIEventStore;
         deviceStore: FcrDeviceStore;
         mediaControl: FcrDesktopMediaControl;
     });
-    joinAudioByComputer(): void;
-    stopAudioByComputer(): void;
     openAudioSettings(): void;
     closeConnectionDialog(): void;
     onTabChange(key: string): void;
@@ -69,6 +63,8 @@ export default class ConnectionGatewayStore {
     setRememberMe(value: boolean): void;
     initRememberedData(): void;
     release(): void;
+    joinAudioByComputer(): void;
+    stopAudioByComputer(): void;
     private _setResetTimer;
     private _rememberNumber;
     private _setWindowHeight;

package/lib/modules/connection-gateway/store.js

@@ -41,7 +41,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.StoreContext = exports.ConnectorRegion = exports.ConnectType = void 0;
+exports["default"] = exports.StoreContext = exports.ConnectorRegion = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
@@ -78,18 +78,19 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 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 _agoraEduCore = require("agora-edu-core");
+var _fcrCore = require("fcr-core");
 var _mobx = require("mobx");
 var _react = require("react");
 var _constant = require("../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
 var _store = require("../setting/store");
-var _type = require("agora-edu-core/lib/room-control/room-connector-control/type");
+var _type = require("fcr-core/lib/room-control/room-connector-control/type");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+var _deviceStore = require("../../common/device-store");
 var _tools = require("../../utilities/tools");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _ConnectionGatewayStore;
-var _initProto, _init_connectType, _init_activeTabKey, _init_rememberMe, _init_rememberedNumberList, _init_connectionPhoneInfo, _init_currentRegion, _init_currentCallInfo, _init_connectInfo, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling, _init_outgoingCall, _init_isHangup, _init_hasPstnStream, _init_hasOwnPstnStream, _init_hasNeedMergedStream, _onTabChangeDecs, _onGetConnectInfoDecs, _regionChangeHandlerDecs, _startCallDecs, _stopCallDecs, _setRememberMeDecs, _initRememberedDataDecs, _rememberNumberDecs, _phoneCallUpdatedDecs, _phoneCallReasonDecs, _setStreamStateDecs, _handleStreamsAddedOrUpdatedDecs, _handleStreamsRemovedDecs, _ref;
+var _initProto, _init_activeTabKey, _init_rememberMe, _init_rememberedNumberList, _init_connectionPhoneInfo, _init_currentRegion, _init_currentCallInfo, _init_connectInfo, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling, _init_outgoingCall, _init_isHangup, _init_hasPstnStream, _init_hasOwnPstnStream, _init_hasNeedMergedStream, _onTabChangeDecs, _onGetConnectInfoDecs, _regionChangeHandlerDecs, _startCallDecs, _stopCallDecs, _setRememberMeDecs, _initRememberedDataDecs, _rememberNumberDecs, _phoneCallUpdatedDecs, _phoneCallReasonDecs, _setStreamStateDecs, _handleStreamsAddedOrUpdatedDecs, _handleStreamsRemovedDecs, _ref;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -108,12 +109,6 @@ var ConnectorRegion = exports.ConnectorRegion = /*#__PURE__*/function (Connector
   ConnectorRegion[ConnectorRegion["AMERICA"] = 2] = "AMERICA";
   return ConnectorRegion;
 }({});
-var ConnectType = exports.ConnectType = /*#__PURE__*/function (ConnectType) {
-  ConnectType[ConnectType["NONE"] = 0] = "NONE";
-  ConnectType[ConnectType["COMPUTER"] = 1] = "COMPUTER";
-  ConnectType[ConnectType["PHONE"] = 2] = "PHONE";
-  return ConnectType;
-}({});
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -130,7 +125,6 @@ var _M = /*#__PURE__*/new WeakMap();
 var _N = /*#__PURE__*/new WeakMap();
 var _O = /*#__PURE__*/new WeakMap();
 var _P = /*#__PURE__*/new WeakMap();
-var _Q = /*#__PURE__*/new WeakMap();
 _ref = (_onTabChangeDecs = [_mobx.action, _mobx.action.bound], _onGetConnectInfoDecs = [_mobx.action, _mobx.action.bound], _regionChangeHandlerDecs = [_mobx.action, _mobx.action.bound], _startCallDecs = [_mobx.action, _mobx.action.bound], _stopCallDecs = [_mobx.action, _mobx.action.bound], _setRememberMeDecs = [_mobx.action, _mobx.action.bound], _initRememberedDataDecs = [_mobx.action, _mobx.action.bound], _rememberNumberDecs = [_mobx.action, _mobx.action.bound], _phoneCallUpdatedDecs = [_mobx.action, _mobx.action.bound], _phoneCallReasonDecs = [_mobx.action, _mobx.action.bound], _setStreamStateDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedOrUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsRemovedDecs = [_mobx.action, _mobx.action.bound], "_roomControl");
 var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   function ConnectionGatewayStore(_ref2) {
@@ -153,50 +147,46 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_failureTimer", null);
     (0, _defineProperty2["default"])(this, "_accepted", false);
     (0, _defineProperty2["default"])(this, "_sessionId", '');
-    _classPrivateFieldInitSpec(this, _A, _init_connectType(this, ConnectType.COMPUTER));
-    _classPrivateFieldInitSpec(this, _B, _init_activeTabKey(this, 'computer'));
-    _classPrivateFieldInitSpec(this, _C, _init_rememberMe(this, true));
-    _classPrivateFieldInitSpec(this, _D, _init_rememberedNumberList(this, []));
-    _classPrivateFieldInitSpec(this, _E, _init_connectionPhoneInfo(this, []));
-    _classPrivateFieldInitSpec(this, _F, _init_currentRegion(this, ConnectorRegion.CHINA));
-    _classPrivateFieldInitSpec(this, _G, _init_currentCallInfo(this, {
+    _classPrivateFieldInitSpec(this, _A, _init_activeTabKey(this, 'computer'));
+    _classPrivateFieldInitSpec(this, _B, _init_rememberMe(this, true));
+    _classPrivateFieldInitSpec(this, _C, _init_rememberedNumberList(this, []));
+    _classPrivateFieldInitSpec(this, _D, _init_connectionPhoneInfo(this, []));
+    _classPrivateFieldInitSpec(this, _E, _init_currentRegion(this, ConnectorRegion.CHINA));
+    _classPrivateFieldInitSpec(this, _F, _init_currentCallInfo(this, {
       zone: '+86',
       phone: ''
     }));
-    _classPrivateFieldInitSpec(this, _H, _init_connectInfo(this, {}));
-    _classPrivateFieldInitSpec(this, _I, _init_phoneCallState(this, _type.FcrRoomConnectorSessionState.CALLING));
-    _classPrivateFieldInitSpec(this, _J, _init_phoneCallReason(this, _type.FcrRoomConnectorSessionReason.NONE));
-    _classPrivateFieldInitSpec(this, _K, _init_connectSession(this, null));
-    _classPrivateFieldInitSpec(this, _L, _init_calling(this, false));
-    _classPrivateFieldInitSpec(this, _M, _init_outgoingCall(this, false));
-    _classPrivateFieldInitSpec(this, _N, _init_isHangup(this, false));
-    _classPrivateFieldInitSpec(this, _O, _init_hasPstnStream(this, false));
-    _classPrivateFieldInitSpec(this, _P, _init_hasOwnPstnStream(this, false));
-    _classPrivateFieldInitSpec(this, _Q, _init_hasNeedMergedStream(this, false));
+    _classPrivateFieldInitSpec(this, _G, _init_connectInfo(this, {}));
+    _classPrivateFieldInitSpec(this, _H, _init_phoneCallState(this, _type.FcrRoomConnectorSessionState.CALLING));
+    _classPrivateFieldInitSpec(this, _I, _init_phoneCallReason(this, _type.FcrRoomConnectorSessionReason.NONE));
+    _classPrivateFieldInitSpec(this, _J, _init_connectSession(this, null));
+    _classPrivateFieldInitSpec(this, _K, _init_calling(this, false));
+    _classPrivateFieldInitSpec(this, _L, _init_outgoingCall(this, false));
+    _classPrivateFieldInitSpec(this, _M, _init_isHangup(this, false));
+    _classPrivateFieldInitSpec(this, _N, _init_hasPstnStream(this, false));
+    _classPrivateFieldInitSpec(this, _O, _init_hasOwnPstnStream(this, false));
+    _classPrivateFieldInitSpec(this, _P, _init_hasNeedMergedStream(this, false));
     this._roomControl = roomControl;
     this._mediaControl = mediaControl;
+    this._deviceStore = deviceStore;
     this._uiEventStore = uiEventStore;
     this._streamControl = roomControl.getStreamControl();
     this._userControl = roomControl.getUserControl();
+    this._uiEventObserver = {
+      onEvent: function onEvent(event) {
+        if (event === _constant.UIAction.CONNECT_AUDIO) {
+          _this.closeConnectionDialog();
+        }
+      }
+    };
     this._roomControl.getRoomConnectorControl().addObserver(this._roomOberver);
     this._streamControl.addObserver(this._streamObserver);
-    this._deviceStore = deviceStore;
-    this._deviceStore.addObserver({
-      onMicrophoneChanged: function onMicrophoneChanged(microphoneId) {
-        _this.connectType = microphoneId ? ConnectType.COMPUTER : ConnectType.NONE;
-      }
-    });
+    this._uiEventStore.addObserver(this._uiEventObserver);
     this.initRememberedData();
-    this._uiEventStore.addObserver({
-      onEvent: function onEvent(action, payload) {
-        if (action === _constant.UIAction.CONNECT_AUDIO) {
-          _this.joinAudioByComputer();
-        }
-      }
-    });
+    this.onGetConnectInfo();
   }
   return (0, _createClass2["default"])(ConnectionGatewayStore, [{
-    key: "connectType",
+    key: "activeTabKey",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -204,7 +194,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "activeTabKey",
+    key: "rememberMe",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -212,7 +202,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "rememberMe",
+    key: "rememberedNumberList",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -220,7 +210,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "rememberedNumberList",
+    key: "connectionPhoneInfo",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -228,7 +218,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "connectionPhoneInfo",
+    key: "currentRegion",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -236,7 +226,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "currentRegion",
+    key: "currentCallInfo",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -244,7 +234,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "currentCallInfo",
+    key: "connectInfo",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -252,7 +242,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "connectInfo",
+    key: "phoneCallState",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -260,7 +250,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "phoneCallState",
+    key: "phoneCallReason",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -268,7 +258,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "phoneCallReason",
+    key: "connectSession",
     get: function get() {
       return _classPrivateFieldGet(_J, this);
     },
@@ -276,7 +266,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "connectSession",
+    key: "calling",
     get: function get() {
       return _classPrivateFieldGet(_K, this);
     },
@@ -284,7 +274,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "calling",
+    key: "outgoingCall",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
@@ -292,7 +282,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "outgoingCall",
+    key: "isHangup",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
@@ -300,7 +290,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "isHangup",
+    key: "hasPstnStream",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
@@ -308,7 +298,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "hasPstnStream",
+    key: "hasOwnPstnStream",
     get: function get() {
       return _classPrivateFieldGet(_O, this);
     },
@@ -316,7 +306,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_O, this, v);
     }
   }, {
-    key: "hasOwnPstnStream",
+    key: "hasNeedMergedStream",
     get: function get() {
       return _classPrivateFieldGet(_P, this);
     },
@@ -324,38 +314,9 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_P, this, v);
     }
   }, {
-    key: "hasNeedMergedStream",
+    key: "connectType",
     get: function get() {
-      return _classPrivateFieldGet(_Q, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_Q, this, v);
-    }
-  }, {
-    key: "joinAudioByComputer",
-    value: function joinAudioByComputer() {
-      var list = this._deviceStore.microphoneList;
-      if (list.length > 0) {
-        this._deviceStore.setMicrophoneId('default');
-        this._mediaControl.setSelectedSpeakerVolume(100);
-        this.closeConnectionDialog();
-        this._uiEventStore.showToast({
-          type: 'normal',
-          message: (0, _i18n.transI18n)('fmt_gateway_tips_nodata')
-        });
-      } else {
-        this._deviceStore.setMicrophoneId('NO_DEVICE');
-        this._uiEventStore.showToast({
-          type: 'normal',
-          message: (0, _i18n.transI18n)('fmt_toolbar_label_nodevice')
-        });
-      }
-    }
-  }, {
-    key: "stopAudioByComputer",
-    value: function stopAudioByComputer() {
-      this._mediaControl.setSelectedSpeakerVolume(0);
-      this._deviceStore.setMicrophoneId('');
+      return this._deviceStore.connectType;
     }
   }, {
     key: "openAudioSettings",
@@ -523,11 +484,22 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       this._disposers.forEach(function (disposer) {
         return disposer();
       });
+      this._uiEventStore.removeObserver(this._uiEventObserver);
       this._roomControl.getRoomConnectorControl().removeObserver(this._roomOberver);
       this._streamControl.removeObserver(this._streamObserver);
       this._failureTimer && clearTimeout(this._failureTimer);
       this._failureTimer = null;
     }
+  }, {
+    key: "joinAudioByComputer",
+    value: function joinAudioByComputer() {
+      this._deviceStore.joinAudioByComputer();
+    }
+  }, {
+    key: "stopAudioByComputer",
+    value: function stopAudioByComputer() {
+      this._deviceStore.stopAudioByComputer();
+    }
   }, {
     key: "_setResetTimer",
     value: function _setResetTimer() {
@@ -647,7 +619,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     value: function _setStreamState() {
       var matchPSTN = function matchPSTN(_ref3) {
         var connectorType = _ref3.connectorType;
-        return connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN;
+        return connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
       };
       var _this$_userControl$ge2 = this._userControl.getLocalUser(),
         userId = _this$_userControl$ge2.userId;
@@ -656,9 +628,11 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       this.hasPstnStream = allStreams.some(matchPSTN);
       this.hasOwnPstnStream = myStreams.some(matchPSTN);
       this.hasNeedMergedStream = allStreams.some(function (stream) {
-        return stream.owner.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN && stream.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN;
+        return stream.owner.connectorType === _fcrCore.FcrRoomConnectorType.PSTN && stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
       });
-      this.connectType = this.hasOwnPstnStream ? ConnectType.PHONE : this._deviceStore.microphoneId ? ConnectType.COMPUTER : ConnectType.NONE;
+      if (this.hasOwnPstnStream) {
+        this._deviceStore.setConnectType(_deviceStore.ConnectType.PHONE);
+      }
       return {
         myStreams: myStreams,
         userId: userId
@@ -681,9 +655,12 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       try {
         var _loop = function _loop() {
             var modifiedStream = _step.value.modifiedStream;
-            if (modifiedStream.connectorType !== _agoraEduCore.FcrRoomConnectorType.PSTN) return {
+            if (modifiedStream.connectorType !== _fcrCore.FcrRoomConnectorType.PSTN) return {
               v: void 0
             };
+            if (modifiedStream.owner.userId === userId && _this3._deviceStore.connectType === _deviceStore.ConnectType.PHONE) {
+              _this3._deviceStore.setConnectType(_deviceStore.ConnectType.NONE);
+            }
             if (myStreams.findIndex(function (stream) {
               return stream.streamId === modifiedStream.streamId;
             }) === -1 && _this3.connectSession) {
@@ -707,23 +684,22 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ConnectionGatewayStore = ConnectionGatewayStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConnectionGatewayStore, [[_mobx.observable, 1, "connectType"], [_mobx.observable, 1, "activeTabKey"], [_mobx.observable, 1, "rememberMe"], [_mobx.observable, 1, "rememberedNumberList"], [_mobx.observable, 1, "connectionPhoneInfo"], [_mobx.observable, 1, "currentRegion"], [_mobx.observable, 1, "currentCallInfo"], [_mobx.observable, 1, "connectInfo"], [_mobx.observable, 1, "phoneCallState"], [_mobx.observable, 1, "phoneCallReason"], [_mobx.observable, 1, "connectSession"], [_mobx.observable, 1, "calling"], [_mobx.observable, 1, "outgoingCall"], [_mobx.observable, 1, "isHangup"], [_mobx.observable, 1, "hasPstnStream"], [_mobx.observable, 1, "hasOwnPstnStream"], [_mobx.observable, 1, "hasNeedMergedStream"], [_decorator.bound, 2, "joinAudioByComputer"], [_decorator.bound, 2, "stopAudioByComputer"], [_decorator.bound, 2, "openAudioSettings"], [_decorator.bound, 2, "closeConnectionDialog"], [_onTabChangeDecs, 18, "onTabChange"], [_onGetConnectInfoDecs, 18, "onGetConnectInfo"], [_regionChangeHandlerDecs, 18, "regionChangeHandler"], [_decorator.bound, 2, "setConnectionInfo"], [_decorator.bound, 2, "setCurrentCallInfo"], [_startCallDecs, 18, "startCall"], [_stopCallDecs, 18, "stopCall"], [_setRememberMeDecs, 18, "setRememberMe"], [_initRememberedDataDecs, 18, "initRememberedData"], [_decorator.bound, 2, "_setResetTimer"], [_rememberNumberDecs, 18, "_rememberNumber"], [_decorator.bound, 2, "_setWindowHeight"], [_phoneCallUpdatedDecs, 18, "_phoneCallUpdated"], [_phoneCallReasonDecs, 18, "_phoneCallReason"], [_setStreamStateDecs, 18, "_setStreamState"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).e, 18);
-_init_connectType = _applyDecs$e[0];
-_init_activeTabKey = _applyDecs$e[1];
-_init_rememberMe = _applyDecs$e[2];
-_init_rememberedNumberList = _applyDecs$e[3];
-_init_connectionPhoneInfo = _applyDecs$e[4];
-_init_currentRegion = _applyDecs$e[5];
-_init_currentCallInfo = _applyDecs$e[6];
-_init_connectInfo = _applyDecs$e[7];
-_init_phoneCallState = _applyDecs$e[8];
-_init_phoneCallReason = _applyDecs$e[9];
-_init_connectSession = _applyDecs$e[10];
-_init_calling = _applyDecs$e[11];
-_init_outgoingCall = _applyDecs$e[12];
-_init_isHangup = _applyDecs$e[13];
-_init_hasPstnStream = _applyDecs$e[14];
-_init_hasOwnPstnStream = _applyDecs$e[15];
-_init_hasNeedMergedStream = _applyDecs$e[16];
-_initProto = _applyDecs$e[17];
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConnectionGatewayStore, [[_mobx.observable, 1, "activeTabKey"], [_mobx.observable, 1, "rememberMe"], [_mobx.observable, 1, "rememberedNumberList"], [_mobx.observable, 1, "connectionPhoneInfo"], [_mobx.observable, 1, "currentRegion"], [_mobx.observable, 1, "currentCallInfo"], [_mobx.observable, 1, "connectInfo"], [_mobx.observable, 1, "phoneCallState"], [_mobx.observable, 1, "phoneCallReason"], [_mobx.observable, 1, "connectSession"], [_mobx.observable, 1, "calling"], [_mobx.observable, 1, "outgoingCall"], [_mobx.observable, 1, "isHangup"], [_mobx.observable, 1, "hasPstnStream"], [_mobx.observable, 1, "hasOwnPstnStream"], [_mobx.observable, 1, "hasNeedMergedStream"], [_mobx.computed, 3, "connectType"], [_decorator.bound, 2, "openAudioSettings"], [_decorator.bound, 2, "closeConnectionDialog"], [_onTabChangeDecs, 18, "onTabChange"], [_onGetConnectInfoDecs, 18, "onGetConnectInfo"], [_regionChangeHandlerDecs, 18, "regionChangeHandler"], [_decorator.bound, 2, "setConnectionInfo"], [_decorator.bound, 2, "setCurrentCallInfo"], [_startCallDecs, 18, "startCall"], [_stopCallDecs, 18, "stopCall"], [_setRememberMeDecs, 18, "setRememberMe"], [_initRememberedDataDecs, 18, "initRememberedData"], [_decorator.bound, 2, "joinAudioByComputer"], [_decorator.bound, 2, "stopAudioByComputer"], [_decorator.bound, 2, "_setResetTimer"], [_rememberNumberDecs, 18, "_rememberNumber"], [_decorator.bound, 2, "_setWindowHeight"], [_phoneCallUpdatedDecs, 18, "_phoneCallUpdated"], [_phoneCallReasonDecs, 18, "_phoneCallReason"], [_setStreamStateDecs, 18, "_setStreamState"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).e, 17);
+_init_activeTabKey = _applyDecs$e[0];
+_init_rememberMe = _applyDecs$e[1];
+_init_rememberedNumberList = _applyDecs$e[2];
+_init_connectionPhoneInfo = _applyDecs$e[3];
+_init_currentRegion = _applyDecs$e[4];
+_init_currentCallInfo = _applyDecs$e[5];
+_init_connectInfo = _applyDecs$e[6];
+_init_phoneCallState = _applyDecs$e[7];
+_init_phoneCallReason = _applyDecs$e[8];
+_init_connectSession = _applyDecs$e[9];
+_init_calling = _applyDecs$e[10];
+_init_outgoingCall = _applyDecs$e[11];
+_init_isHangup = _applyDecs$e[12];
+_init_hasPstnStream = _applyDecs$e[13];
+_init_hasOwnPstnStream = _applyDecs$e[14];
+_init_hasNeedMergedStream = _applyDecs$e[15];
+_initProto = _applyDecs$e[16];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/control-bar/components/cloud-recording-buttons.d.ts

@@ -0,0 +1 @@
+export declare const CloudRecordingButtons: () => import("react/jsx-runtime").JSX.Element;