fcr-ui-scene 3.7.4 → 3.7.5

package/lib/providers/board-share/struct.js

@@ -0,0 +1,23 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUIBoardShareStopReason = void 0;
+// enum, class
+var FcrUIBoardShareStopReason = exports.FcrUIBoardShareStopReason = /*#__PURE__*/function (FcrUIBoardShareStopReason) {
+  /**
+   * 正常停止
+   */
+  FcrUIBoardShareStopReason[FcrUIBoardShareStopReason["NORMAL_STOP"] = 1] = "NORMAL_STOP";
+  /**
+   * 被其他用户停止
+   */
+  FcrUIBoardShareStopReason[FcrUIBoardShareStopReason["STOPPED_BY_OTHER"] = 2] = "STOPPED_BY_OTHER";
+  /**
+   * 白板错误
+   */
+  FcrUIBoardShareStopReason[FcrUIBoardShareStopReason["ABORTED"] = 3] = "ABORTED";
+  return FcrUIBoardShareStopReason;
+}({});

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

@@ -0,0 +1,161 @@
+import { FcrUIBoardShareStopReason } from './struct';
+import { FcrConnectionState, FcrUserInfo, FcrWhiteboardState } from 'fcr-core/lib/type';
+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';
+export interface FcrUIBoardShareObserver {
+    /**
+     * 白板共享开启
+     */
+    onBoardShareStarted?: (event: {
+        ownerId: string;
+        operatorUser: FcrUserInfo;
+    }) => void;
+    /**
+     * 白板共享关闭
+     * @param reason
+     */
+    onBoardShareStopped?: (event: {
+        reason: FcrUIBoardShareStopReason;
+        operatorUser?: FcrUserInfo;
+    }) => void;
+    /**
+     * 白板已准备好挂载
+     * @param boardDom
+     */
+    onBoardReady?: (boardDom: HTMLElement) => void;
+    /**
+     * 白板错误
+     * @param error
+     */
+    onBoardError?: (error: string) => void;
+}
+export interface FcrUIBoardShareProvider {
+    /**
+     * 获取白板bar控制器
+     */
+    get boardBarControl(): FcrUIBoardBarControl;
+    /**
+     * 获取白板是否处于激活状态
+     */
+    get isActive(): boolean;
+    /**
+     * 获取owner用户
+     */
+    get ownerUser(): FcrUserInfo;
+    /**
+     * 获取loading
+     */
+    get loading(): boolean;
+    /**
+     * 获取白板连接状态
+     */
+    get boardState(): FcrWhiteboardState;
+    /**
+     * 获取白板连接状态
+     */
+    get connectionState(): FcrConnectionState;
+    /**
+     * 获取白板是否已加入
+     */
+    get joined(): boolean;
+    /**
+     * 获取白板是否可写
+     */
+    get canWriteBoard(): boolean;
+    /**
+     * 获取白板是否可停止其他白板
+     */
+    get canStopOtherBoard(): boolean;
+    /**
+     * 获取白板是否是本地用户
+     */
+    get isMyBoard(): boolean;
+    /**
+     * 开始白板共享
+     */
+    startShare(): Promise<void>;
+    /**
+     * 停止白板共享
+     */
+    stopShare(): Promise<void>;
+    /**
+     * 设置画笔宽度
+     * @param width
+     */
+    setStrokeWidth(width: number): Promise<void>;
+    /**
+     * 设置画笔颜色
+     * @param color
+     */
+    setStrokeColor(color: FcrColor): Promise<void>;
+    /**
+     * 选择工具
+     */
+    selectTool(tool: FcrBoardToolType): Promise<void>;
+    /**
+     * 清除画布
+     */
+    clear(): Promise<void>;
+    /**
+     * 撤销
+     */
+    undo(): Promise<void>;
+    /**
+     * 重做
+     */
+    redo(): Promise<void>;
+    /**
+     * 截屏
+     * @param hideWindow
+     */
+    captureScreen(hideWindow: boolean): void;
+    /**
+     * 获取白板dom
+     */
+    getBoardDom(): HTMLElement | null;
+    /**
+     * 设置是否双屏显示模式
+     * @param isDualDisplayMode
+     */
+    setIsDualDisplayMode: (isDualDisplayMode: boolean) => void;
+    /**
+     * 添加观察者
+     */
+    addObserver(observer: FcrUIBoardShareObserver): void;
+    /**
+     * 移除观察者
+     */
+    removeObserver(observer: FcrUIBoardShareObserver): void;
+}
+export interface FcrUIBoardBarControl {
+    get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
+    get canWriteBoard(): boolean;
+    get sharingUserInfo(): FcrUserInfo | undefined;
+    get backgroundColor(): string;
+    get currentTheme(): WhiteboardThemeType;
+    get connectionState(): FcrConnectionState;
+    get showLoading(): boolean;
+    get joinSuccess(): boolean;
+    get toolbarState(): FcrToolbarState;
+    release(): void;
+    setSharingUser: (userInfo: FcrUserInfo) => void;
+    setBackgroundColor: (color: string) => void;
+    setWhiteboardTool: (tool: {
+        action: WhiteboardToolAction;
+        tool: FcrBoardToolType | FcrBoardShape | string | number;
+    }) => void;
+    setTheme: (theme: WhiteboardThemeType) => void;
+    setControlEnable: (enable: boolean) => void;
+    setShowLoading: (show: boolean) => void;
+    setCommonColors: (colors: string[]) => void;
+    saveDraft: () => void;
+    setProgress: (progress: number) => void;
+    setJoinSuccess: (success: boolean) => void;
+    setRoomName: (roomName: string) => void;
+    inActive: () => void;
+    resetWhiteboardTool: () => void;
+    setIsDualDisplayMode: (isDualDisplayMode: boolean) => void;
+}

