fcr-ui-scene 3.9.0 → 3.9.1-alpha

package/lib/providers/mouse-detect/provider.js

@@ -126,6 +126,7 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
     });
     (0, _defineProperty2["default"])(this, "_isDebug", false);
     (0, _defineProperty2["default"])(this, "_displayId", null);
+    (0, _defineProperty2["default"])(this, "_macMenuBarOffsetY", 30);
     (0, _defineProperty2["default"])(this, "_debugWindowObserver", {
       onReady: function onReady() {
         var AreaDebugger = (0, _mobxReact.observer)(function () {
@@ -163,9 +164,6 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
     this._task = _schedule.AgoraScheduler.shared.addPollingTask(function () {
       _this._detect();
     }, 50);
-    if ((0, _env.isMac)()) {
-      this._task.stop();
-    }
 
     // 调试时使用，用于查看检测区域
     // this._debug(true);
@@ -178,6 +176,11 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
     set: function set(v) {
       _classPrivateFieldSet(_A, this, v);
     }
+  }, {
+    key: "isMouseDetectEnabled",
+    value: function isMouseDetectEnabled() {
+      return true;
+    }
   }, {
     key: "setDisplayId",
     value: function setDisplayId(displayId) {
@@ -220,7 +223,10 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
   }, {
     key: "setDetectionPositionOffset",
     value: function setDetectionPositionOffset(offset) {
-      this._detectionOffset = offset;
+      this._detectionOffset = {
+        x: offset.x,
+        y: offset.y + ((0, _env.isMac)() ? this._macMenuBarOffsetY : 0)
+      };
     }
   }, {
     key: "addObserver",
@@ -289,6 +295,9 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
         window.show();
         window.setIgnoreMouseEvents(true);
         window.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.MOUSE_DETECT_DEBUGGER_LEVEL);
+        window.setVisibleOnAllWorkspaces(true, {
+          visibleOnFullScreen: true
+        });
         window.addObserver(this._debugWindowObserver);
       } else {
         this._isDebug = false;

package/lib/providers/mouse-detect/type.d.ts

@@ -4,6 +4,8 @@ export interface FcrUIMouseDetectObserver {
     onMouseLeaveDetectArea?: (areaId: FcrUIDetectAreaID) => void;
 }
 export interface FcrUIMouseDetectProvider {
+    /** Whether mouse detection mechanism is enabled on this platform/version */
+    isMouseDetectEnabled(): boolean;
     setDisplayId(displayId: number): void;
     setDetectionPositionOffset(offset: FcrUI.FcrUIPoint): void;
     setDetectArea(areaId: FcrUIDetectAreaID, areaList: FcrUI.FcrUIRectangle[]): void;

package/lib/providers/phone-audio-provider.d.ts

@@ -1,10 +1,11 @@
 import { FcrBaseRoomControl } from 'fcr-core';
 import { FcrUIDeviceProvider } from './device-provider';
-import { FcrPhoneConnectorSession, FcrRoomConnectorPhoneInfo, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'fcr-core/lib/room-control/room-connector-control/type';
+import { FcrPhoneConnectorSession, FcrPhoneConnectorSessionType, FcrRoomConnectorPhoneInfo, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'fcr-core/lib/room-control/room-connector-control/type';
 import { FcrUIConnectType } from '../type';
-import { ConnectorRegion } from '../modules/connection-gateway/enums';
 import { FcrUIMessageProvider } from './message/type';
 import { FcrUIManagedObject } from '../object-manager';
+import { FcrUIAbilityProvider } from './ability-provider';
+import { ConnectorRegion } from '../modules/phone-audio-connect/enums';
 export interface FcrUIPhoneAudioConnectorObserver {
     onPhoneCallStateUpdated(state: FcrRoomConnectorSessionState, reason: FcrRoomConnectorSessionReason): void;
 }
@@ -59,6 +60,16 @@ export interface FcrUIPhoneAudioConnectorProvider {
      * @returns boolean
      */
     get hasOwnPstnStream(): boolean;
+    /**
+     * @getter 是否有 VOLTE 流
+     * @returns boolean
+     */
+    get hasVolteStream(): boolean;
+    /**
+     * @getter 是否有自己的 VOLTE 流
+     * @returns boolean
+     */
+    get hasOwnVolteStream(): boolean;
     /**
      * @getter 是否需要合并流
      * @returns boolean
@@ -81,12 +92,21 @@ export interface FcrUIPhoneAudioConnectorProvider {
     /**
      * @method 开始拨号呼叫
      * @param phoneNumber - 电话号码
+     * @param callOutType - 呼出类型
      */
-    startCall(phoneNumber: string): void;
+    startCall(phoneNumber: string, callOutType?: FcrPhoneConnectorSessionType): void;
     /**
      * @method 挂断电话呼叫
      */
     stopCall(): void;
+    /**
+     * @method 获取呼出电话类型
+     */
+    getPhoneCallOutType(): FcrPhoneConnectorSessionType;
+    /**
+     * @method 获取外呼协议类型数组
+     */
+    getCallOutTypeArray(): string[];
     /**
      * @method 释放资源
      */
@@ -108,6 +128,7 @@ export declare class FcrUIPhoneAudioConnectorProviderImpl implements FcrUIPhoneA
     private _disposers;
     private _messageProvider;
     private _deviceProvider;
+    private _abilityProvider;
     private _streamControl;
     private _roomOberver;
     private _streamObserver;
@@ -123,17 +144,22 @@ export declare class FcrUIPhoneAudioConnectorProviderImpl implements FcrUIPhoneA
     accessor outgoingCall: boolean;
     accessor isHangup: boolean;
     accessor hasPstnStream: boolean;
+    accessor hasVolteStream: boolean;
     accessor hasOwnPstnStream: boolean;
+    accessor hasOwnVolteStream: boolean;
     accessor hasNeedMergedStream: boolean;
     get connectType(): FcrUIConnectType;
-    constructor({ roomControl, messageProvider, deviceProvider, }: {
+    constructor({ roomControl, messageProvider, deviceProvider, abilityProvider, }: {
         roomControl: FcrBaseRoomControl;
         messageProvider: FcrUIMessageProvider;
         deviceProvider: FcrUIDeviceProvider;
+        abilityProvider: FcrUIAbilityProvider;
     });
     getConnectorInfo(): Promise<void>;
     setConnectionInfo(region?: ConnectorRegion): void;
-    startCall(phoneNumber: string): Promise<void>;
+    startCall(phoneNumber: string, callOutType?: FcrPhoneConnectorSessionType): Promise<void>;
+    getCallOutTypeArray(): string[];
+    getPhoneCallOutType(): FcrPhoneConnectorSessionType;
     stopCall(): Promise<void>;
     addObserver(observer: FcrUIPhoneAudioConnectorObserver): void;
     removeObserver(observer: FcrUIPhoneAudioConnectorObserver): void;

package/lib/providers/phone-audio-provider.js

@@ -4,8 +4,6 @@ require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.iterator.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.from.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.slice.js");
@@ -42,6 +40,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrUIPhoneAudioConnectorProviderImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.find-index.js");
 require("core-js/modules/es.array.for-each.js");
@@ -73,10 +73,10 @@ var _type = require("fcr-core/lib/room-control/room-connector-control/type");
 var _decorator = require("agora-foundation/lib/decorator");
 var _type2 = require("../type");
 var _imports = require("fcr-core/lib/imports");
-var _enums = require("../modules/connection-gateway/enums");
 var _type3 = require("../modules/toast-manager/type");
+var _enums = require("../modules/phone-audio-connect/enums");
 var _FcrUIPhoneAudioConnectorProviderImpl;
-var _initProto, _init_accepted, _init_connectionPhoneInfos, _init_connectInfo, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling, _init_outgoingCall, _init_isHangup, _init_hasPstnStream, _init_hasOwnPstnStream, _init_hasNeedMergedStream, _getConnectorInfoDecs, _setConnectionInfoDecs, _startCallDecs, _stopCallDecs, _phoneCallUpdatedDecs, _phoneCallReasonDecs, _setStreamStateDecs, _handleStreamsAddedOrUpdatedDecs, _handleStreamsRemovedDecs, _ref;
+var _initProto, _init_accepted, _init_connectionPhoneInfos, _init_connectInfo, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling, _init_outgoingCall, _init_isHangup, _init_hasPstnStream, _init_hasVolteStream, _init_hasOwnPstnStream, _init_hasOwnVolteStream, _init_hasNeedMergedStream, _getConnectorInfoDecs, _setConnectionInfoDecs, _startCallDecs, _getCallOutTypeArrayDecs, _getPhoneCallOutTypeDecs, _stopCallDecs, _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; }
@@ -102,13 +102,16 @@ var _I = /*#__PURE__*/new WeakMap();
 var _J = /*#__PURE__*/new WeakMap();
 var _K = /*#__PURE__*/new WeakMap();
 var _L = /*#__PURE__*/new WeakMap();
-_ref = (_getConnectorInfoDecs = [_mobx.action, _mobx.action.bound], _setConnectionInfoDecs = [_mobx.action, _mobx.action.bound], _startCallDecs = [_mobx.action, _mobx.action.bound], _stopCallDecs = [_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], "_observable");
+var _M = /*#__PURE__*/new WeakMap();
+var _N = /*#__PURE__*/new WeakMap();
+_ref = (_getConnectorInfoDecs = [_mobx.action, _mobx.action.bound], _setConnectionInfoDecs = [_mobx.action, _mobx.action.bound], _startCallDecs = [_mobx.action, _mobx.action.bound], _getCallOutTypeArrayDecs = [_mobx.action, _mobx.action.bound], _getPhoneCallOutTypeDecs = [_mobx.action, _mobx.action.bound], _stopCallDecs = [_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], "_observable");
 var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProviderImpl = /*#__PURE__*/function () {
   function FcrUIPhoneAudioConnectorProviderImpl(_ref2) {
     var _this = this;
     var roomControl = _ref2.roomControl,
       messageProvider = _ref2.messageProvider,
-      deviceProvider = _ref2.deviceProvider;
+      deviceProvider = _ref2.deviceProvider,
+      abilityProvider = _ref2.abilityProvider;
     (0, _classCallCheck2["default"])(this, FcrUIPhoneAudioConnectorProviderImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), new _imports.AgoraObservable()));
     (0, _defineProperty2["default"])(this, "_disposers", []);
@@ -132,13 +135,16 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
     _classPrivateFieldInitSpec(this, _H, _init_outgoingCall(this, false));
     _classPrivateFieldInitSpec(this, _I, _init_isHangup(this, false));
     _classPrivateFieldInitSpec(this, _J, _init_hasPstnStream(this, false));
-    _classPrivateFieldInitSpec(this, _K, _init_hasOwnPstnStream(this, false));
-    _classPrivateFieldInitSpec(this, _L, _init_hasNeedMergedStream(this, false));
+    _classPrivateFieldInitSpec(this, _K, _init_hasVolteStream(this, false));
+    _classPrivateFieldInitSpec(this, _L, _init_hasOwnPstnStream(this, false));
+    _classPrivateFieldInitSpec(this, _M, _init_hasOwnVolteStream(this, false));
+    _classPrivateFieldInitSpec(this, _N, _init_hasNeedMergedStream(this, false));
     this._roomControl = roomControl;
     this._messageProvider = messageProvider;
     this._deviceProvider = deviceProvider;
     this._streamControl = roomControl.getStreamControl();
     this._userControl = roomControl.getUserControl();
+    this._abilityProvider = abilityProvider;
     this._roomControl.getRoomConnectorControl().addObserver(this._roomOberver);
     this._streamControl.addObserver(this._streamObserver);
     this.getConnectorInfo();
@@ -233,7 +239,7 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "hasOwnPstnStream",
+    key: "hasVolteStream",
     get: function get() {
       return _classPrivateFieldGet(_K, this);
     },
@@ -241,13 +247,29 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "hasNeedMergedStream",
+    key: "hasOwnPstnStream",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_L, this, v);
     }
+  }, {
+    key: "hasOwnVolteStream",
+    get: function get() {
+      return _classPrivateFieldGet(_M, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_M, this, v);
+    }
+  }, {
+    key: "hasNeedMergedStream",
+    get: function get() {
+      return _classPrivateFieldGet(_N, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_N, this, v);
+    }
   }, {
     key: "connectType",
     get: function get() {
@@ -289,8 +311,8 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
   }, {
     key: "startCall",
     value: function () {
-      var _startCall = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(phoneNumber) {
-        var _this$_userControl$ge, phoneUserId, userName;
+      var _startCall = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(phoneNumber, callOutType) {
+        var _this$_userControl$ge, phoneUserId, userName, type;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -304,11 +326,13 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
               }
               return _context2.abrupt("return");
             case 1:
+              type = callOutType !== null && callOutType !== void 0 ? callOutType : this.getPhoneCallOutType();
               _context2.next = 2;
               return this._roomControl.getRoomConnectorControl().startSessionByPhone({
                 phoneNumber: phoneNumber,
                 userName: userName,
-                phoneUserId: phoneUserId
+                phoneUserId: phoneUserId,
+                type: type
               });
             case 2:
               this._sessionId = _context2.sent;
@@ -318,11 +342,40 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
           }
         }, _callee2, this);
       }));
-      function startCall(_x) {
+      function startCall(_x, _x2) {
         return _startCall.apply(this, arguments);
       }
       return startCall;
     }()
+  }, {
+    key: "getCallOutTypeArray",
+    value: function getCallOutTypeArray() {
+      var _permissionInfo$info$, _permissionInfo$info;
+      var permissionInfo = this._roomControl.getPrivilegeControl().getLocalUserPermissionInfo(_fcrCore.FcrPermissionAction.CallOut);
+      if (!permissionInfo.enable) {
+        return [];
+      }
+      var types = (_permissionInfo$info$ = (_permissionInfo$info = permissionInfo.info) === null || _permissionInfo$info === void 0 || (_permissionInfo$info = _permissionInfo$info.params) === null || _permissionInfo$info === void 0 ? void 0 : _permissionInfo$info.type) !== null && _permissionInfo$info$ !== void 0 ? _permissionInfo$info$ : [];
+      return types;
+    }
+  }, {
+    key: "getPhoneCallOutType",
+    value: function getPhoneCallOutType() {
+      var types = this.getCallOutTypeArray();
+      var isSupportVolte = types.find(function (item) {
+        return item === _type.FcrPhoneConnectorSessionTypeToStringMap[_type.FcrPhoneConnectorSessionType.VOLTE];
+      }) && this._abilityProvider.isCallOutVolteAbilitySupported();
+      var volte = isSupportVolte ? _type.FcrPhoneConnectorSessionType.VOLTE : null;
+      var isSupportPstn = types.find(function (item) {
+        return item === _type.FcrPhoneConnectorSessionTypeToStringMap[_type.FcrPhoneConnectorSessionType.PSTN];
+      }) && this._abilityProvider.isCallOutAbilitySupported();
+      var pstn = isSupportPstn ? _type.FcrPhoneConnectorSessionType.PSTN : null;
+      var type = volte || pstn;
+      if (!type) {
+        throw new Error('You are not allowed to call out');
+      }
+      return type;
+    }
   }, {
     key: "stopCall",
     value: function () {
@@ -441,16 +494,22 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
         var connectorType = _ref3.connectorType;
         return connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
       };
+      var matchVOLTE = function matchVOLTE(_ref4) {
+        var connectorType = _ref4.connectorType;
+        return connectorType === _fcrCore.FcrRoomConnectorType.VOLTE;
+      };
       var _this$_userControl$ge2 = this._userControl.getLocalUser(),
         userId = _this$_userControl$ge2.userId;
       var myStreams = this._streamControl.getStreamsByUserId(userId);
       var allStreams = this._streamControl.getStreamList();
       this.hasPstnStream = allStreams.some(matchPSTN);
+      this.hasVolteStream = allStreams.some(matchVOLTE);
       this.hasOwnPstnStream = myStreams.some(matchPSTN);
+      this.hasOwnVolteStream = myStreams.some(matchVOLTE);
       this.hasNeedMergedStream = allStreams.some(function (stream) {
-        return stream.owner.connectorType === _fcrCore.FcrRoomConnectorType.PSTN && stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
+        return stream.owner.connectorType === _fcrCore.FcrRoomConnectorType.PSTN && stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN || stream.owner.connectorType === _fcrCore.FcrRoomConnectorType.VOLTE && stream.connectorType === _fcrCore.FcrRoomConnectorType.VOLTE;
       });
-      if (this.hasOwnPstnStream) {
+      if (this.hasOwnPstnStream || this.hasOwnVolteStream) {
         this._deviceProvider.setConnectType(_type2.FcrUIConnectType.PHONE);
       }
       return {
@@ -475,7 +534,7 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
       try {
         var _loop = function _loop() {
             var modifiedStream = _step.value.modifiedStream;
-            if (modifiedStream.connectorType !== _fcrCore.FcrRoomConnectorType.PSTN) return {
+            if (modifiedStream.connectorType !== _fcrCore.FcrRoomConnectorType.PSTN && modifiedStream.connectorType !== _fcrCore.FcrRoomConnectorType.VOLTE) return {
               v: void 0
             };
             if (modifiedStream.owner.userId === userId && _this3._deviceProvider.connectType === _type2.FcrUIConnectType.PHONE) {
@@ -508,8 +567,8 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
   }]);
 }();
 _FcrUIPhoneAudioConnectorProviderImpl = FcrUIPhoneAudioConnectorProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIPhoneAudioConnectorProviderImpl, [[_mobx.observable, 1, "accepted"], [_mobx.observable, 1, "connectionPhoneInfos"], [_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"], [_getConnectorInfoDecs, 18, "getConnectorInfo"], [_setConnectionInfoDecs, 18, "setConnectionInfo"], [_startCallDecs, 18, "startCall"], [_stopCallDecs, 18, "stopCall"], [_decorator.bound, 2, "_setResetTimer"], [_phoneCallUpdatedDecs, 18, "_phoneCallUpdated"], [_phoneCallReasonDecs, 18, "_phoneCallReason"], [_setStreamStateDecs, 18, "_setStreamState"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 13);
+var _applyDecs$e = _applyDecs(_FcrUIPhoneAudioConnectorProviderImpl, [[_mobx.observable, 1, "accepted"], [_mobx.observable, 1, "connectionPhoneInfos"], [_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, "hasVolteStream"], [_mobx.observable, 1, "hasOwnPstnStream"], [_mobx.observable, 1, "hasOwnVolteStream"], [_mobx.observable, 1, "hasNeedMergedStream"], [_mobx.computed, 3, "connectType"], [_getConnectorInfoDecs, 18, "getConnectorInfo"], [_setConnectionInfoDecs, 18, "setConnectionInfo"], [_startCallDecs, 18, "startCall"], [_getCallOutTypeArrayDecs, 18, "getCallOutTypeArray"], [_getPhoneCallOutTypeDecs, 18, "getPhoneCallOutType"], [_stopCallDecs, 18, "stopCall"], [_decorator.bound, 2, "_setResetTimer"], [_phoneCallUpdatedDecs, 18, "_phoneCallUpdated"], [_phoneCallReasonDecs, 18, "_phoneCallReason"], [_setStreamStateDecs, 18, "_setStreamState"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_handleStreamsRemovedDecs, 18, "_handleStreamsRemoved"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 15);
 _init_accepted = _applyDecs$e2[0];
 _init_connectionPhoneInfos = _applyDecs$e2[1];
 _init_connectInfo = _applyDecs$e2[2];
@@ -520,7 +579,9 @@ _init_calling = _applyDecs$e2[6];
 _init_outgoingCall = _applyDecs$e2[7];
 _init_isHangup = _applyDecs$e2[8];
 _init_hasPstnStream = _applyDecs$e2[9];
-_init_hasOwnPstnStream = _applyDecs$e2[10];
-_init_hasNeedMergedStream = _applyDecs$e2[11];
-_initProto = _applyDecs$e2[12];
+_init_hasVolteStream = _applyDecs$e2[10];
+_init_hasOwnPstnStream = _applyDecs$e2[11];
+_init_hasOwnVolteStream = _applyDecs$e2[12];
+_init_hasNeedMergedStream = _applyDecs$e2[13];
+_initProto = _applyDecs$e2[14];
 _applyDecs$e;

package/lib/runtime.d.ts

@@ -75,6 +75,7 @@ export interface Runtime {
     getNetworkType(): Promise<NetworkType>;
     getSystemMemorySize(): number;
     getSystemCpuInfo(): CpuInfo[];
+    getSystemVersion(): string;
     downloadAndExtractResourceFileFromZip(zipUrl: string, type: FcrUiResourceType): Promise<string[]>;
     downloadResourceFile(fileUrl: string, type: FcrUiResourceType): Promise<string>;
     fileToBlob(filePath: string, type: 'image' | 'video' | 'audio'): Blob;

package/lib/scenes/main-scene.js

@@ -335,7 +335,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             })
           }, dialogId);
         },
-        electronWindowConfig: _invite.electronWindowConfig
+        electronWindowConfig: _invite.electronWindowConfig,
+        webDialogConfig: _invite.webDialogConfig
       }, {
         key: _constant.FcrUIDialogKey.CHAT,
         component: function component(_ref0) {

package/lib/shared-data/chat-data.d.ts

@@ -2,6 +2,7 @@ import { FcrChatRoomReceiveMessage, FcrUIChatProvider } from '../providers/chat-
 import { ChatRoomStoreMap } from '../modules/action-bar/type';
 import { FcrUIRoomType } from '../type';
 import { FcrUIManagedObject } from '../object-manager';
+import { FcrChatRoomConnectionState } from 'fcr-core/lib/room-control/chatroom-control/type';
 export interface FcrUISharedChatDataSource {
     get newMessageCount(): ChatRoomStoreMap;
     set newMessageCount(value: ChatRoomStoreMap);
@@ -15,13 +16,31 @@ export interface FcrUISharedChatDataSource {
      * 设置聊天当前tab
      */
     set activeTab(roomType: FcrUIRoomType);
+    /**
+     * 获取指定房间的连接状态
+     */
+    getConnectionState(roomType: FcrUIRoomType): FcrChatRoomConnectionState;
+    /**
+     * 设置指定房间的连接状态
+     */
+    setConnectionState(roomType: FcrUIRoomType, state: FcrChatRoomConnectionState): void;
+    /**
+     * 获取当前活跃tab的连接状态
+     */
+    get currentConnectionState(): FcrChatRoomConnectionState;
 }
 export declare class FcrUISharedChatDataSourceImpl implements FcrUISharedChatDataSource, FcrUIManagedObject {
     private _chatProvider;
     accessor newMessageCount: ChatRoomStoreMap;
     accessor latestMessage: FcrChatRoomReceiveMessage | undefined;
     accessor activeTab: FcrUIRoomType;
+    accessor mainRoomConnectionState: FcrChatRoomConnectionState;
+    accessor waitingRoomConnectionState: FcrChatRoomConnectionState;
     constructor(_chatProvider: FcrUIChatProvider);
     release(): void;
     private _handleNewMessageEvent;
+    private _handleConnectionStateUpdated;
+    setConnectionState(roomType: FcrUIRoomType, state: FcrChatRoomConnectionState): void;
+    getConnectionState(roomType: FcrUIRoomType): FcrChatRoomConnectionState;
+    get currentConnectionState(): FcrChatRoomConnectionState;
 }

package/lib/shared-data/chat-data.js

@@ -59,8 +59,9 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _mobx = require("mobx");
 var _type = require("../type");
+var _type2 = require("fcr-core/lib/room-control/chatroom-control/type");
 var _FcrUISharedChatDataSourceImpl;
-var _initProto, _init_newMessageCount, _init_latestMessage, _init_activeTab, _handleNewMessageEventDecs, _init__handleNewMessageEvent, _ref;
+var _initProto, _init_newMessageCount, _init_latestMessage, _init_activeTab, _init_mainRoomConnectionState, _init_waitingRoomConnectionState, _handleNewMessageEventDecs, _init__handleNewMessageEvent, _handleConnectionStateUpdatedDecs, _init__handleConnectionStateUpdated, _setConnectionStateDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -76,7 +77,9 @@ 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();
-_ref = (_handleNewMessageEventDecs = [_mobx.action, _mobx.action.bound], "newMessageCount");
+var _D = /*#__PURE__*/new WeakMap();
+var _E = /*#__PURE__*/new WeakMap();
+_ref = (_handleNewMessageEventDecs = [_mobx.action, _mobx.action.bound], _handleConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _setConnectionStateDecs = [_mobx.action, _mobx.action.bound], "newMessageCount");
 var FcrUISharedChatDataSourceImpl = exports.FcrUISharedChatDataSourceImpl = /*#__PURE__*/function () {
   function FcrUISharedChatDataSourceImpl(_chatProvider) {
     var _this = this;
@@ -84,6 +87,8 @@ var FcrUISharedChatDataSourceImpl = exports.FcrUISharedChatDataSourceImpl = /*#_
     _classPrivateFieldInitSpec(this, _A, (_initProto(this), _init_newMessageCount(this, (0, _defineProperty2["default"])({}, _type.FcrUIRoomType.MAIN_ROOM, 0))));
     _classPrivateFieldInitSpec(this, _B, _init_latestMessage(this));
     _classPrivateFieldInitSpec(this, _C, _init_activeTab(this, _type.FcrUIRoomType.MAIN_ROOM));
+    _classPrivateFieldInitSpec(this, _D, _init_mainRoomConnectionState(this, _type2.FcrChatRoomConnectionState.Disconnected));
+    _classPrivateFieldInitSpec(this, _E, _init_waitingRoomConnectionState(this, _type2.FcrChatRoomConnectionState.Disconnected));
     (0, _defineProperty2["default"])(this, "_handleNewMessageEvent", _init__handleNewMessageEvent(this, function (info) {
       var _msgObj$currentRoomTy;
       var msgObj = _objectSpread({}, _this.newMessageCount);
@@ -95,9 +100,13 @@ var FcrUISharedChatDataSourceImpl = exports.FcrUISharedChatDataSourceImpl = /*#_
       _this.newMessageCount = _objectSpread({}, msgObj);
       _this.latestMessage = latestMessage;
     }));
+    (0, _defineProperty2["default"])(this, "_handleConnectionStateUpdated", _init__handleConnectionStateUpdated(this, function (_, state, roomType) {
+      _this.setConnectionState(roomType, state);
+    }));
     this._chatProvider = _chatProvider;
     this._chatProvider.addObserver({
-      onUnReadMessageUpdated: this._handleNewMessageEvent
+      onUnReadMessageUpdated: this._handleNewMessageEvent,
+      onChatRoomConnectionStateUpdated: this._handleConnectionStateUpdated
     });
   }
   return (0, _createClass2["default"])(FcrUISharedChatDataSourceImpl, [{
@@ -126,17 +135,55 @@ var FcrUISharedChatDataSourceImpl = exports.FcrUISharedChatDataSourceImpl = /*#_
     set: function set(v) {
       _classPrivateFieldSet(_C, this, v);
     }
+  }, {
+    key: "mainRoomConnectionState",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
+  }, {
+    key: "waitingRoomConnectionState",
+    get: function get() {
+      return _classPrivateFieldGet(_E, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_E, this, v);
+    }
   }, {
     key: "release",
     value: function release() {}
+  }, {
+    key: "setConnectionState",
+    value: function setConnectionState(roomType, state) {
+      if (roomType === _type.FcrUIRoomType.MAIN_ROOM) {
+        this.mainRoomConnectionState = state;
+      } else if (roomType === _type.FcrUIRoomType.WAITING_ROOM) {
+        this.waitingRoomConnectionState = state;
+      }
+    }
+  }, {
+    key: "getConnectionState",
+    value: function getConnectionState(roomType) {
+      return roomType === _type.FcrUIRoomType.MAIN_ROOM ? this.mainRoomConnectionState : this.waitingRoomConnectionState;
+    }
+  }, {
+    key: "currentConnectionState",
+    get: function get() {
+      return this.getConnectionState(this.activeTab);
+    }
   }]);
 }();
 _FcrUISharedChatDataSourceImpl = FcrUISharedChatDataSourceImpl;
-var _applyDecs$e = _applyDecs(_FcrUISharedChatDataSourceImpl, [[_mobx.observable, 1, "newMessageCount"], [_mobx.observable, 1, "latestMessage"], [_mobx.observable, 1, "activeTab"], [_handleNewMessageEventDecs, 16, "_handleNewMessageEvent"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 5);
+var _applyDecs$e = _applyDecs(_FcrUISharedChatDataSourceImpl, [[_mobx.observable, 1, "newMessageCount"], [_mobx.observable, 1, "latestMessage"], [_mobx.observable, 1, "activeTab"], [_mobx.observable, 1, "mainRoomConnectionState"], [_mobx.observable, 1, "waitingRoomConnectionState"], [_setConnectionStateDecs, 18, "setConnectionState"], [_mobx.computed, 3, "currentConnectionState"], [_handleNewMessageEventDecs, 16, "_handleNewMessageEvent"], [_handleConnectionStateUpdatedDecs, 16, "_handleConnectionStateUpdated"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 8);
 _init_newMessageCount = _applyDecs$e2[0];
 _init_latestMessage = _applyDecs$e2[1];
 _init_activeTab = _applyDecs$e2[2];
-_init__handleNewMessageEvent = _applyDecs$e2[3];
-_initProto = _applyDecs$e2[4];
+_init_mainRoomConnectionState = _applyDecs$e2[3];
+_init_waitingRoomConnectionState = _applyDecs$e2[4];
+_init__handleNewMessageEvent = _applyDecs$e2[5];
+_init__handleConnectionStateUpdated = _applyDecs$e2[6];
+_initProto = _applyDecs$e2[7];
 _applyDecs$e;

package/lib/shared-data/member-data.d.ts

@@ -33,6 +33,11 @@ export interface FcrUISharedMemberDataSource {
      * @returns 如果本地用户处于 PSTN 模式则返回 true，否则返回 false。
      */
     get hasOwnPstnStream(): boolean;
+    /**
+     * 检查本地用户是否处于 VOLTE 模式。
+     * @returns 如果本地用户处于 VOLTE 模式则返回 true，否则返回 false。
+     */
+    get hasOwnVolteStream(): boolean;
     /**
      * 检查本地用户是否是主持人。
      * @returns 如果本地用户是主持人或联系主持人 模式则返回 true，否则返回 false。
@@ -79,6 +84,7 @@ export declare class FcrUISharedMemberDataSourceImpl implements FcrUISharedMembe
     private _dataSource;
     private _disposers;
     private accessor _isLocalUserInPstn;
+    private accessor _isLocalUserInVolte;
     private accessor _interpreterInputLanguageList;
     private accessor _localUser;
     private _userObserver;
@@ -88,13 +94,14 @@ export declare class FcrUISharedMemberDataSourceImpl implements FcrUISharedMembe
     accessor shareScreenVideoSize: FcrRemoteVideoStats['dimensions'] | null;
     get localUserId(): string;
     get hasOwnPstnStream(): boolean;
+    get hasOwnVolteStream(): boolean;
     get interpreterInputLanguageList(): {
         userId: string;
         language: FcrLanguage;
     }[];
     get localUser(): FcrUserInfo;
     get localUserRole(): FcrUserRole;
-    get localUserRoleString(): "participant" | "host" | "cohost" | "audience" | "observer" | "robot";
+    get localUserRoleString(): "participant" | "host" | "audience" | "cohost" | "observer" | "robot";
     get isLocalUserHost(): boolean;
     get remoteMembers(): FcrUIMemberDataImpl[];
     get remoteMembersUserInfosList(): FcrUserInfo[];
@@ -105,6 +112,7 @@ export declare class FcrUISharedMemberDataSourceImpl implements FcrUISharedMembe
     updateMemberListWithBoardState(): void;
     release(): void;
     private _setIsLocalUserInPstn;
+    private _setIsLocalUserInVolte;
     private _handleAllUserCountUpdated;
     private _initUserList;
     private _handleUserInfoUpdated;