fcr-ui-scene 3.7.5 → 3.7.7

package/lib/modules/pc-audio-connect/index.d.ts

@@ -0,0 +1,22 @@
+import { UIModule } from '../../base';
+import './index.css';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUICurrentRoomControlProvider } from '../../providers/room-provider';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
+import { FcrUIPhoneAudioConnectorProvider } from '../../providers/phone-audio-provider';
+import { FcrUIDevicePrivilegeProvider } from '../../providers/device-privilege-provider';
+import { FcrUISharedDevicePrivilegeDataSource } from '../../shared-data-source/device-privilege-data';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+export declare class PcAudioConnectionUIModule extends UIModule {
+    private _store?;
+    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
+    eventProvider?: FcrUIEventProvider;
+    deviceProvider?: FcrUIDeviceProvider;
+    phoneAudioConnectorProvider?: FcrUIPhoneAudioConnectorProvider;
+    devicePrivilegeProvider?: FcrUIDevicePrivilegeProvider;
+    sharedDevicePrivilegeDataSource?: FcrUISharedDevicePrivilegeDataSource;
+    dialogProvider?: FcrUIDialogProvider;
+    onNodeWillActive(): void;
+    onNodeWillInactive(): void;
+    getComponent(): import("react/jsx-runtime").JSX.Element;
+}

package/lib/modules/pc-audio-connect/index.js

@@ -0,0 +1,67 @@
+"use strict";
+
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/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.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PcAudioConnectionUIModule = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _base = require("../../base");
+var _store = _interopRequireWildcard(require("./store"));
+var _view = _interopRequireDefault(require("./view"));
+require("./index.css");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+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 PcAudioConnectionUIModule = exports.PcAudioConnectionUIModule = /*#__PURE__*/function (_UIModule) {
+  function PcAudioConnectionUIModule() {
+    (0, _classCallCheck2["default"])(this, PcAudioConnectionUIModule);
+    return _callSuper(this, PcAudioConnectionUIModule, arguments);
+  }
+  (0, _inherits2["default"])(PcAudioConnectionUIModule, _UIModule);
+  return (0, _createClass2["default"])(PcAudioConnectionUIModule, [{
+    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,
+        phoneAudioConnectorProvider: this.phoneAudioConnectorProvider,
+        devicePrivilegeProvider: this.devicePrivilegeProvider,
+        sharedDevicePrivilegeDataSource: this.sharedDevicePrivilegeDataSource,
+        dialogProvider: this.dialogProvider
+      });
+    }
+  }, {
+    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, {
+        value: this._store,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view["default"], {})
+      });
+    }
+  }]);
+}(_base.UIModule);

package/lib/modules/pc-audio-connect/main-scene/store.js

@@ -279,6 +279,7 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
               hasOpenMicrophonePrivilege = _context2.sent;
               includeMicrophone = shouldIncludeMicrophone && hasOpenMicrophonePrivilege;
               this._deviceProvider.connectAudio(includeMicrophone);
+              this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONNECTION_GATEWAY);
             case 2:
             case "end":
               return _context2.stop();

package/lib/modules/pc-audio-connect/store.d.ts

