fcr-ui-scene 3.7.5 → 3.7.6

package/lib/providers/dialog/provider.electron.d.ts

@@ -3,11 +3,14 @@ import { FcrUIDialogProviderBase } from './provider.base';
 import { FcrUIDialogKey } from '../../utilities/constant';
 export declare class FcrUIElectronDialogProviderImpl extends FcrUIDialogProviderBase {
     private _windowProvider;
-    constructor({ windowProvider }: FcrUIElectronProviderConstructor);
+    private _sharingDisplayBounds;
+    private _renderer;
+    constructor({ windowProvider, renderer }: FcrUIElectronProviderConstructor);
     openDialog(dialogKey: FcrUIDialogKey, params?: Record<string, unknown>): void;
     openDialogWithId(dialogKey: FcrUIDialogKey, dialogId: string, params?: Record<string, unknown>): void;
     closeDialog(dialogKey: FcrUIDialogKey): void;
     closeDialogById(dialogId: string): void;
     protected openWithKeyAndId(dialogKey: FcrUIDialogKey, dialogId: string, params?: Record<string, unknown>): void;
     protected closeByKeyAndId(dialogKey: FcrUIDialogKey, dialogId: string): void;
+    setSharingDisplayBounds(bounds: FcrUI.FcrUIRectangle): void;
 }

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

@@ -57,8 +57,10 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("./type");
 var _provider = require("./provider.base");
