fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib/modules/whiteboard/components/toolbar/store.js

@@ -110,6 +110,7 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_uiEventObserver", {
       onEvent: this._onUiEvent.bind(this)
     });
+    (0, _defineProperty2["default"])(this, "_snapshotTimer", null);
     _classPrivateFieldInitSpec(this, _A, _init_observables(this, {
       currentTool: _fcrCore.FcrBoardToolType.CURVE,
       currentShape: undefined,
@@ -319,6 +320,10 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
     key: "release",
     value: function release() {
       var _this$_boardMainWindo3;
+      if (this._snapshotTimer) {
+        clearInterval(this._snapshotTimer);
+        this._snapshotTimer = null;
+      }
       this._eventProvider.removeObserver(this._uiEventObserver);
       (_this$_boardMainWindo3 = this._boardMainWindow) === null || _this$_boardMainWindo3 === void 0 || _this$_boardMainWindo3.removeObserver(this._boardObserver);
       this._whiteboardControl.removeObserver(this._whiteboardObserver);
@@ -412,46 +417,52 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
     value: function () {
       var _getSnapshotImage2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this5 = this;
-        var mainWindow, progress, imageData;
+        var mainWindow, imageData, _t2;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               this.observables.progress = 0;
               mainWindow = this.boardMainWindow;
               if (!mainWindow) {
-                _context2.next = 2;
+                _context2.next = 4;
                 break;
               }
-              progress = setInterval(function () {
+              if (this._snapshotTimer) clearInterval(this._snapshotTimer);
+              this._snapshotTimer = setInterval(function () {
                 if (_this5.observables.progress < 100) {
                   _this5.observables.progress += 1;
                 } else {
-                  clearInterval(progress);
+                  if (_this5._snapshotTimer) clearInterval(_this5._snapshotTimer);
                 }
               }, 4);
-              _context2.next = 1;
+              _context2.prev = 1;
+              _context2.next = 2;
               return mainWindow.getSnapshotImage();
-            case 1:
+            case 2:
               imageData = _context2.sent;
               (0, _mobx.runInAction)(function () {
                 setTimeout(function () {
                   var _this5$roomInfo;
                   _this5.observables.progress = 100;
-                  clearInterval(progress);
+                  if (_this5._snapshotTimer) clearInterval(_this5._snapshotTimer);
+                  _this5._snapshotTimer = null;
                   var fileName = "".concat((_this5$roomInfo = _this5.roomInfo) === null || _this5$roomInfo === void 0 ? void 0 : _this5$roomInfo.roomName, "_").concat((0, _dayjs["default"])().format('YYYYMMDD_HHmmSSS'), ".jpg");
                   (0, _utils.downloadImageData)(imageData, fileName);
-
-                  // this._eventProvider?.showToast({
-                  //   type: 'info',
-                  //   message: transI18n('fmt_screenshare_whiteboard_tips_savedsuccessfully'),
-                  // });
                 }, 400);
               });
-            case 2:
+              _context2.next = 4;
+              break;
+            case 3:
+              _context2.prev = 3;
+              _t2 = _context2["catch"](1);
+              if (this._snapshotTimer) clearInterval(this._snapshotTimer);
+              this._snapshotTimer = null;
+              console.error('getSnapshotImage failed', _t2);
+            case 4:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this);
+        }, _callee2, this, [[1, 3]]);
       }));
       function _getSnapshotImage() {
         return _getSnapshotImage2.apply(this, arguments);

package/lib/modules/whiteboard/store.js

@@ -68,6 +68,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type3 = require("agora-ui-foundation/lib/components/icon/type");
 var _type4 = require("../layout/type");
 var _sharedStorage = require("../../utilities/shared-storage");
+var _type5 = require("../toast-manager/type");
 var _WhitebaordStoreBase;
 var _initProto, _init__isMounted, _init_boardContainer, _setBoardContainerDomDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -296,7 +297,7 @@ var WhitebaordStoreBase = exports["default"] = /*#__PURE__*/function () {
       this._whiteboardProvider.selectTool(tool);
       this._whiteboardProvider.boardBarControl.setWhiteboardTool({
         action: _type.WhiteboardToolAction.SHAPE,
-        tool: shape
+        shape: shape
       });
     }
   }, {
@@ -312,10 +313,7 @@ var WhitebaordStoreBase = exports["default"] = /*#__PURE__*/function () {
     key: "setStrokeColor",
     value: function setStrokeColor(color) {
       this._whiteboardProvider.setStrokeColor(color);
-      this._whiteboardProvider.boardBarControl.setWhiteboardTool({
-        action: _type.WhiteboardToolAction.COLOR,
-        tool: color
-      });
+      this._whiteboardProvider.boardBarControl.setWhiteboardStrokeColor(color);
     }
   }, {
     key: "setCommonColors",
@@ -399,10 +397,13 @@ var WhitebaordStoreBase = exports["default"] = /*#__PURE__*/function () {
         this._alertWhenReplace(operatorUser, 'seize');
       }
       if (stopByOther && !ownerUserIsMe && operatorIsNotMe) {
-        var _this$_messageProvide;
-        (_this$_messageProvide = this._messageProvider) === null || _this$_messageProvide === void 0 || _this$_messageProvide.showToast({
-          type: 'info',
-          message: "".concat(operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userName, " ").concat((0, _i18n.transI18n)('fmt_screenshare_whiteboard_lables_newshare'))
+        this._messageProvider.showToastByKey({
+          key: _type5.FcrUIToastKey.FMT_MEETING_TOAST_STARTED_NEW_SHARE,
+          params: {
+            transI18nOptions: {
+              reason1: operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userName
+            }
+          }
         });
       }
       if (normalStop && operatorIsNotMe && ownerUserIsMe) {

package/lib/modules/whiteboard/view.js

@@ -105,7 +105,6 @@ var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
       isHost: isHost,
       currentTheme: currentTheme,
       setTheme: setTheme,
-      sharingType: "whiteboard",
       onBoardDomLoaded: setBoardContainerDom,
       currentTool: currentTool
     })]

package/lib/modules/widget/store.electron.d.ts

@@ -2,10 +2,6 @@ import { WebWidgetStoreArgs } from './type';
 import { WebWidgetStoreBase } from './store.base';
 export declare class WebWidgetStore extends WebWidgetStoreBase {
     private _windowProvider;
-    private _window;
-    private _popupSize;
-    private _windowProviderObjectObserver;
-    private _windowProviderObserver;
     constructor(args: WebWidgetStoreArgs);
     getWidgetDialogWindow(dialogId: string): Window;
     release(): void;

package/lib/modules/widget/store.electron.js

@@ -3,6 +3,8 @@
 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.iterator.js");
 require("core-js/modules/es.array.push.js");
@@ -40,8 +42,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WebWidgetStore = void 0;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -52,7 +52,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _type = require("../../type");
 var _objectManager = require("../../object-manager");
 var _store = require("./store.base");
-var _widget = require("../dialog/dialogs/widget");
 var _constant = require("../../utilities/constant");
 var _bound = require("agora-foundation/lib/decorator/bound");
 var _WebWidgetStore;
@@ -70,38 +69,9 @@ var WebWidgetStore = exports.WebWidgetStore = /*#__PURE__*/function (_WebWidgetS
     (0, _classCallCheck2["default"])(this, WebWidgetStore);
     _this = _callSuper(this, WebWidgetStore, [args]);
     (0, _defineProperty2["default"])(_this, "_windowProvider", void _initProto(_this));
-    (0, _defineProperty2["default"])(_this, "_window", null);
-    (0, _defineProperty2["default"])(_this, "_popupSize", null);
-    (0, _defineProperty2["default"])(_this, "_windowProviderObjectObserver", {
-      onReady: function onReady() {
-        if (_this._window && _this._popupSize) {
-          _this._window.setBounds({
-            width: _this._popupSize.width,
-            height: _this._popupSize.height + _widget.TITLE_BAR_HEIGHT //TODO 46 is the height of the title bar
-          });
-        } else {
-          throw new Error('window or popupSize is not set');
-        }
-      }
-    });
-    (0, _defineProperty2["default"])(_this, "_windowProviderObserver", {
-      onWindowCreated: function onWindowCreated(key, id, window) {
-        var widgetConfig = _this._widgetProvider.registeredWidgetConfigs.get(id);
-        var isWebWidget = widgetConfig && widgetConfig.type === _type.FcrWidgetType.webWidget;
-        if (isWebWidget) {
-          if (_this._window) {
-            _this._window.removeObserver(_this._windowProviderObjectObserver);
-          }
-          _this._window = window;
-          _this._popupSize = widgetConfig.popupSize;
-          _this._window.addObserver(_this._windowProviderObjectObserver);
-        }
-      }
-    });
     var objectManager = args.objectManager;
     var windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
     _this._windowProvider = windowProvider;
-    _this._windowProvider.addObserver(_this._windowProviderObserver);
     return _this;
   }
   (0, _inherits2["default"])(WebWidgetStore, _WebWidgetStoreBase);
@@ -119,12 +89,7 @@ var WebWidgetStore = exports.WebWidgetStore = /*#__PURE__*/function (_WebWidgetS
     }
   }, {
     key: "release",
-    value: function release() {
-      this._windowProvider.removeObserver(this._windowProviderObserver);
-      if (this._window) {
-        this._window.removeObserver(this._windowProviderObjectObserver);
-      }
-    }
+    value: function release() {}
   }]);
 }(_store.WebWidgetStoreBase);
 _WebWidgetStore = WebWidgetStore;

