fcr-ui-scene 3.6.1 → 3.6.3

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

@@ -0,0 +1,37 @@
+import { FcrScreenSharingState, FcrSharingControl, FcrWhiteboardState } from 'fcr-core/lib/room-control/sharing-control/type';
+import { FcrScreenStreamCreateConfig } from 'fcr-core/lib/room-control/stream-control/type';
+import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
+export interface FcrUISharingProvider {
+    get screenSharingOwnerId(): string;
+    get whiteboardOwnerId(): string;
+    get screenSharingState(): FcrScreenSharingState;
+    get whiteboardState(): FcrWhiteboardState;
+    startScreenSharing: (config: FcrScreenStreamCreateConfig) => void;
+    startWhiteboard: () => void;
+    updateScreenSharing: (enableAnnotation: boolean) => void;
+    stop: () => void;
+    getScreenSharingState: () => FcrScreenSharingState;
+    getWhiteboardState: () => FcrWhiteboardState;
+    getSharingControl: () => FcrSharingControl;
+}
+export declare class FcrUISharingProviderImpl implements FcrUISharingProvider {
+    private _sharingControl;
+    private _sharedScreenShareSharedDataSource;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _observer;
+    accessor screenSharingOwnerId: string;
+    accessor whiteboardOwnerId: string;
+    accessor screenSharingState: FcrScreenSharingState;
+    accessor whiteboardState: FcrWhiteboardState;
+    get isReplaceScreen(): boolean;
+    get isSeizeStream(): boolean;
+    constructor(_sharingControl: FcrSharingControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource);
+    startScreenSharing(config: FcrScreenStreamCreateConfig): void;
+    startWhiteboard(): void;
+    updateScreenSharing(enableAnnotation: boolean): void;
+    stop(): void;
+    getScreenSharingState(): FcrScreenSharingState;
+    getWhiteboardState(): FcrWhiteboardState;
+    getSharingControl(): FcrSharingControl;
+    release(): void;
+}

package/lib/{shared-data-source/screen-share-data-source.js → providers/sharing-provider.js}

@@ -36,10 +36,8 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUIScreenShareDataSourceImpl = void 0;
+exports.FcrUISharingProviderImpl = void 0;
 require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.date.to-json.js");
-require("core-js/modules/es.json.stringify.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");
@@ -50,13 +48,13 @@ 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 _decorator = require("agora-foundation/lib/decorator");
+var _type = require("fcr-core/lib/room-control/sharing-control/type");
 var _mobx = require("mobx");
 var _base = require("../base");
 var _logger = require("../utilities/logger");
-var _env = require("agora-foundation/lib/utilities/env");
-var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
-var _FcrUIScreenShareDataSourceImpl;
-var _initProto, _init_currentShareAudioProcessingChannel, _init_isSharingScreen, _init_currentShareBounds, _setSharingScreenDecs, _setCurrentShareBoundsDecs, _setCurrentShareAudioProcessingChannelDecs, _ref;
+var _FcrUISharingProviderImpl;
+var _initProto, _init_screenSharingOwnerId, _init_whiteboardOwnerId, _init_screenSharingState, _init_whiteboardState;
 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; }
@@ -70,19 +68,43 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
-_ref = (_setSharingScreenDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareBoundsDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], "logger");
-var FcrUIScreenShareDataSourceImpl = exports.FcrUIScreenShareDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUIScreenShareDataSourceImpl() {
-    (0, _classCallCheck2["default"])(this, FcrUIScreenShareDataSourceImpl);
-    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrUIScreenShareDataSourceImpl'
+var _D = /*#__PURE__*/new WeakMap();
+var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/function () {
+  function FcrUISharingProviderImpl(_sharingControl, _sharedScreenShareSharedDataSource) {
+    var _this = this;
+    (0, _classCallCheck2["default"])(this, FcrUISharingProviderImpl);
+    (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrUISharingProviderImpl'
     })));
