fcr-ui-scene 3.4.5 → 3.5.0

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

@@ -0,0 +1,31 @@
+.connector-tabs {
+  padding: 9px 0;
+  display: flex;
+  justify-content: center;
+  -webkit-app-region: drag;
+  cursor: move;
+  position: sticky;
+  top: 0;
+  background: var(--fcr_mobile_ui_scene_color_popup_fill2);
+  z-index: 100;
+  width: 100%;
+}
+.connector-tabs .fcr-tabs {
+  width: 306px;
+  border-radius: var(--fcr_cornerradius_s);
+  -webkit-app-region: no-drag;
+}
+.connector-tabs .fcr-tabs__nav-item {
+  flex: 1;
+  border-radius: var(--fcr_cornerradius_xs);
+  font-size: 12px;
+}
+.connector-tabs-content {
+  --top: 48px;
+  position: absolute;
+  top: var(--top);
+  height: calc(100% - var(--top));
+  width: 100%;
+  align-items: center;
+  display: flex;
+}

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

@@ -0,0 +1,4 @@
+import { FC } from 'react';
+import './index.css';
+declare const ConnectorTabs: FC;
+export default ConnectorTabs;

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

@@ -0,0 +1,44 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+require("core-js/modules/es.array.concat.js");
+var _tabs = require("agora-ui-foundation/lib/components/tabs");
+var _react = require("react");
+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),
+    activeTabKey = _useContext.activeTabKey,
+    onTabChange = _useContext.onTabChange,
+    hasOwnPstnStream = _useContext.hasOwnPstnStream,
+    connectType = _useContext.connectType;
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "connector-frame",
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "connector-tabs",
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_tabs.FcrTabs, {
+        activeKey: activeTabKey,
+        items: [{
+          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')) : ''),
+          key: 'phone'
+        }],
+        onChange: onTabChange
+      })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "connector-tabs-content",
+      children: props.children
+    })]
+  });
+});
+var _default = exports["default"] = ConnectorTabs;

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