+var _constant = require("../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
 var _isBoolean = _interopRequireDefault(require("lodash/isBoolean"));
+var _imports = require("fcr-core/lib/imports");
 var _FcrUIElectronDialogProviderImpl;
 var _initProto;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -71,11 +73,14 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl = /*#__PURE__*/function (_FcrUIDialogProviderB) {
   function FcrUIElectronDialogProviderImpl(_ref) {
     var _this;
-    var windowProvider = _ref.windowProvider;
+    var windowProvider = _ref.windowProvider,
+      renderer = _ref.renderer;
     (0, _classCallCheck2["default"])(this, FcrUIElectronDialogProviderImpl);
     _this = _callSuper(this, FcrUIElectronDialogProviderImpl);
     (0, _defineProperty2["default"])(_this, "_windowProvider", void _initProto(_this));
+    (0, _defineProperty2["default"])(_this, "_sharingDisplayBounds", null);
     _this._windowProvider = windowProvider;
+    _this._renderer = renderer;
     return _this;
   }
   (0, _inherits2["default"])(FcrUIElectronDialogProviderImpl, _FcrUIDialogProviderB);
@@ -136,6 +141,82 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
       }
       var window = this._windowProvider.getWindowById(dialogKey, dialogId);
       var windowObserver = {
+        onReady: function onReady() {
+          _this2.logger.info("sharing display bounds: ".concat((0, _imports.jsonstring)(_this2._sharingDisplayBounds)));
+          if ([_constant.FcrUIDialogKey.SUB_WINDOW].includes(dialogKey)) {
+            return;
+          }
+          // 获取主屏幕的宽高
+          var bounds = _this2._windowProvider.getCurrentWindow().getBounds();
+          var _this2$_renderer$getD = _this2._renderer.getDisplayMatching(bounds).bounds,
+            mw = _this2$_renderer$getD.width,
+            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 fullScreenDialogs = [_constant.FcrUIDialogKey.TOAST, _constant.FcrUIDialogKey.CONFIRM];
+          var _window$getBounds = window.getBounds(),
+            ww = _window$getBounds.width,
+            wh = _window$getBounds.height;
+          if (shareScreenDialogs.includes(dialogKey)) {
+            return;
+          }
+
+          // 分享主应用所在显示器
+          var x = mx + mw / 2 - ww / 2;
+          var y = my + mh / 2 - wh / 2;
+          if (_this2._sharingDisplayBounds) {
+            var _this2$_sharingDispla = _this2._sharingDisplayBounds,
+              sx = _this2$_sharingDispla.x,
+              sy = _this2$_sharingDispla.y,
+              sw = _this2$_sharingDispla.width,
+              sh = _this2$_sharingDispla.height;
+            if (fullScreenDialogs.includes(dialogKey)) {
+              window.setBounds(_this2._sharingDisplayBounds);
+            } else {
+              // 分享的显示器在左侧
+              if (sx < 0 && Math.abs(sx) >= sw) {
+                x = sx / 2 - ww / 2;
+                y = sh / 2 - wh / 2 + sy;
+                _this2.logger.info("sharing display in the left");
+              }
+
+              // 分享的显示器在右侧
+              else if (sx > 0 && Math.abs(sx) >= mw) {
+                x = sw / 2 - ww / 2 + sx;
+                y = sh / 2 - wh / 2 + sy;
+                _this2.logger.info("sharing display in the right");
+              }
+
+              // 分享的显示器在上面
+              else if (sy < 0 && Math.abs(sy) >= sh) {
+                x = sw / 2 - ww / 2 + sx;
+                y = sy / 2 - wh / 2;
+                _this2.logger.info("sharing display in the top");
+              }
+
+              // 分享的显示器在下面
+              else if (sy > 0 && Math.abs(sy) >= mh) {
+                x = sw / 2 - ww / 2 + sx;
+                y = sy + sh / 2 - wh / 2;
+                _this2.logger.info("sharing display in the bottom");
+              }
+              x = Math.floor(x);
+              y = Math.floor(y);
+              window.setBounds({
+                x: x,
+                y: y
+              });
+            }
+          } else {
+            x = Math.floor(x);
+            y = Math.floor(y);
+            window.setBounds({
+              x: x,
+              y: y
+            });
+          }
+        },
         onClosed: function onClosed() {
           window.removeObserver(windowObserver);
           _this2.dialogKeyMap["delete"](dialogKey);
@@ -168,10 +249,15 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
         window.close();
       }
     }
+  }, {
+    key: "setSharingDisplayBounds",
+    value: function setSharingDisplayBounds(bounds) {
+      this._sharingDisplayBounds = bounds;
+    }
   }]);
 }(_provider.FcrUIDialogProviderBase);
 _FcrUIElectronDialogProviderImpl = FcrUIElectronDialogProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIElectronDialogProviderImpl, [[_decorator.trace, 2, "openDialog"], [_decorator.trace, 2, "openDialogWithId"], [_decorator.trace, 2, "closeDialog"], [_decorator.trace, 2, "closeDialogById"]], [], 0, void 0, _provider.FcrUIDialogProviderBase).e;
+var _applyDecs$e = _applyDecs(_FcrUIElectronDialogProviderImpl, [[_decorator.trace, 2, "openDialog"], [_decorator.trace, 2, "openDialogWithId"], [_decorator.trace, 2, "closeDialog"], [_decorator.trace, 2, "closeDialogById"], [_decorator.trace, 2, "setSharingDisplayBounds"]], [], 0, void 0, _provider.FcrUIDialogProviderBase).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/providers/dialog/type.d.ts

@@ -2,6 +2,7 @@ import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-
 import { FcrUIDialogKey } from '../../utilities/constant';
 import { FcrUIWindowProvider } from '../window/type';
 import { FcrUIDialogInfo } from '../../modules/dialog/type';