-    _classPrivateFieldInitSpec(this, _A, _init_currentShareAudioProcessingChannel(this, _shareAudio.AudioProcessingChannel.MONO));
-    _classPrivateFieldInitSpec(this, _B, _init_isSharingScreen(this, false));
-    _classPrivateFieldInitSpec(this, _C, _init_currentShareBounds(this, (0, _env.isElectron)() ? window.runtime.browserWindow.getBounds() : null));
+    (0, _defineProperty2["default"])(this, "_observer", {
+      onScreenSharingUpdated: function onScreenSharingUpdated(ownerId, state) {
+        _this.screenSharingOwnerId = ownerId;
+        _this.screenSharingState = state;
+        if (state === _type.FcrScreenSharingState.END) {
+          _this.isReplaceScreen && _this._sharedScreenShareSharedDataSource.setIsReplaceScreen(false);
+          _this.isSeizeStream && _this._sharedScreenShareSharedDataSource.setIsSeizeStream(false);
+        }
+      },
+      onWhiteboardStarted: function onWhiteboardStarted(ownerId, operatorUser) {
+        _this.whiteboardOwnerId = ownerId;
+        _this.whiteboardState = _type.FcrWhiteboardState.START;
+      },
+      onWhiteboardEnded: function onWhiteboardEnded(reason, operatorUser) {
+        _this.whiteboardState = _type.FcrWhiteboardState.END;
+      }
+    });
+    _classPrivateFieldInitSpec(this, _A, _init_screenSharingOwnerId(this, ''));
+    _classPrivateFieldInitSpec(this, _B, _init_whiteboardOwnerId(this, ''));
+    _classPrivateFieldInitSpec(this, _C, _init_screenSharingState(this, _type.FcrScreenSharingState.END));
+    _classPrivateFieldInitSpec(this, _D, _init_whiteboardState(this, _type.FcrWhiteboardState.END));
+    this._sharingControl = _sharingControl;
+    this._sharedScreenShareSharedDataSource = _sharedScreenShareSharedDataSource;
+    // @ts-ignore
+    // this._sharingControl.getToken();
+    this._sharingControl.addObserver(this._observer);
   }
