fcr-ui-scene 3.6.2 → 3.6.3

package/lib/modules/whiteboard/components/toolbar/store.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.array.is-array.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");
@@ -40,6 +39,7 @@ require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.function.bind.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");
@@ -62,8 +62,9 @@ var _decorator = require("agora-foundation/lib/decorator");
 var _imports = require("fcr-core/lib/imports");
 var _utils = require("../../utils");
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _constant = require("../../../../utilities/constant");
 var _ToolbarStore;
-var _initProto, _init_observables, _disableToolbarDecs, _resumeToolbarDecs, _redoDecs, _undoDecs, _cleanDecs, _setToolDecs, _setPenDecs, _setShapeDecs, _setStrokeColorDecs, _setStrokeWidthDecs, _clickExpansionToolDecs, _setToolbarPositionDecs, _dragToolbarDecs, _releaseToolbarDecs, _captureScreenDecs, _saveDraftDecs, _setThemeDecs, _setCommonColorDecs, _repositionToolbarDecs, _getSnapshotImageDecs, _ref;
+var _initProto, _init_observables, _resetToolbarVarsDecs, _redoDecs, _undoDecs, _cleanDecs, _setToolDecs, _setPenDecs, _setShapeDecs, _setStrokeColorDecs, _setStrokeWidthDecs, _clickExpansionToolDecs, _setToolbarPositionDecs, _dragToolbarDecs, _releaseToolbarDecs, _captureScreenDecs, _saveDraftDecs, _setThemeDecs, _setCommonColorDecs, _repositionToolbarDecs, _getSnapshotImageDecs, _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; }
@@ -76,9 +77,9 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var colors = ['#EFEFEF', '#FFEC42', '#FFB545', '#E44A19', '#4A4C5F', '#A1C573', '#51BD69', '#EB47A2', '#0E0E0E', '#50E3C2', '#547AFF', '#79479F'];
 var _A = /*#__PURE__*/new WeakMap();
-_ref = (_disableToolbarDecs = [_mobx.action, _mobx.action.bound], _resumeToolbarDecs = [_mobx.action, _mobx.action.bound], _redoDecs = [_mobx.action, _mobx.action.bound], _undoDecs = [_mobx.action, _mobx.action.bound], _cleanDecs = [_mobx.action, _mobx.action.bound], _setToolDecs = [_mobx.action, _mobx.action.bound], _setPenDecs = [_mobx.action, _mobx.action.bound], _setShapeDecs = [_mobx.action, _mobx.action.bound], _setStrokeColorDecs = [_mobx.action, _mobx.action.bound], _setStrokeWidthDecs = [_mobx.action, _mobx.action.bound], _clickExpansionToolDecs = [_mobx.action, _mobx.action.bound], _setToolbarPositionDecs = [_mobx.action, _mobx.action.bound], _dragToolbarDecs = [_mobx.action, _mobx.action.bound], _releaseToolbarDecs = [_mobx.action, _mobx.action.bound], _captureScreenDecs = [_mobx.action, _mobx.action.bound], _saveDraftDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setCommonColorDecs = [_mobx.action, _mobx.action.bound], _repositionToolbarDecs = [_mobx.action, _mobx.action.bound], _getSnapshotImageDecs = [_mobx.action, _mobx.action.bound], "_boardMainWindow");
+_ref = (_resetToolbarVarsDecs = [_mobx.action, _mobx.action.bound], _redoDecs = [_mobx.action, _mobx.action.bound], _undoDecs = [_mobx.action, _mobx.action.bound], _cleanDecs = [_mobx.action, _mobx.action.bound], _setToolDecs = [_mobx.action, _mobx.action.bound], _setPenDecs = [_mobx.action, _mobx.action.bound], _setShapeDecs = [_mobx.action, _mobx.action.bound], _setStrokeColorDecs = [_mobx.action, _mobx.action.bound], _setStrokeWidthDecs = [_mobx.action, _mobx.action.bound], _clickExpansionToolDecs = [_mobx.action, _mobx.action.bound], _setToolbarPositionDecs = [_mobx.action, _mobx.action.bound], _dragToolbarDecs = [_mobx.action, _mobx.action.bound], _releaseToolbarDecs = [_mobx.action, _mobx.action.bound], _captureScreenDecs = [_mobx.action, _mobx.action.bound], _saveDraftDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setCommonColorDecs = [_mobx.action, _mobx.action.bound], _repositionToolbarDecs = [_mobx.action, _mobx.action.bound], _getSnapshotImageDecs = [_mobx.action, _mobx.action.bound], "_boardMainWindow");
 var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
