fcr-ui-scene 3.7.3 → 3.7.4-rc.1

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

@@ -18,10 +18,11 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 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 _type = require("fcr-core/lib/room-control/privilege-control/type");
+var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
 var _privilege = require("../utilities/privilege");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _i18nCommonData = require("../utilities/i18n-common-data");
@@ -53,9 +54,9 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
                   _context.next = 4;
                   break;
                 }
-                hasVideoPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(event.permissionInfo, _fcrCore.FcrPermissionAction.StreamStartVideo, _type.FcrPrivilegeUserRole.SELF);
+                hasVideoPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(event.permissionInfo, _fcrCore.FcrPermissionAction.StreamStartVideo, _type2.FcrPrivilegeUserRole.SELF);
                 localStream = _this._streamControl.getStreamsByUserId(localUserId).find(function (stream) {
-                  return stream.videoSourceType === _imports.AgoraRtcVideoSourceType.CAMERA;
+                  return stream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
                 });
                 hasVideo = (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.VIDEO || (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.BOTH;
                 if (!hasVideoPermission) {
@@ -83,9 +84,9 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
                   _context.next = 8;
                   break;
                 }
-                hasAudioPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(event.permissionInfo, _fcrCore.FcrPermissionAction.StreamStartAudio, _type.FcrPrivilegeUserRole.SELF);
+                hasAudioPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(event.permissionInfo, _fcrCore.FcrPermissionAction.StreamStartAudio, _type2.FcrPrivilegeUserRole.SELF);
                 _localStream = _this._streamControl.getStreamsByUserId(localUserId).find(function (stream) {
-                  return stream.videoSourceType === _imports.AgoraRtcVideoSourceType.CAMERA;
+                  return stream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
                 });
                 hasAudio = (_localStream === null || _localStream === void 0 ? void 0 : _localStream.streamType) === _fcrCore.FcrStreamType.AUDIO || (_localStream === null || _localStream === void 0 ? void 0 : _localStream.streamType) === _fcrCore.FcrStreamType.BOTH;
                 if (!hasAudioPermission) {
@@ -127,13 +128,13 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
           return _regenerator["default"].wrap(function (_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                hasVideoPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(_this._privilegeControl.getAllLocalUserPermissionInfo(), _fcrCore.FcrPermissionAction.StreamStartVideo, _type.FcrPrivilegeUserRole.SELF);
-                hasAudioPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(_this._privilegeControl.getAllLocalUserPermissionInfo(), _fcrCore.FcrPermissionAction.StreamStartAudio, _type.FcrPrivilegeUserRole.SELF);
+                hasVideoPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(_this._privilegeControl.getAllLocalUserPermissionInfo(), _fcrCore.FcrPermissionAction.StreamStartVideo, _type2.FcrPrivilegeUserRole.SELF);
+                hasAudioPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(_this._privilegeControl.getAllLocalUserPermissionInfo(), _fcrCore.FcrPermissionAction.StreamStartAudio, _type2.FcrPrivilegeUserRole.SELF);
                 events.forEach(function (event) {
                   var stream = event.modifiedStream;
                   var operatorUser = event.operatorUser;
                   var operatorUserRole = (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userRole) || _fcrCore.FcrUserRole.HOST;
-                  if (stream.owner.userId === localUserId && (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) !== localUserId && stream.videoSourceType === _imports.AgoraRtcVideoSourceType.CAMERA) {
+                  if (stream.owner.userId === localUserId && (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) !== localUserId && stream.videoSourceType === _type.FcrVideoSourceType.CAMERA) {
                     var hasNoVideo = stream.streamType === _fcrCore.FcrStreamType.NONE || stream.streamType === _fcrCore.FcrStreamType.AUDIO;
                     var hasNoAudio = stream.streamType === _fcrCore.FcrStreamType.NONE || stream.streamType === _fcrCore.FcrStreamType.VIDEO;
                     var hasVideo = stream.streamType === _fcrCore.FcrStreamType.VIDEO || stream.streamType === _fcrCore.FcrStreamType.BOTH;
@@ -247,10 +248,10 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
               return _context3.abrupt("return", true);
             case 1:
               permissionInfo = this._privilegeControl.getLocalUserPermissionInfo(_fcrCore.FcrPermissionAction.StreamStartVideo);
-              hasVideoPermission = (0, _privilege.isPermissionWithTargetRoleEnabled)(permissionInfo, _type.FcrPrivilegeUserRole.SELF);
+              hasVideoPermission = (0, _privilege.isPermissionWithTargetRoleEnabled)(permissionInfo, _type2.FcrPrivilegeUserRole.SELF);
               localUserId = this._userControl.getLocalUser().userId;
               localStream = this._streamControl.getStreamsByUserId(localUserId).find(function (stream) {
-                return stream.videoSourceType === _imports.AgoraRtcVideoSourceType.CAMERA;
+                return stream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
               });
               hasVideo = (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.VIDEO || (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.BOTH;
               if (!this._firstGetCameraPrivilege) {
@@ -329,10 +330,10 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
               return _context4.abrupt("return", true);
             case 1:
               permissionInfo = this._privilegeControl.getLocalUserPermissionInfo(_fcrCore.FcrPermissionAction.StreamStartAudio);
-              hasAudioPermission = (0, _privilege.isPermissionWithTargetRoleEnabled)(permissionInfo, _type.FcrPrivilegeUserRole.SELF);
+              hasAudioPermission = (0, _privilege.isPermissionWithTargetRoleEnabled)(permissionInfo, _type2.FcrPrivilegeUserRole.SELF);
               localUserId = this._userControl.getLocalUser().userId;
               localStream = this._streamControl.getStreamsByUserId(localUserId).find(function (stream) {
-                return stream.videoSourceType === _imports.AgoraRtcVideoSourceType.CAMERA;
+                return stream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
               });
               hasAudio = (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.AUDIO || (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.BOTH;
               if (!this._firstGetMicrophonePrivilege) {

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

@@ -1,7 +1,7 @@
 import { FcrBeautyOptions, FcrCameraTrack, FcrLoopbackTrack, FcrMicrophoneTrack, FcrScreenTrack } from 'fcr-core/lib/media-control/type';
 import { FcrDeviceInfo } from 'fcr-core/lib/type';
 import { FcrCapability, FcrDesktopMediaControl } from 'fcr-core';
-import { AgoraRtcDisplayInfo, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
+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';
@@ -33,7 +33,7 @@ export interface FcrUIDeviceProvider {
     /**
      * 当前摄像头Track对象
      */
-    get cameraTrack(): FcrCameraTrack;
+    get cameraTrack(): FcrCameraTrack | null;
     /**
      * 当前麦克风Track对象
      */
@@ -138,10 +138,6 @@ export interface FcrUIDeviceProvider {
      * @param id
      */
     getLoopbackTrack(id: string): FcrLoopbackTrack;
-    /**
-     * 检查当前声卡采集设备已安装（仅对Macos生效）
-     */
-    checkLoopbackDevice(): Promise<number>;
     /**
      * 检查当前平台能力支持
      * @param type
@@ -150,11 +146,11 @@ export interface FcrUIDeviceProvider {
     /**
      * 获取屏幕共享窗口列表
      */
-    getWindowList(): Promise<AgoraRtcWindowInfo[]>;
+    getWindowList(): Promise<FcrWindowInfo[]>;
     /**
      * 获取屏幕共享显示器列表
      */
-    getDisplayList(): Promise<AgoraRtcDisplayInfo[]>;
+    getDisplayList(): Promise<FcrDisplayInfo[]>;
     /**
      * 应用是否有麦克风权限
      */
@@ -266,6 +262,10 @@ export interface FcrUIDeviceProvider {
      * @param enabled
      */
     toggleLocalCameraPreview(enabled: boolean): void;
+    /**
+     * 获取声卡采集设备ID
+     */
+    getLoopbackDeviceId(): string | null;
     addObserver(observer: FcrUIDeviceObserver): void;
     removeObserver(observer: FcrUIDeviceObserver): void;
 }
@@ -279,7 +279,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     private _hasExecutedOpenCamera;
     private _hasExecutedConnectAudio;
     private _isAudioConnected;
-    private _cameraVideoTrack?;
+    private _cameraVideoTrack;
     private _microphoneAudioTrack;
     private _localVideoViewSet;
     private _videoRotation;
@@ -292,14 +292,13 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     private _mediaControlObserver;
     private _defaultMirror;
     private _volumeIndicationInterval;
-    private accessor _isDeviceListInited;
     private accessor _microphoneDevice;
     private accessor _microphone;
     private accessor _speakerDevice;
     private accessor _speaker;
+    private accessor _cameraDevice;
     accessor currentIsMirror: boolean;
     accessor showForceOpenEffectDialog: boolean;
-    accessor cameraId: string;
     accessor cameraEnabled: boolean;
     accessor showCameraPreview: boolean;
     accessor microphoneEnabled: boolean;
@@ -329,6 +328,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     ifNeedExecuteOpenCamera(): boolean;
     connectAudio(includeMicrophone: boolean): void;
     disconnectAudio(): void;
+    get cameraId(): string;
     get speakerId(): string;
     get microphoneId(): string;
     get defaultMirror(): boolean;
@@ -344,21 +344,18 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     get isAudioConnected(): boolean;
     get shouldEnableMicBeforeSession(): boolean;
     constructor(_eventProvider: FcrUIEventProvider, _mediaControl: FcrDesktopMediaControl, _sharedSettingDataSource: FcrUISharedSettingDataSource);
+    release(): void;
     getScreenTrack(id: string): FcrScreenTrack;
     getLoopbackTrack(id: string): FcrLoopbackTrack;
-    checkLoopbackDevice(): Promise<number>;
     isCapabilitySupported(type: FcrCapability): boolean;
-    getWindowList(): Promise<AgoraRtcWindowInfo[]>;
-    getDisplayList(): Promise<AgoraRtcDisplayInfo[]>;
-    get cameraTrack(): FcrCameraTrack;
+    getWindowList(): Promise<FcrWindowInfo[]>;
+    getDisplayList(): Promise<FcrDisplayInfo[]>;
+    get cameraTrack(): FcrCameraTrack | null;
     get microphoneTrack(): FcrMicrophoneTrack | null;
-    private _initDefaultDevice;
-    private _initDeviceList;
     addObserver(observer: FcrUIDeviceObserver): void;
     removeObserver(observer: FcrUIDeviceObserver): void;
     startPlayLocalVideo(view: HTMLElement, isMirror?: boolean): void;
     stopPlayLocalVideo(view: HTMLElement): void;
-    private _handleSpeakerDetectingChanged;
     startSpeakerTest(): void;
     stopSpeakerTest(): void;
     setCurrentIsMirror(isMirror: boolean): void;
@@ -368,12 +365,10 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     handleForceOpenVideoEffect(): void;
     setVideoOrientation(): void;
     setCameraEnabled(enable: boolean): void;
-    private _handleMicrophoneAudioTrack;
+    private _handleCameraEnabledChanged;
     setMicrophoneEnabled(enable: boolean): void;
-    private _handleMicrophoneEnabledChanged;
     toggleLocalMirror(enable: boolean): void;
     resetMirror(): void;
-    private _handleMicrophoneDetectingChanged;
     startMicrophoneTest(): void;
     stopMicrophoneTest(): void;
     enableVirtualBackground(enable: boolean, source?: VirtualBackground): void;
@@ -384,10 +379,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     enableAudioStereo(enable: boolean): void;
     setNoiseLevel(level: FcrUIAiDenoiseLevel): void;
     setCameraId(cameraId: string): void;
-    private _handleMicrophoneIdChanged;
-    private _handleMicrophoneDeviceIdChanged;
-    private _handleSpeakerDeviceIdChanged;
-    private _handleSpeakerIdChanged;
+    setMainRoomAudioOff(enable: boolean): void;
     setSpeakerId(speakerId: string): void;
     setMicrophoneId(microphoneId: string): void;
     setSpeakerVolume(value: number): void;
@@ -397,29 +389,43 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     loadUiResources(uiResource: FcrUIResource): Promise<void>;
     loadZipResources(zipUrls: string[], type: FcrUiResourceType, callback: (filePathList: string[], type: FcrUiResourceType) => void): Promise<void>;
     toggleAGC(enable: boolean): number;
-    release(): void;
     setConnectType(connectType: FcrUIConnectType): void;
+    toggleLocalCameraPreview(enabled: boolean): void;
+    getLoopbackDeviceId(): string | null;
+    private _initDeviceList;
+    private _handleMicrophoneAudioTrack;
+    private _handleMicrophoneEnabledChanged;
+    private _handleCameraVideoTrack;
+    private _handleCameraDeviceIdChanged;
+    private _handleSpeakerDetectingChanged;
+    private _stopSelectedSpeakerTest;
+    private _handleMicrophoneDetectingChanged;
+    private _stopMicrophoneTest;
+    private _handleMicrophoneIdChanged;
+    private _handleMicrophoneDeviceIdChanged;
+    private _handleSpeakerDeviceIdChanged;
+    private _handleSpeakerIdChanged;
     private _fetchZipAndUnzip;
     private _updateVirtualBackgroundList;
     private _handleSystemSelectedSpeakerChanged;
     private _correctSystemSpeakerDeviceId;
     private _handleSystemSelectedMicrophoneChanged;
     private _correctSystemSelectedMicrophoneDeviceId;
+    private _handleSelectedSpeakerVolumeUpdated;
     private _handleSpeakerTestVolumeIndicationUpdated;
-    private _handleSpeakerVolumeUpdated;
     private _handleMicrophoneVolumeIndicationUpdated;
-    private _handleCameraChanged;
-    toggleLocalCameraPreview(enabled: boolean): void;
+    private _toggleLocalCameraPreview;
+    private _handleCameraAdded;
+    private _handleCameraRemoved;
     private _handleCameraListUpdated;
     private _handleMicrophoneAdded;
     private _handleMicrophoneRemoved;
-    private _correctMicrophoneDeviceId;
     private _handleMicrophoneListUpdated;
     private _handleSpeakerAdded;
     private _handleSpeakerRemoved;
     private _handleSpeakerListUpdated;
     private _getMicrophoneList;
     private _getSpeakerList;
-    setMainRoomAudioOff(enable: boolean): void;
+    private _formatDeviceList;
     private _loadBuiltinResources;
 }