fcr-ui-scene 3.4.1 → 3.4.3

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

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.slice.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _select = require("agora-ui-foundation/lib/components/select");
 require("./index.css");

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

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -25,7 +26,7 @@ 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 _type2 = require("../../../../type");
 var _jsxRuntime = require("react/jsx-runtime");
 var ConnectFromPhone = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
@@ -86,7 +87,7 @@ var ConnectFromPhone = (0, _mobxReact.observer)(function () {
     if (!validateNumberHandler(phone)) return;
     startCall();
   };
-  var isPhoneAudioConnected = connectType === _deviceStore.ConnectType.PHONE;
+  var isPhoneAudioConnected = connectType === _type2.FcrUIConnectType.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/enums.d.ts

@@ -0,0 +1,4 @@
+export declare enum ConnectorRegion {
+    CHINA = 1,
+    AMERICA = 2
+}

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

@@ -0,0 +1,12 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ConnectorRegion = void 0;
+var ConnectorRegion = exports.ConnectorRegion = /*#__PURE__*/function (ConnectorRegion) {
+  ConnectorRegion[ConnectorRegion["CHINA"] = 1] = "CHINA";
+  ConnectorRegion[ConnectorRegion["AMERICA"] = 2] = "AMERICA";
+  return ConnectorRegion;
+}({});

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

@@ -1,10 +1,19 @@
 import { UIModule } from '../../base';
 import './index.css';
-import { StoreConfig } from '../../type';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUICurrentRoomControlProvider } from '../../providers/room-provider';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
+import { FcrUIDevicePrivilegeProvider } from '../../providers/device-privilege-provider';
+import { FcrUISharedDevicePrivilegeDataSource } from '../../shared-data-source/device-privilege-data';
 export declare class ConnectionGatewayUIModule extends UIModule {
-    private _store;
-    constructor(args: StoreConfig);
+    private _store?;
+    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
+    eventProvider?: FcrUIEventProvider;
+    deviceProvider?: FcrUIDeviceProvider;
+    devicePrivilegeProvider?: FcrUIDevicePrivilegeProvider;
+    sharedDevicePrivilegeDataSource?: FcrUISharedDevicePrivilegeDataSource;
+    onNodeWillActive(): void;
+    onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
-    protected onUnload(): void;
     private _handleUIEvent;
 }

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

@@ -23,28 +23,43 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _base = require("../../base");
-var _constant = require("../../utilities/constant");
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
 require("./index.css");
