fcr-ui-scene 3.7.5 → 3.7.7

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

@@ -0,0 +1,124 @@
+import { FcrAnnotationControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/annotation-control/type';
+import { FcrUIDialogProvider } from './dialog-provider';
+import { CurrentShareScreenTypes } from '../modules/share-screen/types';
+import { FcrUIVideoWindowDataSource } from '../shared-data-source/video-window';
+import { FcrUIVideoWindowData } from '../type';
+import { FcrUIPrivilegeProvider } from './privilege-provider';
+import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
+export interface FcrUIAnnotationProvider {
+    /**
+     * 接收端属性，用于获取当前标注窗口的缩放比例
+     */
+    get scalcValue(): number;
+    /**
+     * 接收端方法，用于获取标注功能的 Control 对象
+     */
+    get annotationControl(): FcrAnnotationControl | undefined;
+    /**
+     * 接收端属性，用于获取当前共享窗口数据
+     */
+    get screenShareWindowData(): FcrUIVideoWindowData | undefined;
+    /**
+     * 接收端属性，用于获取当前标注启动状态
+     */
+    get annotationHasStart(): boolean;
+    /**
+     * 安全中是否允许书写
+     */
+    get allowAnnotationWrite(): boolean;
+    /**
+     * 当前用户是否允许书写
+     */
+    get allowAnnotationSelfWrite(): boolean;
+    /**
+     * 发起端状态，用于获取当前是否正在标注
+     */
+    get annotating(): boolean;
+    /**
+     * 发起端数据，当前共享屏幕信息
+     */
+    get currentShareInfo(): CurrentShareScreenTypes;
+    /**
+     * 是否展示toolbar
+     */
+    get isShowToolbar(): boolean;
+    /**
+     * 设置是否展示toolbar
+     */
+    setIsShowToolbar(isShow: boolean): void;
+    /**
+     * 发起端方法，用于打开关闭标注，由用户触发，此操切换标注工具栏打开状态合窗口的鼠标穿透模式
+     */
+    toggleAnnotation(): void;
+    /**
+     * 发起端方法，启动/初始化标注窗口，在主窗口启动时调用
+     */
+    initAnnotationWindow(): void;
+    /**
+     * 发起端方法，打开标注窗口
+     */
+    openAnnotationWindow(): void;
+    /**
+     * 发起端方法，展示标注窗口
+     */
+    showAnnotationWindow(): void;
+    /**
+     * 发起端方法，用于隐藏标注窗口，不是关闭
+     */
+    hideAnnotationWindow(): void;
+    /**
+     * 发起端方法，用于关闭标注窗口
+     */
+    closeAnnotationWindow(): void;
+    /**
+     * 发起端方法，用于设置当前共享屏幕信息
+     */
+    setCurrentShareInfo(info: CurrentShareScreenTypes): void;
+    /**
+     * 发起端方法，用通知标注窗口更新当前共享屏幕信息
+     */
+    setBoundsToAnnotationWindow(info?: CurrentShareScreenTypes): void;
+    /**
+     * 发起端方法，更新标注白板的viewport
+     */
+    updateWindowSize(width: number, height: number): void;
+}
+export declare enum FcrAnnotationState {
+    START = "start",
+    END = "end"
+}
+export declare class FcrUIAnnotationProviderImpl implements FcrUIAnnotationProvider {
+    private _dialogProvider;
+    private _videoWindowDataSource;
+    private _privilegeProvider;
+    private _sharedScreenShareSharedDataSource;
+    private _annotationDialogId;
+    private _annotationToolDialogId;
+    private _disposers;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _annotationControl;
+    accessor annotationState: FcrAnnotationState;
+    accessor annotating: boolean;
+    accessor isShowToolbar: boolean;
+    accessor currentShareInfo: CurrentShareScreenTypes;
+    get allowAnnotationSelfWrite(): boolean;
+    get screenShareWindowData(): import("../shared-data-source/video-window").FcrUIVideoWindowDataImpl | undefined;
+    get scalcValue(): number;
+    get annotationControl(): FcrAnnotationControl | undefined;
+    get annotationHasStart(): boolean;
+    get allowAnnotationWrite(): boolean;
+    constructor(_dialogProvider: FcrUIDialogProvider, _videoWindowDataSource: FcrUIVideoWindowDataSource, _privilegeProvider: FcrUIPrivilegeProvider, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource);
+    updateWindowSize(width: number, height: number): void;
+    toggleAnnotation(): Promise<void>;
+    setIsShowToolbar(isShow: boolean): void;
+    initAnnotationWindow(): void;
+    openAnnotationWindow(): void;
+    showAnnotationWindow(): void;
+    hideAnnotationWindow(): void;
+    setCurrentShareInfo(info: CurrentShareScreenTypes): void;
+    setBoundsToAnnotationWindow(info?: CurrentShareScreenTypes): Promise<void>;
+    closeAnnotationWindow(): void;
+    release(): void;
+    private _openToolbar;
+    private _closeToolbar;
+}

package/lib/providers/annotation-provider.js

@@ -0,0 +1,369 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUIAnnotationProviderImpl = exports.FcrAnnotationState = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+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.iterator.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _constant = require("../utilities/constant");
+var _base = require("../base");
+var _mobx = require("mobx");
+var _imports = require("fcr-core/lib/imports");
+var _type = require("fcr-core/lib/type");
+var _rendererEvent = require("../utilities/renderer-event");
+var _type2 = require("../modules/whiteboard/type");
+var _dialogUtils = require("../utilities/dialog-utils");
+var _logger = require("../utilities/logger");
+var _FcrUIAnnotationProviderImpl;
+var _initProto, _init_annotationState, _init_annotating, _init_isShowToolbar, _init_currentShareInfo, _toggleAnnotationDecs, _setIsShowToolbarDecs, _initAnnotationWindowDecs, _openAnnotationWindowDecs, _showAnnotationWindowDecs, _hideAnnotationWindowDecs, _setCurrentShareInfoDecs, _openToolbarDecs, _closeToolbarDecs, _ref;
+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 FcrAnnotationState = exports.FcrAnnotationState = /*#__PURE__*/function (FcrAnnotationState) {
+  FcrAnnotationState["START"] = "start";
+  FcrAnnotationState["END"] = "end";
+  return FcrAnnotationState;
+}({});
+var _A = /*#__PURE__*/new WeakMap();
+var _B = /*#__PURE__*/new WeakMap();
+var _C = /*#__PURE__*/new WeakMap();
+var _D = /*#__PURE__*/new WeakMap();
+_ref = (_toggleAnnotationDecs = [_mobx.action, _mobx.action.bound], _setIsShowToolbarDecs = [_mobx.action, _mobx.action.bound], _initAnnotationWindowDecs = [_mobx.action, _mobx.action.bound], _openAnnotationWindowDecs = [_mobx.action, _mobx.action.bound], _showAnnotationWindowDecs = [_mobx.action, _mobx.action.bound], _hideAnnotationWindowDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareInfoDecs = [_mobx.action, _mobx.action.bound], _openToolbarDecs = [_mobx.action, _mobx.action.bound], _closeToolbarDecs = [_mobx.action, _mobx.action.bound], "_annotationDialogId");
+var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PURE__*/function () {
+  function FcrUIAnnotationProviderImpl(_dialogProvider, _videoWindowDataSource, _privilegeProvider, _sharedScreenShareSharedDataSource) {
+    (0, _classCallCheck2["default"])(this, FcrUIAnnotationProviderImpl);
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), ''));
+    (0, _defineProperty2["default"])(this, "_annotationToolDialogId", '');
+    (0, _defineProperty2["default"])(this, "_disposers", []);
+    (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+      prefix: 'FcrUIAnnotationProviderImpl'
+    }));
+    _classPrivateFieldInitSpec(this, _A, _init_annotationState(this, FcrAnnotationState.END));
+    _classPrivateFieldInitSpec(this, _B, _init_annotating(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init_isShowToolbar(this, false));
+    _classPrivateFieldInitSpec(this, _D, _init_currentShareInfo(this, {
+      id: '',
+      type: _type.FcrScreenCaptureType.SCREEN,
+      bounds: {
+        x: 0,
+        y: 0,
+        width: 0,
+        height: 0
+      }
+    }));
+    this._dialogProvider = _dialogProvider;
+    this._videoWindowDataSource = _videoWindowDataSource;
+    this._privilegeProvider = _privilegeProvider;
+    this._sharedScreenShareSharedDataSource = _sharedScreenShareSharedDataSource;
+    //@ts-ignore
+    window._annotationProvider = this;
+  }
+  return (0, _createClass2["default"])(FcrUIAnnotationProviderImpl, [{
+    key: "annotationState",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "annotating",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "isShowToolbar",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "currentShareInfo",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
+  }, {
+    key: "allowAnnotationSelfWrite",
+    get: function get() {
+      return this._privilegeProvider.hasAnnotationWritePermission();
+    }
+  }, {
+    key: "screenShareWindowData",
+    get: function get() {
+      return this._videoWindowDataSource.mainList.find(function (item) {
+        return item.hasScreenSharing;
+      });
+    }
+  }, {
+    key: "scalcValue",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.screenShareScalcValue;
+    }
+  }, {
+    key: "annotationControl",
+    get: function get() {
+      return this._annotationControl;
+    }
+  }, {
+    key: "annotationHasStart",
+    get: function get() {
+      return this.annotationState === FcrAnnotationState.START;
+    }
+  }, {
+    key: "allowAnnotationWrite",
+    get: function get() {
+      return this._privilegeProvider.allowAnnotationWriteState();
+    }
+  }, {
+    key: "updateWindowSize",
+    value: function updateWindowSize(width, height) {
+      this.logger.info("[Annotation] updateWindowSize width: ".concat(width, ", height: ").concat(height));
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.FcrUIRendererEventAction.UPDATE_ANNOTATION_WINDOW_SIZE,
+        payload: {
+          width: width,
+          height: height
+        }
+      });
+    }
+  }, {
+    key: "toggleAnnotation",
+    value: function () {
+      var _toggleAnnotation = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (this.annotating) {
+                this.annotating = false;
+                (0, _rendererEvent.sendEvent)({
+                  action: _constant.FcrUIRendererEventAction.SET_ANNOTATION_IGNORE,
+                  payload: true
+                });
+                this._closeToolbar();
+                this.logger.info('[Annotation] toggleAnnotation close toolbar, ignore mouse event true');
+              } else {
+                this.annotating = true;
+                (0, _rendererEvent.sendEvent)({
+                  action: _constant.FcrUIRendererEventAction.SET_ANNOTATION_IGNORE,
+                  payload: false
+                });
+                this._openToolbar();
+                this.logger.info('[Annotation] toggleAnnotation open toolbar, ignore mouse event false');
+              }
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function toggleAnnotation() {
+        return _toggleAnnotation.apply(this, arguments);
+      }
+      return toggleAnnotation;
+    }()
+  }, {
+    key: "setIsShowToolbar",
+    value: function setIsShowToolbar(isShow) {
+      this.isShowToolbar = isShow;
+    }
+  }, {
+    key: "initAnnotationWindow",
+    value: function initAnnotationWindow() {
+      this.logger.info('[Annotation] init annotation fragment');
+      this._annotationDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.ANNOTATION);
+    }
+  }, {
+    key: "openAnnotationWindow",
+    value: function openAnnotationWindow() {
+      this.logger.info('[Annotation] openAnnotationWindow');
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_OPEN,
+        payload: true
+      });
+    }
+  }, {
+    key: "showAnnotationWindow",
+    value: function showAnnotationWindow() {
+      this.logger.info('[Annotation] showAnnotationWindow');
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_SHOW,
+        payload: true
+      });
+    }
+  }, {
+    key: "hideAnnotationWindow",
+    value: function hideAnnotationWindow() {
+      this.logger.info('[Annotation] hideAnnotationWindow');
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_SHOW,
+        payload: false
+      });
+      this._closeToolbar();
+    }
+  }, {
+    key: "setCurrentShareInfo",
+    value: function setCurrentShareInfo(info) {
+      this.currentShareInfo = info;
+    }
+  }, {
+    key: "setBoundsToAnnotationWindow",
+    value: function () {
+      var _setBoundsToAnnotationWindow = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(info) {
+        var _this = this;
+        var targetBounds, _ref2, bounds, _getCurrentSharingWor, _width, _height, x, y, windows, win;
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              targetBounds = null;
+              if (this.currentShareInfo.type === _type.FcrScreenCaptureType.SCREEN) {
+                _ref2 = info || this.currentShareInfo, bounds = _ref2.bounds;
+                _getCurrentSharingWor = (0, _dialogUtils.getCurrentSharingWorkArea)({
+                  currentShareBounds: bounds
+                }), _width = _getCurrentSharingWor.width, _height = _getCurrentSharingWor.height, x = _getCurrentSharingWor.x, y = _getCurrentSharingWor.y;
+                targetBounds = {
+                  width: _width,
+                  height: _height,
+                  x: x,
+                  y: y
+                };
+              } else {
+                windows = window.runtime.getWindows();
+                win = windows.find(function (win) {
+                  return win.id === +_this.currentShareInfo.id;
+                });
+                if (win) {
+                  targetBounds = win.getBounds();
+                }
+                // 当 mac 是分享的全屏应用的时候，通过 id 无法获取到正确的 bounds，因为本身全屏幕应用的尺寸就是屏幕的尺寸，所以可以直接取 info 的 bounds
+                if (!targetBounds) {
+                  targetBounds = (info === null || info === void 0 ? void 0 : info.bounds) || this.currentShareInfo.bounds || null;
+                }
+              }
+              this.logger.info("[Annotation][setBoundsToAnnotationWindow]: targetBounds: ".concat(JSON.stringify(targetBounds)));
+              (0, _rendererEvent.sendEvent)({
+                action: _constant.FcrUIRendererEventAction.SET_CURRENT_SHARE_SCREEN_BOUNDS,
+                payload: targetBounds
+              });
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function setBoundsToAnnotationWindow(_x) {
+        return _setBoundsToAnnotationWindow.apply(this, arguments);
+      }
+      return setBoundsToAnnotationWindow;
+    }()
+  }, {
+    key: "closeAnnotationWindow",
+    value: function closeAnnotationWindow() {
+      this.annotating = false;
+      (0, _rendererEvent.sendEvent)({
+        action: _type2.ToolbarEvents.CLEAN,
+        payload: true
+      });
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_OPEN,
+        payload: false
+      });
+      this._closeToolbar();
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this._dialogProvider.closeDialog(this._annotationDialogId);
+    }
+  }, {
+    key: "_openToolbar",
+    value: function _openToolbar() {
+      this._annotationToolDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.ANNOTATION_TOOL);
+    }
+  }, {
+    key: "_closeToolbar",
+    value: function _closeToolbar() {
+      this._dialogProvider.closeDialog(this._annotationToolDialogId);
+      this._annotationToolDialogId = '';
+    }
+  }]);
+}();
+_FcrUIAnnotationProviderImpl = FcrUIAnnotationProviderImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIAnnotationProviderImpl, [[_mobx.observable, 1, "annotationState"], [_mobx.observable, 1, "annotating"], [_mobx.observable, 1, "isShowToolbar"], [_mobx.observable, 1, "currentShareInfo"], [_mobx.computed, 3, "screenShareWindowData"], [_imports.bound, 2, "updateWindowSize"], [_toggleAnnotationDecs, 18, "toggleAnnotation"], [_setIsShowToolbarDecs, 18, "setIsShowToolbar"], [_initAnnotationWindowDecs, 18, "initAnnotationWindow"], [_openAnnotationWindowDecs, 18, "openAnnotationWindow"], [_showAnnotationWindowDecs, 18, "showAnnotationWindow"], [_hideAnnotationWindowDecs, 18, "hideAnnotationWindow"], [_setCurrentShareInfoDecs, 18, "setCurrentShareInfo"], [_imports.bound, 2, "setBoundsToAnnotationWindow"], [_imports.bound, 2, "closeAnnotationWindow"], [_imports.bound, 2, "release"], [_openToolbarDecs, 18, "_openToolbar"], [_closeToolbarDecs, 18, "_closeToolbar"]], []).e, 5);
+_init_annotationState = _applyDecs$e[0];
+_init_annotating = _applyDecs$e[1];
+_init_isShowToolbar = _applyDecs$e[2];
+_init_currentShareInfo = _applyDecs$e[3];
+_initProto = _applyDecs$e[4];
+(0, _base.registerDependency)('annotationProvider');

