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

package/lib/shared-data-source/screen-share-data.d.ts

@@ -1,9 +1,9 @@
 import { FcrConnectionState, FcrMediaSourceState } from 'fcr-core';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrScreenScenarioType, AgoraRtcWindowInfo } from 'fcr-core/lib/imports';
+import { FcrScreenScenarioType } from 'fcr-core/lib/imports';
 import { FcrUIDisplayCaptureSource } from '../modules/share-screen/types';
 import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
-import { AgoraRtcDisplayInfo, AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
+import { FcrDisplayInfo, FcrWindowInfo, FcrScreenCaptureType } from 'fcr-core/lib/type';
 import { CurrentShareBounds } from '../modules/control-bar/types';
 import { FcrUIConnectionProvider } from '../providers/room-provider';
 import { FcrLoopbackTrack, FcrScreenTrack } from 'fcr-core/lib/media-control/type';
@@ -19,7 +19,7 @@ export interface FcrUIScreenShareSharedDataSource {
      * 获取可用于应用窗口捕获的源列表
      * @returns 本地用户可用于应用窗口捕获的源列表，每个元素包含窗口信息
      */
-    get applicationCaptureSources(): AgoraRtcWindowInfo[];
+    get applicationCaptureSources(): FcrWindowInfo[];
     /**
      * 获取可用于屏幕捕获的源列表
      * @returns 本地用户可用于屏幕捕获的源列表，每个元素包含显示设备信息
@@ -39,7 +39,7 @@ export interface FcrUIScreenShareSharedDataSource {
      * 获取当前选中的共享内容类型
      * @returns 当前选中的共享内容类型：SCREEN(1) 表示整个屏幕，WINDOW(2) 表示应用窗口
      */
-    get currentSelectionType(): AgoraRtcScreenCaptureType;
+    get currentSelectionType(): FcrScreenCaptureType;
     /**
      * 检查当前屏幕共享是否包含音频
      * @returns 如果屏幕共享包含音频流则返回 true，否则返回 false
@@ -64,12 +64,12 @@ export interface FcrUIScreenShareSharedDataSource {
      * 获取当前屏幕共享内容的类型
      * @returns 当前屏幕共享内容的类型：SCREEN(1) 或 WINDOW(2)
      */
-    get currentShareType(): AgoraRtcScreenCaptureType;
+    get currentShareType(): FcrScreenCaptureType;
     /**
      * 获取当前屏幕共享流的唯一标识符
      * @returns 当前屏幕共享流的唯一标识符
      */
-    get currentShareStreamId(): string;
+    get currentShareStreamId(): string | undefined;
     /**
      * 获取当前屏幕共享的媒体轨道对象
      * @returns 当前屏幕共享的媒体轨道对象，如果未开始共享则返回 null
@@ -79,17 +79,17 @@ export interface FcrUIScreenShareSharedDataSource {
      * 异步获取可用的应用窗口列表
      * @returns 返回一个 Promise，解析为可用的应用窗口信息列表
      */
-    get appWindowList(): Promise<AgoraRtcWindowInfo[]>;
+    get appWindowList(): Promise<FcrWindowInfo[]>;
     /**
      * 异步获取可用的显示设备列表
      * @returns 返回一个 Promise，解析为可用的显示设备信息列表
      */
-    get displayList(): Promise<AgoraRtcDisplayInfo[]>;
+    get displayList(): Promise<FcrDisplayInfo[]>;
     /**
      * 获取当前环路back音频源的标识符, 用于设置屏幕共享开启共享音频时的音频源
      * @returns 当前环路back音频源的唯一标识符
      */
-    get loopbackAudioSourceId(): string;
+    get loopbackAudioSourceId(): string | null;
     /**
      * 获取当前屏幕共享的音频轨道对象
      * @returns 当前屏幕共享的音频轨道对象，如果未共享音频则返回 null
@@ -173,6 +173,11 @@ export interface FcrUIScreenShareSharedDataSource {
      * @returns boolean
      */
     get sharingInReplace(): boolean;
+    /**
+     * 获取当前engine是否是连接状态
+     * @returns boolean
+     */
+    get isEngineConnected(): boolean;
     /**
      * 设置当前是否在屏幕共享替换中状态
      */
@@ -213,12 +218,12 @@ export interface FcrUIScreenShareSharedDataSource {
      * 设置当前屏幕共享内容的类型
      * @param type - 屏幕共享内容的类型：SCREEN(1) 或 WINDOW(2)
      */
-    setCurrentShareType(type: AgoraRtcScreenCaptureType): void;
+    setCurrentShareType(type: FcrScreenCaptureType): void;
     /**
      * 设置当前屏幕共享流的唯一标识符
      * @param streamId - 屏幕共享流的唯一标识符
      */
-    setCurrentShareStreamId(streamId: string): void;
+    setCurrentShareStreamId(streamId: string | undefined): void;
     /**
      * 设置屏幕共享是否包含音频
      * @param status - 布尔值，表示是否在屏幕共享中包含音频
@@ -233,7 +238,7 @@ export interface FcrUIScreenShareSharedDataSource {
      * 设置当前选中的共享内容类型
      * @param type - 共享内容的类型：SCREEN(1) 或 WINDOW(2)
      */
-    setCurrentSelectionType(type: AgoraRtcScreenCaptureType): void;
+    setCurrentSelectionType(type: FcrScreenCaptureType): void;
     /**
      * 设置当前选中的共享区域边界信息
      * @param bounds - 共享区域的位置和尺寸信息
@@ -245,14 +250,14 @@ export interface FcrUIScreenShareSharedDataSource {
      * @param type - 共享内容的类型
      * @param bounds - 共享区域的边界信息
      */
-    setCurrentSelection(id: string, type: AgoraRtcScreenCaptureType, bounds?: CurrentShareBounds): void;
+    setCurrentSelection(id: string, type: FcrScreenCaptureType, bounds?: CurrentShareBounds): void;
     /**
      * 设置当前屏幕共享的完整信息
      * @param id - 共享会话的唯一标识符
      * @param type - 共享内容的类型
      * @param bounds - 共享区域的边界信息
      */
-    setCurrentShareIdInfos(id: string, type: AgoraRtcScreenCaptureType, bounds: CurrentShareBounds): void;
+    setCurrentShareIdInfos(id: string, type: FcrScreenCaptureType, bounds: CurrentShareBounds): void;
     /**
      * 设置当前屏幕共享的媒体流状态
      * @param state - 屏幕共享的媒体流状态，枚举类型 FcrMediaSourceState
@@ -262,7 +267,7 @@ export interface FcrUIScreenShareSharedDataSource {
      * 设置可用的应用窗口捕获源列表
      * @param windowInfos - 应用窗口信息列表
      */
-    setApplicationCaptureSources(windowInfos: AgoraRtcWindowInfo[]): void;
+    setApplicationCaptureSources(windowInfos: FcrWindowInfo[]): void;
     /**
      * 设置可用的屏幕捕获源列表
      * @param sources - 屏幕捕获源信息列表
@@ -292,11 +297,11 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
     accessor isSharingScreen: boolean;
     accessor screenSharingOwner: FcrUserInfo | undefined;
     accessor localUserScreenSharingState: FcrMediaSourceState;
-    accessor applicationCaptureSources: AgoraRtcWindowInfo[];
+    accessor applicationCaptureSources: FcrWindowInfo[];
     accessor screenCaptureSources: FcrUIDisplayCaptureSource[];
     accessor currentShareAudioProcessingChannel: AudioProcessingChannel;
     accessor currentSelectionId: string;
-    accessor currentSelectionType: AgoraRtcScreenCaptureType;
+    accessor currentSelectionType: FcrScreenCaptureType;
     accessor shareWithAudio: boolean;
     accessor boardOwnerUser: FcrUserInfo | undefined;
     accessor currentSelectionBounds: CurrentShareBounds;
@@ -317,15 +322,16 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
     screenTrack: FcrScreenTrack | null;
     shareWithAudioTrack: FcrLoopbackTrack | null;
     currentShareId: string;
-    currentShareType: AgoraRtcScreenCaptureType;
-    currentShareStreamId: string;
-    loopbackAudioSourceId: string;
-    get appWindowList(): Promise<AgoraRtcWindowInfo[]>;
-    get displayList(): Promise<AgoraRtcDisplayInfo[]>;
+    currentShareType: FcrScreenCaptureType;
+    currentShareStreamId: string | undefined;
+    loopbackAudioSourceId: string | null;
+    get appWindowList(): Promise<import("fcr-core/lib/imports").AgoraRtcWindowInfo[]>;
+    get displayList(): Promise<import("fcr-core/lib/imports").AgoraRtcDisplayInfo[]>;
     get isZoomMaxmum(): boolean;
     get isZoomMinimum(): boolean;
     get isFullScreenAdaptived(): boolean;
     get isCurrentOriginal(): boolean;
+    get isEngineConnected(): boolean;
     constructor(_connectionProvider: FcrUIConnectionProvider, _deviceProvider: FcrUIDeviceProvider);
     setScreenShareScenarioType(type: FcrScreenScenarioType): void;
     setScreenShareSpeakerViewSize(width: number, height: number): void;
@@ -339,19 +345,20 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
     setShareWithAudioTrack(shareWithAudioTrack: FcrLoopbackTrack | null): void;
     setLoopbackAudioSourceId(sourceId: string): void;
     setScreenTrack(screenTrack: FcrScreenTrack | null): void;
-    setCurrentShareType(type: AgoraRtcScreenCaptureType): void;
+    setCurrentShareType(type: FcrScreenCaptureType): void;
     setCurrentShareId(id: string): void;
-    setCurrentShareStreamId(streamId: string): void;
+    setCurrentShareStreamId(streamId?: string): void;
     setCurrentShareAudioProcessingChannel(channel: AudioProcessingChannel): void;
     setScreenCaptureSources(sources: FcrUIDisplayCaptureSource[]): void;
-    setApplicationCaptureSources(windowInfos: AgoraRtcWindowInfo[]): void;
+    setApplicationCaptureSources(windowInfos: FcrWindowInfo[]): void;
     setLocalUserScreenSharingState(state: FcrMediaSourceState): void;
-    setCurrentShareIdInfos(currentShareId: string, type: AgoraRtcScreenCaptureType, bounds: CurrentShareBounds): void;
-    setCurrentSelection(id: string, type: AgoraRtcScreenCaptureType, bounds?: CurrentShareBounds): void;
+    setCurrentShareIdInfos(currentShareId: string, type: FcrScreenCaptureType, bounds: CurrentShareBounds): void;
+    setCurrentSelection(id: string, type: FcrScreenCaptureType, bounds?: CurrentShareBounds): void;
     setCurrentSelectionId(id: string): void;
-    setCurrentSelectionType(type: AgoraRtcScreenCaptureType): void;
+    setCurrentSelectionType(type: FcrScreenCaptureType): void;
     setCurrentSelectionBounds(bounds: CurrentShareBounds): void;
     setShareWithAudio(withAudio: boolean): void;
     release(): void;
     private _handleOnConnectionStateUpdated;
+    private _setLoopbackAudioSourceId;
 }

package/lib/shared-data-source/screen-share-data.js

@@ -58,10 +58,10 @@ var _base = require("../base");
 var _logger = require("../utilities/logger");
 var _imports = require("fcr-core/lib/imports");
 var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
-var _type = require("agora-rte-sdk/lib/core/rtc/type");
+var _type = require("fcr-core/lib/type");
 var _env = require("agora-foundation/lib/utilities/env");
 var _FcrUIScreenShareSharedDataSourceImpl;
-var _initProto, _init_isSharingScreen, _init_screenSharingOwner, _init_localUserScreenSharingState, _init_applicationCaptureSources, _init_screenCaptureSources, _init_currentShareAudioProcessingChannel, _init_currentSelectionId, _init_currentSelectionType, _init_shareWithAudio, _init_boardOwnerUser, _init_currentSelectionBounds, _init_connectionState, _init_isSeizeStream, _init_screenShareScalcValue, _init_screenShareVideoRatio, _init_screenShareVideoSize, _init_screenShareSpeakerViewSize, _init_screenShareScenarioType, _init_isCurrentScreenShareInSmoothType, _init_sharingInReplace, _setScreenShareScenarioTypeDecs, _setScreenShareSpeakerViewSizeDecs, _setScreenShareVideoRatioDecs, _setScreenShareVideoSizeDecs, _setScreenShareScalcValueDecs, _setIsSeizeStreamDecs, _setIsSharingScreenDecs, _setSharingInReplaceDecs, _setScreenSharingOwnerDecs, _setShareWithAudioTrackDecs, _setLoopbackAudioSourceIdDecs, _setScreenTrackDecs, _setCurrentShareTypeDecs, _setCurrentShareIdDecs, _setCurrentShareStreamIdDecs, _setCurrentShareAudioProcessingChannelDecs, _setScreenCaptureSourcesDecs, _setApplicationCaptureSourcesDecs, _setLocalUserScreenSharingStateDecs, _setCurrentShareIdInfosDecs, _setCurrentSelectionDecs, _setCurrentSelectionIdDecs, _setCurrentSelectionTypeDecs, _setCurrentSelectionBoundsDecs, _setShareWithAudioDecs, _handleOnConnectionStateUpdatedDecs, _ref;
+var _initProto, _init_isSharingScreen, _init_screenSharingOwner, _init_localUserScreenSharingState, _init_applicationCaptureSources, _init_screenCaptureSources, _init_currentShareAudioProcessingChannel, _init_currentSelectionId, _init_currentSelectionType, _init_shareWithAudio, _init_boardOwnerUser, _init_currentSelectionBounds, _init_connectionState, _init_isSeizeStream, _init_screenShareScalcValue, _init_screenShareVideoRatio, _init_screenShareVideoSize, _init_screenShareSpeakerViewSize, _init_screenShareScenarioType, _init_isCurrentScreenShareInSmoothType, _init_sharingInReplace, _setScreenShareScenarioTypeDecs, _setScreenShareSpeakerViewSizeDecs, _setScreenShareVideoRatioDecs, _setScreenShareVideoSizeDecs, _setScreenShareScalcValueDecs, _setIsSeizeStreamDecs, _setIsSharingScreenDecs, _setSharingInReplaceDecs, _setScreenSharingOwnerDecs, _setShareWithAudioTrackDecs, _setLoopbackAudioSourceIdDecs, _setScreenTrackDecs, _setCurrentShareTypeDecs, _setCurrentShareIdDecs, _setCurrentShareStreamIdDecs, _setCurrentShareAudioProcessingChannelDecs, _setScreenCaptureSourcesDecs, _setApplicationCaptureSourcesDecs, _setLocalUserScreenSharingStateDecs, _setCurrentShareIdInfosDecs, _setCurrentSelectionDecs, _setCurrentSelectionIdDecs, _setCurrentSelectionTypeDecs, _setCurrentSelectionBoundsDecs, _setShareWithAudioDecs, _handleOnConnectionStateUpdatedDecs, _setLoopbackAudioSourceIdDecs2, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -92,7 +92,7 @@ var _Q = /*#__PURE__*/new WeakMap();
 var _R = /*#__PURE__*/new WeakMap();
 var _S = /*#__PURE__*/new WeakMap();
 var _T = /*#__PURE__*/new WeakMap();
-_ref = (_setScreenShareScenarioTypeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareSpeakerViewSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoRatioDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareScalcValueDecs = [_mobx.action, _mobx.action.bound], _setIsSeizeStreamDecs = [_mobx.action, _mobx.action.bound], _setIsSharingScreenDecs = [_mobx.action, _mobx.action.bound], _setSharingInReplaceDecs = [_mobx.action, _mobx.action.bound], _setScreenSharingOwnerDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioTrackDecs = [_mobx.action, _mobx.action.bound], _setLoopbackAudioSourceIdDecs = [_mobx.action, _mobx.action.bound], _setScreenTrackDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareStreamIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _setScreenCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setApplicationCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setLocalUserScreenSharingStateDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdInfosDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionBoundsDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioDecs = [_mobx.action, _mobx.action.bound], _handleOnConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_setScreenShareScenarioTypeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareSpeakerViewSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoRatioDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareScalcValueDecs = [_mobx.action, _mobx.action.bound], _setIsSeizeStreamDecs = [_mobx.action, _mobx.action.bound], _setIsSharingScreenDecs = [_mobx.action, _mobx.action.bound], _setSharingInReplaceDecs = [_mobx.action, _mobx.action.bound], _setScreenSharingOwnerDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioTrackDecs = [_mobx.action, _mobx.action.bound], _setLoopbackAudioSourceIdDecs = [_mobx.action, _mobx.action.bound], _setScreenTrackDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareStreamIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _setScreenCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setApplicationCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setLocalUserScreenSharingStateDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdInfosDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionBoundsDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioDecs = [_mobx.action, _mobx.action.bound], _handleOnConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _setLoopbackAudioSourceIdDecs2 = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSourceImpl = /*#__PURE__*/function () {
   function FcrUIScreenShareSharedDataSourceImpl(_connectionProvider, _deviceProvider) {
     (0, _classCallCheck2["default"])(this, FcrUIScreenShareSharedDataSourceImpl);
@@ -110,7 +110,7 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
     _classPrivateFieldInitSpec(this, _E, _init_screenCaptureSources(this, []));
     _classPrivateFieldInitSpec(this, _F, _init_currentShareAudioProcessingChannel(this, _shareAudio.AudioProcessingChannel.MONO));
     _classPrivateFieldInitSpec(this, _G, _init_currentSelectionId(this, (0, _env.isElectron)() ? '' : 'default'));
-    _classPrivateFieldInitSpec(this, _H, _init_currentSelectionType(this, _type.AgoraRtcScreenCaptureType.WINDOW));
+    _classPrivateFieldInitSpec(this, _H, _init_currentSelectionType(this, _type.FcrScreenCaptureType.WINDOW));
     _classPrivateFieldInitSpec(this, _I, _init_shareWithAudio(this, !(0, _env.isElectron)()));
     // electron 默认 false，web 默认 true
     _classPrivateFieldInitSpec(this, _J, _init_boardOwnerUser(this, undefined));
@@ -137,12 +137,13 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
     (0, _defineProperty2["default"])(this, "screenTrack", null);
     (0, _defineProperty2["default"])(this, "shareWithAudioTrack", null);
     (0, _defineProperty2["default"])(this, "currentShareId", '');
-    (0, _defineProperty2["default"])(this, "currentShareType", _type.AgoraRtcScreenCaptureType.SCREEN);
-    (0, _defineProperty2["default"])(this, "currentShareStreamId", '');
-    (0, _defineProperty2["default"])(this, "loopbackAudioSourceId", (0, _env.getPlatform)() === _env.FcrApplicationPlatform.MACOS && (0, _env.isElectron)() ? 'AgoraALD' : (0, _env.isElectron)() ? '' : 'default');
+    (0, _defineProperty2["default"])(this, "currentShareType", _type.FcrScreenCaptureType.SCREEN);
+    (0, _defineProperty2["default"])(this, "currentShareStreamId", undefined);
+    (0, _defineProperty2["default"])(this, "loopbackAudioSourceId", null);
     this._connectionProvider = _connectionProvider;
     this._deviceProvider = _deviceProvider;
     this._connectionProvider.addObserver(this._connectionObserver);
+    this._setLoopbackAudioSourceId();
   }
   return (0, _createClass2["default"])(FcrUIScreenShareSharedDataSourceImpl, [{
     key: "isSharingScreen",
@@ -334,6 +335,11 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
     get: function get() {
       return this.screenShareScalcValue === 1;
     }
+  }, {
+    key: "isEngineConnected",
+    get: function get() {
+      return this.connectionState === _fcrCore.FcrConnectionState.CONNECTED;
+    }
   }, {
     key: "setScreenShareScenarioType",
     value: function setScreenShareScenarioType(type) {
@@ -481,10 +487,15 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
     value: function _handleOnConnectionStateUpdated(state) {
       this.connectionState = state;
     }
+  }, {
+    key: "_setLoopbackAudioSourceId",
+    value: function _setLoopbackAudioSourceId() {
+      this.loopbackAudioSourceId = this._deviceProvider.getLoopbackDeviceId();
+    }
   }]);
 }();
 _FcrUIScreenShareSharedDataSourceImpl = FcrUIScreenShareSharedDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareSharedDataSourceImpl, [[_mobx.observable, 1, "isSharingScreen"], [_mobx.observable, 1, "screenSharingOwner"], [_mobx.observable, 1, "localUserScreenSharingState"], [_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "currentSelectionId"], [_mobx.observable, 1, "currentSelectionType"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentSelectionBounds"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "isSeizeStream"], [_mobx.observable, 1, "screenShareScalcValue"], [_mobx.observable, 1, "screenShareVideoRatio"], [_mobx.observable, 1, "screenShareVideoSize"], [_mobx.observable, 1, "screenShareSpeakerViewSize"], [_mobx.observable, 1, "screenShareScenarioType"], [_mobx.observable, 1, "isCurrentScreenShareInSmoothType"], [_mobx.observable, 1, "sharingInReplace"], [_setScreenShareScenarioTypeDecs, 18, "setScreenShareScenarioType"], [_setScreenShareSpeakerViewSizeDecs, 18, "setScreenShareSpeakerViewSize"], [_setScreenShareVideoRatioDecs, 18, "setScreenShareVideoRatio"], [_setScreenShareVideoSizeDecs, 18, "setScreenShareVideoSize"], [_setScreenShareScalcValueDecs, 18, "setScreenShareScalcValue"], [_setIsSeizeStreamDecs, 18, "setIsSeizeStream"], [_setIsSharingScreenDecs, 18, "setIsSharingScreen"], [_setSharingInReplaceDecs, 18, "setSharingInReplace"], [_setScreenSharingOwnerDecs, 18, "setScreenSharingOwner"], [_setShareWithAudioTrackDecs, 18, "setShareWithAudioTrack"], [_setLoopbackAudioSourceIdDecs, 18, "setLoopbackAudioSourceId"], [_setScreenTrackDecs, 18, "setScreenTrack"], [_setCurrentShareTypeDecs, 18, "setCurrentShareType"], [_setCurrentShareIdDecs, 18, "setCurrentShareId"], [_setCurrentShareStreamIdDecs, 18, "setCurrentShareStreamId"], [_setCurrentShareAudioProcessingChannelDecs, 18, "setCurrentShareAudioProcessingChannel"], [_setScreenCaptureSourcesDecs, 18, "setScreenCaptureSources"], [_setApplicationCaptureSourcesDecs, 18, "setApplicationCaptureSources"], [_setLocalUserScreenSharingStateDecs, 18, "setLocalUserScreenSharingState"], [_setCurrentShareIdInfosDecs, 18, "setCurrentShareIdInfos"], [_setCurrentSelectionDecs, 18, "setCurrentSelection"], [_setCurrentSelectionIdDecs, 18, "setCurrentSelectionId"], [_setCurrentSelectionTypeDecs, 18, "setCurrentSelectionType"], [_setCurrentSelectionBoundsDecs, 18, "setCurrentSelectionBounds"], [_setShareWithAudioDecs, 18, "setShareWithAudio"], [_handleOnConnectionStateUpdatedDecs, 18, "_handleOnConnectionStateUpdated"]], []).e, 21);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareSharedDataSourceImpl, [[_mobx.observable, 1, "isSharingScreen"], [_mobx.observable, 1, "screenSharingOwner"], [_mobx.observable, 1, "localUserScreenSharingState"], [_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "currentSelectionId"], [_mobx.observable, 1, "currentSelectionType"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentSelectionBounds"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "isSeizeStream"], [_mobx.observable, 1, "screenShareScalcValue"], [_mobx.observable, 1, "screenShareVideoRatio"], [_mobx.observable, 1, "screenShareVideoSize"], [_mobx.observable, 1, "screenShareSpeakerViewSize"], [_mobx.observable, 1, "screenShareScenarioType"], [_mobx.observable, 1, "isCurrentScreenShareInSmoothType"], [_mobx.observable, 1, "sharingInReplace"], [_setScreenShareScenarioTypeDecs, 18, "setScreenShareScenarioType"], [_setScreenShareSpeakerViewSizeDecs, 18, "setScreenShareSpeakerViewSize"], [_setScreenShareVideoRatioDecs, 18, "setScreenShareVideoRatio"], [_setScreenShareVideoSizeDecs, 18, "setScreenShareVideoSize"], [_setScreenShareScalcValueDecs, 18, "setScreenShareScalcValue"], [_setIsSeizeStreamDecs, 18, "setIsSeizeStream"], [_setIsSharingScreenDecs, 18, "setIsSharingScreen"], [_setSharingInReplaceDecs, 18, "setSharingInReplace"], [_setScreenSharingOwnerDecs, 18, "setScreenSharingOwner"], [_setShareWithAudioTrackDecs, 18, "setShareWithAudioTrack"], [_setLoopbackAudioSourceIdDecs, 18, "setLoopbackAudioSourceId"], [_setScreenTrackDecs, 18, "setScreenTrack"], [_setCurrentShareTypeDecs, 18, "setCurrentShareType"], [_setCurrentShareIdDecs, 18, "setCurrentShareId"], [_setCurrentShareStreamIdDecs, 18, "setCurrentShareStreamId"], [_setCurrentShareAudioProcessingChannelDecs, 18, "setCurrentShareAudioProcessingChannel"], [_setScreenCaptureSourcesDecs, 18, "setScreenCaptureSources"], [_setApplicationCaptureSourcesDecs, 18, "setApplicationCaptureSources"], [_setLocalUserScreenSharingStateDecs, 18, "setLocalUserScreenSharingState"], [_setCurrentShareIdInfosDecs, 18, "setCurrentShareIdInfos"], [_setCurrentSelectionDecs, 18, "setCurrentSelection"], [_setCurrentSelectionIdDecs, 18, "setCurrentSelectionId"], [_setCurrentSelectionTypeDecs, 18, "setCurrentSelectionType"], [_setCurrentSelectionBoundsDecs, 18, "setCurrentSelectionBounds"], [_setShareWithAudioDecs, 18, "setShareWithAudio"], [_handleOnConnectionStateUpdatedDecs, 18, "_handleOnConnectionStateUpdated"], [_setLoopbackAudioSourceIdDecs2, 18, "_setLoopbackAudioSourceId"]], []).e, 21);
 _init_isSharingScreen = _applyDecs$e[0];
 _init_screenSharingOwner = _applyDecs$e[1];
 _init_localUserScreenSharingState = _applyDecs$e[2];

package/lib/shared-data-source/setting.js

@@ -57,12 +57,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 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 _imports = require("agora-rte-sdk/lib/imports");
 var _type = require("../type");
 var _parameters = require("../utilities/parameters");
 var _mobx = require("mobx");
 var _base = require("../base");
 var _merge = _interopRequireDefault(require("lodash/merge"));
+var _env = require("agora-foundation/lib/utilities/env");
 var _FcrUISharedSettingDataSourceImpl;
 var _initProto, _init__settingConfig, _preHandleSettingDecs, _setSettingDecs, _setMediaDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -98,7 +98,7 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
         shouldHideNonVideoParticipants: false,
         displayedMaxAttendees: 16,
         autoAdjustmentSpeakerVolume: true,
-        autoAdjustmentMicrophoneVolume: (0, _imports.isElectron)(),
+        autoAdjustmentMicrophoneVolume: (0, _env.isElectron)(),
         noiseReduce: _type.FcrUIAiDenoiseLevel.LOW,
         recordingPath: '',
         videoHD: false,
@@ -112,7 +112,8 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
         spotlightEnabled: true,
         isPlaySound: true,
         language: 'zh',
-        shouldHideMyVideo: false
+        shouldHideMyVideo: false,
+        isDualDisplayMode: false
       }
     }));
     (0, _defineProperty2["default"])(this, "_useDefaultAudioEchoCancellation", true);