+import { FcrUIRendererWrapper } from '../../utilities/renderer';
 export type FcrUIDialogDescriptor = {
     dialogKey: FcrUIDialogKey;
     dialogId: string;
@@ -139,6 +140,11 @@ export interface FcrUIDialogProvider {
      * @param observer - 要移除的观察者对象，类型为 FcrUIDialogObserver。
      */
     removeObserver(observer: FcrUIDialogObserver): void;
+    /**
+     * 设置屏幕共享的 bounds
+     * @param bounds - 屏幕共享的 bounds
+     */
+    setSharingDisplayBounds(bounds: FcrUI.FcrUIRectangle | null): void;
     /**
      * 新增弹窗拦截器
      * @param key - 弹窗拦截器的唯一标识符
@@ -158,4 +164,5 @@ export interface FcrUIDialogProvider {
 }
 export type FcrUIElectronProviderConstructor = {
     windowProvider: FcrUIWindowProvider;
+    renderer: FcrUIRendererWrapper;
 };

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

@@ -6,12 +6,15 @@ export declare class FcrUIMouseDetectProviderImpl implements FcrUIManagedObject,
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _renderer;
-    private _detectAreas;
+    private _windowProvder;
+    private accessor _detectAreas;
     private _isInDetectArea;
     private _task;
     private _detectionOffset;
     constructor(objectManager: FcrUIObjectManager);
+    setDisplayId(displayId: number): void;
     setDetectArea(areaId: FcrUIDetectAreaID, areaList: FcrUI.FcrUIRectangle[]): void;
+    getDetectAreas(areaId: FcrUIDetectAreaID): FcrUI.FcrUIRectangle[];
     deleteDetectArea(areaId: FcrUIDetectAreaID): void;
     setDetectionPositionOffset(offset: FcrUI.FcrUIPoint): void;
     addObserver(observer: FcrUIMouseDetectObserver): void;

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

@@ -25,15 +25,19 @@ exports.FcrUIMouseDetectProviderImpl = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.some.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.iterator.some.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
@@ -72,6 +76,8 @@ require("core-js/modules/esnext.set.symmetric-difference.v2.js");
 require("core-js/modules/esnext.set.symmetric-difference.js");
 require("core-js/modules/esnext.set.union.v2.js");
 require("core-js/modules/esnext.set.union.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -85,13 +91,25 @@ var _observable = require("agora-foundation/lib/utilities/observable");
 var _schedule = require("agora-foundation/lib/schedule");
 var _decorator = require("agora-foundation/lib/decorator");
 var _misc = require("agora-foundation/lib/utilities/misc");
+var _constant = require("../../utilities/constant");
+var _reactDom = _interopRequireDefault(require("react-dom"));
+var _mobxReact = require("mobx-react");
+var _mobx = require("mobx");
+var _levelConfig = require("../../modules/dialog/level-config");
+var _jsxRuntime = require("react/jsx-runtime");
 var _FcrUIMouseDetectProviderImpl;
-var _initProto;
+var _initProto, _init__detectAreas;
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
+function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+var _A = /*#__PURE__*/new WeakMap();
 var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__PURE__*/function () {
   function FcrUIMouseDetectProviderImpl(objectManager) {
     var _this = this;
@@ -100,7 +118,7 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
       prefix: 'FcrUIMouseDetectProviderImpl'
     })));
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
-    (0, _defineProperty2["default"])(this, "_detectAreas", new Map());
+    _classPrivateFieldInitSpec(this, _A, _init__detectAreas(this, new Map()));
     (0, _defineProperty2["default"])(this, "_isInDetectArea", new Set());
     (0, _defineProperty2["default"])(this, "_detectionOffset", {
       x: 0,
@@ -108,6 +126,7 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
     });
     this.objectManager = objectManager;
     this._renderer = objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
