fcr-ui-scene 3.7.2 → 3.7.4

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

@@ -61,7 +61,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _decorator = require("agora-foundation/lib/decorator");
 var _mobx = require("mobx");
-var _type = require("agora-rte-sdk/lib/core/rtc/type");
+var _type = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _rendererEvent = require("../utilities/renderer-event");
 var _type2 = require("fcr-core/lib/room-control/type");
@@ -103,7 +103,7 @@ var FcrUIDeviceStreamProviderImpl = exports.FcrUIDeviceStreamProviderImpl = /*#_
       onStreamsAdded: function onStreamsAdded(_, events) {
         var _events$find;
         var localCameraStream = (_events$find = events.find(function (event) {
-          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type.AgoraRtcVideoSourceType.CAMERA;
+          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
         })) === null || _events$find === void 0 ? void 0 : _events$find.modifiedStream;
         if (localCameraStream) {
           _this._bindLocalAudioStream();
@@ -112,7 +112,7 @@ var FcrUIDeviceStreamProviderImpl = exports.FcrUIDeviceStreamProviderImpl = /*#_
       },
       onStreamsUpdated: function onStreamsUpdated(_, events) {
         var localCamera = events.find(function (event) {
-          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type.AgoraRtcVideoSourceType.CAMERA;
+          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
         });
         var localCameraStream = localCamera === null || localCamera === void 0 ? void 0 : localCamera.modifiedStream;
         if (localCameraStream) {
@@ -179,7 +179,7 @@ var FcrUIDeviceStreamProviderImpl = exports.FcrUIDeviceStreamProviderImpl = /*#_
     get: function get() {
       var localStreams = this._roomControl.getStreamControl().getStreamsByUserId(this._localUser.userId);
       return localStreams.find(function (stream) {
-        return stream.videoSourceType === _type.AgoraRtcVideoSourceType.CAMERA;
+        return stream.videoSourceType === _type.FcrVideoSourceType.CAMERA;
       });
     }
   }, {

package/lib/providers/interpreter-provider.js

@@ -36,9 +36,7 @@ var _base = require("../base");
 var _fcrCore = require("fcr-core");
 var _interpreter = require("../shared-data-source/interpreter");
 var _type = require("../modules/interpreter/type");
-var _imports = require("fcr-core/lib/imports");
-var _type2 = require("agora-rte-sdk/lib/type");
-var _type3 = require("fcr-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _utils = require("../modules/interpreter/utils");
 var _constant = require("../utilities/constant");
 var _enums = require("../modules/action-bar/enums");
@@ -49,18 +47,18 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var getRoomJoinOptions = function getRoomJoinOptions(localUser) {
   var roomJoinOptions = {
     userName: localUser.userName,
-    userRole: _type3.FcrUserRole.PARTICIPANT,
+    userRole: _type2.FcrUserRole.PARTICIPANT,
     roomToken: '',
     streamLatency: _fcrCore.FcrStreamLatencyLevel.ULTRA_LOW,
     createStreamConfigs: [{
-      videoSourceState: _imports.AgoraRtcMediaSourceState.CLOSE,
-      audioSourceState: _imports.AgoraRtcMediaSourceState.CLOSE,
+      videoSourceState: _type2.FcrMediaSourceState.CLOSE,
+      audioSourceState: _type2.FcrMediaSourceState.CLOSE,
       videoSourceId: '',
       audioSourceId: '',
       streamName: 'default',
-      streamType: _imports.AgoraRteMediaStreamType.NONE,
-      videoSourceType: _type2.AgoraRteVideoSourceType.CAMERA,
-      audioSourceType: _type2.AgoraRteAudioSourceType.MICROPHONE
+      streamType: _type2.FcrStreamType.NONE,
+      videoSourceType: _type2.FcrVideoSourceType.CAMERA,
+      audioSourceType: _type2.FcrAudioSourceType.MICROPHONE
     }]
   };
   return roomJoinOptions;

package/lib/providers/multi-display-provider.d.ts

@@ -0,0 +1,90 @@
+import { FcrUIDisplayContentDistribution, FcrUIDisplayDistributionContentType, FcrUIDisplayState, FcrUIMainWindowRenderer, FcrUIMultiDisplayObserver } from '../modules/secondary-window/type';
+import { FcrUIMemberSharedDataSource } from '../shared-data-source/member-data';
+import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
+import { FcrUISharedSettingDataSource } from '../shared-data-source/setting';
+import { FcrUIVideoWindowDataSource } from '../shared-data-source/video-window';
+import { FcrUIEventProvider } from './event-provider';
+import { FcrUISharingProvider } from './sharing-provider';
+import { FcrUISharedWhiteboardDataSource } from '../shared-data-source/whiteboard-data';
+export interface FcrUIMultiDisplayProvider {
+    get mianWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
+    get secondaryWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
+    get contentDistribution(): FcrUIDisplayContentDistribution;
+    get displayState(): FcrUIDisplayState;
+    get displayCount(): number;
+    /** 是否激活多屏显示模式
+     * 如果是 Electron 环境，显示器数量大于 1 且开启了双屏模式，则返回 true
+     * 如果是 Web 环境，返回 false
+     */
+    get isActive(): boolean;
+    /** 判断本地用户的视频流是否在副窗口 */
+    get isLocalCameraInSecondaryWindow(): boolean;
+    addObserver(observer: FcrUIMultiDisplayObserver): void;
+    removeObserver(observer: FcrUIMultiDisplayObserver): void;
+    release(): void;
+    /** 显示主窗口在排序最小的显示器中，当前正在共享屏幕（窗口）所在的显示器除外 */
+    showMainWindowInIndexLeastDisplay(options?: {
+        displayOfCurrentSharingBounds?: Electron.Display;
+        /** 是否最大化应用窗口，不是 mac 下的应用全屏 */
+        maximize?: boolean;
+    }): void;
+    /** 如果屏幕共享和主窗口在同一个显示器，则将主窗口移动到排序最小的显示器中，共享屏幕（窗口）所在的显示器除外 */
+    moveMainWindowToIndexLeastDisplay(): void;
+    /** 设置主窗口为窗口最大化 */
+    setMainWindowMaximize(): void;
+}
+export declare class FcrUIMultiDisplayProviderImpl implements FcrUIMultiDisplayProvider {
+    protected _logger: import("agora-foundation/lib/logger").Logger;
+    private _observers;
+    private _disposers;
+    private _isElectron;
+    private _eventProvider;
+    private _sharedSettingDataSource;
+    private _sharedMemberDataSource;
+    private _sharedVideoWindowDataSource;
+    private _sharingProvider;
+    private _sharedScreenShareDataSource;
+    private _fcrUIMainWindowRenderer;
+    private _sharedWhiteboardDataSource;
+    private _contentDistribution;
+    private get _userId();
+    private accessor _displayCount;
+    private accessor _displayState;
+    private accessor _secondaryWindowContentType;
+    private accessor _mainWindowContentType;
+    get contentDistribution(): FcrUIDisplayContentDistribution;
+    get displayState(): FcrUIDisplayState;
+    get displayCount(): number;
+    get isActive(): boolean;
+    get mianWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
+    get secondaryWindowContentType(): `${FcrUIDisplayDistributionContentType}`;
+    get isLocalCameraInSecondaryWindow(): boolean;
+    constructor({ eventProvider, sharedSettingDataSource, sharedMemberDataSource, sharedVideoWindowDataSource, sharingProvider, sharedScreenShareSharedDataSource, fcrUIMainWindowRenderer, sharedWhiteboardDataSource, }: {
+        eventProvider: FcrUIEventProvider;
+        sharedSettingDataSource: FcrUISharedSettingDataSource;
+        sharedMemberDataSource: FcrUIMemberSharedDataSource;
+        sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
+        sharingProvider: FcrUISharingProvider;
+        sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
+        fcrUIMainWindowRenderer: FcrUIMainWindowRenderer;
+        sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource;
+    });
+    addObserver(observer: FcrUIMultiDisplayObserver): void;
+    removeObserver(observer: FcrUIMultiDisplayObserver): void;
+    release(): void;
+    moveMainWindowToIndexLeastDisplay(): void;
+    showMainWindowInIndexLeastDisplay(options?: {
+        displayOfCurrentSharingBounds?: Electron.Display;
+        isMaximized?: boolean;
+    }): void;
+    setMainWindowMaximize(): void;
+    private _getContentDistribution;
+    private _setDisplayState;
+    private _addReaction;
+    private _getSharingStream;
+    private _handleDisplayCountUpdated;
+    private _handleContentDistributionUpdated;
+    private _initDisplayState;
+    private _handleScreenSharingState;
+    private _handleWhiteboardState;
+}