package/lib/providers/board-share/type.js

@@ -0,0 +1,6 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -1,8 +1,9 @@
 import { FcrChatRoomConnectionState, FcrChatRoomReceivedImageMessage, FcrChatRoomReceivedTextMessage } from 'fcr-core/lib/room-control/chatroom-control/type';
 import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIRoomProvider } from './room-provider';
+import { FcrUIRoomProvider } from './room-provider/room-provider';
 import { FcrUIRoomType } from '../type';
+import { FcrUIManagedObject } from '../object-manager';
 export type FcrChatRoomReceiveMessage = FcrChatRoomReceivedImageMessage | FcrChatRoomReceivedTextMessage;
 export type FcrUILatestMessageInfo = {
     notifyMsgs: FcrChatRoomReceiveMessage[];
@@ -59,13 +60,18 @@ export interface FcrUIChatProvider {
     addObserver(observer: FcrUIChatProviderObserver): void;
     removeObserver(observer: FcrUIChatProviderObserver): void;
 }
-export declare class FcrUIChatProviderImpl implements FcrUIChatProvider {
+export declare class FcrUIChatProviderImpl implements FcrUIChatProvider, FcrUIManagedObject {
+    private _currentRoomControl;
+    private _roomProvider;
     private _observable;
     private _latestsMessageInfo;
+    private _waitingRoomControl?;
     private _chatRoomObserver;
     accessor chatConnectionState: FcrChatRoomConnectionState;
     private _waitingChatRoomObserver;
+    private _roomProviderObserver;
     constructor(_currentRoomControl: FcrBaseRoomControl, _roomProvider: FcrUIRoomProvider);
+    release(): void;
     get latestsMessageInfo(): FcrUILatestMessageInfo;
     set latestsMessageInfo(info: FcrUILatestMessageInfo);
     setPrivateChatTargetUser(user: FcrUserInfo, roomType: FcrUIRoomType): void;

package/lib/providers/chat-provider.js

@@ -51,7 +51,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _imports = require("fcr-core/lib/imports");
 var _type = require("fcr-core/lib/room-control/chatroom-control/type");
 var _type2 = require("fcr-core/lib/room-control/type");
-var _base = require("../base");
 var _mobx = require("mobx");
 var _type3 = require("../type");
 var _FcrUIChatProviderImpl;
@@ -69,8 +68,8 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var FcrUIChatProviderImpl = exports.FcrUIChatProviderImpl = /*#__PURE__*/function () {
   function FcrUIChatProviderImpl(_currentRoomControl, _roomProvider) {
-    var _currentRoomControl$g,
-      _this = this;
+    var _this = this,
+      _currentRoomControl$g;
     (0, _classCallCheck2["default"])(this, FcrUIChatProviderImpl);
     (0, _defineProperty2["default"])(this, "_observable", (_initProto(this), new _imports.AgoraObservable()));
     (0, _defineProperty2["default"])(this, "_latestsMessageInfo", {
@@ -86,13 +85,17 @@ var FcrUIChatProviderImpl = exports.FcrUIChatProviderImpl = /*#__PURE__*/functio
       onTextMessageReceived: this._handleWaitingRoomTextMessageReceived.bind(this),
       onConnectionStateUpdated: this._handleWaitingRoomConnectionUpdated.bind(this)
     });
+    (0, _defineProperty2["default"])(this, "_roomProviderObserver", {
+      onJoinWaitingRoom: function onJoinWaitingRoom(roomControl) {
+        _this._waitingRoomControl = roomControl;
+        roomControl.getChatRoomControl().addObserver(_this._waitingChatRoomObserver);
+      }
+    });
+    this._currentRoomControl = _currentRoomControl;
+    this._roomProvider = _roomProvider;
     if (((_currentRoomControl$g = _currentRoomControl.getRoomInfo()) === null || _currentRoomControl$g === void 0 ? void 0 : _currentRoomControl$g.roomType) === _type2.FcrRoomType.Mainroom) {
       _currentRoomControl.getChatRoomControl().addObserver(this._chatRoomObserver);
-      _roomProvider.addObserver({
-        onJoinWaitingRoom: function onJoinWaitingRoom(roomControl) {
-          roomControl.getChatRoomControl().addObserver(_this._waitingChatRoomObserver);
-        }
-      });
+      _roomProvider.addObserver(this._roomProviderObserver);
     } else {
       _currentRoomControl.getChatRoomControl().addObserver(this._waitingChatRoomObserver);
     }
@@ -105,6 +108,16 @@ var FcrUIChatProviderImpl = exports.FcrUIChatProviderImpl = /*#__PURE__*/functio
     set: function set(v) {
       _classPrivateFieldSet(_A, this, v);
     }
+  }, {
+    key: "release",
+    value: function release() {
+      this._currentRoomControl.getChatRoomControl().removeObserver(this._chatRoomObserver);
+      this._roomProvider.removeObserver(this._roomProviderObserver);
+      this._currentRoomControl.getChatRoomControl().removeObserver(this._waitingChatRoomObserver);
+      if (this._waitingRoomControl) {
+        this._waitingRoomControl.getChatRoomControl().removeObserver(this._waitingChatRoomObserver);
+      }
+    }
   }, {
     key: "latestsMessageInfo",
     get: function get() {
@@ -153,7 +166,8 @@ var FcrUIChatProviderImpl = exports.FcrUIChatProviderImpl = /*#__PURE__*/functio
   }]);
 }();
 _FcrUIChatProviderImpl = FcrUIChatProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIChatProviderImpl, [[_mobx.observable, 1, "chatConnectionState"]], []).e, 2);