-  return (0, _createClass2["default"])(FcrUIScreenShareDataSourceImpl, [{
-    key: "currentShareAudioProcessingChannel",
+  return (0, _createClass2["default"])(FcrUISharingProviderImpl, [{
+    key: "screenSharingOwnerId",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -90,7 +112,7 @@ var FcrUIScreenShareDataSourceImpl = exports.FcrUIScreenShareDataSourceImpl = /*
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "isSharingScreen",
+    key: "whiteboardOwnerId",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -98,7 +120,7 @@ var FcrUIScreenShareDataSourceImpl = exports.FcrUIScreenShareDataSourceImpl = /*
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "currentShareBounds",
+    key: "screenSharingState",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -106,29 +128,70 @@ var FcrUIScreenShareDataSourceImpl = exports.FcrUIScreenShareDataSourceImpl = /*
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "setSharingScreen",
-    value: function setSharingScreen(isSharingScreen) {
-      this.isSharingScreen = isSharingScreen;
-      this.logger.info("setSharingScreen: ".concat(isSharingScreen));
+    key: "whiteboardState",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
+  }, {
+    key: "isReplaceScreen",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isReplaceScreen;
+    }
+  }, {
+    key: "isSeizeStream",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isSeizeStream;
+    }
+  }, {
+    key: "startScreenSharing",
+    value: function startScreenSharing(config) {
+      this._sharingControl.startScreenSharing(config);
+    }
+  }, {
+    key: "startWhiteboard",
+    value: function startWhiteboard() {
+      this._sharingControl.startWhiteboard();
+    }
+  }, {
+    key: "updateScreenSharing",
+    value: function updateScreenSharing(enableAnnotation) {
+      this._sharingControl.updateScreenSharing(enableAnnotation);
+    }
+  }, {
+    key: "stop",
+    value: function stop() {
+      this._sharingControl.stop();
+    }
+  }, {
+    key: "getScreenSharingState",
+    value: function getScreenSharingState() {
+      return this._sharingControl.getScreenSharingState();
+    }
+  }, {
+    key: "getWhiteboardState",
+    value: function getWhiteboardState() {
+      return this._sharingControl.getWhiteboardState();
     }
   }, {
-    key: "setCurrentShareBounds",
-    value: function setCurrentShareBounds(currentShareBounds) {
-      this.currentShareBounds = currentShareBounds;
-      this.logger.info("setCurrentShareBounds: ".concat(JSON.stringify(currentShareBounds)));
+    key: "getSharingControl",
+    value: function getSharingControl() {
+      return this._sharingControl;
     }
   }, {
-    key: "setCurrentShareAudioProcessingChannel",
-    value: function setCurrentShareAudioProcessingChannel(channel) {
-      this.currentShareAudioProcessingChannel = channel;
-      this.logger.info("setCurrentShareAudioProcessingChannel: ".concat(channel));
+    key: "release",
+    value: function release() {
+      this._sharingControl.removeObserver(this._observer);
     }
   }]);
 }();
-_FcrUIScreenShareDataSourceImpl = FcrUIScreenShareDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareDataSourceImpl, [[_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "isSharingScreen"], [_mobx.observable, 1, "currentShareBounds"], [_setSharingScreenDecs, 18, "setSharingScreen"], [_setCurrentShareBoundsDecs, 18, "setCurrentShareBounds"], [_setCurrentShareAudioProcessingChannelDecs, 18, "setCurrentShareAudioProcessingChannel"]], []).e, 4);
-_init_currentShareAudioProcessingChannel = _applyDecs$e[0];
-_init_isSharingScreen = _applyDecs$e[1];
-_init_currentShareBounds = _applyDecs$e[2];
-_initProto = _applyDecs$e[3];
-(0, _base.registerDependency)('screenShareDataSource');
+_FcrUISharingProviderImpl = FcrUISharingProviderImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharingProviderImpl, [[_mobx.observable, 1, "screenSharingOwnerId"], [_mobx.observable, 1, "whiteboardOwnerId"], [_mobx.observable, 1, "screenSharingState"], [_mobx.observable, 1, "whiteboardState"], [_decorator.bound, 2, "startScreenSharing"], [_decorator.bound, 2, "startWhiteboard"], [_decorator.bound, 2, "updateScreenSharing"], [_decorator.bound, 2, "stop"], [_decorator.bound, 2, "getScreenSharingState"], [_decorator.bound, 2, "getWhiteboardState"], [_decorator.bound, 2, "getSharingControl"], [_decorator.bound, 2, "release"]], []).e, 5);
+_init_screenSharingOwnerId = _applyDecs$e[0];
+_init_whiteboardOwnerId = _applyDecs$e[1];
+_init_screenSharingState = _applyDecs$e[2];
+_init_whiteboardState = _applyDecs$e[3];
+_initProto = _applyDecs$e[4];
+(0, _base.registerDependency)('sharingProvider');

package/lib/providers/user-setting-storage-provider.d.ts

@@ -0,0 +1,20 @@
+import { FcrUISettingConfig } from '../type';
+export interface FcrUIUserSettingStorageProvider {
+    /**
+     * 写入本地存储
+     * @param key
+     * @param value
+     */
+    write(value: Partial<FcrUISettingConfig>): number;
+    /**
+     * 从本地存储读取
+     * @param key
+     */
+    read(): FcrUISettingConfig | null;
+}
+export declare class FcrUIUserSettingStorageProviderImpl implements FcrUIUserSettingStorageProvider {
+    private _isElectron;
+    constructor();
+    write(value: Partial<FcrUISettingConfig>): number;
+    read(): any;
+}

package/lib/providers/user-setting-storage-provider.js

@@ -0,0 +1,74 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.define-properties.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUIUserSettingStorageProviderImpl = void 0;
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/esnext.json.parse.js");
+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 _base = require("../base");
+var _env = require("agora-foundation/lib/utilities/env");
+var _settingConfigStorage = require("../utilities/setting-config-storage");
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var FcrUIUserSettingStorageProviderImpl = exports.FcrUIUserSettingStorageProviderImpl = /*#__PURE__*/function () {
+  function FcrUIUserSettingStorageProviderImpl() {
+    (0, _classCallCheck2["default"])(this, FcrUIUserSettingStorageProviderImpl);
+    (0, _defineProperty2["default"])(this, "_isElectron", false);
+    this._isElectron = (0, _env.isElectron)();
+  }
+  return (0, _createClass2["default"])(FcrUIUserSettingStorageProviderImpl, [{
+    key: "write",
+    value: function write(value) {
+      var userSetting = this.read();
+      if (userSetting) {
+        value = _objectSpread(_objectSpread({}, userSetting), value);
+      }
+      if (this._isElectron) {
+        window.runtime.setUserSettingData(value);
+      } else {
+        localStorage.setItem(_settingConfigStorage.settingConfigStorageKey, JSON.stringify(value));
+      }
+      return 1;
+    }
+  }, {
+    key: "read",
+    value: function read() {
+      if (this._isElectron) {
+        return window.runtime.getUserSettingData();
+      } else {
+        var getItem = localStorage.getItem(_settingConfigStorage.settingConfigStorageKey);
+        return getItem ? JSON.parse(getItem) : null;
+      }
+    }
+
+    // remove(key: string) {
+    //   localStorage.removeItem(key);
+    // }
+  }]);
+}(); // export enum FcrLocalStorageSettingKey {
+//   SpotlightEnabled = 'spotlightEnabled',
+//   ShouldHideNonVideoParticipants = 'shouldHideNonVideoParticipants',
+// }
+(0, _base.registerDependency)('userSettingStorageProvider');

package/lib/runtime.d.ts

@@ -1,3 +1,5 @@
+import { WindowManager } from './type';
+
 export {};
 declare global {
   interface NetworkType {
@@ -48,7 +50,7 @@ declare global {
     ): void;
 
     browserWindow: import('electron').BrowserWindow;
-    captureScreen(options?: { hideWindow?: boolean }): void;
+    captureScreen(options?: { hideWindow?: boolean; alwaysHide?: boolean }): void;
     setFragmentOptions(
       entryPath: string,
       windowOptions: import('electron').BrowserWindowConstructorOptions,
@@ -82,6 +84,8 @@ declare global {
     openSystemPreferences(mediaType: 'microphone' | 'camera' | 'sharing'): void;
     getUserSettingData(): object;
     setUserSettingData(data: object): void;
+    getActiveWindow(): WindowManager | undefined;
+    getWindows(): WindowManager[];
     onCreatorInit?: (initOptions: any) => void;
     onSettingOpen?: () => void;
     onSettingClose?: () => void;
@@ -101,6 +105,7 @@ declare global {
     setParameters: (parameters: string) => void;
     onCloseWindowBeforeLaunchSuccess?: () => void;
     exitedMeeting?: (roomId: string, reason: FcrUIExitReason) => void;
+    getIsMeetingLaunched: () => Promise<boolean>;
   }
 
   interface Window {

package/lib/scenes/main-scene.d.ts

@@ -31,7 +31,9 @@ import { FcrUIWidgetProvider } from '../providers/widget-provider';
 import { FcrUIAbilityProviderImpl } from '../providers/ability-provider';
 import { FcrUIMeetingTimeSharedDataSource } from '../shared-data-source/meeting-time';
 import { FcrUISecuritySharedDataSource } from '../shared-data-source/security-data';
-import { FcrUIScreenShareDataSource } from '../shared-data-source/screen-share-data-source';
+import { FcrUIAnnotationProvider } from '../providers/annotation-provider';
+import { FcrUISharingProvider } from '../providers/sharing-provider';
+import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
 export type FcrMainUISceneArgs = {
     engine: FcrCoreEngine;
     eventProvider: FcrUIEventProvider;
@@ -47,6 +49,7 @@ export type FcrMainUISceneArgs = {
     sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
     sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
     widgetProvider: FcrUIWidgetProvider;
+    sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
 };
 export declare class FcrMainUIScene extends FcrBaseUIScene {
     eventProvider: FcrUIEventProvider;
@@ -72,6 +75,8 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     phoneAudioConnectorProvider: FcrUIPhoneAudioConnectorProviderImpl;
     widgetProvider: FcrUIWidgetProvider;
     abilityProvider: FcrUIAbilityProviderImpl;
+    annotationProvider: FcrUIAnnotationProvider;
+    sharingProvider: FcrUISharingProvider;
     sharedConfigDataSource: FcrUISharedConfigDataSource;
     sharedInterpreterDataSource: FcrUISharedInterpreterDataSourceImpl;
     sharedSettingDataSource: FcrUISharedSettingDataSource;
@@ -85,7 +90,7 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     sharedMemberDataSource: FcrUIMemberSharedDataSource;
     sharedMeetingTimeDataSource: FcrUIMeetingTimeSharedDataSource;
     sharedSecuritySharedDataSource: FcrUISecuritySharedDataSource;
-    screenShareDataSource: FcrUIScreenShareDataSource;
+    sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
     private _isWaitingRoomNotify;
     constructor(args: FcrMainUISceneArgs);
     private _addObservers;

package/lib/scenes/main-scene.js

@@ -126,8 +126,11 @@ var _abilityProvider = require("../providers/ability-provider");
 var _meetingTime = require("../shared-data-source/meeting-time");
 var _securityData = require("../shared-data-source/security-data");
 var _rename = require("../modules/dialog/components/rename");
+var _annotation = require("../modules/annotation");
+var _annotationTool = require("../modules/dialog/components/annotation-tool");
+var _annotationProvider = require("../providers/annotation-provider");
+var _sharingProvider = require("../providers/sharing-provider");
 var _confirmLeaveMeeting = require("../modules/dialog/components/confirm-leave-meeting");
-var _screenShareDataSource = require("../shared-data-source/screen-share-data-source");
 var _jsxRuntime = require("react/jsx-runtime");
 var _FcrMainUIScene;
 var _initProto; // import { RemoveAdmitWaitingRoomDialog } from '../modules/dialog/components/remove-admit-waiting-room';
@@ -160,12 +163,12 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       dialogProvider = args.dialogProvider,
       sharedVideoWindowDataSource = args.sharedVideoWindowDataSource,
       sharedDevicePrivilegeDataSource = args.sharedDevicePrivilegeDataSource,
-      widgetProvider = args.widgetProvider;
+      widgetProvider = args.widgetProvider,
+      sharedScreenShareSharedDataSource = args.sharedScreenShareSharedDataSource;
     var mainRoomControl = roomProvider.currentRoomControl;
+    var sharingControl = mainRoomControl.getSharingControl();
     var streamControl = mainRoomControl.getStreamControl();
     var userControl = mainRoomControl.getUserControl();
-    var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, dialogProvider, roomProvider);
-    var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, screenShareProvider, mainRoomControl.getBoardControl());
     var privilegeControl = mainRoomControl.getPrivilegeControl();
     var interpreterControl = mainRoomControl.getInterpreterControl();
     var abilityControl = mainRoomControl.getAbilityControl();
@@ -177,8 +180,6 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     var remoteVideoRenderProvider = new _rendererProvider.FcrUIRemoteVideoRenderProviderImpl(mainRoomControl.getStreamControl());
     var mainRoomControlProvider = new _roomProvider.FcrUIMainRoomControlProviderImpl(mainRoomControl, eventProvider, messageProvider, dialogProvider, sharedInterpreterDataSource);
     var privilegeProvider = mainRoomControlProvider.privilegeProvider;
-    var sharedSecurityDataSource = new _securityData.FcrUISecuritySharedDataSourceImpl(privilegeProvider, sharedMemberDataSource);
-    var screenShareDataSource = new _screenShareDataSource.FcrUIScreenShareDataSourceImpl();
     var interpreterProvider = new _interpreterProvider.FcrUIInterpreterProviderImpl({
       privilegeProvider: privilegeProvider,
       interpreterControl: interpreterControl,
@@ -192,9 +193,10 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
     var sessionProvider = new _sessionProvider.FcrUISessionProviderImpl(engine);
     var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, interpreterProvider, sharedInterpreterDataSource);
-    var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider);
+    var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider);
     var monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(engine.getMonitorControl());
     var chatProvider = new _chatProvider.FcrUIChatProviderImpl(currentRoomControlProvider.currentRoomControl, roomProvider);
+    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource);
     var sharedWaitingRoomDataSource = new _waitingRoom.FcrUISharedWaitingRoomDataSourceImpl(roomProvider, eventProvider);
     var phoneAudioConnectorProvider = new _phoneAudioProvider.FcrUIPhoneAudioConnectorProviderImpl({
       roomControl: mainRoomControl,
@@ -205,6 +207,10 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     var sharedMeetingTimeDataSource = new _meetingTime.FcrUIMeetingTimeSharedDataSourceImpl({
       mainRoomControl: mainRoomControl
     });
+    var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource, mainRoomControl.getSharingControl().getBoardControl());
+    var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource);
+    var annotationProvider = new _annotationProvider.FcrUIAnnotationProviderImpl(dialogProvider, sharingProvider, sharedMemberDataSource, sharedVideoWindowDataSource, screenShareProvider, deviceProvider);
+    var sharedSecurityDataSource = new _securityData.FcrUISecuritySharedDataSourceImpl(privilegeProvider, sharedMemberDataSource);
     _this.messageProvider = messageProvider;
     _this.dialogProvider = dialogProvider;
     _this.eventProvider = eventProvider;
@@ -226,6 +232,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     _this.screenShareProvider = screenShareProvider;
     _this.phoneAudioConnectorProvider = phoneAudioConnectorProvider;
     _this.chatProvider = chatProvider;
+    _this.annotationProvider = annotationProvider;
+    _this.sharingProvider = sharingProvider;
     _this.sharedSpeakerSpotlightDataSource = sharedSpeakerSpotlightDataSource;
     _this.sharedPinDataSource = sharedPinDataSource;
     _this.sharedConfigDataSource = sharedConfigDataSource;
@@ -239,7 +247,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     _this.sharedMemberDataSource = sharedMemberDataSource;
     _this.sharedMeetingTimeDataSource = sharedMeetingTimeDataSource;
     _this.sharedSecuritySharedDataSource = sharedSecurityDataSource;
-    _this.screenShareDataSource = screenShareDataSource;
+    _this.sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
     _this.widgetProvider = widgetProvider;
     _this.abilityProvider = abilityProvider;
     _this._addObservers();
@@ -336,6 +344,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       var pcAudioConnection = new _pcAudioConnect.PcAudioConnectionUIModule(this, this);
       var phoneAudioConnection = new _phoneAudioConnect.PhoneAudioConnectionUIModule(this, this);
       var webWidgetUIModule = new _widget2.WebWidgetUIModule(this, this);
+      var annotationUIModule = new _annotation.AnnotationUIModule(this, this);
       this.addSubNode(chatModule);
       this.addSubNode(audioStreamUIModule);
       this.addSubNode(soundEffectUIModule);
@@ -358,6 +367,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       this.addSubNode(pcAudioConnection);
       this.addSubNode(phoneAudioConnection);
       this.addSubNode(webWidgetUIModule);
+      this.addSubNode(annotationUIModule);
       var getView = function getView() {
         dialogModule.addDialogs([
         // {
@@ -451,8 +461,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
           key: _constant.FcrUIDialogKey.CONTROL_BAR,
           component: function component(props) {
             return (0, _env.isElectron)() ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar2.ControlBarDialog, {
-              module: controlbarUIModule,
-              params: props.params
+              module: controlbarUIModule
             }, "ControlBar") : shareScreenModule.getComponent();
           }
         }, {
@@ -470,18 +479,35 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
               children: participantsModule.getRenameDialogContent()
             }, "RenameDialog");
           }
+        }, {
+          key: _constant.FcrUIDialogKey.ANNOTATION_TOOL,
+          component: function component() {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationTool.AnnotationBarDialog, {
+              children: annotationUIModule.getToolComponents()
+            }, "annotation");
+          }
         }, {
           key: _constant.FcrUIDialogKey.LEAVE_MEETING,
           component: function component(props) {
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirmLeaveMeeting.ConfirmLeaveMeetingDialog, {
               title: (0, _i18n.transI18n)('fmt_actionbar_labels_endmeeting'),
-              onOk: function onOk() {
-                _this3.mainRoomControlProvider.mainRoomControl.close();
-                _this3.roomProvider.exitRoom();
-                _this3.eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_DIALOG, {
-                  dialogKey: _constant.FcrUIDialogKey.LEAVE_MEETING
-                });
-              },
+              onOk: /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+                return _regenerator["default"].wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      _this3.roomProvider.setIsSelfEndMeeting(true);
+                      _context.next = 3;
+                      return _this3.mainRoomControlProvider.mainRoomControl.close();
+                    case 3:
+                      _this3.eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_DIALOG, {
+                        dialogKey: _constant.FcrUIDialogKey.LEAVE_MEETING
+                      });
+                    case 4:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee);
+              })),
               onCancel: function onCancel() {
                 _this3.eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_DIALOG, {
                   dialogKey: _constant.FcrUIDialogKey.LEAVE_MEETING
@@ -509,8 +535,10 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
               stateBar: stateBarUIModule.getComponent(),
               layers: _this3.renderLayers([dialogModule.getComponent(), eventToastUIModule.getComponent('local'), eventNotificationUIModule.getComponent()]),
               whiteboard: whiteBoradUIModule.getComponent(),
+              annotationControl: annotationUIModule.getControlComponent(),
+              annotation: annotationUIModule.getComponent(),
               globalToast: eventToastUIModule.getComponent('global'),
-              confirm: eventConfirmUIModule.getComponent()
+              confirm: eventConfirmUIModule.getComponent('mainroom')
             })
           }), 'mainroom')
         });
