fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib/providers/device-stream-provider.d.ts

@@ -7,10 +7,10 @@ import { FcrUIInterpreterProvider } from './interpreter-provider';
 import { FcrUIMessageProvider } from './message/type';
 import { FcrUIManagedObject } from '../object-manager';
 import { FcrUIDialogProvider } from './dialog/type';
+import { FcrUIFacilityProvider } from './facility/type';
 export interface FcrUIDeviceStreamProvider {
     enableCameraWithPreCheck(enable: boolean): void;
     enableMicrophoneWithPreCheck(enable: boolean): void;
-    checkoutDevicePermission(mediaType: 'camera' | 'microphone'): void;
 }
 export declare class FcrUIDeviceStreamProviderImpl implements FcrUIDeviceStreamProvider, FcrUIManagedObject {
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -25,6 +25,7 @@ export declare class FcrUIDeviceStreamProviderImpl implements FcrUIDeviceStreamP
     private _sharedDevicePrivilegeDataSource;
     private _interpreterProvider;
     private _sharedInterpreterDataSource;
+    private _facilityProvider;
     private get _localUser();
     private _devicePrivilegeObserver;
     private _handleOnCameraNeedClosed;
@@ -33,8 +34,7 @@ export declare class FcrUIDeviceStreamProviderImpl implements FcrUIDeviceStreamP
     private _streamControlObserver;
     private _deviceProviderObserver;
     private _interpreterProviderObserver;
-    constructor(roomControl: FcrBaseRoomControl, deviceProvider: FcrUIDeviceProvider, messageProvider: FcrUIMessageProvider, dialogProvider: FcrUIDialogProvider, devicePrivilegeProvider: FcrUIDevicePrivilegeProvider, sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource, interpreterProvider?: FcrUIInterpreterProvider | null, sharedInterpreterDataSource?: FcrUISharedInterpreterDataSource | null);
-    checkoutDevicePermission(mediaType: 'camera' | 'microphone'): Promise<boolean>;
+    constructor(roomControl: FcrBaseRoomControl, deviceProvider: FcrUIDeviceProvider, messageProvider: FcrUIMessageProvider, dialogProvider: FcrUIDialogProvider, devicePrivilegeProvider: FcrUIDevicePrivilegeProvider, sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource, interpreterProvider: (FcrUIInterpreterProvider | null) | undefined, sharedInterpreterDataSource: (FcrUISharedInterpreterDataSource | null) | undefined, facilityProvider: FcrUIFacilityProvider);
     enableCameraWithPreCheck(enable: boolean): Promise<void>;
     enableMicrophoneWithPreCheck(enable: boolean): Promise<void>;
     release(): void;

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

@@ -5,7 +5,6 @@ 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.filter.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
@@ -14,14 +13,10 @@ 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-properties.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.get-own-property-descriptors.js");
-require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.iterator.filter.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");
@@ -62,30 +57,26 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _decorator = require("agora-foundation/lib/decorator");
 var _mobx = require("mobx");
 var _type = require("fcr-core/lib/type");
-var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type2 = require("fcr-core/lib/room-control/type");
-var _constant = require("../utilities/constant");
-var _bg = _interopRequireDefault(require("../modules/dialog/dialogs/system-preference/assets/bg1.png"));
-var _bg2 = _interopRequireDefault(require("../modules/dialog/dialogs/system-preference/assets/bg2.png"));
 var _fcrCore = require("fcr-core");
 var _type3 = require("../modules/interpreter/type");
 var _logger = require("../utilities/logger");
+var _type4 = require("../modules/toast-manager/type");
 var _FcrUIDeviceStreamProviderImpl;
-var _initProto, _checkoutDevicePermissionDecs, _enableCameraWithPreCheckDecs, _enableMicrophoneWithPreCheckDecs, _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; }
+var _initProto, _enableCameraWithPreCheckDecs, _enableMicrophoneWithPreCheckDecs, _ref;
 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; }
