fcr-ui-scene 3.7.8 → 3.8.0-alpha

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

@@ -4,7 +4,6 @@ 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.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");
@@ -40,14 +39,18 @@ 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.for-each.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.push.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"));
@@ -56,7 +59,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectManager = require("../../object-manager");
 var _logger = require("../../utilities/logger");
-var _types = require("fcr-core/lib/room-control/whiteboard-control/types");
 var _fcrCore = require("fcr-core");
 var _mobx = require("mobx");
 var _type = require("fcr-core/lib/type");
@@ -66,6 +68,7 @@ var _decorator = require("agora-foundation/lib/decorator");
 var _imports = require("fcr-core/lib/imports");
 var _constant = require("../../utilities/constant");
 var _theme = _interopRequireDefault(require("../../modules/whiteboard/libs/theme"));
+var _enum = require("fcr-core/lib/room-control/whiteboard-control/enum");
 var _FcrUIBoardShareProviderBase;
 var _initProto, _init_loading, _init_boardState, _init_connectionState, _init_joined, _handleStartedDecs, _handleEndedDecs, _handleConnectionStateUpdatedDecs, _handleConnectedDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -85,10 +88,12 @@ var _D = /*#__PURE__*/new WeakMap();
 _ref = (_handleStartedDecs = [_mobx.action, _mobx.action.bound], _handleEndedDecs = [_mobx.action, _mobx.action.bound], _handleConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleConnectedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PURE__*/function () {
   function FcrUIBoardShareProviderBase(objectManager) {
+    var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUIBoardShareProviderBase);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUIBoardShareProviderBase'
     })));