-  function ToolbarStore(_whiteboardControl, _roomControl, _annotationProvider) {
+  function ToolbarStore(_whiteboardControl, _roomControl, _annotationProvider, _eventProvider) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, ToolbarStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), undefined));
@@ -91,8 +92,20 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
         _this.observables.undoSteps = enable;
       }
     });
+    (0, _defineProperty2["default"])(this, "_whiteboardObserver", {
+      onConnectionStateUpdated: function onConnectionStateUpdated(state) {
+        if (state === _imports.AgoraRteConnectionState.CONNECTED && _this._whiteboardControl) {
+          _this._boardMainWindow = _this._whiteboardControl.getMainWindow();
+          _this._lastStrokeWidth = 0;
+          _this.boardMainWindow.addObserver(_this._boardObserver);
+        }
+      }
+    });
+    (0, _defineProperty2["default"])(this, "_uiEventObserver", {
+      onEvent: this._onUiEvent.bind(this)
+    });
     _classPrivateFieldInitSpec(this, _A, _init_observables(this, {
-      currentTool: undefined,
+      currentTool: _enums.FcrBoardToolType.CURVE,
       currentShape: undefined,
       currentColor: colors[2],
       currentStrokeWidth: 2,
@@ -122,15 +135,9 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
     this._whiteboardControl = _whiteboardControl;
     this._roomControl = _roomControl;
     this._annotationProvider = _annotationProvider;
-    this._whiteboardControl.addObserver({
-      onConnectionStateUpdated: function onConnectionStateUpdated(state) {
-        if (state === _imports.AgoraRteConnectionState.CONNECTED) {
-          _this._boardMainWindow = _this._whiteboardControl.getMainWindow();
-          _this._lastStrokeWidth = 0;
-          _this._boardMainWindow.addObserver(_this._boardObserver);
-        }
-      }
-    });
+    this._eventProvider = _eventProvider;
+    this._whiteboardControl.addObserver(this._whiteboardObserver);
+    this._eventProvider.addObserver(this._uiEventObserver);
   }
   return (0, _createClass2["default"])(ToolbarStore, [{
     key: "observables",
@@ -155,19 +162,36 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "disableToolbar",
-    value: function disableToolbar() {
-      this._lastStrokeWidth = this.observables.currentStrokeWidth;
-      this.boardMainWindow.setStrokeWidth(0);
-      this.setTool(_enums.FcrBoardToolType.NONE);
-    }
+    key: "_onUiEvent",
+    value: function () {
+      var _onUiEvent2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(event, params) {
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.t0 = event;
+              _context.next = _context.t0 === _constant.FcrUIAction.RESET_WHITEBOARD_TOOLBAR_VARS ? 3 : 5;
+              break;
+            case 3:
+              this.resetToolbarVars();
+              return _context.abrupt("break", 5);
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function _onUiEvent(_x, _x2) {
+        return _onUiEvent2.apply(this, arguments);
+      }
+      return _onUiEvent;
+    }()
   }, {
-    key: "resumeToolbar",
-    value: function resumeToolbar() {
-      if (this._lastStrokeWidth > 0) {
-        this.observables.currentStrokeWidth = this._lastStrokeWidth;
-        this.boardMainWindow.setStrokeWidth(this._lastStrokeWidth);
-        this._lastStrokeWidth = 0;
+    key: "resetToolbarVars",
+    value: function resetToolbarVars() {
+      if (this._boardMainWindow) {
+        this.setStrokeColor(colors[2]);
+        this.setStrokeWidth(2);
+        this.setPen(_type.FcrBoardShape.Curve);
       }
     }
   }, {
@@ -292,7 +316,9 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
     key: "release",
     value: function release() {
       var _this$_boardMainWindo;
+      this._eventProvider.removeObserver(this._uiEventObserver);
       (_this$_boardMainWindo = this._boardMainWindow) === null || _this$_boardMainWindo === void 0 || _this$_boardMainWindo.removeObserver(this._boardObserver);
+      this._whiteboardControl.removeObserver(this._whiteboardObserver);
     }
   }, {
     key: "_updateDockPlacement",
@@ -381,16 +407,16 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
   }, {
     key: "_getSnapshotImage",
     value: function () {
-      var _getSnapshotImage2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _getSnapshotImage2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this5 = this;
         var mainWindow, progress, imageData;
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               this.observables.progress = 0;
               mainWindow = this.boardMainWindow;
               if (!mainWindow) {
-                _context.next = 8;
+                _context2.next = 8;
                 break;
               }
               progress = setInterval(function () {
@@ -400,10 +426,10 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
                   clearInterval(progress);
                 }
               }, 4);
-              _context.next = 6;
+              _context2.next = 6;
               return mainWindow.getSnapshotImage();
             case 6:
-              imageData = _context.sent;
+              imageData = _context2.sent;
               (0, _mobx.runInAction)(function () {
                 setTimeout(function () {
                   var _this5$roomInfo;
@@ -420,9 +446,9 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
               });
             case 8:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
       function _getSnapshotImage() {
         return _getSnapshotImage2.apply(this, arguments);
@@ -456,7 +482,7 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
   }]);
 }();
 _ToolbarStore = ToolbarStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ToolbarStore, [[_mobx.observable, 1, "observables"], [_disableToolbarDecs, 18, "disableToolbar"], [_resumeToolbarDecs, 18, "resumeToolbar"], [_redoDecs, 18, "redo"], [_undoDecs, 18, "undo"], [_cleanDecs, 18, "clean"], [_setToolDecs, 18, "setTool"], [_setPenDecs, 18, "setPen"], [_setShapeDecs, 18, "setShape"], [_setStrokeColorDecs, 18, "setStrokeColor"], [_setStrokeWidthDecs, 18, "setStrokeWidth"], [_clickExpansionToolDecs, 18, "clickExpansionTool"], [_setToolbarPositionDecs, 18, "setToolbarPosition"], [_dragToolbarDecs, 18, "dragToolbar"], [_releaseToolbarDecs, 18, "releaseToolbar"], [_captureScreenDecs, 18, "captureScreen"], [_saveDraftDecs, 18, "saveDraft"], [_setThemeDecs, 18, "setTheme"], [_setCommonColorDecs, 18, "setCommonColor"], [_repositionToolbarDecs, 18, "repositionToolbar"], [_decorator.bound, 2, "release"], [_decorator.bound, 2, "_updateDockPlacement"], [_decorator.bound, 2, "_updateDockPosition"], [_decorator.bound, 2, "_updateMaxVisibleTools"], [_decorator.bound, 2, "_setBackgroundColor"], [_getSnapshotImageDecs, 18, "_getSnapshotImage"]], []).e, 2);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ToolbarStore, [[_mobx.observable, 1, "observables"], [_decorator.bound, 2, "_onUiEvent"], [_resetToolbarVarsDecs, 18, "resetToolbarVars"], [_redoDecs, 18, "redo"], [_undoDecs, 18, "undo"], [_cleanDecs, 18, "clean"], [_setToolDecs, 18, "setTool"], [_setPenDecs, 18, "setPen"], [_setShapeDecs, 18, "setShape"], [_setStrokeColorDecs, 18, "setStrokeColor"], [_setStrokeWidthDecs, 18, "setStrokeWidth"], [_clickExpansionToolDecs, 18, "clickExpansionTool"], [_setToolbarPositionDecs, 18, "setToolbarPosition"], [_dragToolbarDecs, 18, "dragToolbar"], [_releaseToolbarDecs, 18, "releaseToolbar"], [_captureScreenDecs, 18, "captureScreen"], [_saveDraftDecs, 18, "saveDraft"], [_setThemeDecs, 18, "setTheme"], [_setCommonColorDecs, 18, "setCommonColor"], [_repositionToolbarDecs, 18, "repositionToolbar"], [_decorator.bound, 2, "release"], [_decorator.bound, 2, "_updateDockPlacement"], [_decorator.bound, 2, "_updateDockPosition"], [_decorator.bound, 2, "_updateMaxVisibleTools"], [_decorator.bound, 2, "_setBackgroundColor"], [_getSnapshotImageDecs, 18, "_getSnapshotImage"]], []).e, 2);
 _init_observables = _applyDecs$e[0];
 _initProto = _applyDecs$e[1];
 var ToolbarContext = exports.ToolbarContext = /*#__PURE__*/(0, _react.createContext)({});

package/lib/modules/whiteboard/index.js

@@ -314,7 +314,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       this._roomControl = (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl;
       this._securityStore = this.privilegeProvider;
       this._whiteboardControl = this._roomControl.getSharingControl().getBoardControl();
-      this._toolbarStore = new _store.ToolbarStore(this._whiteboardControl, this._roomControl, this.annotationProvider);
+      this._toolbarStore = new _store.ToolbarStore(this._whiteboardControl, this._roomControl, this.annotationProvider, this.eventProvider);
       var streamControl = this._roomControl.getStreamControl();
       var userControl = this._roomControl.getUserControl();
       this._userControl = userControl;
@@ -508,7 +508,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
 
           var isActive = (_this$_whiteboardCont6 = this._whiteboardControl) === null || _this$_whiteboardCont6 === void 0 ? void 0 : _this$_whiteboardCont6.getActivity();
           if (isActive && this._whiteboardControl) {
-            var _this$_userControl2, _this$_ownerUser3, _this$_localUser3, _this$_boardStore2, _this$_boardStore3, _this$_uiEventStore3;
+            var _this$_userControl2, _this$_ownerUser3, _this$_localUser3, _this$_boardStore2, _this$_boardStore3, _this$_uiEventStore3, _this$_toolbarStore;
             var ownerUserId = this._whiteboardControl.getOwnerId();
             this._ownerUser = (_this$_userControl2 = this._userControl) === null || _this$_userControl2 === void 0 ? void 0 : _this$_userControl2.getUser(ownerUserId);
             this._isMyBoard = ((_this$_ownerUser3 = this._ownerUser) === null || _this$_ownerUser3 === void 0 ? void 0 : _this$_ownerUser3.userId) === ((_this$_localUser3 = this._localUser) === null || _this$_localUser3 === void 0 ? void 0 : _this$_localUser3.userId);
@@ -518,6 +518,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
               action: _type.WhiteboardBaseEvents.SET_OWNER_USER_ID,
               payload: ownerUserId
             });
+            (_this$_toolbarStore = this._toolbarStore) === null || _this$_toolbarStore === void 0 || _this$_toolbarStore.resetToolbarVars();
           } else {
             this.logger.warn('whiteboard mount, getBoardActiveInfo activeInfo isActive is false , ownerUserId is null');
           }

package/lib/modules/whiteboard/style.css

@@ -7,10 +7,6 @@
   pointer-events: all;
 }
 
-.board-widget-app {
-  height: 100%;
-}
-
 .fcr-board-pagination {
   position: absolute;
   left: 10px;

package/lib/modules/whiteboard/view.js

@@ -17,12 +17,16 @@ var _boardContext = _interopRequireDefault(require("../../utilities/board-contex
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _fcrCore = require("fcr-core");
 var _store = require("./components/toolbar/store");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _jsxRuntime = require("react/jsx-runtime");
 var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_boardContext["default"]),
     showToolbar = _useContext.showToolbar;
   var _useContext2 = (0, _react.useContext)(_store.ToolbarContext),
-    progress = _useContext2.observables.progress;
+    _useContext2$observab = _useContext2.observables,
+    progress = _useContext2$observab.progress,
+    currentTool = _useContext2$observab.currentTool;
   var transI18n = (0, _i18n.useI18n)();
   var _useContext3 = (0, _react.useContext)(_context.BoardUIContext),
     _useContext3$observab = _useContext3.observables,
@@ -34,9 +38,11 @@ var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
     handleClose = _useContext3.handleClose,
     handleOpen = _useContext3.handleOpen;
   var loading = connectionState === _fcrCore.FcrConnectionState.CONNECTING || connectionState === _fcrCore.FcrConnectionState.RECONNECTING;
+  var cursorClassname = "board-widget-cursor-".concat([_enums.FcrBoardToolType[currentTool || _enums.FcrBoardToolType.NONE]]);
+  var boardWidgetAppCls = (0, _classnames["default"])('board-widget-app', cursorClassname.toLowerCase());
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "board-widget-app",
+      className: boardWidgetAppCls,
       ref: handleBoardDomLoad
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "window-manager-collector",

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

@@ -9,23 +9,74 @@ import { FcrUIVideoWindowData } from '../type';
 import { FcrUIScreenShareProvider } from './screen-share-provider';
 import { FcrUIDeviceProvider } from './device-provider';
 export interface FcrUIAnnotationProvider {
+    /**
+     * 接收端属性，用于获取当前标注窗口的缩放比例
+     */
+    get scalcValue(): number;
+    /**
+     * 接收端方法，用于获取标注功能的 Control 对象
+     */
+    get annotationControl(): FcrAnnotationControl | undefined;
+    /**
+     * 接收端方法，用于获取标注窗口的 MainWindow 对象
+     */
+    get boardMainWindow(): FcrBoardMainWindow | undefined;
+    /**
+     * 接收端属性，用于获取当前共享窗口数据
+     */
+    get screenShareWindowData(): FcrUIVideoWindowData | undefined;
+    /**
+     * 接收端属性，用于获取当前标注启动状态
+     */
+    get annotationHasStart(): boolean;
+    /**
+     * 接收端属性，用于获取当前标注状态
+     */
+    get annotationState(): FcrAnnotationState;
+    /**
+     * 发起端状态，用于获取当前是否正在标注
+     */
     get annotating(): boolean;
+    /**
+     * 发起端数据，当前共享屏幕信息
+     */
     get currentShareInfo(): CurrentShareScreenTypes;
+    /**
+     * 发起端方法，用于打开关闭标注，由用户触发，此操切换标注工具栏打开状态合窗口的鼠标穿透模式
+     */
     toggleAnnotation(): void;
+    /**
+     * 发起端方法，启动标注窗口，在主窗口启动时调用
+     */
     openAnnotationWindow(): void;
+    /**
+     * 发起端方法，用于隐藏标注窗口，不是关闭
+     */
     hideAnnotationWindow(): void;
+    /**
+     * 发起端方法，用于设置当前共享屏幕信息
+     */
     setCurrentShareInfo(info: CurrentShareScreenTypes): void;
+    /**
+     * 发起端方法，用通知标注窗口更新当前共享屏幕信息
+     */
     setBoundsToAnnotationWindow(info?: CurrentShareScreenTypes): void;
-    get annotationControl(): FcrAnnotationControl | undefined;
-    get boardMainWindow(): FcrBoardMainWindow | undefined;
-    get screenShareWindowData(): FcrUIVideoWindowData | undefined;
-    get annotationState(): FcrAnnotationState;
-    get annotationHasStart(): boolean;
+    /**
+     * 接收端方法，用于放大标注窗口
+     */
     zoomIn(): void;
+    /**
+     * 接收端方法，用于缩小标注窗口
+     */
     zoomOut(): void;
+    /**
+     * 接收端方法，用于设置标注窗口的缩放比例
+     */
     fullContainer(scalc: number): void;
+    /**
+     * 接收端方法，用于设置标注窗口的缩放比例
+     */
     setOriginScalc(): void;
-    get scalcValue(): number;
 }
 export declare enum FcrAnnotationState {
     START = "start",
@@ -47,20 +98,19 @@ export declare class FcrUIAnnotationProviderImpl implements FcrUIAnnotationProvi
     private _shareScreenOwnerId;
     private _maxScalcValue;
     private _minScalcValue;
+    private _annotationObserver;
+    private _currentScreenShareOwnerCanStartAnnotation;
+    private _observer;
+    private get _localUser();
     accessor scalcValue: number;
     accessor annotationState: FcrAnnotationState;
     accessor annotating: boolean;
     accessor currentShareInfo: CurrentShareScreenTypes;
-    private _annotationObserver;
-    private _currentScreenShareOwnerCanStartAnnotation;
-    private _observer;
-    private _initAnnotationTransaction;
-    constructor(_dialogProvider: FcrUIDialogProvider, _sharingProvider: FcrUISharingProvider, _memberDataSource: FcrUIMemberSharedDataSource, _videoWindowDataSource: FcrUIVideoWindowDataSource, _screenShareProvider: FcrUIScreenShareProvider, _deviceProvider: FcrUIDeviceProvider);
     get screenShareWindowData(): import("../shared-data-source/video-window").FcrUIVideoWindowDataImpl | undefined;
     get boardMainWindow(): FcrBoardMainWindow | undefined;
     get annotationControl(): FcrAnnotationControl | undefined;
     get annotationHasStart(): boolean;
-    private get _localUser();
+    constructor(_dialogProvider: FcrUIDialogProvider, _sharingProvider: FcrUISharingProvider, _memberDataSource: FcrUIMemberSharedDataSource, _videoWindowDataSource: FcrUIVideoWindowDataSource, _screenShareProvider: FcrUIScreenShareProvider, _deviceProvider: FcrUIDeviceProvider);
     zoomIn(): void;
     zoomOut(): void;
     fullContainer(scalc: number): void;
@@ -74,4 +124,5 @@ export declare class FcrUIAnnotationProviderImpl implements FcrUIAnnotationProvi
     release(): void;
     private _openToolbar;
     private _closeToolbar;
+    private _initAnnotationTransaction;
 }

package/lib/providers/annotation-provider.js

@@ -40,6 +40,8 @@ exports.FcrUIAnnotationProviderImpl = exports.FcrAnnotationState = void 0;
 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");
@@ -106,19 +108,6 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     (0, _defineProperty2["default"])(this, "_shareScreenOwnerId", '');
     (0, _defineProperty2["default"])(this, "_maxScalcValue", 4);
     (0, _defineProperty2["default"])(this, "_minScalcValue", 1);
-    _classPrivateFieldInitSpec(this, _A, _init_scalcValue(this, 1));
-    _classPrivateFieldInitSpec(this, _B, _init_annotationState(this, FcrAnnotationState.END));
-    _classPrivateFieldInitSpec(this, _C, _init_annotating(this, false));
-    _classPrivateFieldInitSpec(this, _D, _init_currentShareInfo(this, {
-      id: '',
-      type: _type.AgoraRtcScreenCaptureType.SCREEN,
-      bounds: {
-        x: 0,
-        y: 0,
-        width: 0,
-        height: 0
-      }
-    }));
     (0, _defineProperty2["default"])(this, "_annotationObserver", {
       onConnectionStateUpdated: function () {
         var _onConnectionStateUpdated = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(state) {
@@ -155,12 +144,27 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
         }
       }
     });
+    _classPrivateFieldInitSpec(this, _A, _init_scalcValue(this, 1));
+    _classPrivateFieldInitSpec(this, _B, _init_annotationState(this, FcrAnnotationState.END));
+    _classPrivateFieldInitSpec(this, _C, _init_annotating(this, false));
+    _classPrivateFieldInitSpec(this, _D, _init_currentShareInfo(this, {
+      id: '',
+      type: _type.AgoraRtcScreenCaptureType.SCREEN,
+      bounds: {
+        x: 0,
+        y: 0,
+        width: 0,
+        height: 0
+      }
+    }));
     this._dialogProvider = _dialogProvider;
     this._sharingProvider = _sharingProvider;
     this._memberDataSource = _memberDataSource;
     this._videoWindowDataSource = _videoWindowDataSource;
     this._screenShareProvider = _screenShareProvider;
     this._deviceProvider = _deviceProvider;
+    //@ts-ignore
+    window._annotationProvider = this;
     this._sharingProvider.getSharingControl().addObserver(this._observer);
     setTimeout(function () {
       return _this.openAnnotationWindow();
@@ -171,6 +175,17 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     }
   }
   return (0, _createClass2["default"])(FcrUIAnnotationProviderImpl, [{
+    key: "_currentScreenShareOwnerCanStartAnnotation",
+    value: function _currentScreenShareOwnerCanStartAnnotation() {
+      var owner = this._screenShareProvider.getCurrentScreenSharingOwner();
+      return owner && owner.platform !== _type4.FcrPlatform.IOS;
+    }
+  }, {
+    key: "_localUser",
+    get: function get() {
+      return this._memberDataSource.localUser;
+    }
+  }, {
     key: "scalcValue",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
@@ -202,23 +217,6 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     set: function set(v) {
       _classPrivateFieldSet(_D, this, v);
     }
-  }, {
-    key: "_currentScreenShareOwnerCanStartAnnotation",
-    value: function _currentScreenShareOwnerCanStartAnnotation() {
-      var owner = this._screenShareProvider.getCurrentScreenSharingOwner();
-      return owner && owner.platform !== _type4.FcrPlatform.IOS;
-    }
-  }, {
-    key: "_initAnnotationTransaction",
-    value: function _initAnnotationTransaction(screenShareOwnerId) {
-      this._annotationControl = this.getAnnotationControl();
-      if (this._localUser.userId !== screenShareOwnerId) {
-        if (this._annotationControl) {
-          this._annotationControl.addObserver(this._annotationObserver);
-          this._annotationControl.open();
-        }
-      }
-    }
   }, {
     key: "screenShareWindowData",
     get: function get() {
@@ -239,13 +237,7 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
   }, {
     key: "annotationHasStart",
     get: function get() {
-      //return this.annotationState === FcrAnnotationState.START;
-      return false;
-    }
-  }, {
-    key: "_localUser",
-    get: function get() {
-      return this._memberDataSource.localUser;
+      return this.annotationState === FcrAnnotationState.START;
     }
   }, {
     key: "zoomIn",
@@ -285,6 +277,7 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
                   payload: true
                 });
                 this._closeToolbar();
+                this.logger.info('[Annotation] toggleAnnotation close toolbar, ignore mouse event true');
               } else {
                 this.annotating = true;
                 (0, _rendererEvent.sendEvent)({
@@ -292,6 +285,7 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
                   payload: false
                 });
                 this._openToolbar();
+                this.logger.info('[Annotation] toggleAnnotation open toolbar, ignore mouse event false');
               }
             case 1:
             case "end":
@@ -313,12 +307,12 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     key: "openAnnotationWindow",
     value: function openAnnotationWindow() {
       this._annotationDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.ANNOTATION);
-      this.logger.info('openedAnnotationWindow');
+      this.logger.info('[Annotation] openedAnnotationWindow');
     }
   }, {
     key: "hideAnnotationWindow",
     value: function hideAnnotationWindow() {
-      this.logger.info('hideAnnotationWindow');
+      this.logger.info('[Annotation] hideAnnotationWindow');
       this.annotating = false;
       (0, _rendererEvent.sendEvent)({
         action: _type3.ToolbarEvents.CLEAN,
@@ -364,12 +358,17 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
                 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 3:
+            case 4:
             case "end":
               return _context3.stop();
           }
@@ -399,10 +398,21 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
       this._dialogProvider.closeDialog(this._annotationToolDialogId);
       this._annotationToolDialogId = '';
     }
+  }, {
+    key: "_initAnnotationTransaction",
+    value: function _initAnnotationTransaction(screenShareOwnerId) {
+      this._annotationControl = this.getAnnotationControl();
+      if (this._localUser.userId !== screenShareOwnerId) {
+        if (this._annotationControl) {
+          this._annotationControl.addObserver(this._annotationObserver);
+          this._annotationControl.open();
+        }
+      }
+    }
   }]);
 }();
 _FcrUIAnnotationProviderImpl = FcrUIAnnotationProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIAnnotationProviderImpl, [[_mobx.observable, 1, "scalcValue"], [_mobx.observable, 1, "annotationState"], [_mobx.observable, 1, "annotating"], [_mobx.observable, 1, "currentShareInfo"], [_mobx.computed, 3, "screenShareWindowData"], [_zoomInDecs, 18, "zoomIn"], [_zoomOutDecs, 18, "zoomOut"], [_fullContainerDecs, 18, "fullContainer"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_toggleAnnotationDecs, 18, "toggleAnnotation"], [_imports.bound, 2, "getAnnotationControl"], [_openAnnotationWindowDecs, 18, "openAnnotationWindow"], [_hideAnnotationWindowDecs, 18, "hideAnnotationWindow"], [_setCurrentShareInfoDecs, 18, "setCurrentShareInfo"], [_imports.bound, 2, "setBoundsToAnnotationWindow"], [_imports.bound, 2, "release"], [_openToolbarDecs, 18, "_openToolbar"], [_closeToolbarDecs, 18, "_closeToolbar"]], []).e, 5);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIAnnotationProviderImpl, [[_mobx.observable, 1, "scalcValue"], [_mobx.observable, 1, "annotationState"], [_mobx.observable, 1, "annotating"], [_mobx.observable, 1, "currentShareInfo"], [_mobx.computed, 3, "screenShareWindowData"], [_zoomInDecs, 18, "zoomIn"], [_zoomOutDecs, 18, "zoomOut"], [_fullContainerDecs, 18, "fullContainer"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_toggleAnnotationDecs, 18, "toggleAnnotation"], [_imports.bound, 2, "getAnnotationControl"], [_openAnnotationWindowDecs, 18, "openAnnotationWindow"], [_hideAnnotationWindowDecs, 18, "hideAnnotationWindow"], [_setCurrentShareInfoDecs, 18, "setCurrentShareInfo"], [_imports.bound, 2, "setBoundsToAnnotationWindow"], [_imports.bound, 2, "release"], [_openToolbarDecs, 18, "_openToolbar"], [_closeToolbarDecs, 18, "_closeToolbar"], [_imports.bound, 2, "_initAnnotationTransaction"]], []).e, 5);
 _init_scalcValue = _applyDecs$e[0];
 _init_annotationState = _applyDecs$e[1];
 _init_annotating = _applyDecs$e[2];

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