package/lib/shared-data-source/video-window.js

@@ -562,6 +562,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     _classPrivateFieldInitSpec(this, _H2, _init_foldList(this, []));
     _classPrivateFieldInitSpec(this, _I2, _init_spotlightStreamId(this, ''));
     this._sharedSettingDataSource = _sharedSettingDataSource;
+    this.spotlightEnabled = _sharedSettingDataSource.setting.spotlightEnabled;
     this._spotlightPool.addObserver({
       onRemoved: this.onSpotlightRemoved
     });
@@ -802,7 +803,6 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     key: "update",
     value: function update(param) {
       var _this5 = this;
-      console.log('onStreamsAdded update', param);
       var handleStreamInfoUpdated = function handleStreamInfoUpdated(stream, list, limitCount, placement) {
         var existedUserStream = list[_this5._findItemIndexWithWindowId(stream.streamId, list)];
         if (existedUserStream) {
@@ -1163,7 +1163,6 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
   }, {
     key: "_insertNewData",
     value: function _insertNewData(stream, list, limitCount, isMySelf, placement) {
-      console.log('onStreamsAdded', stream);
       var videoWindowData = new FcrUIVideoWindowDataImpl(_type.FcrUIWindowType.VIDEO, stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN ? {
         audioStream: stream
       } : {

package/lib/shared-data-source/whiteboard-data.d.ts

@@ -0,0 +1,70 @@
+import { FcrConnectionState, FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrUIMainWindowRenderer, FcrUIMainWindowRendererObserver, WhiteboardToolAction } from '../modules/secondary-window/type';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { WhiteboardThemeType } from '../modules/whiteboard/type';
+import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrUIPrivilegeProvider } from '../providers/privilege-provider';
+import { FcrToolbarState } from '../modules/components/toolbar/types';
+export interface FcrUISharedWhiteboardDataSource {
+    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;
+    get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
+    setSharingUser: (userInfo: FcrUserInfo | undefined) => 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;
+    inActive: () => void;
+    release: () => void;
+}
+export declare class FcrUISharedWhiteboardDataSourceImpl implements FcrUISharedWhiteboardDataSource {
+    private _whiteboardControl;
+    private _privilegeProvider;
+    private _fcrUIMainWindowRenderer;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _showLoading;
+    private _disposers;
+    private _toolbarStateObserver;
+    accessor currentTheme: Required<WhiteboardThemeType>;
+    accessor sharingUserInfo: FcrUserInfo | undefined;
+    accessor backgroundColor: string;
+    accessor hasWriteBoardPermission: boolean;
+    accessor connectionState: FcrConnectionState;
+    accessor joinSuccess: boolean;
+    accessor toolbarState: FcrToolbarState;
+    get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
+    get showLoading(): boolean;
+    get canWriteBoard(): boolean;
+    constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _privilegeProvider: FcrUIPrivilegeProvider, _fcrUIMainWindowRenderer: FcrUIMainWindowRenderer);
+    setControlEnable(enable: boolean): void;
+    setSharingUser(userInfo: FcrUserInfo | undefined): void;
+    setBackgroundColor(color: string): void;
+    setWhiteboardTool(tool: {
+        action: WhiteboardToolAction;
+        tool: FcrBoardToolType | FcrBoardShape | string | number;
+    }): void;
+    setTheme(theme: WhiteboardThemeType): void;
+    setShowLoading(show: boolean): void;
+    setCommonColors(colors: string[]): void;
+    saveDraft(): void;
+    setProgress(progress: number): void;
+    setJoinSuccess(success: boolean): void;
+    inActive(): void;
+    release(): void;
+    private _resetWhiteboardTool;
+    private _handleConnectionStateUpdated;
+}