package/lib/providers/board-share/bar-control/base.d.ts

@@ -11,9 +11,9 @@ export declare abstract class FcrUIBoardControlShareProviderBase implements FcrU
     private readonly _privilegeProvider;
     private readonly _boardControl;
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private _showLoading;
     private _roomName;
     private get _boardMainRoom();
+    private accessor _showLoading;
     accessor currentTheme: Required<WhiteboardThemeType>;
     accessor sharingUserInfo: FcrUserInfo | undefined;
     accessor backgroundColor: string;

package/lib/providers/board-share/bar-control/base.js

@@ -39,7 +39,6 @@ require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
-require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
@@ -63,7 +62,7 @@ var _utils = require("../../../modules/whiteboard/utils");
 var _toolbar = require("../../../modules/components/toolbar");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _FcrUIBoardControlShareProviderBase;
-var _initProto, _init_currentTheme, _init_sharingUserInfo, _init_backgroundColor, _init_hasWriteBoardPermission, _init_connectionState, _init_joinSuccess, _init_toolbarState, _setControlEnableDecs, _setSharingUserDecs, _setBackgroundColorDecs, _setWhiteboardToolDecs, _setThemeDecs, _setShowLoadingDecs, _setCommonColorsDecs, _setProgressDecs, _setJoinSuccessDecs, _handleDraftSavedDecs, _ref;
+var _initProto, _init__showLoading, _init_currentTheme, _init_sharingUserInfo, _init_backgroundColor, _init_hasWriteBoardPermission, _init_connectionState, _init_joinSuccess, _init_toolbarState, _setControlEnableDecs, _setSharingUserDecs, _setBackgroundColorDecs, _setWhiteboardToolDecs, _setThemeDecs, _setShowLoadingDecs, _setCommonColorsDecs, _setProgressDecs, _setJoinSuccessDecs, _handleDraftSavedDecs, _ref;
 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; }
