fcr-ui-scene 3.6.4-rc.1 → 3.7.0

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

@@ -1,13 +1,10 @@
 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 { FcrUISharingProvider } from './sharing-provider';
-import { FcrUIMemberSharedDataSource } from '../shared-data-source/member-data';
-import { FcrBoardMainWindow } from 'fcr-core/lib/room-control/whiteboard-control/types';
 import { FcrUIVideoWindowDataSource } from '../shared-data-source/video-window';
 import { FcrUIVideoWindowData } from '../type';
-import { FcrUIScreenShareProvider } from './screen-share-provider';
-import { FcrUIDeviceProvider } from './device-provider';
+import { FcrUIPrivilegeProvider } from './privilege-provider';
+import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
 export interface FcrUIAnnotationProvider {
     /**
      * 接收端属性，用于获取当前标注窗口的缩放比例
@@ -17,10 +14,6 @@ export interface FcrUIAnnotationProvider {
      * 接收端方法，用于获取标注功能的 Control 对象
      */
     get annotationControl(): FcrAnnotationControl | undefined;
-    /**
-     * 接收端方法，用于获取标注窗口的 MainWindow 对象
-     */
-    get boardMainWindow(): FcrBoardMainWindow | undefined;
     /**
      * 接收端属性，用于获取当前共享窗口数据
      */
@@ -30,9 +23,13 @@ export interface FcrUIAnnotationProvider {
      */
     get annotationHasStart(): boolean;
     /**
-     * 接收端属性，用于获取当前标注状态
+     * 安全中是否允许书写
+     */
+    get allowAnnotationWrite(): boolean;
+    /**
+     * 当前用户是否允许书写
      */
-    get annotationState(): FcrAnnotationState;
+    get allowAnnotationSelfWrite(): boolean;
     /**
      * 发起端状态，用于获取当前是否正在标注
      */
@@ -41,18 +38,38 @@ export interface FcrUIAnnotationProvider {
      * 发起端数据，当前共享屏幕信息
      */
     get currentShareInfo(): CurrentShareScreenTypes;
+    /**
+     * 是否展示toolbar
+     */
+    get isShowToolbar(): boolean;
+    /**
+     * 设置是否展示toolbar
+     */
+    setIsShowToolbar(isShow: boolean): void;
     /**
      * 发起端方法，用于打开关闭标注，由用户触发，此操切换标注工具栏打开状态合窗口的鼠标穿透模式
      */
     toggleAnnotation(): void;
     /**
-     * 发起端方法，启动标注窗口，在主窗口启动时调用
+     * 发起端方法，启动/初始化标注窗口，在主窗口启动时调用
+     */
+    initAnnotationWindow(): void;
+    /**
+     * 发起端方法，打开标注窗口
      */
     openAnnotationWindow(): void;
+    /**
+     * 发起端方法，展示标注窗口
+     */
+    showAnnotationWindow(): void;
     /**
      * 发起端方法，用于隐藏标注窗口，不是关闭
      */
     hideAnnotationWindow(): void;
+    /**
+     * 发起端方法，用于关闭标注窗口
+     */
+    closeAnnotationWindow(): void;
     /**
      * 发起端方法，用于设置当前共享屏幕信息
      */
@@ -62,21 +79,9 @@ export interface FcrUIAnnotationProvider {
      */
     setBoundsToAnnotationWindow(info?: CurrentShareScreenTypes): void;
     /**
-     * 接收端方法，用于放大标注窗口
-     */
-    zoomIn(): void;
-    /**
-     * 接收端方法，用于缩小标注窗口
+     * 发起端方法，更新标注白板的viewport
      */
-    zoomOut(): void;
-    /**
-     * 接收端方法，用于设置标注窗口的缩放比例
-     */
-    fullContainer(scalc: number): void;
-    /**
-     * 接收端方法，用于设置标注窗口的缩放比例
-     */
-    setOriginScalc(): void;
+    updateWindowSize(width: number, height: number): void;
 }
 export declare enum FcrAnnotationState {
     START = "start",
@@ -84,45 +89,36 @@ export declare enum FcrAnnotationState {
 }
 export declare class FcrUIAnnotationProviderImpl implements FcrUIAnnotationProvider {
     private _dialogProvider;
-    private _sharingProvider;
-    private _memberDataSource;
     private _videoWindowDataSource;
-    private _screenShareProvider;
-    private _deviceProvider;
+    private _privilegeProvider;
+    private _sharedScreenShareSharedDataSource;
     private _annotationDialogId;
     private _annotationToolDialogId;
     private _disposers;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _annotationControl;
-    private _boardMainWindow;
-    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 isShowToolbar: boolean;
     accessor currentShareInfo: CurrentShareScreenTypes;
+    get allowAnnotationSelfWrite(): boolean;
     get screenShareWindowData(): import("../shared-data-source/video-window").FcrUIVideoWindowDataImpl | undefined;
-    get boardMainWindow(): FcrBoardMainWindow | undefined;
+    get scalcValue(): number;
     get annotationControl(): FcrAnnotationControl | undefined;
     get annotationHasStart(): boolean;
-    constructor(_dialogProvider: FcrUIDialogProvider, _sharingProvider: FcrUISharingProvider, _memberDataSource: FcrUIMemberSharedDataSource, _videoWindowDataSource: FcrUIVideoWindowDataSource, _screenShareProvider: FcrUIScreenShareProvider, _deviceProvider: FcrUIDeviceProvider);
-    zoomIn(): void;
-    zoomOut(): void;
-    fullContainer(scalc: number): void;
-    setOriginScalc(): void;
+    get allowAnnotationWrite(): boolean;
+    constructor(_dialogProvider: FcrUIDialogProvider, _videoWindowDataSource: FcrUIVideoWindowDataSource, _privilegeProvider: FcrUIPrivilegeProvider, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource);
+    updateWindowSize(width: number, height: number): void;
     toggleAnnotation(): Promise<void>;
-    getAnnotationControl(): FcrAnnotationControl | undefined;
+    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;
-    private _initAnnotationTransaction;
 }

package/lib/providers/annotation-provider.js

@@ -37,6 +37,8 @@ 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");
@@ -52,8 +54,6 @@ 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");
-require("core-js/modules/web.timers.js");
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -63,16 +63,13 @@ var _constant = require("../utilities/constant");
 var _base = require("../base");
 var _mobx = require("mobx");
 var _type = require("agora-rte-sdk/lib/core/rtc/type");
-var _type2 = require("fcr-core/lib/room-control/sharing-control/type");
 var _imports = require("fcr-core/lib/imports");
 var _rendererEvent = require("../utilities/renderer-event");
-var _fcrCore = require("fcr-core");
-var _type3 = require("../modules/whiteboard/type");
-var _tools = require("../utilities/tools");
-var _type4 = require("fcr-core/lib/type");
+var _type2 = require("../modules/whiteboard/type");
+var _dialogUtils = require("../utilities/dialog-utils");
 var _logger = require("../utilities/logger");
 var _FcrUIAnnotationProviderImpl;
-var _initProto, _init_scalcValue, _init_annotationState, _init_annotating, _init_currentShareInfo, _zoomInDecs, _zoomOutDecs, _fullContainerDecs, _setOriginScalcDecs, _toggleAnnotationDecs, _openAnnotationWindowDecs, _hideAnnotationWindowDecs, _setCurrentShareInfoDecs, _openToolbarDecs, _closeToolbarDecs, _ref;
+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; }
@@ -92,10 +89,9 @@ var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
-_ref = (_zoomInDecs = [_mobx.action, _mobx.action.bound], _zoomOutDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound], _toggleAnnotationDecs = [_mobx.action, _mobx.action.bound], _openAnnotationWindowDecs = [_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");
+_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, _sharingProvider, _memberDataSource, _videoWindowDataSource, _screenShareProvider, _deviceProvider) {
-    var _this = this;
+  function FcrUIAnnotationProviderImpl(_dialogProvider, _videoWindowDataSource, _privilegeProvider, _sharedScreenShareSharedDataSource) {
     (0, _classCallCheck2["default"])(this, FcrUIAnnotationProviderImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), ''));
     (0, _defineProperty2["default"])(this, "_annotationToolDialogId", '');
@@ -103,48 +99,9 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
       prefix: 'FcrUIAnnotationProviderImpl'
     }));