@@ -5,6 +5,9 @@ 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';
+import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIMessageProvider } from '../../providers/message-provider';
 export declare class ConnectionGatewayUIModule extends UIModule {
     private _store?;
     currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
@@ -12,6 +15,9 @@ export declare class ConnectionGatewayUIModule extends UIModule {
     deviceProvider?: FcrUIDeviceProvider;
     devicePrivilegeProvider?: FcrUIDevicePrivilegeProvider;
     sharedDevicePrivilegeDataSource?: FcrUISharedDevicePrivilegeDataSource;
+    sharedMemberDataSource?: FcrUIMemberSharedDataSource;
+    dialogProvider?: FcrUIDialogProvider;
+    messageProvider?: FcrUIMessageProvider;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;

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

@@ -47,7 +47,10 @@ var ConnectionGatewayUIModule = exports.ConnectionGatewayUIModule = /*#__PURE__*
         eventProvider: this.eventProvider,
         deviceProvider: this.deviceProvider,
         devicePrivilegeProvider: this.devicePrivilegeProvider,
-        sharedDevicePrivilegeDataSource: this.sharedDevicePrivilegeDataSource
+        sharedDevicePrivilegeDataSource: this.sharedDevicePrivilegeDataSource,
+        sharedMemberDataSource: this.sharedMemberDataSource,
+        dialogProvider: this.dialogProvider,
+        messageProvider: this.messageProvider
       });
       this.eventProvider.addObserver({
         onEvent: this._handleUIEvent.bind(this)

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

@@ -7,11 +7,15 @@ import { ConnectorRegion } from './enums';
 import { ConnectListType } from './types';
 import { FcrUIDevicePrivilegeProvider } from '../../providers/device-privilege-provider';
 import { FcrUISharedDevicePrivilegeDataSource } from '../../shared-data-source/device-privilege-data';
+import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIMessageProvider } from '../../providers/message-provider';
 export default class ConnectionGatewayStore {
     private _roomControl;
-    private _userControl;
     private _disposers;
     private _eventProvider;
+    private _messageProvider;
+    private _dialogProvider;
     private _deviceProvider;
     private _streamControl;
     private _roomOberver;
@@ -22,6 +26,7 @@ export default class ConnectionGatewayStore {
     private _sessionId;
     private _devicePrivilegeProvider?;
     private _sharedDevicePrivilegeDataSource?;
+    private _sharedMemberDataSource;
     accessor activeTabKey: string;
     accessor rememberMe: boolean;
     accessor rememberedNumberList: ConnectListType[];
@@ -36,16 +41,20 @@ export default class ConnectionGatewayStore {
     accessor outgoingCall: boolean;
     accessor isHangup: boolean;
     accessor hasPstnStream: boolean;
-    accessor hasOwnPstnStream: boolean;
     accessor hasNeedMergedStream: boolean;
     get connectType(): FcrUIConnectType;
-    constructor({ roomControl, eventProvider, deviceProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, }: {
+    constructor({ roomControl, eventProvider, deviceProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, sharedMemberDataSource, dialogProvider, messageProvider, }: {
         roomControl: FcrBaseRoomControl;
         eventProvider: FcrUIEventProvider;
         deviceProvider: FcrUIDeviceProvider;
         devicePrivilegeProvider: FcrUIDevicePrivilegeProvider;
         sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
+        sharedMemberDataSource: FcrUIMemberSharedDataSource;
+        dialogProvider: FcrUIDialogProvider;
+        messageProvider: FcrUIMessageProvider;
     });
+    get localUser(): import("fcr-core/lib/type").FcrUserInfo;
+    get hasOwnPstnStream(): boolean;
     openAudioSettings(): void;
     closeConnectionDialog(): void;
     onTabChange(key: string): void;

package/lib/modules/connection-gateway/store.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");
@@ -91,7 +87,7 @@ 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;
+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_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; }
@@ -120,7 +116,6 @@ var _L = /*#__PURE__*/new WeakMap();
 var _M = /*#__PURE__*/new WeakMap();
 var _N = /*#__PURE__*/new WeakMap();
 var _O = /*#__PURE__*/new WeakMap();
-var _P = /*#__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) {
@@ -129,7 +124,10 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       eventProvider = _ref2.eventProvider,
       deviceProvider = _ref2.deviceProvider,
       devicePrivilegeProvider = _ref2.devicePrivilegeProvider,
-      sharedDevicePrivilegeDataSource = _ref2.sharedDevicePrivilegeDataSource;
+      sharedDevicePrivilegeDataSource = _ref2.sharedDevicePrivilegeDataSource,
+      sharedMemberDataSource = _ref2.sharedMemberDataSource,
+      dialogProvider = _ref2.dialogProvider,
+      messageProvider = _ref2.messageProvider;
     (0, _classCallCheck2["default"])(this, ConnectionGatewayStore);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
     (0, _defineProperty2["default"])(this, "_disposers", []);
@@ -161,15 +159,16 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     _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));
+    _classPrivateFieldInitSpec(this, _O, _init_hasNeedMergedStream(this, false));
     this._roomControl = roomControl;
-    this._eventProvider = eventProvider;
+    this._dialogProvider = dialogProvider;
     this._deviceProvider = deviceProvider;
     this._streamControl = roomControl.getStreamControl();
-    this._userControl = roomControl.getUserControl();
     this._devicePrivilegeProvider = devicePrivilegeProvider;
     this._sharedDevicePrivilegeDataSource = sharedDevicePrivilegeDataSource;
+    this._sharedMemberDataSource = sharedMemberDataSource;
+    this._messageProvider = messageProvider;
+    this._eventProvider = eventProvider;
     this._deviceObserver = {
       onAudioConnected: function onAudioConnected() {
         _this.closeConnectionDialog();
@@ -293,7 +292,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "hasOwnPstnStream",
+    key: "hasNeedMergedStream",
     get: function get() {
       return _classPrivateFieldGet(_O, this);
     },
@@ -301,22 +300,24 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_O, this, v);
     }
   }, {
-    key: "hasNeedMergedStream",
+    key: "connectType",
     get: function get() {
-      return _classPrivateFieldGet(_P, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_P, this, v);
+      return this._deviceProvider.connectType;
     }
   }, {
-    key: "connectType",
+    key: "localUser",
     get: function get() {
-      return this._deviceProvider.connectType;
+      return this._sharedMemberDataSource.localUser;
+    }
+  }, {
+    key: "hasOwnPstnStream",
+    get: function get() {
+      return this._sharedMemberDataSource.hasOwnPstnStream;
     }
   }, {
     key: "openAudioSettings",
     value: function openAudioSettings() {
-      this._eventProvider.openDeviceSettingDialog({
+      this._dialogProvider.openDeviceSettingDialog({
         activeTab: _store.DeviceSettingTab.AUDIO,
         highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
       });
@@ -382,11 +383,11 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     key: "startCall",
     value: function () {
       var _startCall = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var _this$_userControl$ge, phoneUserId, userName;
+        var _this$localUser, phoneUserId, userName;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _this$_userControl$ge = this._userControl.getLocalUser(), phoneUserId = _this$_userControl$ge.userId, userName = _this$_userControl$ge.userName;
+              _this$localUser = this.localUser, phoneUserId = _this$localUser.userId, userName = _this$localUser.userName;
               this.calling = true;
               this.outgoingCall = true;
               this.isHangup = false;
@@ -431,7 +432,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
               _context3.next = 5;
               return this._roomControl.getRoomConnectorControl().stopSession(this.connectSession.sessionId);
             case 5:
-              this._eventProvider.showToast({
+              this._messageProvider.showToast({
                 type: 'normal',
                 message: (0, _i18n.transI18n)('fmt_PSTN_status_hungup')
               });
@@ -596,7 +597,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       switch (reason) {
         case _type.FcrRoomConnectorSessionReason.ACCEPTED:
           // 已接听
-          this._eventProvider.showToast({
+          this._messageProvider.showToast({
             type: 'normal',
             message: (0, _i18n.transI18n)('fmt_PSTN_status_voiceconnected')
           });
@@ -625,12 +626,10 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
         var connectorType = _ref3.connectorType;
         return connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
       };
-      var _this$_userControl$ge2 = this._userControl.getLocalUser(),
-        userId = _this$_userControl$ge2.userId;
+      var userId = this.localUser.userId;
       var myStreams = this._streamControl.getStreamsByUserId(userId);
       var allStreams = this._streamControl.getStreamList();
       this.hasPstnStream = allStreams.some(matchPSTN);
-      this.hasOwnPstnStream = myStreams.some(matchPSTN);
       this.hasNeedMergedStream = allStreams.some(function (stream) {
         return stream.owner.connectorType === _fcrCore.FcrRoomConnectorType.PSTN && stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
       });
@@ -692,7 +691,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ConnectionGatewayStore = ConnectionGatewayStore;
-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"], [_phoneCallUpdatedDecs, 18, "_phoneCallUpdated"], [_phoneCallReasonDecs, 18, "_phoneCallReason"], [_setStreamStateDecs, 18, "_setStreamState"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).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, "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"], [_phoneCallUpdatedDecs, 18, "_phoneCallUpdated"], [_phoneCallReasonDecs, 18, "_phoneCallReason"], [_setStreamStateDecs, 18, "_setStreamState"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).e, 16);
 _init_activeTabKey = _applyDecs$e[0];
 _init_rememberMe = _applyDecs$e[1];
 _init_rememberedNumberList = _applyDecs$e[2];
@@ -707,7 +706,6 @@ _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];
+_init_hasNeedMergedStream = _applyDecs$e[14];
+_initProto = _applyDecs$e[15];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

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

@@ -21,7 +21,6 @@ var _react = require("react");
 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");
@@ -37,7 +36,6 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
     copyInfoState = _useState2[0],
     setCopyInfoState = _useState2[1];
   var _useContext = (0, _react.useContext)(_store.StoreContext),
-    startTime = _useContext.startTime,
     _useContext$roomInfo = _useContext.roomInfo,
     inviteLink = _useContext$roomInfo.inviteLink,
     password = _useContext$roomInfo.password,
@@ -45,14 +43,11 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
     roomName = _useContext$roomInfo.roomName,
     userName = _useContext.localUser.userName,
     setShowMeetingDetailPortal = _useContext.setShowMeetingDetailPortal,
-    roomDuration = _useContext.roomDuration,
     showToast = _useContext.showToast,
-    meetingId = _useContext.meetingId;
-  var _useMeetingTime = (0, _meetingTime.useMeetingTime)({
-      duration: roomDuration,
-      startTime: startTime
-    }),
-    meetingTime = _useMeetingTime.meetingTime;
+    meetingId = _useContext.meetingId,
+    startTime = _useContext.startTime,
+    roomDuration = _useContext.roomDuration,
+    meetingTime = _useContext.meetingTime;
   var getShareLink = function getShareLink() {
     var info = {
       roomId: roomId,
@@ -67,14 +62,6 @@ 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);
-
-  // 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;
@@ -223,6 +210,13 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
             size: 20
           })
         })]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "meeting-details__content-share-link meeting-details__content-meeting-duration",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("label", {
+          children: t('fmt_premeeting_joinroom_mobile_label_meeting_duration')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          children: meetingTime
+        })]
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "meeting-details__footer",

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

@@ -9,8 +9,6 @@ exports.MorePopoverContent = void 0;
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.map.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.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
@@ -25,8 +23,8 @@ var _copyText = require("../../../../utilities/copyText");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _enums = require("../../enums");
-var _type3 = require("fcr-core/lib/room-control/type");
 var _tools = require("../../../../utilities/tools");
+var _type3 = require("../../../../type");
 var _meetingDetail = require("../../../../utilities/meeting-detail");
 var _jsxRuntime = require("react/jsx-runtime");
 var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(function (props) {
@@ -54,7 +52,8 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
     userName = _useContext.localUser.userName,
     meetingId = _useContext.meetingId,
     startTime = _useContext.startTime,
-    roomDuration = _useContext.roomDuration;
+    roomDuration = _useContext.roomDuration,
+    isRoomDetailSupported = _useContext.isRoomDetailSupported;
   var transI18n = (0, _i18n.useI18n)();
   var onItemClick = function onItemClick(item) {
     if (item.onClick) {
@@ -133,7 +132,7 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
     classNames: 'share-action-nav__media-list-item-with-divider',
     displayWhenNoPermission: 'hidden',
     key: 'copyMeetingInfo',
-    hasPermission: true,
+    hasPermission: isRoomDetailSupported,
     onClick: function onClick() {
       handleCopyMeetingDetail();
     }
@@ -186,7 +185,7 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
   var moreOptionsFilter = moreOptions.filter(function (item) {
     return item.hasPermission;
   });
-  var count = newMessageCount[_type3.FcrRoomType.Mainroom] || 0;
+  var count = newMessageCount[_type3.FcrUIRoomType.MAIN_ROOM] || 0;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     ref: ref,
     className: "share-action-nav__popover-inner-content share-action-nav__not-draggable",

package/lib/modules/control-bar/components/share-state-nav/index.js

@@ -1,6 +1,7 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -14,9 +15,9 @@ require("./index.css");
 var _mobxReact = require("mobx-react");
 var _store = require("../../store");
 var _react = require("react");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _type2 = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _meetingTime = require("../../../../hooks/meeting-time");
 var _enums = require("../../enums");
 var _jsxRuntime = require("react/jsx-runtime");
 var DragIcon = exports.DragIcon = function DragIcon() {
@@ -43,16 +44,11 @@ var ShareStateNav = exports.ShareStateNav = (0, _mobxReact.observer)(function (p
     currentPosition = props.currentPosition;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     roomDuration = _useContext.roomDuration,
-    startTime = _useContext.startTime,
     isMuteAudio = _useContext.isMuteAudio,
-    cloudRecordingState = _useContext.cloudRecordingState;
-  var _useMeetingTime = (0, _meetingTime.useMeetingTime)({
-      duration: roomDuration,
-      startTime: startTime
-    }),
-    meetingTime = _useMeetingTime.meetingTime,
-    totalHourText = _useMeetingTime.totalHourText,
-    totalMinuteText = _useMeetingTime.totalMinuteText;
+    cloudRecordingState = _useContext.cloudRecordingState,
+    meetingTime = _useContext.meetingTime,
+    totalHourText = _useContext.totalHourText,
+    totalMinuteText = _useContext.totalMinuteText;
   var totalMins = (0, _react.useMemo)(function () {
     return Math.floor(roomDuration / 1000 / 60);
   }, [roomDuration]);
@@ -76,6 +72,22 @@ var ShareStateNav = exports.ShareStateNav = (0, _mobxReact.observer)(function (p
         })
       })
     }), cloudRecordingState !== _type2.FcrRecordingState.Stopped && cloudRecordingState !== _type2.FcrRecordingState.Paused && /*#__PURE__*/(0, _jsxRuntime.jsx)(RecordingOn, {}), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "share-state-nav__meeting-elapsed-time",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        className: (0, _classnames["default"])(),
+        children: meetingTime
+      }), roomDuration > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+        trigger: "hover",
+        mouseEnterDelay: 0,
+        content: transI18n('fmt_popup_label_meetingduration', {
+          reason1: totalMins
+        }),
+        placement: "bottom",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+          children: ["(", totalHourText, totalMinuteText, ")"]
+        })
+      })]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "share-state-nav__stop-share fcr-flex fcr-items-center fcr-justify-center",
       onClick: props.onStopShare,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {

package/lib/modules/control-bar/index.css

@@ -284,8 +284,7 @@
 
   cursor: pointer;
 }