@@ -0,0 +1,46 @@
+import { FcrPhoneConnectorSession, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'fcr-core/lib/room-control/room-connector-control/type';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
+import { FcrUIPhoneAudioConnectorProvider } from '../../providers/phone-audio-provider';
+import { FcrUIDevicePrivilegeProvider } from '../../providers/device-privilege-provider';
+import { FcrUISharedDevicePrivilegeDataSource } from '../../shared-data-source/device-privilege-data';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+export default class ConnectionGatewayStore {
+    private _disposers;
+    private _eventProvider;
+    private _deviceProvider;
+    private _failureTimer;
+    private _deviceObserver;
+    private _phoneAudioConnectorProvider;
+    private _devicePrivilegeProvider?;
+    private _sharedDevicePrivilegeDataSource?;
+    private _dialogProvider;
+    private _needShowConfirmDialog;
+    accessor phoneCallState: FcrRoomConnectorSessionState;
+    accessor phoneCallReason: FcrRoomConnectorSessionReason;
+    accessor connectSession: FcrPhoneConnectorSession | null;
+    accessor calling: boolean;
+    get connectType(): import("../../type").FcrUIConnectType;
+    get hasNeedMergedStream(): boolean;
+    get hasOwnPstnStream(): boolean;
+    get outgoingCall(): boolean;
+    get hasPstnStream(): boolean;
+    get connectInfo(): import("fcr-core/lib/room-control/room-connector-control/type").FcrRoomConnectorPhoneInfo;
+    constructor({ eventProvider, deviceProvider, phoneAudioConnectorProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, dialogProvider, }: {
+        roomControl: FcrBaseRoomControl;
+        eventProvider: FcrUIEventProvider;
+        deviceProvider: FcrUIDeviceProvider;
+        phoneAudioConnectorProvider: FcrUIPhoneAudioConnectorProvider;
+        devicePrivilegeProvider: FcrUIDevicePrivilegeProvider;
+        sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
+        dialogProvider: FcrUIDialogProvider;
+    });
+    openAudioSettings(): void;
+    closeConnectionDialog(): void;
+    release(): void;
+    private _handleInterceptorCloseDialog;
+    joinAudioByComputer(): Promise<void>;
+    stopAudioByComputer(): void;
+}
+export declare const StoreContext: import("react").Context<ConnectionGatewayStore>;

package/lib/modules/pc-audio-connect/store.js

@@ -0,0 +1,304 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.StoreContext = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.iterator.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.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+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 _mobx = require("mobx");
+var _react = require("react");
+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 _constant = require("../../utilities/constant");
+var _dialogProvider = require("../../providers/dialog-provider");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _ConnectionGatewayStore;
+var _initProto, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling;
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
+function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
+function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+var _A = /*#__PURE__*/new WeakMap();
+var _B = /*#__PURE__*/new WeakMap();
+var _C = /*#__PURE__*/new WeakMap();
+var _D = /*#__PURE__*/new WeakMap();
+var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
+  function ConnectionGatewayStore(_ref) {
+    var _this = this;
+    var eventProvider = _ref.eventProvider,
+      deviceProvider = _ref.deviceProvider,
+      phoneAudioConnectorProvider = _ref.phoneAudioConnectorProvider,
+      devicePrivilegeProvider = _ref.devicePrivilegeProvider,
+      sharedDevicePrivilegeDataSource = _ref.sharedDevicePrivilegeDataSource,
+      dialogProvider = _ref.dialogProvider;
+    (0, _classCallCheck2["default"])(this, ConnectionGatewayStore);
+    (0, _defineProperty2["default"])(this, "_disposers", (_initProto(this), []));
+    (0, _defineProperty2["default"])(this, "_failureTimer", null);
+    (0, _defineProperty2["default"])(this, "_needShowConfirmDialog", true);
+    _classPrivateFieldInitSpec(this, _A, _init_phoneCallState(this, _type.FcrRoomConnectorSessionState.CALLING));
+    _classPrivateFieldInitSpec(this, _B, _init_phoneCallReason(this, _type.FcrRoomConnectorSessionReason.NONE));
+    _classPrivateFieldInitSpec(this, _C, _init_connectSession(this, null));
+    _classPrivateFieldInitSpec(this, _D, _init_calling(this, false));
+    this._dialogProvider = dialogProvider;
+    this._eventProvider = eventProvider;
+    this._deviceProvider = deviceProvider;
+    this._phoneAudioConnectorProvider = phoneAudioConnectorProvider;
+    this._devicePrivilegeProvider = devicePrivilegeProvider;
+    this._sharedDevicePrivilegeDataSource = sharedDevicePrivilegeDataSource;
+    this._deviceObserver = {
+      onAudioConnected: function onAudioConnected() {
+        _this._needShowConfirmDialog = false;
+        _this.closeConnectionDialog();
+      }
+    };
+    this._deviceProvider.addObserver(this._deviceObserver);
+    this._dialogProvider.addInterceptor(_dialogProvider.FcrDialogInterceptorEventName.ON_CLOSE, this._handleInterceptorCloseDialog);
+  }
+  return (0, _createClass2["default"])(ConnectionGatewayStore, [{
+    key: "phoneCallState",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "phoneCallReason",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "connectSession",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "calling",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
+  }, {
+    key: "connectType",
+    get: function get() {
+      return this._deviceProvider.connectType;
+    }
+  }, {
+    key: "hasNeedMergedStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasNeedMergedStream;
+    }
+  }, {
+    key: "hasOwnPstnStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasOwnPstnStream;
+    }
+  }, {
+    key: "outgoingCall",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.outgoingCall;
+    }
+  }, {
+    key: "hasPstnStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasPstnStream;
+    }
+  }, {
+    key: "connectInfo",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.connectInfo;
+    }
+  }, {
+    key: "openAudioSettings",
+    value: function openAudioSettings() {
+      this._dialogProvider.openDeviceSettingDialog({
+        activeTab: _store.DeviceSettingTab.AUDIO,
+        highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
+      });
+    }
+  }, {
+    key: "closeConnectionDialog",
+    value: function closeConnectionDialog() {
+      this._eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_CONNECTION_DIALOG);
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this._deviceProvider.removeObserver(this._deviceObserver);
+      this._failureTimer && clearTimeout(this._failureTimer);
+      this._failureTimer = null;
+    }
+  }, {
+    key: "_handleInterceptorCloseDialog",
+    value: function _handleInterceptorCloseDialog(dialogKey) {
+      var _this2 = this;
+      if (dialogKey === _constant.FcrUIDialogKey.CONNECTION_GATEWAY) {
+        if (!this._needShowConfirmDialog) {
+          return false;
+        }
+        this._needShowConfirmDialog = false;
+        if (this.hasOwnPstnStream) {
+          return false;
+        }
+        var _dialogKey = this._eventProvider.openConfirmDialog({
+          title: (0, _i18n.transI18n)('fmt_actionbar_tips_joinroom_noaudio'),
+          content: (0, _i18n.transI18n)('fmt_actionbar_tips_canthear'),
+          cancelText: (0, _i18n.transI18n)('fmt_actionbar_button_continue'),
+          okText: (0, _i18n.transI18n)('fmt_actionbar_option_connectaudio'),
+          alignCenter: true,
+          showCancel: true,
+          width: 255,
+          cancelButtonProps: {
+            block: true,
+            type: 'secondary',
+            shape: 'rounded'
+          },
+          okButtonProps: {
+            block: true,
+            type: 'primary',
+            shape: 'rounded'
+          },
+          closable: false,
+          onCancel: function onCancel() {
+            _this2._eventProvider.closeConfirm(_dialogKey);
+            _this2.closeConnectionDialog();
+          },
+          onOk: function () {
+            var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+              return _regenerator["default"].wrap(function (_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    _this2._eventProvider.closeConfirm(_dialogKey);
+                    _context.next = 1;
+                    return _this2.joinAudioByComputer();
+                  case 1:
+                    _this2.closeConnectionDialog();
+                  case 2:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }));
+            function onOk() {
+              return _onOk.apply(this, arguments);
+            }
+            return onOk;
+          }(),
+          reverseButton: true
+        });
+        return true;
+      }
+      return false;
+    }
+  }, {
+    key: "joinAudioByComputer",
+    value: function () {
+      var _joinAudioByComputer = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+        var shouldIncludeMicrophone, hasOpenMicrophonePrivilege, includeMicrophone;
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!(this._sharedDevicePrivilegeDataSource && this._devicePrivilegeProvider)) {
+                _context2.next = 2;
+                break;
+              }
+              shouldIncludeMicrophone = this._sharedDevicePrivilegeDataSource.shouldIncludeMicrophone;
+              _context2.next = 1;
+              return this._devicePrivilegeProvider.hasOpenMicrophonePrivilege();
+            case 1:
+              hasOpenMicrophonePrivilege = _context2.sent;
+              includeMicrophone = shouldIncludeMicrophone && hasOpenMicrophonePrivilege;
+              this._deviceProvider.connectAudio(includeMicrophone);
+            case 2:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function joinAudioByComputer() {
+        return _joinAudioByComputer.apply(this, arguments);
+      }
+      return joinAudioByComputer;
+    }()
+  }, {
+    key: "stopAudioByComputer",
+    value: function stopAudioByComputer() {
+      this._deviceProvider.disconnectAudio();
+    }
+  }]);
+}();
+_ConnectionGatewayStore = ConnectionGatewayStore;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConnectionGatewayStore, [[_mobx.observable, 1, "phoneCallState"], [_mobx.observable, 1, "phoneCallReason"], [_mobx.observable, 1, "connectSession"], [_mobx.observable, 1, "calling"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasNeedMergedStream"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "outgoingCall"], [_mobx.computed, 3, "hasPstnStream"], [_mobx.computed, 3, "connectInfo"], [_decorator.bound, 2, "openAudioSettings"], [_decorator.bound, 2, "closeConnectionDialog"], [_decorator.bound, 2, "_handleInterceptorCloseDialog"], [_decorator.bound, 2, "joinAudioByComputer"], [_decorator.bound, 2, "stopAudioByComputer"]], []).e, 5);
+_init_phoneCallState = _applyDecs$e[0];
+_init_phoneCallReason = _applyDecs$e[1];
+_init_connectSession = _applyDecs$e[2];
+_init_calling = _applyDecs$e[3];
+_initProto = _applyDecs$e[4];
+var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/secondary-window/store.d.ts

@@ -21,7 +21,6 @@ export declare class SecondaryWindowStore {
     private _diffScalcValue;
     private accessor _screenShareScalcValue;
     accessor isSharingWhiteboard: boolean;
-    accessor iframeLoaded: boolean;
     accessor interceptedClose: boolean;
     get secondaryWindowContentType(): "speaker" | "gallery" | "hidden" | "local-camera" | "remote-camera" | "sharing-screen" | "sharing-screen-with-annotation" | "sharing-whiteboard";
     get videoWindowData(): VideoWindowDataReturn<typeof this.secondaryWindowContentType>;
@@ -47,6 +46,7 @@ export declare class SecondaryWindowStore {
     get isSharingWithAudio(): boolean;
     get videoRenderContext(): FcrVideoTrackRenderer;
     get isActive(): boolean;
+    get baseUrl(): string;
     constructor({ objectManager }: SecondaryWindowStoreArgs);
     getContent(): void;
     handleIframeLoad(iframe: HTMLIFrameElement): void;

package/lib/modules/secondary-window/store.js

@@ -65,7 +65,7 @@ var _type2 = require("../layout/type");
 var _objectManager = require("../../object-manager");
 var _type3 = require("../../providers/dialog/type");
 var _SecondaryWindowStore;
-var _initProto, _init__screenShareScalcValue, _init_isSharingWhiteboard, _init_iframeLoaded, _init_interceptedClose;
+var _initProto, _init__screenShareScalcValue, _init_isSharingWhiteboard, _init_interceptedClose;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -79,7 +79,6 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
-var _D = /*#__PURE__*/new WeakMap();
 var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function () {
   function SecondaryWindowStore(_ref) {
     var _this = this;
@@ -103,8 +102,7 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     (0, _defineProperty2["default"])(this, "_diffScalcValue", 0.5);
     _classPrivateFieldInitSpec(this, _A, _init__screenShareScalcValue(this, 1));
     _classPrivateFieldInitSpec(this, _B, _init_isSharingWhiteboard(this, false));
-    _classPrivateFieldInitSpec(this, _C, _init_iframeLoaded(this, false));
-    _classPrivateFieldInitSpec(this, _D, _init_interceptedClose(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init_interceptedClose(this, false));
     (0, _defineProperty2["default"])(this, "_handleSecondaryWindowClosed", function (dialogKey) {
       if (dialogKey !== _constant.FcrUIDialogKey.SUB_WINDOW) {
         return false;
@@ -160,21 +158,13 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "iframeLoaded",
+    key: "interceptedClose",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_C, this, v);
     }
-  }, {
-    key: "interceptedClose",
-    get: function get() {
-      return _classPrivateFieldGet(_D, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_D, this, v);
-    }
   }, {
     key: "secondaryWindowContentType",
     get: function get() {
@@ -272,17 +262,17 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "connectionState",
     get: function get() {
-      return this._boardShareProvider.connectionState;
+      return this._boardShareProvider.boardBarControl.connectionState;
     }
   }, {
     key: "showLoading",
     get: function get() {
-      return this._boardShareProvider.loading;
+      return this._boardShareProvider.boardBarControl.showLoading;
     }
   }, {
     key: "joinSuccess",
     get: function get() {
-      return this._boardShareProvider.joined;
+      return this._boardShareProvider.boardBarControl.joinSuccess;
     }
   }, {
     key: "isMyBoard",
@@ -327,6 +317,11 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     get: function get() {
       return this._boardShareProvider.isActive;
     }
+  }, {
+    key: "baseUrl",
+    get: function get() {
+      return this._renderer.getBaseUrl();
+    }
   }, {
     key: "getContent",
     value: function getContent() {}
@@ -337,7 +332,6 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
       iframe === null || iframe === void 0 || iframe.addEventListener('load', function () {
         iframe.style.width = '100%';
         iframe.style.height = '100%';
-        _this2.iframeLoaded = true;
         if (!iframe.contentWindow) {
           _this2.logger.error('Iframe has no contentWindow');
           return;
@@ -494,16 +488,14 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "_closeSecondaryWindow",
     value: function _closeSecondaryWindow() {
-      this.iframeLoaded = false;
       this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
     }
   }]);
 }();
 _SecondaryWindowStore = SecondaryWindowStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SecondaryWindowStore, [[_mobx.observable, 1, "_screenShareScalcValue"], [_mobx.observable, 1, "isSharingWhiteboard"], [_mobx.observable, 1, "iframeLoaded"], [_mobx.observable, 1, "interceptedClose"], [_mobx.computed, 3, "videoWindowData"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_mobx.computed, 3, "scalValue"], [_decorator.bound, 2, "handleIframeLoad"], [_decorator.bound, 2, "zoomIn"], [_decorator.bound, 2, "zoomOut"], [_decorator.bound, 2, "fullContainer"], [_decorator.bound, 2, "setInterceptedClose"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "setOriginScalc"], [_decorator.bound, 2, "setSpeakerViewSize"], [_decorator.bound, 2, "setWhiteboardTool"], [_decorator.bound, 2, "saveWhiteboardDraft"], [_decorator.bound, 2, "setProgress"], [_decorator.bound, 2, "setTheme"], [_decorator.bound, 2, "setControlEnable"], [_decorator.bound, 2, "setShowLoading"], [_decorator.bound, 2, "setCommonColors"], [_decorator.bound, 2, "log"]], []).e, 5);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SecondaryWindowStore, [[_mobx.observable, 1, "_screenShareScalcValue"], [_mobx.observable, 1, "isSharingWhiteboard"], [_mobx.observable, 1, "interceptedClose"], [_mobx.computed, 3, "videoWindowData"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_mobx.computed, 3, "scalValue"], [_decorator.bound, 2, "handleIframeLoad"], [_decorator.bound, 2, "zoomIn"], [_decorator.bound, 2, "zoomOut"], [_decorator.bound, 2, "fullContainer"], [_decorator.bound, 2, "setInterceptedClose"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "setOriginScalc"], [_decorator.bound, 2, "setSpeakerViewSize"], [_decorator.bound, 2, "setWhiteboardTool"], [_decorator.bound, 2, "saveWhiteboardDraft"], [_decorator.bound, 2, "setProgress"], [_decorator.bound, 2, "setTheme"], [_decorator.bound, 2, "setControlEnable"], [_decorator.bound, 2, "setShowLoading"], [_decorator.bound, 2, "setCommonColors"], [_decorator.bound, 2, "log"]], []).e, 4);
 _init__screenShareScalcValue = _applyDecs$e[0];
 _init_isSharingWhiteboard = _applyDecs$e[1];
-_init_iframeLoaded = _applyDecs$e[2];
-_init_interceptedClose = _applyDecs$e[3];
-_initProto = _applyDecs$e[4];
+_init_interceptedClose = _applyDecs$e[2];
+_initProto = _applyDecs$e[3];
 var SecondaryWindowStoreContext = exports.SecondaryWindowStoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/secondary-window/view.js

@@ -47,7 +47,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
     isAspectRatioPreserved = store.isAspectRatioPreserved,
     isShowToolbar = store.isShowToolbar,
     isActive = store.isActive,
-    iframeLoaded = store.iframeLoaded,
+    baseUrl = store.baseUrl,
     setOriginScalc = store.setOriginScalc,
     zoomIn = store.zoomIn,
     zoomOut = store.zoomOut,
@@ -104,7 +104,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
   var content = null;
   if (isBoardShare) {
     content = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [showLoading && !iframeLoaded && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.Loading, {
+      children: [showLoading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.Loading, {
         joined: joinSuccess,
         connectionState: connectionState,
         canOperate: canWriteBoard,
@@ -114,7 +114,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       }), toolbarState.progress > 0 && toolbarState.progress < 100 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_progress["default"], {
         title: "".concat((0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_downloading'), "..."),
         progress: toolbarState.progress
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar.WhiteboardControlbar, {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_controlBar.WhiteboardControlbar, {
         onClose: function onClose() {},
         onEnable: function onEnable(enable) {
           setControlEnable(enable);
@@ -127,17 +127,17 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
         sharingType: 'whiteboard',
         ownerUserName: videoWindowData.userName,
         isMyBoard: isActive && store.isMyBoard,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
+        children: [!isShowToolbar && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "whiteboard-action-prevent"
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
           ref: handleIframeLoad,
           allow: "webview",
-          src: "/whiteboard.html?type=whiteboard",
+          src: "".concat(baseUrl, "/whiteboard.html?type=whiteboard"),
           style: {
             width: '100vw',
-            height: '100vh',
-            minWidth: '100vw',
-            minHeight: '100vh'
+            height: 'calc(100vh - 28px)'
           }
-        })
+        })]
       })]
     });
   } else {
@@ -181,7 +181,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       }), secondaryWindowContentType === _type2.FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION && annotationHasStart && /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
         ref: handleIframeLoad,
         allow: "webview",
-        src: "/whiteboard.html?type=annotation",
+        src: "".concat(baseUrl, "/whiteboard.html?type=annotation"),
         style: {
           width: '100%',
           height: '100%',