@@ -555,11 +583,11 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
   }, {
     key: "_runSettingConfig",
     value: function () {
-      var _runSettingConfig2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _runSettingConfig2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this4 = this;
         var deviceProvider, settingConfig, showToast, allowJoinWithCloseVideo, hasOpenCameraPrivilege, isJoinWithCloseVideo, allowJoinWithMuteAudio, hasOpenMicrophonePrivilege, isJoinWithMuteAudio;
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               deviceProvider = this.deviceProvider;
               settingConfig = this.sharedConfigDataSource.settingConfig;
@@ -571,10 +599,10 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
                 });
               };
               allowJoinWithCloseVideo = this.privilegeProvider.allowJoinWithMutedVideo();
-              _context.next = 7;
+              _context2.next = 7;
               return this.devicePrivilegeProvider.hasOpenCameraPrivilege();
             case 7:
-              hasOpenCameraPrivilege = _context.sent;
+              hasOpenCameraPrivilege = _context2.sent;
               if (this.deviceProvider.ifNeedExecuteOpenCamera()) {
                 isJoinWithCloseVideo = allowJoinWithCloseVideo && !hasOpenCameraPrivilege;
                 if (isJoinWithCloseVideo) {
@@ -590,10 +618,10 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
                 }
               }
               allowJoinWithMuteAudio = this.privilegeProvider.allowJoinWithMuteAudio();