package/lib/modules/widget/view.js

@@ -50,7 +50,7 @@ var WebWidgetView = exports.WebWidgetView = (0, _mobxReact.observer)(function ()
       onLoad: onLoad,
       style: {
         width: widgetConfig.popupSize.width,
-        height: widgetConfig.popupSize.height
+        height: widgetConfig.popupSize.height - 46 // 46 is the height of the dialog title bar
       }
     })
   });

package/lib/modules/widget/web-widget.d.ts

@@ -26,7 +26,7 @@ export declare class FcrUIWebWidgetImpl implements FcrUIWebWidget {
     fetchUserList(params: FcrUserPageParams): Promise<import("fcr-core/lib/imports").AgoraRteUserPageResponse>;
     startSessionByPhone(params: FcrPhoneConnectorSessionParams): Promise<string>;
     startSessionByIP(params: FcrIPConnectorSessionParams): Promise<string>;
-    stopSession(sessionId: string): Promise<void>;
+    stopSession(sessionId: string): Promise<number>;
     addObserver(): void;
     removeObserver(): void;
     private _handleApiResponse;

package/lib/object-manager.d.ts

@@ -57,6 +57,7 @@ export declare enum FcrUIObjectKeys {
     P_BOARD_SHARE_PROVIDER = "boardShareProvider",
     P_WHITEBOARD_CONTROL_PROVIDER = "whiteboardControlProvider",
     P_MOUSE_DETECT_PROVIDER = "mouseDetectProvider",
+    P_USER_AUDIO_VOLUME_PROVIDER = "userAudioVolumeProvider",
     /**
      * shared data sources
      */
@@ -66,6 +67,7 @@ export declare enum FcrUIObjectKeys {
     S_SHARED_SETTING_DATA_SOURCE = "sharedSettingDataSource",
     S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE = "sharedSpeakerSpotlightDataSource",
     S_SHARED_PIN_DATA_SOURCE = "sharedPinDataSource",
+    S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE = "sharedUserAudioVolumeDataSource",
     S_SHARED_VIDEO_WINDOW_DATA_SOURCE = "sharedVideoWindowDataSource",
     S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE = "sharedDevicePrivilegeDataSource",
     S_SHARED_SCREEN_SHARE_DATA_SOURCE = "sharedScreenShareDataSource",

package/lib/object-manager.js

@@ -173,6 +173,7 @@ var FcrUIObjectKeys = exports.FcrUIObjectKeys = /*#__PURE__*/function (FcrUIObje
   FcrUIObjectKeys["P_BOARD_SHARE_PROVIDER"] = "boardShareProvider";
   FcrUIObjectKeys["P_WHITEBOARD_CONTROL_PROVIDER"] = "whiteboardControlProvider";
   FcrUIObjectKeys["P_MOUSE_DETECT_PROVIDER"] = "mouseDetectProvider";
+  FcrUIObjectKeys["P_USER_AUDIO_VOLUME_PROVIDER"] = "userAudioVolumeProvider";
   /**
    * shared data sources
    */
@@ -182,6 +183,7 @@ var FcrUIObjectKeys = exports.FcrUIObjectKeys = /*#__PURE__*/function (FcrUIObje
   FcrUIObjectKeys["S_SHARED_SETTING_DATA_SOURCE"] = "sharedSettingDataSource";
   FcrUIObjectKeys["S_SHARED_SPEAKER_SPOTLIGHT_DATA_SOURCE"] = "sharedSpeakerSpotlightDataSource";
   FcrUIObjectKeys["S_SHARED_PIN_DATA_SOURCE"] = "sharedPinDataSource";
+  FcrUIObjectKeys["S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE"] = "sharedUserAudioVolumeDataSource";
   FcrUIObjectKeys["S_SHARED_VIDEO_WINDOW_DATA_SOURCE"] = "sharedVideoWindowDataSource";
   FcrUIObjectKeys["S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE"] = "sharedDevicePrivilegeDataSource";
   FcrUIObjectKeys["S_SHARED_SCREEN_SHARE_DATA_SOURCE"] = "sharedScreenShareDataSource";

package/lib/plugins/multi-lang-plugin.js

@@ -3,7 +3,7 @@
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _zhCN = require("../translations/zhCN");
 var _enUS = require("../translations/enUS");
-var _logger = require("agora-foundation/lib/logger");
+var _logger = require("../utilities/logger");
 //@internal
 
 var logger = (0, _logger.getLogger)();

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

@@ -35,6 +35,22 @@ export interface FcrUIAbilityProvider {
      * 检查当前平台是否支持云录制
      */
     isRecordingSupported(): boolean;
+    /**
+     * 检查当前平台是否支持白板
+     */
+    isBoardAbilitySupported(): boolean;
+    /**
+     * 检查当前平台是否支持虚拟背景
+     */
+    isVirtualBackgroundSupported(): boolean;
+    /**
+     * 检查当前平台是否支持美颜
+     */
+    isBeautyModeAbilitySupported(): boolean;
+    /**
+     * 检查当前平台是否支持外呼
+     */
+    isCallOutAbilitySupported(): boolean;
 }
 export declare class FcrUIAbilityProviderImpl implements FcrUIAbilityProvider, FcrUIManagedObject {
     private _abilityControl;
@@ -55,7 +71,7 @@ export declare class FcrUIAbilityProviderImpl implements FcrUIAbilityProvider, F
      */
     isLiveSupported: () => boolean;
     /**
-     * 检查当前平台是否支持指定能力
+     * 检查当前平台是否支持同声传译能力
      */
     isInterpreterSupported: () => boolean;
     /**
@@ -74,4 +90,20 @@ export declare class FcrUIAbilityProviderImpl implements FcrUIAbilityProvider, F
      * 检查当前平台是否支持云录制
      */
     isRecordingSupported: () => boolean;
+    /**
+     * 检查当前平台是否支持白板
+     */
+    isBoardAbilitySupported: () => boolean;
+    /**
+     * 检查当前平台是否支持虚拟背景
+     */
+    isVirtualBackgroundSupported: () => boolean;
+    /**
+     * 检查当前平台是否支持美颜
+     */
+    isBeautyModeAbilitySupported: () => boolean;
+    /**
+     * 检查当前平台是否支持外呼
+     */
+    isCallOutAbilitySupported: () => boolean;
 }

package/lib/providers/ability-provider.js

@@ -41,7 +41,7 @@ var FcrUIAbilityProviderImpl = exports.FcrUIAbilityProviderImpl = /*#__PURE__*/f
       return result;
     });
     /**
-     * 检查当前平台是否支持指定能力
+     * 检查当前平台是否支持同声传译能力
      */
     (0, _defineProperty2["default"])(this, "isInterpreterSupported", function () {
       var result = _this._abilityControl.isAbilitySupported(_type.FcrAbility.Interpreter);
@@ -75,6 +75,34 @@ var FcrUIAbilityProviderImpl = exports.FcrUIAbilityProviderImpl = /*#__PURE__*/f
       var result = _this._abilityControl.isAbilitySupported(_type.FcrAbility.Recording);
       return result;
     });
+    /**
+     * 检查当前平台是否支持白板
+     */
+    (0, _defineProperty2["default"])(this, "isBoardAbilitySupported", function () {
+      var result = _this._abilityControl.isAbilitySupported(_type.FcrAbility.Board);
+      return result;
+    });
+    /**
+     * 检查当前平台是否支持虚拟背景
+     */
+    (0, _defineProperty2["default"])(this, "isVirtualBackgroundSupported", function () {
+      var result = _this._abilityControl.isAbilitySupported(_type.FcrAbility.SettingVirtualBackground);
+      return result;
+    });
+    /**
+     * 检查当前平台是否支持美颜
+     */
+    (0, _defineProperty2["default"])(this, "isBeautyModeAbilitySupported", function () {
+      var result = _this._abilityControl.isAbilitySupported(_type.FcrAbility.SettingBeautyMode);
+      return result;
+    });
+    /**
+     * 检查当前平台是否支持外呼
+     */
+    (0, _defineProperty2["default"])(this, "isCallOutAbilitySupported", function () {
+      var result = _this._abilityControl.isAbilitySupported(_type.FcrAbility.PstnCallOut);
+      return result;
+    });
     this._abilityControl = _abilityControl;
   }
   return (0, _createClass2["default"])(FcrUIAbilityProviderImpl, [{

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

@@ -0,0 +1,39 @@
+import { AgoraObservable } from 'fcr-core/lib/imports';
+import { FcrAnnotationControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/annotation-control/type';
+import { FcrBaseWhiteboardObserver } from 'fcr-core/lib/room-control/whiteboard-control-v2/type';
+import { FcrSharingControl, FcrUserControl } from 'fcr-core/lib/type';
+import { FcrUIManagedObject, FcrUIObjectManager } from '../../object-manager';
+import { FcrUIAnnotationObserver, FcrUIAnnotationProvider, FcrUIBoardBarControl, FcrUIStandaloneToolbarControl } from './type';
+export declare abstract class FcrUIAnnotationProviderBase implements FcrUIManagedObject, FcrUIAnnotationProvider {
+    protected logger: import("fcr-core/lib/imports").Logger;
+    protected observable: AgoraObservable<FcrUIAnnotationObserver>;
+    protected sharingControl: FcrSharingControl;
+    protected annotationControl: FcrAnnotationControl;
+    protected boardBarControl: FcrUIBoardBarControl;
+    protected accessor isControlEnabled: boolean;
+    protected accessor isConnected: boolean;
+    protected accessor isToolbarOpened: boolean;
+    protected userControl: FcrUserControl;
+    protected boardObserver: FcrBaseWhiteboardObserver;
+    private _sharingObserver;
+    constructor(objectManager: FcrUIObjectManager);
+    get isToolbarControlEnabled(): boolean;
+    get isAnnotationOpened(): boolean;
+    get isAnnotationToolbarOpened(): boolean;
+    enableToolbarControl(enable: boolean): void;
+    openAnnotationToolbar(): void;
+    closeAnnotationToolbar(): void;
+    openAnnotationMask(): void;
+    closeAnnotationMask(): void;
+    clearAnnotationMask(): void;
+    updateAnnotationViewportSize(Width: number, height: number): void;
+    openAnnotation(): Promise<void>;
+    closeAnnotation(): void;
+    getBoardBarControl(): FcrUIBoardBarControl;
+    getBoardContentView(): HTMLElement | null;
+    repositionAnnotationMask(): void;
+    release(): void;
+    getStandaloneToolbarControl(): FcrUIStandaloneToolbarControl;
+    addObserver(observer: FcrUIAnnotationObserver): void;
+    removeObserver(observer: FcrUIAnnotationObserver): void;
+}