-    (0, _defineProperty2["default"])(this, "_shareScreenOwnerId", '');
-    (0, _defineProperty2["default"])(this, "_maxScalcValue", 4);
-    (0, _defineProperty2["default"])(this, "_minScalcValue", 1);
-    (0, _defineProperty2["default"])(this, "_annotationObserver", {
-      onConnectionStateUpdated: function () {
-        var _onConnectionStateUpdated = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(state) {
-          var _this$_annotationCont, mainWindow;
-          return _regenerator["default"].wrap(function (_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                if (state === _fcrCore.FcrConnectionState.CONNECTED) {
-                  mainWindow = (_this$_annotationCont = _this._annotationControl) === null || _this$_annotationCont === void 0 ? void 0 : _this$_annotationCont.getMainWindow();
-                  _this._boardMainWindow = mainWindow;
-                  _this.annotationState = FcrAnnotationState.START;
-                }
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        function onConnectionStateUpdated(_x) {
-          return _onConnectionStateUpdated.apply(this, arguments);
-        }
-        return onConnectionStateUpdated;
-      }()
-    });
-    (0, _defineProperty2["default"])(this, "_observer", {
-      onScreenSharingUpdated: function onScreenSharingUpdated(ownerId, state) {
-        if (state === _type2.FcrScreenSharingState.START_WHIT_ANNOTATION || state === _type2.FcrScreenSharingState.START_ONLY_SCREEN) {
-          _this._shareScreenOwnerId = ownerId;
-          if (_this._currentScreenShareOwnerCanStartAnnotation()) {
-            _this._initAnnotationTransaction(_this._shareScreenOwnerId);
-          }
-        } else {
-          _this.annotationState = FcrAnnotationState.END;
-        }
-      }
-    });
-    _classPrivateFieldInitSpec(this, _A, _init_scalcValue(this, 1));
-    _classPrivateFieldInitSpec(this, _B, _init_annotationState(this, FcrAnnotationState.END));
-    _classPrivateFieldInitSpec(this, _C, _init_annotating(this, false));
+    _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.AgoraRtcScreenCaptureType.SCREEN,
@@ -156,35 +113,14 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
       }
     }));
     this._dialogProvider = _dialogProvider;