-              _context.next = 12;
+              _context2.next = 12;
               return this.devicePrivilegeProvider.hasOpenMicrophonePrivilege();
             case 12:
-              hasOpenMicrophonePrivilege = _context.sent;
+              hasOpenMicrophonePrivilege = _context2.sent;
               if (this.deviceProvider.ifNeedExecuteAutoConnectAudio()) {
                 isJoinWithMuteAudio = allowJoinWithMuteAudio && !hasOpenMicrophonePrivilege && this.deviceProvider.shouldEnableMicBeforeSession;
                 if (isJoinWithMuteAudio) {
@@ -618,9 +646,9 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
               }
             case 15:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
       function _runSettingConfig() {
         return _runSettingConfig2.apply(this, arguments);

package/lib/scenes/waiting-scene.d.ts

@@ -22,6 +22,8 @@ import { FcrUIMemberSharedDataSource } from '../shared-data-source/member-data';
 import { FcrUIWidgetProvider } from '../providers/widget-provider';
 import { FcrUISharedWaitingRoomDataSource } from '../shared-data-source/waiting-room';
 import { FcrUIAbilityProviderImpl } from '../providers/ability-provider';
+import { FcrUIScreenShareProviderImpl } from '../providers/screen-share-provider';
+import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
 export type FcrWaitingUISceneArgs = {
     engine: FcrCoreEngine;
     eventProvider: FcrUIEventProvider;
@@ -34,8 +36,10 @@ export type FcrWaitingUISceneArgs = {
     sharedSettingDataSource: FcrUISharedSettingDataSource;
     sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
     widgetProvider: FcrUIWidgetProvider;
+    sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
 };
 export declare class FcrWaitingUIScene extends FcrBaseUIScene {
+    private _dom;
     eventProvider: FcrUIEventProvider;
     roomProvider: FcrUIRoomProvider;
     waitingRoomControlProvider: FcrUIWaitingRoomControlProviderImpl;
@@ -51,6 +55,7 @@ export declare class FcrWaitingUIScene extends FcrBaseUIScene {
     monitorProvider: FcrUIMonitorProviderImpl;
     deviceStreamProvider: FcrUIDeviceStreamProviderImpl;
     widgetProvider: FcrUIWidgetProvider;
+    screenShareProvider: FcrUIScreenShareProviderImpl;
     sharedConfigDataSource: FcrUISharedConfigDataSource;
     messageProvider: FcrUIMessageProvider;
     sharedInterpreterDataSource: FcrUISharedInterpreterDataSourceImpl;
@@ -60,6 +65,7 @@ export declare class FcrWaitingUIScene extends FcrBaseUIScene {
     sharedChatDataSource: FcrUISharedChatDataSource;
     sharedMemberDataSource: FcrUIMemberSharedDataSource;
     sharedWaitingRoomDataSource: FcrUISharedWaitingRoomDataSource;
+    sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
     abilityProvider: FcrUIAbilityProviderImpl;
     constructor(args: FcrWaitingUISceneArgs);
     mount(dom: HTMLElement): void;