@@ -6,7 +6,7 @@ import { VirtualBackground } from '../modules/device-pretest/assets/virtual-back
 import { FcrUIVideoEffectType, FcrUIBeautyKey, FcrUIConnectType, FcrUIResource, FcrUIDeviceObserver, FcrUIMediaConfig, FcrUIAiDenoiseLevel, FcrUiResourceType } from '../type';
 import { FcrUIEventProvider } from './event-provider';
 import { BeautyKey } from '../modules/setting/store';
-import { FcrUILocalStorageProviderImpl } from './local-storage-provider';
+import { FcrUIUserSettingStorageProviderImpl } from './user-setting-storage-provider';
 export declare const DEFAULT_DEVICE_ID = "default";
 export interface FcrUIDeviceProvider {
     /**
@@ -273,7 +273,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     private _eventProvider;
     private _mediaControl;
     private _mediaConfig;
-    private _localStorageProvider;
+    private _userSettingStorageProvider;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _listeners;
@@ -339,7 +339,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     };
     get isAudioConnected(): boolean;
     get shouldEnableMicBeforeSession(): boolean;
-    constructor(_eventProvider: FcrUIEventProvider, _mediaControl: FcrDesktopMediaControl, _mediaConfig: FcrUIMediaConfig, _localStorageProvider: FcrUILocalStorageProviderImpl);
+    constructor(_eventProvider: FcrUIEventProvider, _mediaControl: FcrDesktopMediaControl, _mediaConfig: FcrUIMediaConfig, _userSettingStorageProvider: FcrUIUserSettingStorageProviderImpl);
     getScreenTrack(id: string): FcrScreenTrack;
     getLoopbackTrack(id: string): FcrLoopbackTrack;
     checkLoopbackDevice(): Promise<number>;