+var _constant = require("../../utilities/constant");
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var ConnectionGatewayUIModule = exports.ConnectionGatewayUIModule = /*#__PURE__*/function (_UIModule) {
-  function ConnectionGatewayUIModule(args) {
-    var _this;
+  function ConnectionGatewayUIModule() {
     (0, _classCallCheck2["default"])(this, ConnectionGatewayUIModule);
-    _this = _callSuper(this, ConnectionGatewayUIModule);
-    _this._store = new _store["default"](args);
-    args.uiEventStore.addObserver({
-      onEvent: _this._handleUIEvent.bind(_this)
-    });
-    return _this;
+    return _callSuper(this, ConnectionGatewayUIModule, arguments);
   }
   (0, _inherits2["default"])(ConnectionGatewayUIModule, _UIModule);
   return (0, _createClass2["default"])(ConnectionGatewayUIModule, [{
+    key: "onNodeWillActive",
+    value: function onNodeWillActive() {
+      var _this$currentRoomCont;
+      this._store = new _store["default"]({
+        roomControl: (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl,
+        eventProvider: this.eventProvider,
+        deviceProvider: this.deviceProvider,
+        devicePrivilegeProvider: this.devicePrivilegeProvider,
+        sharedDevicePrivilegeDataSource: this.sharedDevicePrivilegeDataSource
+      });
+      this.eventProvider.addObserver({
+        onEvent: this._handleUIEvent.bind(this)
+      });
+    }
+  }, {
+    key: "onNodeWillInactive",
+    value: function onNodeWillInactive() {
+      var _this$_store;
+      (_this$_store = this._store) === null || _this$_store === void 0 || _this$_store.release();
+    }
+  }, {
     key: "getComponent",
     value: function getComponent() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
@@ -52,15 +67,10 @@ var ConnectionGatewayUIModule = exports.ConnectionGatewayUIModule = /*#__PURE__*
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {})
       });
     }
-  }, {
-    key: "onUnload",
-    value: function onUnload() {
-      this._store.release();
-    }
   }, {
     key: "_handleUIEvent",
     value: function _handleUIEvent(action, payload) {
-      if (action === _constant.UIAction.OPEN_DIALOG && (payload === null || payload === void 0 ? void 0 : payload.dialogKey) === _constant.DialogKey.CONNECTION_GATEWAY) {
+      if (action === _constant.FcrUIAction.OPEN_DIALOG && (payload === null || payload === void 0 ? void 0 : payload.dialogKey) === _constant.FcrUIDialogKey.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,28 +1,27 @@
 import { FcrPhoneConnectorSession, FcrRoomConnectorPhoneInfo, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'fcr-core/lib/room-control/room-connector-control/type';
-import { ConnectType } from '../../common/device-store';
-import { StoreConfig } from '../../type';
-export declare enum ConnectorRegion {
-    CHINA = 1,
-    AMERICA = 2
-}
-type ConnectListType = {
-    phone: string;
-    zone: string;
-};
+import { FcrUIConnectType } from '../../type';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
+import { ConnectorRegion } from './enums';
+import { ConnectListType } from './types';
+import { FcrUIDevicePrivilegeProvider } from '../../providers/device-privilege-provider';
+import { FcrUISharedDevicePrivilegeDataSource } from '../../shared-data-source/device-privilege-data';
 export default class ConnectionGatewayStore {
     private _roomControl;
     private _userControl;
     private _disposers;
-    private _uiEventStore;
-    private _deviceStore;
+    private _eventProvider;
+    private _deviceProvider;
     private _streamControl;
-    private _mediaControl;
     private _roomOberver;
     private _streamObserver;
+    private _deviceObserver;
     private _failureTimer;
     private _accepted;
     private _sessionId;
-    private _uiEventObserver;
+    private _devicePrivilegeProvider?;
+    private _sharedDevicePrivilegeDataSource?;
     accessor activeTabKey: string;
     accessor rememberMe: boolean;
     accessor rememberedNumberList: ConnectListType[];
@@ -39,8 +38,14 @@ export default class ConnectionGatewayStore {
     accessor hasPstnStream: boolean;
     accessor hasOwnPstnStream: boolean;
     accessor hasNeedMergedStream: boolean;
-    get connectType(): ConnectType;
-    constructor({ roomControl, uiEventStore, deviceStore, mediaControl }: StoreConfig);
+    get connectType(): FcrUIConnectType;
+    constructor({ roomControl, eventProvider, deviceProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, }: {
+        roomControl: FcrBaseRoomControl;
+        eventProvider: FcrUIEventProvider;
+        deviceProvider: FcrUIDeviceProvider;
+        devicePrivilegeProvider: FcrUIDevicePrivilegeProvider;
+        sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
+    });
     openAudioSettings(): void;
     closeConnectionDialog(): void;
     onTabChange(key: string): void;
@@ -56,7 +61,7 @@ export default class ConnectionGatewayStore {
     setRememberMe(value: boolean): void;
     initRememberedData(): void;
     release(): void;
-    joinAudioByComputer(): void;
+    joinAudioByComputer(): Promise<void>;
     stopAudioByComputer(): void;
     private _setResetTimer;
     private _rememberNumber;
@@ -67,4 +72,3 @@ export default class ConnectionGatewayStore {
     private _handleStreamsRemoved;
 }
 export declare const StoreContext: import("react").Context<ConnectionGatewayStore>;
-export {};

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 = void 0;
+exports["default"] = exports.StoreContext = 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");
@@ -58,10 +58,6 @@ 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/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
-require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
@@ -81,14 +77,15 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 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("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 _type2 = require("../../type");
+var _constant = require("../../utilities/constant");
+var _enums = require("./enums");
 var _ConnectionGatewayStore;
 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; } } }; }
@@ -104,11 +101,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 ConnectorRegion = exports.ConnectorRegion = /*#__PURE__*/function (ConnectorRegion) {
-  ConnectorRegion[ConnectorRegion["CHINA"] = 1] = "CHINA";
-  ConnectorRegion[ConnectorRegion["AMERICA"] = 2] = "AMERICA";
-  return ConnectorRegion;
-}({});
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -130,9 +122,10 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   function ConnectionGatewayStore(_ref2) {
     var _this = this;
     var roomControl = _ref2.roomControl,
-      uiEventStore = _ref2.uiEventStore,
-      deviceStore = _ref2.deviceStore,
-      mediaControl = _ref2.mediaControl;
+      eventProvider = _ref2.eventProvider,
+      deviceProvider = _ref2.deviceProvider,
+      devicePrivilegeProvider = _ref2.devicePrivilegeProvider,
+      sharedDevicePrivilegeDataSource = _ref2.sharedDevicePrivilegeDataSource;
     (0, _classCallCheck2["default"])(this, ConnectionGatewayStore);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
     (0, _defineProperty2["default"])(this, "_disposers", []);
@@ -151,7 +144,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     _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, _E, _init_currentRegion(this, _enums.ConnectorRegion.CHINA));
     _classPrivateFieldInitSpec(this, _F, _init_currentCallInfo(this, {
       zone: '+86',
       phone: ''
@@ -167,21 +160,19 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     _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._eventProvider = eventProvider;
+    this._deviceProvider = deviceProvider;
     this._streamControl = roomControl.getStreamControl();
     this._userControl = roomControl.getUserControl();
-    this._uiEventObserver = {
-      onEvent: function onEvent(event) {
-        if (event === _constant.UIAction.CONNECT_AUDIO) {
-          _this.closeConnectionDialog();
-        }
+    this._devicePrivilegeProvider = devicePrivilegeProvider;
+    this._sharedDevicePrivilegeDataSource = sharedDevicePrivilegeDataSource;
+    this._deviceObserver = {
+      onAudioConnected: function onAudioConnected() {
+        _this.closeConnectionDialog();
       }
     };
     this._roomControl.getRoomConnectorControl().addObserver(this._roomOberver);
     this._streamControl.addObserver(this._streamObserver);
-    this._uiEventStore.addObserver(this._uiEventObserver);
     this.initRememberedData();
     this.onGetConnectInfo();
   }
@@ -316,20 +307,20 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "connectType",
     get: function get() {
-      return this._deviceStore.connectType;
+      return this._deviceProvider.connectType;
     }
   }, {
     key: "openAudioSettings",
     value: function openAudioSettings() {
-      this._uiEventStore.openDeviceSettingDialog({
+      this._eventProvider.openDeviceSettingDialog({
         activeTab: _store.DeviceSettingTab.AUDIO,
-        highlightSelector: _constant.HighlightElement.AUDIO_MICROPHONE
+        highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
       });
     }
   }, {
     key: "closeConnectionDialog",
     value: function closeConnectionDialog() {
-      this._uiEventStore.sendEvent(_constant.UIAction.CLOSE_CONNECTION_DIALOG);
+      this._eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_CONNECTION_DIALOG);
     }
   }, {
     key: "onTabChange",
@@ -371,7 +362,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setConnectionInfo",
     value: function setConnectionInfo() {
-      var region = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ConnectorRegion.CHINA;
+      var region = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _enums.ConnectorRegion.CHINA;
       if (this.connectionPhoneInfo.length > 0) {
         this.connectInfo = this.connectionPhoneInfo.find(function (info) {
           return info.region === Number(region);
@@ -436,7 +427,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
               _context3.next = 5;
               return this._roomControl.getRoomConnectorControl().stopSession(this.connectSession.sessionId);
             case 5:
-              this._uiEventStore.showToast({
+              this._eventProvider.showToast({
                 type: 'normal',
                 message: (0, _i18n.transI18n)('fmt_PSTN_status_hungup')
               });
@@ -483,7 +474,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       this._disposers.forEach(function (disposer) {
         return disposer();
       });
-      this._uiEventStore.removeObserver(this._uiEventObserver);
+      this._deviceProvider.removeObserver(this._deviceObserver);
       this._roomControl.getRoomConnectorControl().removeObserver(this._roomOberver);
       this._streamControl.removeObserver(this._streamObserver);
       this._failureTimer && clearTimeout(this._failureTimer);
@@ -491,13 +482,38 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "joinAudioByComputer",
-    value: function joinAudioByComputer() {
-      this._deviceStore.joinAudioByComputer();
-    }
+    value: function () {
+      var _joinAudioByComputer = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+        var shouldIncludeMicrophone, hasOpenMicrophonePrivilege, includeMicrophone;
+        return _regenerator["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (!(this._sharedDevicePrivilegeDataSource && this._devicePrivilegeProvider)) {
+                _context4.next = 7;
+                break;
+              }
+              shouldIncludeMicrophone = this._sharedDevicePrivilegeDataSource.shouldIncludeMicrophone;
+              _context4.next = 4;
+              return this._devicePrivilegeProvider.hasOpenMicrophonePrivilege();
+            case 4:
+              hasOpenMicrophonePrivilege = _context4.sent;
+              includeMicrophone = shouldIncludeMicrophone && hasOpenMicrophonePrivilege;
+              this._deviceProvider.connectAudio(includeMicrophone);
+            case 7:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function joinAudioByComputer() {
+        return _joinAudioByComputer.apply(this, arguments);
+      }
+      return joinAudioByComputer;
+    }()
   }, {
     key: "stopAudioByComputer",
     value: function stopAudioByComputer() {
-      this._deviceStore.stopAudioByComputer();
+      this._deviceProvider.disconnectAudio();
     }
   }, {
     key: "_setResetTimer",
@@ -576,7 +592,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       switch (reason) {
         case _type.FcrRoomConnectorSessionReason.ACCEPTED:
           // 已接听
-          this._uiEventStore.showToast({
+          this._eventProvider.showToast({
             type: 'normal',
             message: (0, _i18n.transI18n)('fmt_PSTN_status_voiceconnected')
           });
@@ -615,7 +631,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
         return stream.owner.connectorType === _fcrCore.FcrRoomConnectorType.PSTN && stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
       });
       if (this.hasOwnPstnStream) {
-        this._deviceStore.setConnectType(_deviceStore.ConnectType.PHONE);
+        this._deviceProvider.setConnectType(_type2.FcrUIConnectType.PHONE);
       }
       return {
         myStreams: myStreams,
@@ -642,8 +658,12 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
             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 (modifiedStream.owner.userId === userId && _this3._deviceProvider.connectType === _type2.FcrUIConnectType.PHONE) {
+              if (_this3._deviceProvider.isAudioConnected) {
+                _this3._deviceProvider.setConnectType(_type2.FcrUIConnectType.COMPUTER);
+              } else {
+                _this3._deviceProvider.setConnectType(_type2.FcrUIConnectType.NONE);
+              }
             }
             if (myStreams.findIndex(function (stream) {
               return stream.streamId === modifiedStream.streamId;

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

@@ -0,0 +1,4 @@
+export type ConnectListType = {
+    phone: string;
+    zone: string;
+};

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

@@ -0,0 +1,6 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -14,7 +14,7 @@ var _mobxReact = require("mobx-react");
 var _store = require("./store");
 var _tabFrame = _interopRequireDefault(require("../components/tab-frame"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _deviceStore = require("../../common/device-store");
+var _type = require("../../type");
 var _jsxRuntime = require("react/jsx-runtime");
 var View = exports.View = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
@@ -27,7 +27,7 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     activeKey: activeTabKey,
     onChange: onTabChange,
     tabs: [{
-      label: "".concat(transI18n('fmt_PSTN_label_pcaudio')).concat(connectType === _deviceStore.ConnectType.COMPUTER ? "-".concat(transI18n('fmt_PSTN_status_connected')) : ''),
+      label: "".concat(transI18n('fmt_PSTN_label_pcaudio')).concat(connectType === _type.FcrUIConnectType.COMPUTER ? "-".concat(transI18n('fmt_PSTN_status_connected')) : ''),
       key: 'computer',
       content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_computer["default"], {})
     }, {

package/lib/modules/control-bar/components/meeting-details/index.js

@@ -22,21 +22,16 @@ require("./index.css");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _store = require("../../store");
 var _meetingTime = require("../../../../hooks/meeting-time");
+var _enums = require("../../enums");
+var _meetingDetail = require("../../../../utilities/meeting-detail");
 var _jsxRuntime = require("react/jsx-runtime");
-var CopyState = /*#__PURE__*/function (CopyState) {
-  CopyState[CopyState["COPYINIT"] = 1] = "COPYINIT";
-  CopyState[CopyState["COPYING"] = 2] = "COPYING";
-  CopyState[CopyState["COPIED"] = 3] = "COPIED";
-  CopyState[CopyState["FAILED"] = 4] = "FAILED";
-  return CopyState;
-}(CopyState || {});
 var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function () {
   var t = (0, _i18n.useI18n)();
   var copyTimer = null;
   var _useState = (0, _react.useState)({
-      copyState: CopyState.COPYINIT,
+      copyState: _enums.CopyState.COPYINIT,
       copyIcon: _type.FcrIconType.FCR_LINK,
-      copyText: t('fmt_sharing_button_copydetailed')
+      copyText: t('fmt_popup_button_meetinginfor')
     }),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     copyInfoState = _useState2[0],
@@ -72,13 +67,15 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
   }, []);
   if (!roomName || !userName) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
   var displayMeetingId = (0, _tools.renderMeetingId)(meetingId, roomId);
-  var detailText = t('fmt_sharing_label_invitationdetailed', {
-    reason1: userName,
-    reason2: roomName,
-    // reason3: dayjs(startTime ?? 0).format('YYYY-MM-DD HH:mm:ss'),
-    reason3: '',
-    reason4: shareLink
-  });
+
+  // const detailText = t('fmt_sharing_label_invitationdetailed', {
+  //   reason1: userName,
+  //   reason2: roomName,
+  //   // reason3: dayjs(startTime ?? 0).format('YYYY-MM-DD HH:mm:ss'),
+  //   reason3: '',
+  //   reason4: shareLink,
+  // });
+  var detailText = (0, _meetingDetail.generateMeetingDetail)(userName, roomName, (0, _meetingDetail.generateMeetingDuration)(startTime !== null && startTime !== void 0 ? startTime : 0, roomDuration), shareLink, displayMeetingId, password !== null && password !== void 0 ? password : '');
   function handleCopyMeetingId(copyContent) {
     if (!copyContent) return;
     var content = meetingId ? copyContent : copyContent.replace(/\s+/g, '');
@@ -124,22 +121,22 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
       });
     });
   }
-  function handlerCopyMeetingDetail(detailText) {
-    if (copyInfoState.copyState !== CopyState.COPYINIT) {
+  function handlerCopyMeetingDetail() {
+    if (copyInfoState.copyState !== _enums.CopyState.COPYINIT) {
       return;
     }
     if (copyTimer) {
       clearTimeout(copyTimer);
     }
     setCopyInfoState({
-      copyState: CopyState.COPYING,
+      copyState: _enums.CopyState.COPYING,
       copyIcon: _type.FcrIconType.FCR_RESET,
       copyText: t('fmt_meeting_call_voice_call_button_copy_info')
     });
     (0, _copyText.copyText)(detailText).then(function () {
       copyTimer = setTimeout(function () {
         setCopyInfoState({
-          copyState: CopyState.COPIED,
+          copyState: _enums.CopyState.COPIED,
           copyIcon: _type.FcrIconType.FCR_CHOOSEIT,
           copyText: t('fmt_statusbar_status_coppied')
         });
@@ -152,15 +149,15 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
     });
   }
   (0, _react.useEffect)(function () {
-    if (copyInfoState.copyState === CopyState.COPIED) {
+    if (copyInfoState.copyState === _enums.CopyState.COPIED) {
       if (copyTimer) {
         clearTimeout(copyTimer);
       }
       copyTimer = setTimeout(function () {
         setCopyInfoState({
-          copyState: CopyState.COPYINIT,
+          copyState: _enums.CopyState.COPYINIT,
           copyIcon: _type.FcrIconType.FCR_LINK,
-          copyText: t('fmt_sharing_button_copydetailed')
+          copyText: t('fmt_popup_button_meetinginfor')
         });
       }, 1000);
     }
@@ -212,7 +209,9 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
       }), !!password && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "meeting-details__content-share-link",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("label", {
-          children: t('fmt_meeting_creatpage_label_password')
+          children: t('fmt_meeting_mainwindow_topbar_left_popup_label_meeting_password', {
+            reason1: ''
+          })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           children: password
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -230,12 +229,10 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_button.FcrButton, {
         size: "XS",
         shape: "rounded",
-        onClick: function onClick() {
-          return handlerCopyMeetingDetail(detailText);
-        },
+        onClick: handlerCopyMeetingDetail,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
           className: (0, _classnames["default"])({
-            'meeting-details__reset-icon': copyInfoState.copyState === CopyState.COPYING
+            'meeting-details__reset-icon': copyInfoState.copyState === _enums.CopyState.COPYING
           }),
           type: copyInfoState.copyIcon,
           size: 20,

package/lib/modules/control-bar/components/more-actions/index.css

@@ -50,6 +50,7 @@
   padding-left: 6px;
   margin: 0 10px;
   cursor: pointer;
+  position: relative;
 }
 
 .share-action-nav__media-list-item-with-divider {
@@ -70,3 +71,20 @@
   position: relative;
   left: -16px;
 }
+
+.share-action-nav__popover-inner-content-chat-count {
+  border-radius: var(--fcr_cornerradius_xs);
+  height: 14px;
+  min-width: 18px;
+  background: var(--fcr_ui_scene_ramp_red6);
+  color: var(--fcr_ui_scene_white10);
+  font-size: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.share-action-nav__popover-inner-content-text {
+  flex: 1;
+  text-align: left;
+}

package/lib/modules/control-bar/components/more-actions/index.d.ts

@@ -1,7 +1,3 @@
 import './index.css';
-interface MorePopoverContentProps {
-    hasChatPermission: boolean;
-    closePopover?: () => void;
-}
+import { MorePopoverContentProps } from '../../types';
 export declare const MorePopoverContent: (props: MorePopoverContentProps) => import("react/jsx-runtime").JSX.Element;
-export {};