-
-.fcr-button {
+.share-action-nav .fcr-button {
   -webkit-app-region: no-drag;
 }
 

package/lib/modules/control-bar/index.d.ts

@@ -12,6 +12,13 @@ import { FcrUISharedChatDataSource } from '../../shared-data-source/chat-data';
 import { FcrUIDevicePrivilegeProvider } from '../../providers/device-privilege-provider';
 import { FcrUISharedDevicePrivilegeDataSource } from '../../shared-data-source/device-privilege-data';
 import { CurrentShareScreenTypes } from '../share-screen/types';
+import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
+import { FcrUILocalStorageProvider } from '../../providers/local-storage-provider';
+import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIMeetingTimeSharedDataSource } from '../../shared-data-source/meeting-time';
+import { FcrUIMessageProvider } from '../../providers/message-provider';
+import { FcrUISecuritySharedDataSource } from '../../shared-data-source/security-data';
 export declare class ControlBarUIModule extends UIModule {
     private _store?;
     private _deviceControlStore?;
@@ -27,6 +34,13 @@ export declare class ControlBarUIModule extends UIModule {
     sharedChatDataSource?: FcrUISharedChatDataSource;
     devicePrivilegeProvider?: FcrUIDevicePrivilegeProvider;
     sharedDevicePrivilegeDataSource?: FcrUISharedDevicePrivilegeDataSource;
+    sharedMemberDataSource?: FcrUIMemberSharedDataSource;
+    localStorageProvider?: FcrUILocalStorageProvider;
+    abilityProvider?: FcrUIAbilityProviderImpl;
+    dialogProvider?: FcrUIDialogProvider;
+    sharedMeetingTimeDataSource?: FcrUIMeetingTimeSharedDataSource;
+    messageProvider?: FcrUIMessageProvider;
+    sharedSecuritySharedDataSource?: FcrUISecuritySharedDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(props: {

package/lib/modules/control-bar/index.js

@@ -14,8 +14,6 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.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.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");
@@ -67,12 +65,18 @@ var ControlBarUIModule = exports.ControlBarUIModule = /*#__PURE__*/function (_UI
         deviceProvider: this.deviceProvider,
         sharedLayoutDataSource: this.sharedLayoutDataSource,
         roomProvider: this.roomProvider,
-        screenShareProvider: this.screenShareProvider,
-        sharedChatDataSource: this.sharedChatDataSource
+        sharedChatDataSource: this.sharedChatDataSource,
+        sharedMemberDataSource: this.sharedMemberDataSource,
+        localStorageProvider: this.localStorageProvider,
+        abilityProvider: this.abilityProvider,
+        sharedMeetingTimeDataSource: this.sharedMeetingTimeDataSource,
+        messageProvider: this.messageProvider,
+        sharedSecuritySharedDataSource: this.sharedSecuritySharedDataSource
       });
       this.privilegeProvider = this.privilegeProvider;
-      this._deviceControlStore = new _store2.DeviceControlStore((_this$mainRoomControl2 = this.mainRoomControlProvider) === null || _this$mainRoomControl2 === void 0 ? void 0 : _this$mainRoomControl2.mainRoomControl, this.deviceProvider, this.eventProvider, this.deviceStreamProvider, this.sharedDevicePrivilegeDataSource);
-      this._leaveMeetingStore = new _store3.LeaveMeetingStore(this.privilegeProvider, this.roomProvider, this.mainRoomControlProvider.mainRoomControl);
+      this.screenShareProvider = this.screenShareProvider;
+      this._deviceControlStore = new _store2.DeviceControlStore((_this$mainRoomControl2 = this.mainRoomControlProvider) === null || _this$mainRoomControl2 === void 0 ? void 0 : _this$mainRoomControl2.mainRoomControl, this.deviceProvider, this.dialogProvider, this.deviceStreamProvider, this.sharedDevicePrivilegeDataSource);
+      this._leaveMeetingStore = new _store3.LeaveMeetingStore(this.privilegeProvider, this.roomProvider, this.mainRoomControlProvider.mainRoomControl, this.sharedMemberDataSource, this.abilityProvider, this.dialogProvider);
       this.eventProvider.addObserver({
         onEvent: this.onUiEvent.bind(this)
       });