@@ -81,6 +80,7 @@ var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
+var _H = /*#__PURE__*/new WeakMap();
 _ref = (_setControlEnableDecs = [_mobx.action, _mobx.action.bound], _setSharingUserDecs = [_mobx.action, _mobx.action.bound], _setBackgroundColorDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardToolDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setShowLoadingDecs = [_mobx.action, _mobx.action.bound], _setCommonColorsDecs = [_mobx.action, _mobx.action.bound], _setProgressDecs = [_mobx.action, _mobx.action.bound], _setJoinSuccessDecs = [_mobx.action, _mobx.action.bound], _handleDraftSavedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderBase = /*#__PURE__*/function () {
   function FcrUIBoardControlShareProviderBase(_privilegeProvider, _boardControl) {
@@ -88,15 +88,15 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _imports.createLogger)({
       prefix: 'WhiteboardControlStore'
     })));
-    (0, _defineProperty2["default"])(this, "_showLoading", true);
     (0, _defineProperty2["default"])(this, "_roomName", '');
-    _classPrivateFieldInitSpec(this, _A, _init_currentTheme(this, (0, _theme["default"])()[0]));
-    _classPrivateFieldInitSpec(this, _B, _init_sharingUserInfo(this, undefined));
-    _classPrivateFieldInitSpec(this, _C, _init_backgroundColor(this, '#ffffff'));
-    _classPrivateFieldInitSpec(this, _D, _init_hasWriteBoardPermission(this, false));
-    _classPrivateFieldInitSpec(this, _E, _init_connectionState(this, _type.FcrConnectionState.DISCONNECTED));
-    _classPrivateFieldInitSpec(this, _F, _init_joinSuccess(this, false));
-    _classPrivateFieldInitSpec(this, _G, _init_toolbarState(this, {
+    _classPrivateFieldInitSpec(this, _A, _init__showLoading(this, true));
+    _classPrivateFieldInitSpec(this, _B, _init_currentTheme(this, (0, _theme["default"])()[0]));
+    _classPrivateFieldInitSpec(this, _C, _init_sharingUserInfo(this, undefined));
+    _classPrivateFieldInitSpec(this, _D, _init_backgroundColor(this, '#ffffff'));
+    _classPrivateFieldInitSpec(this, _E, _init_hasWriteBoardPermission(this, false));
+    _classPrivateFieldInitSpec(this, _F, _init_connectionState(this, _type.FcrConnectionState.DISCONNECTED));
+    _classPrivateFieldInitSpec(this, _G, _init_joinSuccess(this, false));
+    _classPrivateFieldInitSpec(this, _H, _init_toolbarState(this, {
       controlEnable: false,
       currentTool: _enums.FcrBoardToolType.LASER_POINTER,
       currentStrokeWidth: 2,
@@ -121,7 +121,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       return boardMainRoom;
     }
   }, {
-    key: "currentTheme",
+    key: "_showLoading",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -129,7 +129,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "sharingUserInfo",
+    key: "currentTheme",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -137,7 +137,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "backgroundColor",
+    key: "sharingUserInfo",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -145,7 +145,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "hasWriteBoardPermission",
+    key: "backgroundColor",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -153,7 +153,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "connectionState",
+    key: "hasWriteBoardPermission",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -161,7 +161,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "joinSuccess",
+    key: "connectionState",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -169,17 +169,25 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "toolbarState",
+    key: "joinSuccess",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_G, this, v);
     }
+  }, {
+    key: "toolbarState",
+    get: function get() {
+      return _classPrivateFieldGet(_H, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_H, this, v);
+    }
   }, {
     key: "showLoading",
     get: function get() {
-      return [_type.FcrConnectionState.CONNECTING, _type.FcrConnectionState.RECONNECTING].includes(this.connectionState) && this._showLoading;
+      return this._showLoading;
     }
   }, {
     key: "canWriteBoard",
@@ -293,14 +301,15 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
   }]);
 }();
 _FcrUIBoardControlShareProviderBase = FcrUIBoardControlShareProviderBase;