-_ref = (_checkoutDevicePermissionDecs = [_mobx.action, _mobx.action.bound], _enableCameraWithPreCheckDecs = [_mobx.action, _mobx.action.bound], _enableMicrophoneWithPreCheckDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_enableCameraWithPreCheckDecs = [_mobx.action, _mobx.action.bound], _enableMicrophoneWithPreCheckDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIDeviceStreamProviderImpl = exports.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;
     (0, _classCallCheck2["default"])(this, FcrUIDeviceStreamProviderImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUIDeviceStreamProviderImpl'
@@ -134,6 +125,7 @@ var FcrUIDeviceStreamProviderImpl = exports.FcrUIDeviceStreamProviderImpl = /*#_
     this._deviceProvider = deviceProvider;
     this._messageProvider = messageProvider;
     this._dialogProvider = dialogProvider;
+    this._facilityProvider = facilityProvider;
     this._devicePrivilegeProvider = devicePrivilegeProvider;
     this._sharedDevicePrivilegeDataSource = sharedDevicePrivilegeDataSource;
     this._interpreterProvider = interpreterProvider;
@@ -178,99 +170,40 @@ var FcrUIDeviceStreamProviderImpl = exports.FcrUIDeviceStreamProviderImpl = /*#_
         return stream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
       });
     }
-  }, {
-    key: "checkoutDevicePermission",
-    value: function () {
-      var _checkoutDevicePermission = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(mediaType) {
-        var hasSystemPermission, dialogMap;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              hasSystemPermission = true;
-              dialogMap = {
-                camera: {
-                  title: (0, _i18n.transI18n)('fmt_camera_popup_label_restricted'),
-                  desc: (0, _i18n.transI18n)('fmt_camera_popup_label_system_change'),
-                  img: _bg["default"]
-                },
-                microphone: {
-                  title: (0, _i18n.transI18n)('fmt_audio_popup_label_restricted'),
-                  desc: (0, _i18n.transI18n)('fmt_audio_popup_label_system_change'),
-                  img: _bg2["default"]
-                }
-              }; // TODO: facilityProvider
-              // if (isElectron()) {
-              //   hasSystemPermission = await renderer.checkMediaPermission(mediaType);
-              // }
-              if (!hasSystemPermission) {
-                this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SYSTEM_PREFERENCE, _objectSpread(_objectSpread({}, dialogMap[mediaType]), {}, {
-                  buttons: [{
-                    withClose: true,
-                    text: (0, _i18n.transI18n)('fmt_audio_popup_button_system_change'),
-                    onClick: function onClick() {
-                      // TODO:
-                      // renderer.openSystemPreferences(mediaType);
-                    }
-                  }, {
-                    withClose: true,
-                    styleType: 'white',
-                    text: (0, _i18n.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 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(enable) {
+      var _enableCameraWithPreCheck = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(enable) {
         var _this$_roomControl$ge;
-        var canOpenCamera, hasDeivcePermission;
-        return _regenerator["default"].wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        var canOpenCamera;
+        return _regenerator["default"].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) === _type2.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: (0, _i18n.transI18n)('fmt_toolbar_tips_host_forbid_open_camera')
+              this._messageProvider.showToastByKey({
+                key: _type4.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;
@@ -278,45 +211,38 @@ var FcrUIDeviceStreamProviderImpl = exports.FcrUIDeviceStreamProviderImpl = /*#_
   }, {
     key: "enableMicrophoneWithPreCheck",
     value: function () {
-      var _enableMicrophoneWithPreCheck = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(enable) {
+      var _enableMicrophoneWithPreCheck = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(enable) {
         var _this$_roomControl$ge2;
-        var canOpenMicrophone, hasDeivcePermission;
-        return _regenerator["default"].wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        var canOpenMicrophone;
+        return _regenerator["default"].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) === _type2.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: (0, _i18n.transI18n)('fmt_toolbar_tips_host_forbid_open_mic')
+              this._messageProvider.showToastByKey({
+                key: _type4.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;
@@ -419,7 +345,7 @@ var FcrUIDeviceStreamProviderImpl = exports.FcrUIDeviceStreamProviderImpl = /*#_
   }]);
 }();
 _FcrUIDeviceStreamProviderImpl = FcrUIDeviceStreamProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIDeviceStreamProviderImpl, [[_checkoutDevicePermissionDecs, 18, "checkoutDevicePermission"], [_enableCameraWithPreCheckDecs, 18, "enableCameraWithPreCheck"], [_enableMicrophoneWithPreCheckDecs, 18, "enableMicrophoneWithPreCheck"], [_decorator.bound, 2, "_handleCameraChanged"], [_decorator.bound, 2, "_handleMicrophoneChanged"], [_decorator.bound, 2, "_bindLocalAudioStream"], [_decorator.bound, 2, "_bindLocalVideoStream"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrUIDeviceStreamProviderImpl, [[_enableCameraWithPreCheckDecs, 18, "enableCameraWithPreCheck"], [_enableMicrophoneWithPreCheckDecs, 18, "enableMicrophoneWithPreCheck"], [_decorator.bound, 2, "_handleCameraChanged"], [_decorator.bound, 2, "_handleMicrophoneChanged"], [_decorator.bound, 2, "_bindLocalAudioStream"], [_decorator.bound, 2, "_bindLocalVideoStream"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

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

@@ -157,8 +157,13 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
             mh = _this2$_renderer$getD.height,
             mx = _this2$_renderer$getD.x,
             my = _this2$_renderer$getD.y;
-          var shareScreenDialogs = [_constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR, _constant.FcrUIDialogKey.VIDEO_WINDOW];
+          var shareScreenDialogs = [_constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR, _constant.FcrUIDialogKey.VIDEO_WINDOW, _constant.FcrUIDialogKey.ANNOTATION_MASK, _constant.FcrUIDialogKey.ANNOTATION_TOOLBAR];
           var fullScreenDialogs = [_constant.FcrUIDialogKey.TOAST, _constant.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/providers/interpreter-provider.js

@@ -244,8 +244,8 @@ var FcrUIInterpreterProviderImpl = exports.FcrUIInterpreterProviderImpl = /*#__P
         }
         return onLeaveMainRoom;
       }(),
-      onExitRoom: function () {
-        var _onExitRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+      onExitMeeting: function () {
+        var _onExitMeeting = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
           return _regenerator["default"].wrap(function (_context5) {
             while (1) switch (_context5.prev = _context5.next) {
               case 0:
@@ -256,10 +256,10 @@ var FcrUIInterpreterProviderImpl = exports.FcrUIInterpreterProviderImpl = /*#__P
             }
           }, _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/providers/message/provider.d.ts

@@ -1,12 +1,14 @@
 import { FcrUIToastParams, FcrUINotificationParams, FcrUINotificationContentType } from '../../type';
 import { FcrUIManagedObject } from '../../object-manager';
-import { FcrUIMessageObserver, FcrUIMessageProvider } from './type';
+import { FcrUIMessageObserver, FcrUIMessageProvider, FcrUIMessageShowToastbyKeyParams } from './type';
 import { FcrUIToastPosition } from './struct';
 export declare class FcrUIMessageProviderImpl implements FcrUIMessageProvider, FcrUIManagedObject {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
+    private _toastParams;
     release(): void;
     showToast(params: FcrUIToastParams, position?: FcrUIToastPosition): void;
+    showToastByKey({ key, position, params, }: FcrUIMessageShowToastbyKeyParams): void;
     showNotification(params: FcrUINotificationParams): void;
     closeNotification(key: FcrUINotificationContentType): void;
     addObserver(observer: FcrUIMessageObserver): void;

package/lib/providers/message/provider.js

@@ -49,6 +49,7 @@ var _logger = require("../../utilities/logger");
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _decorator = require("agora-foundation/lib/decorator");
 var _struct = require("./struct");
+var _toastParams = require("../../modules/toast-manager/toast-params");
 var _FcrUIMessageProviderImpl;
 var _initProto;
 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)]; } }; }
@@ -63,6 +64,7 @@ var FcrUIMessageProviderImpl = exports.FcrUIMessageProviderImpl = /*#__PURE__*/f
       prefix: 'FcrUIMessageProviderImpl'
     })));
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
+    (0, _defineProperty2["default"])(this, "_toastParams", new _toastParams.ToastParams());
   }
   return (0, _createClass2["default"])(FcrUIMessageProviderImpl, [{
     key: "release",
@@ -75,6 +77,16 @@ var FcrUIMessageProviderImpl = exports.FcrUIMessageProviderImpl = /*#__PURE__*/f
       var position = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _struct.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 ? _struct.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/providers/message/type.d.ts

@@ -1,3 +1,5 @@
+import { FcrUIToastConfig } from '../../modules/toast-manager/store';
+import { FcrUIToastKey } from '../../modules/toast-manager/type';
 import { FcrUIToastParams, FcrUINotificationParams, FcrUINotificationContentType } from '../../type';
 import { FcrUIToastPosition } from './struct';
 export interface FcrUIMessageObserver {
@@ -5,6 +7,11 @@ export interface FcrUIMessageObserver {
     onNotificationReceived?: (params: FcrUINotificationParams) => void;
     onNotificationClose?: (type: FcrUINotificationContentType) => void;
 }
+export interface FcrUIMessageShowToastbyKeyParams {
+    key: FcrUIToastKey;
+    position?: FcrUIToastPosition;
+    params?: FcrUIToastConfig;
+}
 /**
  * FcrUIMessageProvider 接口定义了一系列用于管理和操作 UI 消息的方法。
  * 这些方法涵盖了显示不同类型消息（如 Toast 提示、通知等）、关闭通知以及管理消息事件观察者的功能。
@@ -18,6 +25,14 @@ export interface FcrUIMessageProvider {
      * 该参数包含了 Toast 的内容、显示时长等相关配置信息。
      */
     showToast(params: FcrUIToastParams, position?: FcrUIToastPosition): void;
+    /**
+     * 根据 key 显示一个 Toast 提示消息。
+     * Toast 通常是短暂显示的轻量级消息，用于向用户传达简单的信息。
+     *
+     * @param param - 显示 Toast 提示所需的参数，类型为 FcrUIMessageShowToastbyKeyParams，
+     * 该参数包含了 Toast 的 key 和显示位置，根据 key 获取 Toast 的内容、显示时长等相关配置信息。
+     */
+    showToastByKey(param: FcrUIMessageShowToastbyKeyParams): void;
     /**
      * 显示一个通知消息。
      * 通知通常用于向用户展示更重要、更详细的信息，可能会在界面上停留一段时间。

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

@@ -86,7 +86,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectManager = require("../../object-manager");
 var _logger = require("../../utilities/logger");
-var _platform = require("../../utilities/platform");
+var _env = require("agora-foundation/lib/utilities/env");
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _schedule = require("agora-foundation/lib/schedule");
 var _decorator = require("agora-foundation/lib/decorator");
@@ -163,7 +163,7 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
     this._task = _schedule.AgoraScheduler.shared.addPollingTask(function () {
       _this._detect();
     }, 50);
-    if ((0, _platform.isMac)()) {
+    if ((0, _env.isMac)()) {
       this._task.stop();
     }
 

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

@@ -1,4 +1,5 @@
 export declare enum FcrUIDetectAreaID {
     ControlBar = "ControlBar",
-    Confirm = "Confirm"
+    Confirm = "Confirm",
+    AnnotationToolbar = "AnnotationToolbar"
 }

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

@@ -8,5 +8,6 @@ exports.FcrUIDetectAreaID = void 0;
 var FcrUIDetectAreaID = exports.FcrUIDetectAreaID = /*#__PURE__*/function (FcrUIDetectAreaID) {
   FcrUIDetectAreaID["ControlBar"] = "ControlBar";
   FcrUIDetectAreaID["Confirm"] = "Confirm";
+  FcrUIDetectAreaID["AnnotationToolbar"] = "AnnotationToolbar";
   return FcrUIDetectAreaID;
 }({});

package/lib/providers/multi-display-provider.d.ts

@@ -51,6 +51,7 @@ export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayP
     private _contentDistribution;
     private _isLocalUserNotScreenSharing;
     private _screenShareObserver;
+    private _sharingObserver;
     private get _userId();
     private get _isScreenSharing();
     private get _screenSharingState();

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

@@ -125,6 +125,17 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
         _this._isLocalUserNotScreenSharing = true;
       }
     });
+    (0, _defineProperty2["default"])(this, "_sharingObserver", {
+      onScreenSharingUpdated: function onScreenSharingUpdated(streamInfo, state) {
+        if (state === _type.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,
@@ -150,6 +161,7 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
     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();
@@ -256,6 +268,7 @@ var FcrUIMultiDisplayProviderImpl = exports.FcrUIMultiDisplayProviderImpl = /*#_
     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/providers/phone-audio-provider.d.ts

@@ -5,6 +5,9 @@ import { FcrUIConnectType } from '../type';
 import { ConnectorRegion } from '../modules/connection-gateway/enums';
 import { FcrUIMessageProvider } from './message/type';
 import { FcrUIManagedObject } from '../object-manager';
+export interface FcrUIPhoneAudioConnectorObserver {
+    onPhoneCallStateUpdated(state: FcrRoomConnectorSessionState, reason: FcrRoomConnectorSessionReason): void;
+}
 export interface FcrUIPhoneAudioConnectorProvider {
     /**
      * @getter 接听状态
@@ -88,8 +91,18 @@ export interface FcrUIPhoneAudioConnectorProvider {
      * @method 释放资源
      */
     release(): void;
+    /**
+     * @method 添加观察者
+     * @param observer - 观察者
+     */
+    addObserver(observer: FcrUIPhoneAudioConnectorObserver): void;
+    /**
+     * @method 移除观察者
+     */
+    removeObserver(observer: FcrUIPhoneAudioConnectorObserver): void;
 }
 export declare class FcrUIPhoneAudioConnectorProviderImpl implements FcrUIPhoneAudioConnectorProvider, FcrUIManagedObject {
+    private _observable;
     private _roomControl;
     private _userControl;
     private _disposers;
@@ -122,6 +135,8 @@ export declare class FcrUIPhoneAudioConnectorProviderImpl implements FcrUIPhoneA
     setConnectionInfo(region?: ConnectorRegion): void;
     startCall(phoneNumber: string): Promise<void>;
     stopCall(): Promise<void>;
+    addObserver(observer: FcrUIPhoneAudioConnectorObserver): void;
+    removeObserver(observer: FcrUIPhoneAudioConnectorObserver): void;
     release(): void;
     private _setResetTimer;
     private _phoneCallUpdated;

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

@@ -71,9 +71,10 @@ var _fcrCore = require("fcr-core");
 var _mobx = require("mobx");
 var _type = require("fcr-core/lib/room-control/room-connector-control/type");
 var _decorator = require("agora-foundation/lib/decorator");
-var _i18n = require("agora-ui-foundation/lib/i18n");
 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 _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;
 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; } } }; }
@@ -101,7 +102,7 @@ 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], "_roomControl");
+_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 FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProviderImpl = /*#__PURE__*/function () {
   function FcrUIPhoneAudioConnectorProviderImpl(_ref2) {
     var _this = this;
@@ -109,7 +110,7 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
       messageProvider = _ref2.messageProvider,
       deviceProvider = _ref2.deviceProvider;
     (0, _classCallCheck2["default"])(this, FcrUIPhoneAudioConnectorProviderImpl);
-    (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), new _imports.AgoraObservable()));
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_roomOberver", {
       onPhoneConnectorSessionStateUpdated: this._phoneCallUpdated.bind(this)