+    this._windowProvder = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onMouseEnterDetectArea', 'onMouseLeaveDetectArea']));
     this._task = _schedule.AgoraScheduler.shared.addPollingTask(function () {
       _this._detect();
@@ -115,8 +134,72 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
     if ((0, _platform.isMac)()) {
       this._task.stop();
     }
+
+    // 调试时使用，用于查看检测区域
+    var debug = false;
+    if (debug) {
+      this._windowProvder.setWindowOptions(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG, {
+        frame: false,
+        transparent: true,
+        backgroundColor: '#00000000',
+        title: 'MouseDetectDebugger'
+      });
+      var window = this._windowProvder.getWindowById(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG);
+      window.show();
+      window.setIgnoreMouseEvents(true);
+      this.logger.info('windows_index setAlwaysOnTop in mouse-detect-provider');
+      window.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.MOUSE_DETECT_DEBUGGER_LEVEL);
+      window.addObserver({
+        onReady: function onReady() {
+          var AreaDebugger = (0, _mobxReact.observer)(function () {
+            var content = Array.from(_this._detectAreas.keys()).map(function (areaId) {
+              var list = _this._detectAreas.get(areaId);
+              return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+                "data-area-id": areaId,
+                children: list.map(function (item, index) {
+                  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+                    style: {
+                      width: item.width,
+                      height: item.height,
+                      position: 'absolute',
+                      top: item.y,
+                      left: item.x,
+                      backgroundColor: 'rgba(10,10,10,0.5)'
+                    }
+                  }, index);
+                })
+              }, areaId);
+            });
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+              className: "fcr-ui-mouse-detect-debugger",
+              children: content
+            });
+          });
+          _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(AreaDebugger, {}), window.getRootNode());
+        }
+      });
+    }
   }
   return (0, _createClass2["default"])(FcrUIMouseDetectProviderImpl, [{
+    key: "_detectAreas",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "setDisplayId",
+    value: function setDisplayId(displayId) {
+      var display = this._renderer.getAllDisplays().find(function (d) {
+        return d.id === displayId;
+      });
+      if (display) {
+        var window = this._windowProvder.getWindowById(_constant.FcrUIDialogKey.MOUSE_DETECT_DEBUG);
+        window.setBounds(display.bounds);
+      }
+    }
+  }, {
     key: "setDetectArea",
     value: function setDetectArea(areaId, areaList) {
       var oldList = this._detectAreas.get(areaId);
@@ -134,6 +217,11 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
         this._detect();
       }
     }
+  }, {
+    key: "getDetectAreas",
+    value: function getDetectAreas(areaId) {
+      return this._detectAreas.get(areaId) || [];
+    }
   }, {
     key: "deleteDetectArea",
     value: function deleteDetectArea(areaId) {
@@ -199,7 +287,8 @@ var FcrUIMouseDetectProviderImpl = exports.FcrUIMouseDetectProviderImpl = /*#__P
   }]);
 }();
 _FcrUIMouseDetectProviderImpl = FcrUIMouseDetectProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIMouseDetectProviderImpl, [[_decorator.trace, 2, "setDetectArea"], [_decorator.trace, 2, "deleteDetectArea"], [_decorator.trace, 2, "setDetectionPositionOffset"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
+var _applyDecs$e = _applyDecs(_FcrUIMouseDetectProviderImpl, [[_mobx.observable, 1, "_detectAreas"], [_decorator.trace, 2, "setDisplayId"], [[_decorator.trace, _mobx.action], 2, "setDetectArea"], [_decorator.trace, 2, "getDetectAreas"], [[_decorator.trace, _mobx.action], 2, "deleteDetectArea"], [_decorator.trace, 2, "setDetectionPositionOffset"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 2);
+_init__detectAreas = _applyDecs$e2[0];
+_initProto = _applyDecs$e2[1];
 _applyDecs$e;

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

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

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

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

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

@@ -4,8 +4,10 @@ export interface FcrUIMouseDetectObserver {
     onMouseLeaveDetectArea?: (areaId: FcrUIDetectAreaID) => void;
 }
 export interface FcrUIMouseDetectProvider {
+    setDisplayId(displayId: number): void;
     setDetectionPositionOffset(offset: FcrUI.FcrUIPoint): void;
     setDetectArea(areaId: FcrUIDetectAreaID, areaList: FcrUI.FcrUIRectangle[]): void;
+    getDetectAreas(areaId: FcrUIDetectAreaID): FcrUI.FcrUIRectangle[];
     deleteDetectArea(areaId: FcrUIDetectAreaID): void;
     addObserver(observer: FcrUIMouseDetectObserver): void;
     removeObserver(observer: FcrUIMouseDetectObserver): void;

package/lib/providers/renderer-provider.d.ts

@@ -35,6 +35,10 @@ export interface FcrUILocalVideoRenderProvider {
      * 摄像头是否已开启
      */
     get cameraEnabled(): boolean;
+    /**
+     * 是否将自己的视频在本地镜像显示
+     */
+    get isLocalMirrorEnabled(): boolean;
     /**
      * 开始预览摄像头
      * @param el
@@ -80,6 +84,7 @@ declare abstract class FcrUILocalVideoRenderProviderBase implements FcrUILocalVi
     constructor(_deviceProvider: FcrUIDeviceProvider);
     get cameraEnabled(): boolean;
     get cameraId(): string;
+    get isLocalMirrorEnabled(): boolean;
     startCameraPreview(el: HTMLElement, config: FcrRenderConfig): void;
     stopCameraPreview(el: HTMLElement): void;
     release(): void;

package/lib/providers/renderer-provider.js

@@ -194,6 +194,11 @@ var FcrUILocalVideoRenderProviderBase = /*#__PURE__*/function () {
     get: function get() {
       return this._deviceProvider.cameraId;
     }
+  }, {
+    key: "isLocalMirrorEnabled",
+    get: function get() {
+      return this._deviceProvider.isLocalMirrorEnabled;
+    }
   }, {
     key: "startCameraPreview",
     value: function startCameraPreview(el, config) {

package/lib/providers/room-provider/room-provider.d.ts

@@ -141,6 +141,7 @@ export declare class FcrUIMainRoomControlProviderImpl implements FcrUIMainRoomCo
     get privilegeProvider(): FcrUIPrivilegeProviderImpl;
     private get _localUser();
     release(): void;
+    private _initUserMap;
     private _handleSecurityUpdated;
     private _handleUserRoleChangeToast;
 }

package/lib/providers/room-provider/room-provider.js

@@ -81,7 +81,7 @@ var _waitingRoomControlManager = _interopRequireDefault(require("./waiting-room-
 var _constant = require("../../utilities/constant");
 var _privilegeProvider = require("../privilege-provider");
 var _FcrUIRoomProviderImpl, _FcrUIMainRoomControlProviderImpl;
-var _initProto, _init_liveStreamingState, _init_liveStreamingConfig, _init_cloudRecordingState, _initBaseRoomStateDecs, _ref, _initProto2, _init_privilegeOperator, _init_boardOwnerUser, _handleSecurityUpdatedDecs, _ref2;
+var _initProto, _init_liveStreamingState, _init_liveStreamingConfig, _init_cloudRecordingState, _initBaseRoomStateDecs, _ref, _initProto2, _init_privilegeOperator, _init_boardOwnerUser, _initUserMapDecs, _handleSecurityUpdatedDecs, _ref2;
 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); }
@@ -371,7 +371,7 @@ var FcrUIConnectionProviderImpl = exports.FcrUIConnectionProviderImpl = /*#__PUR
 }();
 var _A2 = /*#__PURE__*/new WeakMap();
 var _B2 = /*#__PURE__*/new WeakMap();
-_ref2 = (_handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], "_privilegeProvider");
+_ref2 = (_initUserMapDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], "_privilegeProvider");
 var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl = /*#__PURE__*/function () {
   function FcrUIMainRoomControlProviderImpl(_mainRoomControl, eventProvider, messageProvider, dialogProvider, _sharedInterpreterDataSource) {
     var _this2 = this;
@@ -388,6 +388,7 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
     this._privilegeControl = _mainRoomControl.getPrivilegeControl();
     this._userControl = _mainRoomControl.getUserControl();
     this._privilegeProvider = new _privilegeProvider.FcrUIPrivilegeProviderImpl(_mainRoomControl.getPrivilegeControl(), _mainRoomControl.getUserControl(), _mainRoomControl.getStreamControl(), eventProvider);
+    this._initUserMap();
     this._privilegeObserver = {
       onSecurityInfoUpdated: this._handleSecurityUpdated.bind(this)
     };
@@ -404,8 +405,8 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
       },
       onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
         if (event.reason === _type3.FcrUserUpdatedReason.ROLE) {
-          _this2._userMap.set(event.modifiedUser.userId, event.modifiedUser);
           _this2._handleUserRoleChangeToast(event.modifiedUser);
+          _this2._userMap.set(event.modifiedUser.userId, event.modifiedUser);
         }
       }
     };
@@ -466,6 +467,15 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
       this._userControl.removeObserver(this._userObserver);
       this._privilegeProvider.release();
     }