-var _applyDecs$e = _applyDecs(_FcrUIBoardControlShareProviderBase, [[_mobx.observable, 1, "currentTheme"], [_mobx.observable, 1, "sharingUserInfo"], [_mobx.observable, 1, "backgroundColor"], [_mobx.observable, 1, "hasWriteBoardPermission"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "joinSuccess"], [_mobx.observable, 1, "toolbarState"], [_mobx.computed, 3, "canWriteBoard"], [_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_setShowLoadingDecs, 18, "setShowLoading"], [_setCommonColorsDecs, 18, "setCommonColors"], [_imports.bound, 2, "saveDraft"], [_setProgressDecs, 18, "setProgress"], [_setJoinSuccessDecs, 18, "setJoinSuccess"], [_imports.bound, 2, "resetWhiteboardTool"], [_handleDraftSavedDecs, 18, "_handleDraftSaved"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 8);
-_init_currentTheme = _applyDecs$e2[0];
-_init_sharingUserInfo = _applyDecs$e2[1];
-_init_backgroundColor = _applyDecs$e2[2];
-_init_hasWriteBoardPermission = _applyDecs$e2[3];
-_init_connectionState = _applyDecs$e2[4];
-_init_joinSuccess = _applyDecs$e2[5];
-_init_toolbarState = _applyDecs$e2[6];
-_initProto = _applyDecs$e2[7];
+var _applyDecs$e = _applyDecs(_FcrUIBoardControlShareProviderBase, [[_mobx.observable, 1, "_showLoading"], [_mobx.observable, 1, "currentTheme"], [_mobx.observable, 1, "sharingUserInfo"], [_mobx.observable, 1, "backgroundColor"], [_mobx.observable, 1, "hasWriteBoardPermission"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "joinSuccess"], [_mobx.observable, 1, "toolbarState"], [_mobx.computed, 3, "canWriteBoard"], [_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_setShowLoadingDecs, 18, "setShowLoading"], [_setCommonColorsDecs, 18, "setCommonColors"], [_imports.bound, 2, "saveDraft"], [_setProgressDecs, 18, "setProgress"], [_setJoinSuccessDecs, 18, "setJoinSuccess"], [_imports.bound, 2, "resetWhiteboardTool"], [_handleDraftSavedDecs, 18, "_handleDraftSaved"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 9);
+_init__showLoading = _applyDecs$e2[0];
+_init_currentTheme = _applyDecs$e2[1];
+_init_sharingUserInfo = _applyDecs$e2[2];
+_init_backgroundColor = _applyDecs$e2[3];
+_init_hasWriteBoardPermission = _applyDecs$e2[4];
+_init_connectionState = _applyDecs$e2[5];
+_init_joinSuccess = _applyDecs$e2[6];
+_init_toolbarState = _applyDecs$e2[7];
+_initProto = _applyDecs$e2[8];
 _applyDecs$e;