fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib-es/providers/device-stream-provider.js

@@ -3,7 +3,6 @@ import "core-js/modules/es.symbol.description.js";
 import "core-js/modules/es.symbol.to-primitive.js";
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.error.to-string.js";
-import "core-js/modules/es.array.filter.js";
 import "core-js/modules/es.array.is-array.js";
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/es.array.push.js";
@@ -12,14 +11,10 @@ import "core-js/modules/es.function.name.js";
 import "core-js/modules/es.map.js";
 import "core-js/modules/es.number.constructor.js";
 import "core-js/modules/es.object.create.js";
-import "core-js/modules/es.object.define-properties.js";
 import "core-js/modules/es.object.define-property.js";
 import "core-js/modules/es.object.get-own-property-descriptor.js";
-import "core-js/modules/es.object.get-own-property-descriptors.js";
-import "core-js/modules/es.object.keys.js";
 import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/esnext.function.metadata.js";
-import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.map.delete-all.js";
 import "core-js/modules/esnext.map.emplace.js";
 import "core-js/modules/esnext.map.every.js";
@@ -43,10 +38,8 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _FcrUIDeviceStreamProviderImpl;
-var _initProto, _checkoutDevicePermissionDecs, _enableCameraWithPreCheckDecs, _enableMicrophoneWithPreCheckDecs, _ref;
+var _initProto, _enableCameraWithPreCheckDecs, _enableMicrophoneWithPreCheckDecs, _ref;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-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) { _defineProperty(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; }
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.array.find.js";
 import "core-js/modules/es.array.for-each.js";
@@ -64,21 +57,19 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 import { bound } from 'agora-foundation/lib/decorator';
 import { action } from 'mobx';
 import { FcrVideoSourceType } from 'fcr-core/lib/type';
-import { transI18n } from 'agora-ui-foundation/lib/i18n';
 import { FcrRoomType } from 'fcr-core/lib/room-control/type';
-import { FcrUIDialogKey } from '../utilities/constant';
-import bg1 from '../modules/dialog/dialogs/system-preference/assets/bg1.png';
-import bg2 from '../modules/dialog/dialogs/system-preference/assets/bg2.png';
 import { FcrAudioSourceType } from 'fcr-core';
 import { UpdateType } from '../modules/interpreter/type';
 import { createLogger } from '../utilities/logger';
-_ref = (_checkoutDevicePermissionDecs = [action, action.bound], _enableCameraWithPreCheckDecs = [action, action.bound], _enableMicrophoneWithPreCheckDecs = [action, action.bound], "logger");
+import { FcrUIToastKey } from '../modules/toast-manager/type';
+_ref = (_enableCameraWithPreCheckDecs = [action, action.bound], _enableMicrophoneWithPreCheckDecs = [action, action.bound], "logger");
 export var FcrUIDeviceStreamProviderImpl = /*#__PURE__*/function () {
   function FcrUIDeviceStreamProviderImpl(roomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource) {
     var _this = this,
       _this$_interpreterPro;
     var interpreterProvider = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
     var sharedInterpreterDataSource = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
+    var facilityProvider = arguments.length > 8 ? arguments[8] : undefined;
     _classCallCheck(this, FcrUIDeviceStreamProviderImpl);
     _defineProperty(this, _ref, (_initProto(this), createLogger({
       prefix: 'FcrUIDeviceStreamProviderImpl'
@@ -127,6 +118,7 @@ export var FcrUIDeviceStreamProviderImpl = /*#__PURE__*/function () {
     this._deviceProvider = deviceProvider;
     this._messageProvider = messageProvider;
     this._dialogProvider = dialogProvider;
+    this._facilityProvider = facilityProvider;
     this._devicePrivilegeProvider = devicePrivilegeProvider;
     this._sharedDevicePrivilegeDataSource = sharedDevicePrivilegeDataSource;
     this._interpreterProvider = interpreterProvider;
@@ -171,99 +163,40 @@ export var FcrUIDeviceStreamProviderImpl = /*#__PURE__*/function () {
         return stream.videoSourceType === FcrVideoSourceType.CAMERA;
       });
     }
-  }, {
-    key: "checkoutDevicePermission",
-    value: function () {
-      var _checkoutDevicePermission = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(mediaType) {
-        var hasSystemPermission, dialogMap;
-        return _regeneratorRuntime.wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              hasSystemPermission = true;
-              dialogMap = {
-                camera: {
-                  title: transI18n('fmt_camera_popup_label_restricted'),
-                  desc: transI18n('fmt_camera_popup_label_system_change'),
-                  img: bg1
-                },
-                microphone: {
-                  title: transI18n('fmt_audio_popup_label_restricted'),
-                  desc: transI18n('fmt_audio_popup_label_system_change'),
-                  img: bg2
-                }
-              }; // TODO: facilityProvider
-              // if (isElectron()) {
-              //   hasSystemPermission = await renderer.checkMediaPermission(mediaType);
-              // }
-              if (!hasSystemPermission) {
-                this._dialogProvider.openDialog(FcrUIDialogKey.SYSTEM_PREFERENCE, _objectSpread(_objectSpread({}, dialogMap[mediaType]), {}, {
-                  buttons: [{
-                    withClose: true,
-                    text: transI18n('fmt_audio_popup_button_system_change'),
-                    onClick: function onClick() {
-                      // TODO:
-                      // renderer.openSystemPreferences(mediaType);
-                    }
-                  }, {
-                    withClose: true,
-                    styleType: 'white',
-                    text: transI18n('fmt_audio_popup_button_cancel')
-                  }]
-                }));
-              }
-              return _context.abrupt("return", hasSystemPermission);
-            case 1:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function checkoutDevicePermission(_x) {
-        return _checkoutDevicePermission.apply(this, arguments);
-      }
-      return checkoutDevicePermission;
-    }()
   }, {
     key: "enableCameraWithPreCheck",
     value: function () {
-      var _enableCameraWithPreCheck = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(enable) {
+      var _enableCameraWithPreCheck = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(enable) {
         var _this$_roomControl$ge;
-        var canOpenCamera, hasDeivcePermission;
-        return _regeneratorRuntime.wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        var canOpenCamera;
+        return _regeneratorRuntime.wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!(((_this$_roomControl$ge = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge === void 0 ? void 0 : _this$_roomControl$ge.roomType) === FcrRoomType.Mainroom)) {
-                _context2.next = 2;
+                _context.next = 2;
                 break;
               }
-              _context2.next = 1;
+              _context.next = 1;
               return this._devicePrivilegeProvider.hasOpenCameraPrivilege();
             case 1:
-              canOpenCamera = _context2.sent;
+              canOpenCamera = _context.sent;
               if (!(!canOpenCamera && enable)) {
-                _context2.next = 2;
+                _context.next = 2;
                 break;
               }
-              this._messageProvider.showToast({
-                type: 'error',
-                message: transI18n('fmt_toolbar_tips_host_forbid_open_camera')
+              this._messageProvider.showToastByKey({
+                key: FcrUIToastKey.FMT_TOOLBAR_TIPS_HOST_FORBID_OPEN_CAMERA
               });
-              return _context2.abrupt("return");
+              return _context.abrupt("return");
             case 2:
-              _context2.next = 3;
-              return this.checkoutDevicePermission('camera');
+              this._deviceProvider.setCameraEnabled(enable);
             case 3:
-              hasDeivcePermission = _context2.sent;
-              if (hasDeivcePermission) {
-                this._deviceProvider.setCameraEnabled(enable);
-              }
-            case 4:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
-        }, _callee2, this);
+        }, _callee, this);
       }));
-      function enableCameraWithPreCheck(_x2) {
+      function enableCameraWithPreCheck(_x) {
         return _enableCameraWithPreCheck.apply(this, arguments);
       }
       return enableCameraWithPreCheck;
@@ -271,45 +204,38 @@ export var FcrUIDeviceStreamProviderImpl = /*#__PURE__*/function () {
   }, {
     key: "enableMicrophoneWithPreCheck",
     value: function () {
-      var _enableMicrophoneWithPreCheck = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(enable) {
+      var _enableMicrophoneWithPreCheck = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(enable) {
         var _this$_roomControl$ge2;
-        var canOpenMicrophone, hasDeivcePermission;
-        return _regeneratorRuntime.wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        var canOpenMicrophone;
+        return _regeneratorRuntime.wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (!(((_this$_roomControl$ge2 = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge2 === void 0 ? void 0 : _this$_roomControl$ge2.roomType) === FcrRoomType.Mainroom)) {
-                _context3.next = 2;
+                _context2.next = 2;
                 break;
               }
-              _context3.next = 1;
+              _context2.next = 1;
               return this._devicePrivilegeProvider.hasOpenMicrophonePrivilege();
             case 1:
-              canOpenMicrophone = _context3.sent;
+              canOpenMicrophone = _context2.sent;
               if (!(!canOpenMicrophone && enable)) {
-                _context3.next = 2;
+                _context2.next = 2;
                 break;
               }
-              this._messageProvider.showToast({
-                type: 'error',
-                message: transI18n('fmt_toolbar_tips_host_forbid_open_mic')
+              this._messageProvider.showToastByKey({
+                key: FcrUIToastKey.FMT_TOOLBAR_TIPS_HOST_FORBID_OPEN_MIC
               });
-              return _context3.abrupt("return");
+              return _context2.abrupt("return");
             case 2:
-              _context3.next = 3;
-              return this.checkoutDevicePermission('microphone');
+              this._deviceProvider.setMicrophoneEnabled(enable);
+              this._sharedDevicePrivilegeDataSource.setShouldIncludeMicrophone(enable);
             case 3:
-              hasDeivcePermission = _context3.sent;
-              if (hasDeivcePermission) {
-                this._deviceProvider.setMicrophoneEnabled(enable);
-                this._sharedDevicePrivilegeDataSource.setShouldIncludeMicrophone(enable);
-              }
-            case 4:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
-      function enableMicrophoneWithPreCheck(_x3) {
+      function enableMicrophoneWithPreCheck(_x2) {
         return _enableMicrophoneWithPreCheck.apply(this, arguments);
       }
       return enableMicrophoneWithPreCheck;
@@ -412,7 +338,7 @@ export var FcrUIDeviceStreamProviderImpl = /*#__PURE__*/function () {
   }]);
 }();
 _FcrUIDeviceStreamProviderImpl = FcrUIDeviceStreamProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIDeviceStreamProviderImpl, [[_checkoutDevicePermissionDecs, 18, "checkoutDevicePermission"], [_enableCameraWithPreCheckDecs, 18, "enableCameraWithPreCheck"], [_enableMicrophoneWithPreCheckDecs, 18, "enableMicrophoneWithPreCheck"], [bound, 2, "_handleCameraChanged"], [bound, 2, "_handleMicrophoneChanged"], [bound, 2, "_bindLocalAudioStream"], [bound, 2, "_bindLocalVideoStream"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrUIDeviceStreamProviderImpl, [[_enableCameraWithPreCheckDecs, 18, "enableCameraWithPreCheck"], [_enableMicrophoneWithPreCheckDecs, 18, "enableMicrophoneWithPreCheck"], [bound, 2, "_handleCameraChanged"], [bound, 2, "_handleMicrophoneChanged"], [bound, 2, "_bindLocalAudioStream"], [bound, 2, "_bindLocalVideoStream"]], []).e;
 var _applyDecs$e2 = _slicedToArray(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib-es/providers/dialog/provider.electron.js

@@ -150,8 +150,13 @@ export var FcrUIElectronDialogProviderImpl = /*#__PURE__*/function (_FcrUIDialog
             mh = _this2$_renderer$getD.height,
             mx = _this2$_renderer$getD.x,
             my = _this2$_renderer$getD.y;
-          var shareScreenDialogs = [FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR, FcrUIDialogKey.VIDEO_WINDOW];
+          var shareScreenDialogs = [FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR, FcrUIDialogKey.VIDEO_WINDOW, FcrUIDialogKey.ANNOTATION_MASK, FcrUIDialogKey.ANNOTATION_TOOLBAR];
           var fullScreenDialogs = [FcrUIDialogKey.TOAST, FcrUIDialogKey.CONFIRM];
+          /**
+           * 注意：窗口内的子节点包含 img 等 资源标签时，资源加载完成后，元素实际尺寸变化，易出现窗口位置不居中、布局偏移等问题
+           * 1.  问题根源：img 加载前初始宽高为 0，导致通过 window.getBounds() 等 API 获取的窗口宽高不准确
+           * 2.  解决方案：如为 img 标签显式设置固定宽高，确保初始布局计算与最终渲染一致
+           */
           var _window$getBounds = window.getBounds(),
             ww = _window$getBounds.width,
             wh = _window$getBounds.height;

package/lib-es/providers/interpreter-provider.js

@@ -240,8 +240,8 @@ export var FcrUIInterpreterProviderImpl = /*#__PURE__*/function () {
         }
         return onLeaveMainRoom;
       }(),
-      onExitRoom: function () {
-        var _onExitRoom = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+      onExitMeeting: function () {
+        var _onExitMeeting = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
           return _regeneratorRuntime.wrap(function (_context5) {
             while (1) switch (_context5.prev = _context5.next) {
               case 0:
@@ -252,10 +252,10 @@ export var FcrUIInterpreterProviderImpl = /*#__PURE__*/function () {
             }
           }, _callee5);
         }));
-        function onExitRoom() {
-          return _onExitRoom.apply(this, arguments);
+        function onExitMeeting() {
+          return _onExitMeeting.apply(this, arguments);
         }
-        return onExitRoom;
+        return onExitMeeting;
       }()
     });
     var privilegeProvider = params.privilegeProvider,

package/lib-es/providers/message/provider.js

@@ -49,6 +49,7 @@ import { createLogger } from '../../utilities/logger';
 import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
 import { trace } from 'agora-foundation/lib/decorator';
 import { FcrUIToastPosition } from './struct';
+import { ToastParams } from '../../modules/toast-manager/toast-params';
 export var FcrUIMessageProviderImpl = /*#__PURE__*/function () {
   function FcrUIMessageProviderImpl() {
     _classCallCheck(this, FcrUIMessageProviderImpl);
@@ -56,6 +57,7 @@ export var FcrUIMessageProviderImpl = /*#__PURE__*/function () {
       prefix: 'FcrUIMessageProviderImpl'
     })));
     _defineProperty(this, "_observable", new AgoraObservable());
+    _defineProperty(this, "_toastParams", new ToastParams());
   }
   return _createClass(FcrUIMessageProviderImpl, [{
     key: "release",
@@ -68,6 +70,16 @@ export var FcrUIMessageProviderImpl = /*#__PURE__*/function () {
       var position = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : FcrUIToastPosition.GLOBAL;
       this._observable.notifyObservers('onToastReceived', params, position);
     }
+  }, {
+    key: "showToastByKey",
+    value: function showToastByKey(_ref) {
+      var key = _ref.key,
+        _ref$position = _ref.position,
+        position = _ref$position === void 0 ? FcrUIToastPosition.GLOBAL : _ref$position,
+        params = _ref.params;
+      var toastParams = this._toastParams.getToastParams(key, params);
+      this._observable.notifyObservers('onToastReceived', toastParams, position);
+    }
   }, {
     key: "showNotification",
     value: function showNotification(params) {

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

@@ -91,7 +91,7 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 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; }
 import { FcrUIObjectKeys } from '../../object-manager';
 import { createLogger, generateLogObserver } from '../../utilities/logger';
-import { isMac } from '../../utilities/platform';
+import { isMac } from 'agora-foundation/lib/utilities/env';
 import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
 import { AgoraScheduler } from 'agora-foundation/lib/schedule';
 import { trace } from 'agora-foundation/lib/decorator';

package/lib-es/providers/mouse-detect/struct.js

@@ -1,5 +1,6 @@
 export var FcrUIDetectAreaID = /*#__PURE__*/function (FcrUIDetectAreaID) {
   FcrUIDetectAreaID["ControlBar"] = "ControlBar";
   FcrUIDetectAreaID["Confirm"] = "Confirm";
+  FcrUIDetectAreaID["AnnotationToolbar"] = "AnnotationToolbar";
   return FcrUIDetectAreaID;
 }({});

package/lib-es/providers/multi-display-provider.js

@@ -40,8 +40,6 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _FcrUIMultiDisplayProviderImpl;
 var _initProto, _init__displayCount, _init__displayState, _init__secondaryWindowContentType, _init__mainWindowContentType;
-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) { _defineProperty(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; }
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.array.find.js";
 import "core-js/modules/es.array.for-each.js";
@@ -59,6 +57,8 @@ import "core-js/modules/esnext.weak-map.delete-all.js";
 import "core-js/modules/esnext.weak-map.emplace.js";
 import "core-js/modules/web.dom-collections.for-each.js";
 import "core-js/modules/web.dom-collections.iterator.js";
+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) { _defineProperty(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); }
 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; }
@@ -118,6 +118,17 @@ export var FcrUIMultiDisplayProviderImpl = /*#__PURE__*/function () {
         _this._isLocalUserNotScreenSharing = true;
       }
     });
+    _defineProperty(this, "_sharingObserver", {
+      onScreenSharingUpdated: function onScreenSharingUpdated(streamInfo, state) {
+        if (state === FcrScreenSharingState.START_WHIT_ANNOTATION) {
+          if ((streamInfo === null || streamInfo === void 0 ? void 0 : streamInfo.owner.userId) !== _this._userId) {
+            var _state = _objectSpread({}, _this._displayState);
+            _this._handleScreenSharingState(_state);
+            _this._setDisplayState(_state);
+          }
+        }
+      }
+    });
     _classPrivateFieldInitSpec(this, _A, _init__displayCount(this, 1));
     _classPrivateFieldInitSpec(this, _B, _init__displayState(this, {
       participantCount: 1,
@@ -143,6 +154,7 @@ export var FcrUIMultiDisplayProviderImpl = /*#__PURE__*/function () {
     this._screenShareProvider = screenShareProvider;
     this._renderer.addEventListener(this._handleDisplayCountUpdated);
     this._screenShareProvider.addObserver(this._screenShareObserver);
+    this._sharingControl.addObserver(this._sharingObserver);
     this._displayCount = renderer.getAllDisplays().length;
     this._initDisplayState();
     this._addReaction();
@@ -249,6 +261,7 @@ export var FcrUIMultiDisplayProviderImpl = /*#__PURE__*/function () {
     value: function release() {
       this._renderer.removeEventListener(this._handleDisplayCountUpdated);
       this._screenShareProvider.removeObserver(this._screenShareObserver);
+      this._sharingControl.removeObserver(this._sharingObserver);
       this._observers.removeAllObservers();
       this._disposers.forEach(function (disposer) {
         return disposer();

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

@@ -79,9 +79,10 @@ import { FcrRoomConnectorType } from 'fcr-core';
 import { action, computed, observable, reaction } from 'mobx';
 import { FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'fcr-core/lib/room-control/room-connector-control/type';
 import { bound } from 'agora-foundation/lib/decorator';
-import { transI18n } from 'agora-ui-foundation/lib/i18n';
 import { FcrUIConnectType } from '../type';
+import { AgoraObservable } from 'fcr-core/lib/imports';
 import { ConnectorRegion } from '../modules/connection-gateway/enums';
+import { FcrUIToastKey } from '../modules/toast-manager/type';
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -94,7 +95,7 @@ var _I = /*#__PURE__*/new WeakMap();
 var _J = /*#__PURE__*/new WeakMap();
 var _K = /*#__PURE__*/new WeakMap();
 var _L = /*#__PURE__*/new WeakMap();
-_ref = (_getConnectorInfoDecs = [action, action.bound], _setConnectionInfoDecs = [action, action.bound], _startCallDecs = [action, action.bound], _stopCallDecs = [action, action.bound], _phoneCallUpdatedDecs = [action, action.bound], _phoneCallReasonDecs = [action, action.bound], _setStreamStateDecs = [action, action.bound], _handleStreamsAddedOrUpdatedDecs = [action, action.bound], _handleStreamsRemovedDecs = [action, action.bound], "_roomControl");
+_ref = (_getConnectorInfoDecs = [action, action.bound], _setConnectionInfoDecs = [action, action.bound], _startCallDecs = [action, action.bound], _stopCallDecs = [action, action.bound], _phoneCallUpdatedDecs = [action, action.bound], _phoneCallReasonDecs = [action, action.bound], _setStreamStateDecs = [action, action.bound], _handleStreamsAddedOrUpdatedDecs = [action, action.bound], _handleStreamsRemovedDecs = [action, action.bound], "_observable");
 export var FcrUIPhoneAudioConnectorProviderImpl = /*#__PURE__*/function () {
   function FcrUIPhoneAudioConnectorProviderImpl(_ref2) {
     var _this = this;
@@ -102,7 +103,7 @@ export var FcrUIPhoneAudioConnectorProviderImpl = /*#__PURE__*/function () {
       messageProvider = _ref2.messageProvider,
       deviceProvider = _ref2.deviceProvider;
     _classCallCheck(this, FcrUIPhoneAudioConnectorProviderImpl);
-    _defineProperty(this, _ref, void _initProto(this));
+    _defineProperty(this, _ref, (_initProto(this), new AgoraObservable()));
     _defineProperty(this, "_disposers", []);
     _defineProperty(this, "_roomOberver", {
       onPhoneConnectorSessionStateUpdated: this._phoneCallUpdated.bind(this)
@@ -138,9 +139,8 @@ export var FcrUIPhoneAudioConnectorProviderImpl = /*#__PURE__*/function () {
       return _this.isHangup;
     }, function (isHangup) {
       if (isHangup) {
-        _this._messageProvider.showToast({
-          type: 'normal',
-          message: transI18n('fmt_PSTN_status_hungup')
+        _this._messageProvider.showToastByKey({
+          key: FcrUIToastKey.FMT_PSTN_STATUS_HUNGUP
         });
       }
     }));
@@ -343,6 +343,16 @@ export var FcrUIPhoneAudioConnectorProviderImpl = /*#__PURE__*/function () {
       }
       return stopCall;
     }()
+  }, {
+    key: "addObserver",
+    value: function addObserver(observer) {
+      this._observable.addObserver(observer);
+    }
+  }, {
+    key: "removeObserver",
+    value: function removeObserver(observer) {
+      this._observable.removeObserver(observer);
+    }
   }, {
     key: "release",
     value: function release() {
@@ -390,6 +400,7 @@ export var FcrUIPhoneAudioConnectorProviderImpl = /*#__PURE__*/function () {
           this.phoneCallState = FcrRoomConnectorSessionState.CALLING;
           break;
       }
+      this._observable.notifyObservers('onPhoneCallStateUpdated', this.phoneCallState, this.phoneCallReason);
     }
   }, {
     key: "_phoneCallReason",
@@ -397,10 +408,6 @@ export var FcrUIPhoneAudioConnectorProviderImpl = /*#__PURE__*/function () {
       switch (reason) {
         case FcrRoomConnectorSessionReason.ACCEPTED:
           // 已接听
-          this._messageProvider.showToast({
-            type: 'normal',
-            message: transI18n('fmt_PSTN_status_voiceconnected')
-          });
           // this.closeConnectionDialog();
           this.accepted = true;
           break;