+    (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_observer", {
       // onWhiteboardStarted is active event callback
@@ -120,6 +125,14 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
     if (this.isActive) {
       this._boardControl.open();
     }
+    this._disposers.push((0, _mobx.reaction)(function () {
+      return _this.canWriteBoard;
+    }, function (canWriteBoard) {
+      // 权限被移除时，重置白板工具
+      if (!canWriteBoard) {
+        _this.boardBarControl.resetWhiteboardTool();
+      }
+    }));
   }
   return (0, _createClass2["default"])(FcrUIBoardShareProviderBase, [{
     key: "boardMainWindow",
@@ -266,6 +279,10 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
   }, {
     key: "release",
     value: function release() {
+      this._disposers.forEach(function (dispose) {
+        return dispose();
+      });
+      this._disposers = [];
       this._sharingControl.removeObserver(this._observer);
       this._boardControl.removeObserver(this._boardObserver);
     }
@@ -313,7 +330,7 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
       this.logger.info("Board share ended with reason: ".concat(reason, ", operatorUser: ").concat((0, _imports.jsonstring)(operatorUser), "."));
       this._boardControl.close();
       this.boardState = _type.FcrWhiteboardState.END;
-      if (reason === _types.FcrBoardInactiveReason.SEIZE) {
+      if (reason === _enum.FcrBoardInactiveReason.SEIZE) {
         this._observable.notifyObservers('onBoardShareStopped', {
           reason: _struct.FcrUIBoardShareStopReason.STOPPED_BY_OTHER,
           operatorUser: operatorUser

package/lib/providers/board-share/provider.browser.js

@@ -57,7 +57,7 @@ var _browser = require("./bar-control/browser");
 var _provider = require("./provider.base");
 var _mobx = require("mobx");
 var _decorator = require("agora-foundation/lib/decorator");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 var _FcrUIBoardShareProviderImpl;
 var _initProto, _handleStateUpdatedDecs, _handleRedoStateUpdatedDecs, _handleUndoStateUpdatedDecs, _ref;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -130,7 +130,7 @@ var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PUR
   }, {
     key: "_resetWhiteboardTool",
     value: function _resetWhiteboardTool() {
-      this.boardMainWindow.setToolType(_enums.FcrBoardToolType.LASER_POINTER);
+      this.boardMainWindow.setToolType(_fcrCore.FcrBoardToolType.LASER_POINTER);
       this.boardMainWindow.setStrokeWidth(2);
       this.boardMainWindow.setStrokeColor(this._boardBarControl.currentTheme.colors[2]);
       this.boardBarControl.resetWhiteboardTool();

package/lib/providers/board-share/provider.electron.js

@@ -53,7 +53,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectManager2 = require("../../object-manager");
 var _logger = require("../../utilities/logger");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _fcrCore = require("fcr-core");
 var _mobx = require("mobx");
 var _decorator = require("agora-foundation/lib/decorator");
@@ -150,7 +149,7 @@ var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PUR
   }, {
     key: "_resetWhiteboardTool",
     value: function _resetWhiteboardTool() {
-      this.boardMainWindow.setToolType(_enums.FcrBoardToolType.LASER_POINTER);
+      this.boardMainWindow.setToolType(_fcrCore.FcrBoardToolType.LASER_POINTER);
       this.boardMainWindow.setStrokeWidth(2);
       this.boardMainWindow.setStrokeColor(this._boardBarControl.currentTheme.colors[2]);
       this.boardBarControl.resetWhiteboardTool();

package/lib/providers/board-share/type.d.ts

@@ -3,8 +3,7 @@ import { FcrConnectionState, FcrUserInfo, FcrWhiteboardState } from 'fcr-core/li
 import { WhiteboardThemeType } from '../../modules/whiteboard/type';
 import { FcrToolbarState } from '../../modules/components/toolbar/types';
 import { FcrUIMainWindowRendererObserver, WhiteboardToolAction } from '../../modules/secondary-window/type';
-import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
-import { FcrColor } from 'fcr-core/lib/room-control/whiteboard-control/types';
+import { FcrBoardShape, FcrBoardToolType, FcrColor } from 'fcr-core';
 export interface FcrUIBoardShareObserver {
     /**
      * 白板共享开启

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

@@ -10,6 +10,7 @@ import { FcrUIMessageProvider } from './message/type';
 import { BeautyKey } from '../modules/setting/type';
 import { FcrUIFacilityProvider } from './facility/type';
 import { FcrUIRendererWrapper } from '../utilities/renderer';
+import { FcrUISoundEffectAudiosSchema } from '../schema';
 export declare const DEFAULT_DEVICE_ID = "default";
 export interface FcrUIDeviceProvider {
     /**
@@ -103,7 +104,8 @@ export interface FcrUIDeviceProvider {
     get speakerDetecting(): boolean;
     get microphoneDetecting(): boolean;
     get showCameraPreview(): boolean;
-    get soundEffectList(): Map<string, Record<string, string>>;
+    get soundEffectPlayUrlMap(): Map<keyof FcrUISoundEffectAudiosSchema, string>;
+    get soundEffectFilePathMap(): Map<keyof FcrUISoundEffectAudiosSchema, string>;
     get beautyKey(): FcrUIBeautyKey;
     get currentIsMirror(): boolean;
     get defaultMirror(): boolean;
@@ -137,6 +139,11 @@ export interface FcrUIDeviceProvider {
     enableAudioEchoCancellation(enable: boolean): void;
     enableAudioStereo(enable: boolean): void;
     setNoiseLevel(level: FcrUIAiDenoiseLevel): void;
+    /**
+     * 开关自动增益控制
+     * @param enable
+     */
+    toggleAGC(enable: boolean): void;
     /**
      * 开关摄像头
      * @param enable
@@ -295,7 +302,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     private _messageProvider;
     private _mediaControl;
     private _sharedSettingDataSource;
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("fcr-core/lib/imports").Logger;
     private _observable;
     private _disposer;
     private _hasExecutedOpenCamera;
@@ -314,6 +321,8 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     private _mediaControlObserver;
     private _defaultMirror;
     private _volumeIndicationInterval;
+    private _soundEffectPlayUrlMap;
+    private _soundEffectFilePathMap;
     private accessor _microphoneEnabled;
     private accessor _isMicrophoneWorking;
     private accessor _microphoneDevice;
@@ -339,7 +348,6 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     accessor beautyKey: FcrUIBeautyKey;
     accessor beautyOptions: FcrBeautyOptions;
     accessor virtualBackgroundList: VirtualBackground[];
-    accessor soundEffectList: Map<string, Record<string, string>>;
     accessor microphoneDetecting: boolean;
     accessor speakerDetecting: boolean;
     accessor connectType: FcrUIConnectType;
@@ -373,6 +381,8 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     get microphoneEnabled(): boolean;
     get microphoneState(): FcrUIMicrophoneState;
     constructor(_renderer: FcrUIRendererWrapper, _facilityProvider: FcrUIFacilityProvider, _messageProvider: FcrUIMessageProvider, _mediaControl: FcrDesktopMediaControl, _sharedSettingDataSource: FcrUISharedSettingDataSource);
+    get soundEffectPlayUrlMap(): Map<keyof FcrUISoundEffectAudiosSchema, string>;
+    get soundEffectFilePathMap(): Map<keyof FcrUISoundEffectAudiosSchema, string>;
     resetDevice(): void;
     release(): void;
     getScreenTrack(id: string): FcrScreenTrack;
@@ -418,7 +428,8 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     setShowCameraPreview(enable: boolean): void;
     loadUiResources(uiResource: FcrUIResource): Promise<void>;
     loadZipResources(zipUrls: string[], type: FcrUiResourceType, callback: (filePathList: string[], type: FcrUiResourceType) => void): Promise<void>;
-    toggleAGC(enable: boolean): number;
+    loadFileResources(fileUrl: string, type: FcrUiResourceType, callback: (filePath: string) => void): Promise<void>;
+    toggleAGC(enable: boolean): void;
     setConnectType(connectType: FcrUIConnectType): void;
     toggleLocalCameraPreview(enabled: boolean): void;
     getLoopbackDeviceId(): string | null;
@@ -436,7 +447,6 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     private _handleMicrophoneDeviceIdChanged;
     private _handleSpeakerDeviceIdChanged;
     private _handleSpeakerIdChanged;
-    private _fetchZipAndUnzip;
     private _updateVirtualBackgroundList;
     private _handleSystemSelectedSpeakerChanged;
     private _correctSystemSpeakerDeviceId;