-    this._sharingProvider = _sharingProvider;
-    this._memberDataSource = _memberDataSource;
     this._videoWindowDataSource = _videoWindowDataSource;
-    this._screenShareProvider = _screenShareProvider;
-    this._deviceProvider = _deviceProvider;
+    this._privilegeProvider = _privilegeProvider;
+    this._sharedScreenShareSharedDataSource = _sharedScreenShareSharedDataSource;
     //@ts-ignore
     window._annotationProvider = this;
-    this._sharingProvider.getSharingControl().addObserver(this._observer);
-    setTimeout(function () {
-      return _this.openAnnotationWindow();
-    });
-    var exitScreenShareOwner = this._screenShareProvider.getCurrentScreenSharingOwner();
-    if (this._currentScreenShareOwnerCanStartAnnotation() && exitScreenShareOwner) {
-      this._initAnnotationTransaction(exitScreenShareOwner.userId);
-    }
   }
   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",
+    key: "annotationState",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -192,7 +128,7 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "annotationState",
+    key: "annotating",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -200,7 +136,7 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "annotating",
+    key: "isShowToolbar",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -215,6 +151,11 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     set: function set(v) {
       _classPrivateFieldSet(_D, this, v);
     }
+  }, {
+    key: "allowAnnotationSelfWrite",
+    get: function get() {
+      return this._privilegeProvider.hasAnnotationWritePermission();
+    }
   }, {
     key: "screenShareWindowData",
     get: function get() {
@@ -223,9 +164,9 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
       });
     }
   }, {
-    key: "boardMainWindow",
+    key: "scalcValue",
     get: function get() {
-      return this._boardMainWindow;
+      return this._sharedScreenShareSharedDataSource.screenShareScalcValue;
     }
   }, {
     key: "annotationControl",
@@ -238,35 +179,28 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
       return this.annotationState === FcrAnnotationState.START;
     }
   }, {
-    key: "zoomIn",
-    value: function zoomIn() {
-      if (this.scalcValue < this._maxScalcValue) {
-        this.scalcValue = this.scalcValue + 0.5;
-      }
-    }
-  }, {
-    key: "zoomOut",
-    value: function zoomOut() {
-      if (this.scalcValue > this._minScalcValue) {
-        this.scalcValue = this.scalcValue - 0.5;
-      }
-    }
-  }, {
-    key: "fullContainer",
-    value: function fullContainer(scalc) {
-      this.scalcValue = scalc;
+    key: "allowAnnotationWrite",
+    get: function get() {
+      return this._privilegeProvider.allowAnnotationWriteState();
     }
   }, {
-    key: "setOriginScalc",
-    value: function setOriginScalc() {
-      this.scalcValue = this._minScalcValue;
+    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 _callee2() {
-        return _regenerator["default"].wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      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;
@@ -287,9 +221,9 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
               }
             case 1:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
-        }, _callee2, this);
+        }, _callee, this);
       }));
       function toggleAnnotation() {
         return _toggleAnnotation.apply(this, arguments);
@@ -297,25 +231,38 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
       return toggleAnnotation;
     }()
   }, {
-    key: "getAnnotationControl",
-    value: function getAnnotationControl() {
-      return this._sharingProvider.getSharingControl().getAnnotationControl();
+    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._annotationDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.ANNOTATION);
-      this.logger.info('[Annotation] openedAnnotationWindow');
+      this.logger.info('[Annotation] openAnnotationWindow');
+      (0, _rendererEvent.sendEvent)({
+        action: _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_OPEN,
+        payload: true
+      });
     }
   }, {
-    key: "hideAnnotationWindow",
-    value: function hideAnnotationWindow() {
-      this.logger.info('[Annotation] hideAnnotationWindow');
-      this.annotating = false;
+    key: "showAnnotationWindow",
+    value: function showAnnotationWindow() {
+      this.logger.info('[Annotation] showAnnotationWindow');
       (0, _rendererEvent.sendEvent)({
-        action: _type3.ToolbarEvents.CLEAN,
+        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
@@ -330,28 +277,28 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
   }, {
     key: "setBoundsToAnnotationWindow",
     value: function () {
-      var _setBoundsToAnnotationWindow = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(info) {
-        var _this2 = this;
-        var targetBounds, _ref2, bounds, _getCurrentSharingWor, width, height, x, y, windows, win;
-        return _regenerator["default"].wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      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.AgoraRtcScreenCaptureType.SCREEN) {
                 _ref2 = info || this.currentShareInfo, bounds = _ref2.bounds;
-                _getCurrentSharingWor = (0, _tools.getCurrentSharingWorkArea)({
+                _getCurrentSharingWor = (0, _dialogUtils.getCurrentSharingWorkArea)({
                   currentShareBounds: bounds
-                }), width = _getCurrentSharingWor.width, height = _getCurrentSharingWor.height, x = _getCurrentSharingWor.x, y = _getCurrentSharingWor.y;
+                }), _width = _getCurrentSharingWor.width, _height = _getCurrentSharingWor.height, x = _getCurrentSharingWor.x, y = _getCurrentSharingWor.y;
                 targetBounds = {
-                  width: width,
-                  height: height,
+                  width: _width,
+                  height: _height,
                   x: x,
                   y: y
                 };
               } else {
                 windows = window.runtime.getWindows();
                 win = windows.find(function (win) {
-                  return win.id === +_this2.currentShareInfo.id;
+                  return win.id === +_this.currentShareInfo.id;
                 });
                 if (win) {
                   targetBounds = win.getBounds();
@@ -368,15 +315,29 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
               });
             case 1:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
-      function setBoundsToAnnotationWindow(_x2) {
+      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() {
@@ -396,22 +357,13 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
       this._dialogProvider.closeDialog(this._annotationToolDialogId);
       this._annotationToolDialogId = '';
     }
-  }, {
-    key: "_initAnnotationTransaction",
-    value: function _initAnnotationTransaction(screenShareOwnerId) {
-      this._annotationControl = this.getAnnotationControl();
-      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"], [_imports.bound, 2, "_initAnnotationTransaction"]], []).e, 5);
-_init_scalcValue = _applyDecs$e[0];
-_init_annotationState = _applyDecs$e[1];
-_init_annotating = _applyDecs$e[2];
+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/app-list-provider.d.ts

@@ -0,0 +1,98 @@
+import { DeviceSettingDialogConfig } from '../modules/setting/store';
+import { FcrUIWebWidgetConfig } from '../type';
+import { FcrUIDialogProvider } from './dialog-provider';
+import { FcrUIEventProvider } from './event-provider';
+import { FcrUIWidgetProvider } from './widget-provider';
+import { AppItemProps } from '../modules/action-bar/types';
+import { FcrUISharedApplistSourceImpl } from '../shared-data-source/app-list-data';
+import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
+import { FcrLiveStreamingState } from 'fcr-core/lib/type';
+export declare enum FcrUIApplistItemType {
+    INTERPRETER = 0,
+    LIVE_STREAMING = 1,
+    BEAUTY_BACKGROUND = 2,
+    WIDGETS = 3
+}
+export interface FcrUIApplistObserver {
+    /**
+     * 私聊用户变更
+     * @param user
+     * @param roomType
+     * @returns
+     */
+    onApplistItemClick?: (type: FcrUIApplistItemType) => void;
+}
+export interface FcrUIApplistProvider {
+    get appItemOptions(): AppItemProps[];
+    openDeviceSettingDialog: (arg: Partial<DeviceSettingDialogConfig>) => void;
+    openInterpreterDialog(): void;
+    openLiveStreamingDialog(): void;
+    clickWidget(widgetConfig: FcrUIWebWidgetConfig): void;
+    addObserver(observer: FcrUIApplistObserver): void;
+    removeObserver(observer: FcrUIApplistObserver): void;
+}
+export declare class FcrUIApplistProviderImpl implements FcrUIApplistProvider {
+    private _dialogProvider;
+    private _eventProvider;
+    private _widgetProvider;
+    private _sharedApplistDataSource;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _observable;
+    constructor(_dialogProvider: FcrUIDialogProvider, _eventProvider: FcrUIEventProvider, _widgetProvider: FcrUIWidgetProvider, _sharedApplistDataSource: FcrUISharedApplistSourceImpl);
+    get isInterpreterEnabled(): boolean;
+    get liveStreamingState(): FcrLiveStreamingState;
+    get hasEnableInterpreterPermission(): boolean;
+    get hasStartLiveStreamingPermission(): boolean;
+    get widgetConfigs(): FcrUIWebWidgetConfig[];
+    get appItemOptions(): AppItemProps[];
+    private _notifyClick;
+    openDeviceSettingDialog(arg: Partial<DeviceSettingDialogConfig>): void;
+    openInterpreterDialog(): void;
+    openLiveStreamingDialog(): void;
+    clickWidget(widgetConfig: FcrUIWebWidgetConfig): void;
+    get interpreterProps(): {
+        name: string;
+        onClick: () => void;
+        fcrToolTipProps: {
+            content: string;
+        };
+        fcrIconProps: {
+            type: FcrIconType;
+            iconPrimary: string;
+        };
+        permission: boolean;
+    };
+    get liveStreamingProps(): {
+        name: string;
+        onClick: () => void;
+        fcrToolTipProps: {
+            content: string;
+        };
+        fcrIconProps: {
+            type: FcrIconType;
+            iconColors: {
+                iconPrimary: string;
+            };
+        };
+        permission: boolean;
+    };
+    get beautyBackgroundProps(): {
+        name: string;
+        onClick: () => void;
+        fcrIconProps: {
+            type: FcrIconType;
+        };
+        permission: boolean;
+    };
+    get widgetListProps(): {
+        name: string;
+        fcrToolTipProps: {
+            content: string;
+        };
+        onClick: () => void;
+        imgSrc: string;
+        permission: boolean;
+    }[];
+    addObserver(observer: FcrUIApplistObserver): void;
+    removeObserver(observer: FcrUIApplistObserver): void;
+}