@@ -145,9 +146,8 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
       return _this.isHangup;
     }, function (isHangup) {
       if (isHangup) {
-        _this._messageProvider.showToast({
-          type: 'normal',
-          message: (0, _i18n.transI18n)('fmt_PSTN_status_hungup')
+        _this._messageProvider.showToastByKey({
+          key: _type3.FcrUIToastKey.FMT_PSTN_STATUS_HUNGUP
         });
       }
     }));
@@ -350,6 +350,16 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
       }
       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() {
@@ -397,6 +407,7 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
           this.phoneCallState = _type.FcrRoomConnectorSessionState.CALLING;
           break;
       }
+      this._observable.notifyObservers('onPhoneCallStateUpdated', this.phoneCallState, this.phoneCallReason);
     }
   }, {
     key: "_phoneCallReason",
@@ -404,10 +415,6 @@ var FcrUIPhoneAudioConnectorProviderImpl = exports.FcrUIPhoneAudioConnectorProvi
       switch (reason) {
         case _type.FcrRoomConnectorSessionReason.ACCEPTED:
           // 已接听
-          this._messageProvider.showToast({
-            type: 'normal',
-            message: (0, _i18n.transI18n)('fmt_PSTN_status_voiceconnected')
-          });
           // this.closeConnectionDialog();
           this.accepted = true;
           break;