+  }, {
+    key: "_initUserMap",
+    value: function _initUserMap() {
+      var _this3 = this;
+      var userList = this._userControl.getUserList();
+      userList.forEach(function (user) {
+        _this3._userMap.set(user.userId, user);
+      });
+    }
   }, {
     key: "_handleSecurityUpdated",
     value: function _handleSecurityUpdated(roomId, event) {
@@ -478,7 +488,7 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
         _securityInfo$info4,
         _securityInfo$info5,
         _securityInfo$info6,
-        _this3 = this,
+        _this4 = this,
         _event$securityInfo$i,
         _event$securityInfo$i2;
       this.privilegeOperator = event.operatorUser;
@@ -552,10 +562,10 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
             okText: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_button_gotit'),
             showCancel: false,
             onOk: function onOk() {
-              _this3._dialogProvider.closeDialogById(dialogId);
+              _this4._dialogProvider.closeDialogById(dialogId);
             },
             onCancel: function onCancel() {
-              _this3._dialogProvider.closeDialogById(dialogId);
+              _this4._dialogProvider.closeDialogById(dialogId);
             },
             height: 160
           });
@@ -677,25 +687,25 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
   }]);
 }();
 _FcrUIMainRoomControlProviderImpl = FcrUIMainRoomControlProviderImpl;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMainRoomControlProviderImpl, [[_mobx.observable, 1, "privilegeOperator"], [_mobx.observable, 1, "boardOwnerUser"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"]], []).e, 3);
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMainRoomControlProviderImpl, [[_mobx.observable, 1, "privilegeOperator"], [_mobx.observable, 1, "boardOwnerUser"], [_initUserMapDecs, 18, "_initUserMap"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"]], []).e, 3);
 _init_privilegeOperator = _applyDecs$e2[0];
 _init_boardOwnerUser = _applyDecs$e2[1];
 _initProto2 = _applyDecs$e2[2];
 var FcrUIWaitingRoomControlProviderImpl = exports.FcrUIWaitingRoomControlProviderImpl = /*#__PURE__*/function () {
   function FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider) {
-    var _this4 = this;
+    var _this5 = this;
     (0, _classCallCheck2["default"])(this, FcrUIWaitingRoomControlProviderImpl);
     this._roomProvider = roomProvider;
     this._eventProvider = eventProvider;
     this._roomObserver = {
       onJoinWaitingRoom: function onJoinWaitingRoom(roomControl) {
-        _this4._setWaitingRoomControl(roomControl);
+        _this5._setWaitingRoomControl(roomControl);
       },
       onLeaveWaitingRoom: function onLeaveWaitingRoom() {
-        var _this4$_privilegeProv;
-        (_this4$_privilegeProv = _this4._privilegeProvider) === null || _this4$_privilegeProv === void 0 || _this4$_privilegeProv.release();
-        _this4._privilegeProvider = undefined;
-        _this4._waitingRoomControl = undefined;
+        var _this5$_privilegeProv;
+        (_this5$_privilegeProv = _this5._privilegeProvider) === null || _this5$_privilegeProv === void 0 || _this5$_privilegeProv.release();
+        _this5._privilegeProvider = undefined;
+        _this5._waitingRoomControl = undefined;
       }
     };
     roomProvider.addObserver(this._roomObserver);

package/lib/providers/screen-share/provider.base.js

@@ -66,7 +66,6 @@ var _struct = require("./struct");
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _decorator = require("agora-foundation/lib/decorator");
 var _mobx = require("mobx");
-var _type2 = require("agora-rte-sdk/lib/core/rtc/type");
 var _get = _interopRequireDefault(require("lodash/get"));
 var _FcrUIScreenShareProviderBase;
 var _initProto, _init__isLocalUserScreenSharing, _init__isRemoteUserScreenSharing, _init__isSharingWithAudio, _init__isSharingInSmoothMode, _init__isSharingInStereoAudioMode, _init__shareStreamId, _init__sharingUser, _enableScreenShareAudioDecs, _disableScreenShareAudioDecs, _enableSmoothModeDecs, _disableSmoothModeDecs, _enableStereoAudioModeDecs, _disableStereoAudioModeDecs, _findSharingUserDecs, _handleStreamUpdatedDecs, _ref;
@@ -183,7 +182,7 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
         _this.observable.notifyObservers('onScreenShareStarted', _this.strategy.getScreenTrack());
       }
     });
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onScreenShareErrorOccurred', 'onScreenShareStarted', 'onScreenShareStopped', 'onShareSourceReplaced', 'onPrepreScreenCapture']));
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onScreenShareErrorOccurred', 'onAudioShareErrorOccurred', 'onScreenShareStarted', 'onScreenShareStopped', 'onShareSourceReplaced', 'onPrepreScreenCapture']));
   }
   return (0, _createClass2["default"])(FcrUIScreenShareProviderBase, [{
     key: "_isLocalUserScreenSharing",
@@ -328,12 +327,6 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
                 _context.next = 1;
                 break;
               }
-              // this.observable.notifyObservers(
-              //   'onScreenShareErrorOccurred',
-              //   FcrUIScreenShareErrorCode.CANNOT_START_LOOPBACK_CAPTURE,
-              // );
-
-              // throw new Error('cannot start screen share audio: no screen stream created');
               this.logger.info('local screen stream not yet created, skip updating stream for audio');
               return _context.abrupt("return");
             case 1:
@@ -352,7 +345,7 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
               _context.prev = 4;
               _t = _context["catch"](1);
               this.logger.warn('failed to start screen share audio', _t);
-              this.observable.notifyObservers('onScreenShareErrorOccurred', _struct.FcrUIScreenShareErrorCode.CANNOT_START_LOOPBACK_CAPTURE);
+              this.observable.notifyObservers('onAudioShareErrorOccurred', _struct.FcrUIAudioShareErrorCode.CANNOT_UPDATE_STREAM);
               throw new Error("cannot start screen share audio, error: ".concat(_t));
             case 5:
             case "end":
@@ -394,6 +387,7 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
               _context2.prev = 4;
               _t2 = _context2["catch"](1);
               this.logger.warn('failed to update stream when stopping share audio', _t2);
+              throw new Error("cannot update screen stream, error: ".concat(_t2));
             case 5:
             case "end":
               return _context2.stop();
@@ -409,13 +403,11 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
     key: "enableSmoothMode",
     value: function enableSmoothMode() {
       this._isSharingInSmoothMode = true;
-      this._streamControl.setScreenScenario(_type2.AgoraRtcScreenScenarioType.SMOOTH);
     }
   }, {
     key: "disableSmoothMode",
     value: function disableSmoothMode() {
       this._isSharingInSmoothMode = false;
-      this._streamControl.setScreenScenario(_type2.AgoraRtcScreenScenarioType.CLEARITY);
     }
   }, {
     key: "enableStereoAudioMode",