-_init_chatConnectionState = _applyDecs$e[0];
-_initProto = _applyDecs$e[1];
-(0, _base.registerDependency)('chatProvider');
+var _applyDecs$e = _applyDecs(_FcrUIChatProviderImpl, [[_mobx.observable, 1, "chatConnectionState"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 2);
+_init_chatConnectionState = _applyDecs$e2[0];
+_initProto = _applyDecs$e2[1];
+_applyDecs$e;

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

@@ -1,6 +1,7 @@
 import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'fcr-core';
-import { FcrUIMessageProvider } from './message-provider';
+import { FcrUIMessageProvider } from './message/type';
 import { FcrUIDeviceProvider } from './device-provider';
+import { FcrUIManagedObject } from '../object-manager';
 export interface FcrUIDevicePrivilegeObserver {
     /**
      * 可开启摄像头权限变更
@@ -53,7 +54,7 @@ export interface FcrUIDevicePrivilegeProvider {
     addObserver(observer: FcrUIDevicePrivilegeObserver): void;
     removeObserver(observer: FcrUIDevicePrivilegeObserver): void;
 }
-export declare class FcrUIDevicePrivilegeProviderImpl implements FcrUIDevicePrivilegeProvider {
+export declare class FcrUIDevicePrivilegeProviderImpl implements FcrUIDevicePrivilegeProvider, FcrUIManagedObject {
     private _privilegeControl;
     private _streamControl;
     private _userControl;

package/lib/providers/device-privilege-provider.js

@@ -20,7 +20,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("fcr-core/lib/type");
 var _imports = require("fcr-core/lib/imports");
-var _base = require("../base");
 var _fcrCore = require("fcr-core");
 var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
 var _privilege = require("../utilities/privilege");
@@ -408,5 +407,4 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
       this._observable.removeObserver(observer);
     }
   }]);
-}();
-(0, _base.registerDependency)('devicePrivilegeProvider');
+}();

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

@@ -3,10 +3,13 @@ import { FcrDeviceInfo } from 'fcr-core/lib/type';
 import { FcrCapability, FcrDesktopMediaControl } from 'fcr-core';
 import { FcrDisplayInfo, FcrWindowInfo } from 'fcr-core/lib/type';
 import { VirtualBackground } from '../modules/device-pretest/assets/virtual-backdound-resources';
-import { FcrUIVideoEffectType, FcrUIBeautyKey, FcrUIConnectType, FcrUIResource, FcrUIDeviceObserver, FcrUIAiDenoiseLevel, FcrUiResourceType } from '../type';
-import { FcrUIEventProvider } from './event-provider';
-import { BeautyKey } from '../modules/setting/store';
-import { FcrUISharedSettingDataSource } from '../shared-data-source/setting';
+import { FcrUIVideoEffectType, FcrUIBeautyKey, FcrUIConnectType, FcrUIResource, FcrUIDeviceObserver, FcrUIAiDenoiseLevel, FcrUiResourceType, FcrUIMicrophoneState } from '../type';
+import { FcrUISharedSettingDataSource } from '../shared-data/setting';
+import { FcrUIManagedObject } from '../object-manager';
+import { FcrUIMessageProvider } from './message/type';
+import { BeautyKey } from '../modules/setting/type';
+import { FcrUIFacilityProvider } from './facility/type';
+import { FcrUIRendererWrapper } from '../utilities/renderer';
 export declare const DEFAULT_DEVICE_ID = "default";
 export interface FcrUIDeviceProvider {
     /**
@@ -46,6 +49,10 @@ export interface FcrUIDeviceProvider {
      * 当前是否开启了麦克风
      */
     get microphoneEnabled(): boolean;
+    /**
+     * 当前麦克风状态
+     */
+    get microphoneState(): FcrUIMicrophoneState;
     /**
      * 摄像头列表
      */
@@ -266,11 +273,14 @@ export interface FcrUIDeviceProvider {
      * 获取声卡采集设备ID
      */
     getLoopbackDeviceId(): string | null;
+    resetDevice(): void;
     addObserver(observer: FcrUIDeviceObserver): void;
     removeObserver(observer: FcrUIDeviceObserver): void;
 }
-export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
-    private _eventProvider;
+export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, FcrUIManagedObject {
+    private _renderer;
+    private _facilityProvider;
+    private _messageProvider;
     private _mediaControl;
     private _sharedSettingDataSource;
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -292,6 +302,8 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     private _mediaControlObserver;
     private _defaultMirror;
     private _volumeIndicationInterval;
+    private accessor _microphoneEnabled;
+    private accessor _isMicrophoneWorking;
     private accessor _microphoneDevice;
     private accessor _microphone;
     private accessor _speakerDevice;
@@ -301,7 +313,6 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     accessor showForceOpenEffectDialog: boolean;
     accessor cameraEnabled: boolean;
     accessor showCameraPreview: boolean;
-    accessor microphoneEnabled: boolean;
     accessor cameraList: FcrDeviceInfo[];
     accessor microphoneList: FcrDeviceInfo[];
     accessor microphoneVolumeLevel: number;
@@ -343,7 +354,10 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     };
     get isAudioConnected(): boolean;
     get shouldEnableMicBeforeSession(): boolean;
-    constructor(_eventProvider: FcrUIEventProvider, _mediaControl: FcrDesktopMediaControl, _sharedSettingDataSource: FcrUISharedSettingDataSource);
+    get microphoneEnabled(): boolean;
+    get microphoneState(): FcrUIMicrophoneState;
+    constructor(_renderer: FcrUIRendererWrapper, _facilityProvider: FcrUIFacilityProvider, _messageProvider: FcrUIMessageProvider, _mediaControl: FcrDesktopMediaControl, _sharedSettingDataSource: FcrUISharedSettingDataSource);
+    resetDevice(): void;
     release(): void;
     getScreenTrack(id: string): FcrScreenTrack;
     getLoopbackTrack(id: string): FcrLoopbackTrack;
@@ -394,6 +408,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     getLoopbackDeviceId(): string | null;
     private _initDeviceList;
     private _handleMicrophoneAudioTrack;
+    private _handleMicrophoneStateUpdated;
     private _handleMicrophoneEnabledChanged;
     private _handleCameraVideoTrack;
     private _handleCameraDeviceIdChanged;
@@ -411,6 +426,8 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     private _correctSystemSpeakerDeviceId;
     private _handleSystemSelectedMicrophoneChanged;
     private _correctSystemSelectedMicrophoneDeviceId;
+    private _showSystemSelectedDeviceChangedToast;
+    private _windows10UnsupportAirPods;
     private _handleSelectedSpeakerVolumeUpdated;
     private _handleSpeakerTestVolumeIndicationUpdated;
     private _handleMicrophoneVolumeIndicationUpdated;