fcr-ui-scene 3.6.1 → 3.6.3

package/lib/ui-manager.js

@@ -160,7 +160,7 @@ var FcrUIManager = exports.FcrUIManager = /*#__PURE__*/function () {
     }
   }, {
     key: "renderMainSceneUI",
-    value: function renderMainSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider) {
+    value: function renderMainSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareSharedDataSource) {
       var scene = new _mainScene.FcrMainUIScene({
         engine: this._engine,
         eventProvider: eventProvider,
@@ -175,7 +175,8 @@ var FcrUIManager = exports.FcrUIManager = /*#__PURE__*/function () {
         messageProvider: messageProvider,
         sharedVideoWindowDataSource: sharedVideoWindowDataSource,
         sharedDevicePrivilegeDataSource: sharedDevicePrivilegeDataSource,
-        widgetProvider: widgetProvider
+        widgetProvider: widgetProvider,
+        sharedScreenShareSharedDataSource: sharedScreenShareSharedDataSource
       });
       scene.nodeWillActive();
       scene.mount(this._containerDom);
@@ -187,7 +188,7 @@ var FcrUIManager = exports.FcrUIManager = /*#__PURE__*/function () {
     }
   }, {
     key: "renderWaitingSceneUI",
-    value: function renderWaitingSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, dialogProvider, messageProvider, sharedLayoutDataSource, sharedSettingDataSource, sharedDevicePrivilegeDataSource, widgetProvider) {
+    value: function renderWaitingSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, dialogProvider, messageProvider, sharedLayoutDataSource, sharedSettingDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareSharedDataSource) {
       var scene = new _waitingScene.FcrWaitingUIScene({
         engine: this._engine,
         eventProvider: eventProvider,
@@ -199,7 +200,8 @@ var FcrUIManager = exports.FcrUIManager = /*#__PURE__*/function () {
         sharedLayoutDataSource: sharedLayoutDataSource,
         sharedSettingDataSource: sharedSettingDataSource,
         sharedDevicePrivilegeDataSource: sharedDevicePrivilegeDataSource,
-        widgetProvider: widgetProvider
+        widgetProvider: widgetProvider,
+        sharedScreenShareSharedDataSource: sharedScreenShareSharedDataSource
       });
       scene.nodeWillActive();
       scene.mount(this._containerDom);

package/lib/ui-scene.js

@@ -85,9 +85,12 @@ var _widgetProvider = require("./providers/widget-provider");
 var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("fcr-core/lib/utilities/logger");
 var _logger2 = require("./utilities/logger");
+var _screenShareData = require("./shared-data-source/screen-share-data");
 var _store = _interopRequireDefault(require("./modules/setting/store"));
 var _monitorProvider = require("./providers/monitor-provider");
 var _uiResources = require("./utilities/ui-resources");
+var _userSettingStorageProvider = require("./providers/user-setting-storage-provider");
+var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
 var _FcrUIDefaultScene;
 var _initProto;
@@ -132,6 +135,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       }
     });
     this._localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
+    this._userSettingStorageProvider = new _userSettingStorageProvider.FcrUIUserSettingStorageProviderImpl();
     var language = (0, _i18n.getLanguage)();
     (0, _tools.setLanguage)(language);
     window.addEventListener('beforeunload', this._handleBeforeUnload);
@@ -140,6 +144,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
   return (0, _createClass2["default"])(FcrUIDefaultScene, [{
     key: "exit",
     value: function exit() {
+      this._observable.notifyObservers('onExited', this._config.roomId, _type.FcrUIExitReason.LEAVE_ROOM);
       this._release();
     }
   }, {
@@ -170,16 +175,16 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       this._eventProvider = new _eventProvider.FcrUIEventProviderImpl();
       this._messageProvider = new _messageProvider.FcrUIMessageProviderImpl();
       this._dialogProvider = new _dialogProvider.FcrUIDialogProviderImpl();
+      var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
       this._sharedDevicePrivilegeDataSource = new _devicePrivilegeData.FcrUISharedDevicePrivilegeDataSourceImpl();
-      this._deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(this._eventProvider, engine.getDesktopMediaControl(), this._settingConfig.media, this._localStorageProvider);
+      this._deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(this._eventProvider, engine.getDesktopMediaControl(), this._settingConfig.media, this._userSettingStorageProvider);
       this._roomProvider = new _roomProvider.FcrUIRoomProviderImpl(this._eventProvider, this._config, engine, this._messageProvider);
       this._sharedConfigDataSource = new _config2.FcrUISharedConfigDataSourceImpl({
         creatorConfig: this._creatorConfig,
         sceneConfig: this._config,
-        settingConfig: this._settingConfig,
-        localStorageProvider: this._localStorageProvider
+        settingConfig: this._settingConfig
       });
-      this._sharedSettingDataSource = new _setting.FcrUISharedSettingDataSourceImpl(this._creatorConfig, this._localStorageProvider);
+      this._sharedSettingDataSource = new _setting.FcrUISharedSettingDataSourceImpl(this._creatorConfig, this._userSettingStorageProvider);
       this._sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(this._sharedConfigDataSource);
       this._sharedSpeakerSpotlightDataSource = new _speakerSpotlight.FcrUISharedSpeakerSpotlightDataSourceImpl();
       this._sharedVideoWindowDataSource = new _videoWindow.FcrUIVideoWindowDataSourceImpl(this._sharedSettingDataSource);
@@ -189,6 +194,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
         roomProvider: this._roomProvider,
         dialogProvider: this._dialogProvider
       });
+      this._sharedScreenShareDataSource = new _screenShareData.FcrUIScreenShareSharedDataSourceImpl(connectionProvider, this._deviceProvider);
       var openDefaultCamera = (0, _parameters.isOpenDefaultCamera)(this._creatorConfig.parameters);
       var openDefaultMicrophone = (0, _parameters.isOpenDefaultMicrophone)(this._creatorConfig.parameters);
       if (openDefaultCamera) {
@@ -211,14 +217,31 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       var sharedVideoWindowDataSource = this._sharedVideoWindowDataSource;
       var sharedDevicePrivilegeDataSource = this._sharedDevicePrivilegeDataSource;
       var widgetProvider = this._widgetProvider;
+      var sharedScreenShareDataSource = this._sharedScreenShareDataSource;
       var uiManager = this._uiManager;
       var dom = this._dom;
-      this._addObservers(roomProvider, eventProvider, deviceProvider, engine, uiManager, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider);
+      this._addObservers(roomProvider, eventProvider, deviceProvider, engine, uiManager, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareDataSource);
 
       // start render UI
 
       // const skipPretest = isSkipPretest(config.parameters);
       var skipPretest = true;
+      var renderSceneUI = function renderSceneUI(response) {
+        _this2._renderSceneUI(response, uiManager, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, messageProvider, dialogProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareDataSource);
+      };
+      var joinRoomCallback = function joinRoomCallback() {
+        _this2._initSettingStore({
+          engine: engine,
+          roomProvider: roomProvider,
+          eventProvider: eventProvider,
+          deviceProvider: deviceProvider,
+          sharedConfigDataSource: sharedConfigDataSource,
+          sharedLayoutDataSource: sharedLayoutDataSource,
+          messageProvider: messageProvider,
+          sharedSettingDataSource: sharedSettingDataSource,
+          dialogProvider: dialogProvider
+        });
+      };
       if (!skipPretest) {
         var joining = false;
         uiManager.renderDevicePretestUi(deviceProvider,
@@ -226,7 +249,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
         function () {
           if (joining) return;
           joining = true;
-          _this2._joinRoom(engine, roomProvider, deviceProvider)["finally"](function () {
+          _this2._joinRoom(engine, roomProvider, deviceProvider, joinRoomCallback)["finally"](function () {
             joining = false;
           });
         },
@@ -235,7 +258,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
           _this2._observable.notifyObservers('onLaunchCancel', _this2._config.roomId);
         });
       } else {
-        this._joinRoom(engine, roomProvider, deviceProvider);
+        this._joinRoom(engine, roomProvider, deviceProvider, joinRoomCallback);
       }
     }
   }, {
@@ -258,7 +281,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
     }
   }, {
     key: "_addObservers",
-    value: function _addObservers(roomProvider, eventProvider, deviceProvider, engine, uiManager, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider) {
+    value: function _addObservers(roomProvider, eventProvider, deviceProvider, engine, uiManager, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareSharedDataSource) {
       var _this3 = this;
       var observable = this._observable;
       var sceneConfig = this._config;
@@ -297,7 +320,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
         onJoinWaitingRoom: function onJoinWaitingRoom(roomControl, isWaitingRoomManaager) {
           if (_this3._dom && !isWaitingRoomManaager) {
             var _this3$_messageProvid;
-            _this3._disposers.push(uiManager.renderWaitingSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, dialogProvider, messageProvider, sharedLayoutDataSource, sharedSettingDataSource, sharedDevicePrivilegeDataSource, widgetProvider));
+            _this3._disposers.push(uiManager.renderWaitingSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, dialogProvider, messageProvider, sharedLayoutDataSource, sharedSettingDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareSharedDataSource));
             (_this3$_messageProvid = _this3._messageProvider) === null || _this3$_messageProvid === void 0 || _this3$_messageProvid.showToast({
               message: (0, _i18n.transI18n)('fmt_waitingroom_attendie_overview_label_move_in_by_host'),
               type: 'error'
@@ -305,26 +328,30 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
           }
         },
         onRoomClosed: function onRoomClosed() {
-          _dialog.FcrDialogApi.open({
-            id: 'login-confirm-dialog-kick-out',
-            dialogProps: {
-              content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_comfirmDialog.LoginConfirmDialog, {
-                title: (0, _i18n.transI18n)('fmt_toolbar_tips_leave_confirm_dialog_end_title'),
-                desc: (0, _i18n.transI18n)('fmt_leave_tips_classover'),
-                id: "login-confirm-dialog-kick-out",
-                imgSrc: _leaveMeeting["default"],
-                showImg: true,
-                btnTxt: (0, _i18n.transI18n)('fmt_waitingroom_attendie_popup_button_gotit'),
-                onConfirm: function onConfirm() {
-                  observable.notifyObservers('onExited', sceneConfig.roomId, _type.FcrUIExitReason.CLOSE_ROOM);
-                }
-              }),
-              width: 320,
-              closable: false,
-              rootClassName: 'login-confirm-dialog',
-              maskClosable: false
-            }
-          });
+          if (roomProvider.isSelfEndMeeting) {
+            observable.notifyObservers('onExited', sceneConfig.roomId, _type.FcrUIExitReason.CLOSE_ROOM);
+          } else {
+            _dialog.FcrDialogApi.open({
+              id: 'login-confirm-dialog-kick-out',
+              dialogProps: {
+                content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_comfirmDialog.LoginConfirmDialog, {
+                  title: (0, _i18n.transI18n)('fmt_toolbar_tips_leave_confirm_dialog_end_title'),
+                  desc: (0, _i18n.transI18n)('fmt_leave_tips_classover'),
+                  id: "login-confirm-dialog-kick-out",
+                  imgSrc: _leaveMeeting["default"],
+                  showImg: true,
+                  btnTxt: (0, _i18n.transI18n)('fmt_waitingroom_attendie_popup_button_gotit'),
+                  onConfirm: function onConfirm() {
+                    observable.notifyObservers('onExited', sceneConfig.roomId, _type.FcrUIExitReason.CLOSE_ROOM);
+                  }
+                }),
+                width: 320,
+                closable: false,
+                rootClassName: 'login-confirm-dialog',
+                maskClosable: false
+              }
+            });
+          }
         },
         onExitRoom: function onExitRoom() {
           observable.notifyObservers('onExited', sceneConfig.roomId, _type.FcrUIExitReason.LEAVE_ROOM);
@@ -335,7 +362,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
           _this3._sharedPinDataSource = new _pinData.FcrUISharedPinDataSourceImpl(eventProvider, _this3._sharedVideoWindowDataSource);
           var sharedPinDataSource = _this3._sharedPinDataSource;
           var sharedVideoWindowDataSource = _this3._sharedVideoWindowDataSource;
-          _this3._renderSceneUI(roomControl, uiManager, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, messageProvider, dialogProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider);
+          _this3._renderSceneUI(roomControl, uiManager, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, messageProvider, dialogProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareSharedDataSource);
         }
       });
       engine.addObserver({
@@ -354,6 +381,9 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                 observable.notifyObservers('onExited', sceneConfig.roomId, _type.FcrUIExitReason.ABORTED);
               }
             });
+            if ((0, _env.isElectron)() && !window.runtime.browserWindow.isVisible()) {
+              window.runtime.browserWindow.show();
+            }
           }
           if (state === _fcrCore.FcrConnectionState.CONNECTED) {
             uiManager.renderLoading(false);
@@ -372,7 +402,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
   }, {
     key: "_joinRoom",
     value: function () {
-      var _joinRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(engine, roomControl, deviceProvider) {
+      var _joinRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(engine, roomControl, deviceProvider, joinRoomCallback) {
         var _this4 = this;
         var p;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
@@ -387,17 +417,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                   return _regenerator["default"].wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
-                        _this4._initSettingStore({
-                          engine: _this4._engine,
-                          roomProvider: _this4._roomProvider,
-                          eventProvider: _this4._eventProvider,
-                          deviceProvider: _this4._deviceProvider,
-                          sharedConfigDataSource: _this4._sharedConfigDataSource,
-                          sharedLayoutDataSource: _this4._sharedLayoutDataSource,
-                          messageProvider: _this4._messageProvider,
-                          sharedSettingDataSource: _this4._sharedSettingDataSource,
-                          dialogProvider: _this4._dialogProvider
-                        });
+                        joinRoomCallback();
                         return _context.abrupt("return", response);
                       case 2:
                       case "end":
@@ -405,7 +425,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                     }
                   }, _callee);
                 }));
-                return function (_x4) {
+                return function (_x5) {
                   return _ref.apply(this, arguments);
                 };
               }());
@@ -421,7 +441,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
           }
         }, _callee2);
       }));
-      function _joinRoom(_x, _x2, _x3) {
+      function _joinRoom(_x, _x2, _x3, _x4) {
         return _joinRoom2.apply(this, arguments);
       }
       return _joinRoom;
@@ -429,7 +449,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
   }, {
     key: "_renderSceneUI",
     value: function () {
-      var _renderSceneUI2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(roomControl, uiManager, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, messageProvider, dialogProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider) {
+      var _renderSceneUI2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(roomControl, uiManager, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, messageProvider, dialogProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareDataSource) {
         var _roomControl$getRoomI;
         var type;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
@@ -442,10 +462,10 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                   this._disposers.push(uiManager.renderPullingUi(roomControl));
                 } else {
                   this._setLocalMeetingTimeKey();
-                  this._disposers.push(uiManager.renderMainSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider));
+                  this._disposers.push(uiManager.renderMainSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareDataSource));
                 }
               } else {
-                this._disposers.push(uiManager.renderWaitingSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, dialogProvider, messageProvider, sharedLayoutDataSource, sharedSettingDataSource, sharedDevicePrivilegeDataSource, widgetProvider));
+                this._disposers.push(uiManager.renderWaitingSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, dialogProvider, messageProvider, sharedLayoutDataSource, sharedSettingDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareDataSource));
               }
             case 2:
             case "end":
@@ -453,7 +473,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
           }
         }, _callee3, this);
       }));
-      function _renderSceneUI(_x5, _x6, _x7, _x8, _x9, _x10, _x11, _x12, _x13, _x14, _x15, _x16, _x17, _x18, _x19) {
+      function _renderSceneUI(_x6, _x7, _x8, _x9, _x10, _x11, _x12, _x13, _x14, _x15, _x16, _x17, _x18, _x19, _x20, _x21) {
         return _renderSceneUI2.apply(this, arguments);
       }
       return _renderSceneUI;
@@ -516,8 +536,8 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
         sharedSettingDataSource: sharedSettingDataSource,
         dialogProvider: dialogProvider,
         settingConfig: sharedConfigDataSource.settingConfig,
-        localStorageProvider: this._localStorageProvider,
-        userId: this._creatorConfig.userId
+        userId: this._creatorConfig.userId,
+        userSettingStorageProvider: this._userSettingStorageProvider
       });
       (_this$_dialogProvider = this._dialogProvider) === null || _this$_dialogProvider === void 0 || _this$_dialogProvider.addObserver({
         onOpenSettingDialog: function onOpenSettingDialog() {

package/lib/utilities/constant.d.ts

@@ -13,7 +13,12 @@ export declare enum FcrUIRendererEventAction {
     POWER_MONITOR_UNLOCK_SCREEN = "POWER_MONITOR_UNLOCK_SCREEN",
     CALL_CLOSE_MAIN_WINDOW = "CALL_CLOSE_MAIN_WINDOW",
     ENTER_FULL_SCREEN = "ENTER_FULL_SCREEN",
-    LEAVE_FULL_SCREEN = "LEAVE_FULL_SCREEN"
+    LEAVE_FULL_SCREEN = "LEAVE_FULL_SCREEN",
+    SET_CURRENT_SHARE_SCREEN_BOUNDS = "SET_CURRENT_SHARE_SCREEN_BOUNDS",
+    SET_ANNOTATION_TO_SHOW = "SET_ANNOTATION_TO_SHOW",
+    SET_ANNOTATION_IGNORE = "SET_ANNOTATION_IGNORE",
+    SET_ANNOTATION_UNDO = "SET_ANNOTATION_UNDO",
+    SET_ANNOTATION_REDO = "SET_ANNOTATION_REDO"
 }
 export declare enum FcrUIParticipantType {
     MUTE_AUDIO = "MUTE_AUDIO",
@@ -120,7 +125,8 @@ export declare enum FcrUIAction {
     SET_SHARE_WITH_AUDIO = 62,
     CLOSE_VIDEO_WINDOW = 63,
     OPEN_CONFIRM = 64,
-    OPEN_TOP_VIDEO_WINDOW = 65
+    OPEN_TOP_VIDEO_WINDOW = 65,
+    RESET_WHITEBOARD_TOOLBAR_VARS = 66
 }
 export declare enum FcrUIDialogKey {
     DEVICE_SETTINGS = "device-settings",
@@ -144,6 +150,8 @@ export declare enum FcrUIDialogKey {
     WAITING_ROOM_OPERATION = "operation-waiting-room",
     WIDGET = "widget",
     RENAME = "rename",
+    ANNOTATION_TOOL = "annotation-tool",
+    ANNOTATION = "annotation",
     LEAVE_MEETING = "leave-meeting"
 }
 export declare enum FcrUIHighlightElement {

package/lib/utilities/constant.js

@@ -15,6 +15,11 @@ var FcrUIRendererEventAction = exports.FcrUIRendererEventAction = /*#__PURE__*/f
   FcrUIRendererEventAction["CALL_CLOSE_MAIN_WINDOW"] = "CALL_CLOSE_MAIN_WINDOW";
   FcrUIRendererEventAction["ENTER_FULL_SCREEN"] = "ENTER_FULL_SCREEN";
   FcrUIRendererEventAction["LEAVE_FULL_SCREEN"] = "LEAVE_FULL_SCREEN";
+  FcrUIRendererEventAction["SET_CURRENT_SHARE_SCREEN_BOUNDS"] = "SET_CURRENT_SHARE_SCREEN_BOUNDS";
+  FcrUIRendererEventAction["SET_ANNOTATION_TO_SHOW"] = "SET_ANNOTATION_TO_SHOW";
+  FcrUIRendererEventAction["SET_ANNOTATION_IGNORE"] = "SET_ANNOTATION_IGNORE";
+  FcrUIRendererEventAction["SET_ANNOTATION_UNDO"] = "SET_ANNOTATION_UNDO";
+  FcrUIRendererEventAction["SET_ANNOTATION_REDO"] = "SET_ANNOTATION_REDO";
   return FcrUIRendererEventAction;
 }({});
 var FcrUIParticipantType = exports.FcrUIParticipantType = /*#__PURE__*/function (FcrUIParticipantType) {
@@ -126,6 +131,7 @@ var FcrUIAction = exports.FcrUIAction = /*#__PURE__*/function (FcrUIAction) {
   FcrUIAction[FcrUIAction["CLOSE_VIDEO_WINDOW"] = 63] = "CLOSE_VIDEO_WINDOW";
   FcrUIAction[FcrUIAction["OPEN_CONFIRM"] = 64] = "OPEN_CONFIRM";
   FcrUIAction[FcrUIAction["OPEN_TOP_VIDEO_WINDOW"] = 65] = "OPEN_TOP_VIDEO_WINDOW";
+  FcrUIAction[FcrUIAction["RESET_WHITEBOARD_TOOLBAR_VARS"] = 66] = "RESET_WHITEBOARD_TOOLBAR_VARS";
   return FcrUIAction;
 }({});
 var FcrUIDialogKey = exports.FcrUIDialogKey = /*#__PURE__*/function (FcrUIDialogKey) {
@@ -150,6 +156,8 @@ var FcrUIDialogKey = exports.FcrUIDialogKey = /*#__PURE__*/function (FcrUIDialog
   FcrUIDialogKey["WAITING_ROOM_OPERATION"] = "operation-waiting-room";
   FcrUIDialogKey["WIDGET"] = "widget";
   FcrUIDialogKey["RENAME"] = "rename";
+  FcrUIDialogKey["ANNOTATION_TOOL"] = "annotation-tool";
+  FcrUIDialogKey["ANNOTATION"] = "annotation";
   FcrUIDialogKey["LEAVE_MEETING"] = "leave-meeting";
   return FcrUIDialogKey;
 }({});

package/lib/utilities/logger.d.ts

@@ -4,4 +4,8 @@ export declare const createLogger: (opts: {
     prefix: string;
     database?: boolean;
 }) => import("agora-foundation/lib/logger").Logger;
+export declare const createFragmentLogger: (opts: {
+    prefix: string;
+    database?: boolean;
+}) => import("agora-foundation/lib/logger").Logger;
 export declare const generateLogObserver: <T>(logger: ReturnType<typeof _getLogger>, callbackMethods: (keyof T)[]) => T;

package/lib/utilities/logger.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLogger = exports.generateLogObserver = exports.createLogger = void 0;
+exports.getLogger = exports.generateLogObserver = exports.createLogger = exports.createFragmentLogger = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.object.to-string.js");
@@ -27,6 +27,13 @@ var createLogger = exports.createLogger = function createLogger(opts) {
     database: opts.database
   });
 };
+var createFragmentLogger = exports.createFragmentLogger = function createFragmentLogger(opts) {
+  return (0, _logger.createLogger)({
+    label: 'fragments',
+    prefix: "".concat(opts.prefix, "@").concat((0, _misc.randomString)(5)),
+    database: opts.database
+  });
+};
 var generateLogObserver = exports.generateLogObserver = function generateLogObserver(logger, callbackMethods) {
   var observer = {};
   callbackMethods.forEach(function (method) {

package/lib/utilities/renderer-event.d.ts

@@ -1,3 +1,5 @@
+import { title as AnnotationTitle } from '../fragments/annotation/index';
+import { title as AnnotationToolTitle } from '../modules/dialog/components/annotation-tool';
 type RendererEventListener = (event: RendererCustomEvent) => void;
 export declare const addEventListener: (listener: RendererEventListener) => void;
 export declare const removeEventListener: (listener: RendererEventListener) => void;
@@ -6,4 +8,5 @@ export declare const openLinkInDefaultBrowser: (url: string) => void;
 export declare const getBrowserWindowById: (id: number) => Electron.CrossProcessExports.BrowserWindow | undefined;
 export declare const getControlBarMediaSourceId: () => string | undefined;
 export declare const getVideoWindowMediaSourceId: () => string | undefined;
+export declare const getAnnotationMediaSourceId: (title: typeof AnnotationTitle | typeof AnnotationToolTitle) => string | undefined;
 export {};

package/lib/utilities/renderer-event.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sendEvent = exports.removeEventListener = exports.openLinkInDefaultBrowser = exports.getVideoWindowMediaSourceId = exports.getControlBarMediaSourceId = exports.getBrowserWindowById = exports.addEventListener = void 0;
+exports.sendEvent = exports.removeEventListener = exports.openLinkInDefaultBrowser = exports.getVideoWindowMediaSourceId = exports.getControlBarMediaSourceId = exports.getBrowserWindowById = exports.getAnnotationMediaSourceId = exports.addEventListener = void 0;
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
@@ -101,4 +101,17 @@ var getVideoWindowMediaSourceId = exports.getVideoWindowMediaSourceId = function
   } else {
     console.error('failed to call getVideoWindowMediaSourceId, window.runtime is not available');
   }
+};
+var getAnnotationMediaSourceId = exports.getAnnotationMediaSourceId = function getAnnotationMediaSourceId(title) {
+  if (window.runtime) {
+    var mediaSourceList = window.runtime.getMediaSourceIdList();
+    var info = mediaSourceList.find(function (item) {
+      return item.title === title;
+    });
+    if (info) {
+      return info.mediaSourceId;
+    }
+  } else {
+    console.error('failed to call getMediaSourceId, window.runtime is not available');
+  }
 };

package/lib/utilities/screen.js

@@ -34,7 +34,8 @@ var enterFullScreen = exports.enterFullScreen = function enterFullScreen() {
 var exitFullScreen = exports.exitFullScreen = function exitFullScreen() {
   if (!isFullScreen()) return;
   if ((0, _env.isElectron)()) {
-    window.runtime.browserWindow.setFullScreen(false);
+    var _window$runtime$brows;
+    (_window$runtime$brows = window.runtime.browserWindow) === null || _window$runtime$brows === void 0 || _window$runtime$brows.setFullScreen(false);
   } else {
     if (document.exitFullscreen) {
       document.exitFullscreen();

package/lib/utilities/setting-config-storage.d.ts

@@ -1,16 +1,15 @@
 import { FcrUIMediaConfig, FcrUISettingConfig } from '../type';
-import { FcrUILocalStorageProvider } from '../providers/local-storage-provider';
+import { FcrUIUserSettingStorageProvider } from '../providers/user-setting-storage-provider';
 export declare const settingConfigStorageKey = "fcr-ui-setting-config";
 export declare class FcrSettingConfigStorage implements FcrUISettingConfig {
-    private _isElectron;
     private _settingConfig;
-    private _localStorageProvider;
-    constructor({ localStorageProvider }: {
-        localStorageProvider: FcrUILocalStorageProvider;
+    private _userSettingStorageProvider;
+    constructor({ userSettingStorageProvider, }: {
+        userSettingStorageProvider: FcrUIUserSettingStorageProvider;
     });
     get media(): FcrUIMediaConfig;
     set media(media: FcrUIMediaConfig);
-    private _initMediaConfig;
+    get setting(): import("../modules/setting/store").FcrUICustomSetting;
     private _initSettingConfig;
     private _setSettingConfig;
     private _createMediaProxy;

package/lib/utilities/setting-config-storage.js

@@ -20,32 +20,49 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.settingConfigStorageKey = exports.FcrSettingConfigStorage = 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 _env = require("agora-foundation/lib/utilities/env");
-var _store = require("../modules/setting/store");
+var _fcrCore = require("fcr-core");
+var _tools = require("./tools");
 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 settingConfigStorageKey = exports.settingConfigStorageKey = 'fcr-ui-setting-config';
 var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/function () {
   function FcrSettingConfigStorage(_ref) {
-    var localStorageProvider = _ref.localStorageProvider;
+    var userSettingStorageProvider = _ref.userSettingStorageProvider;
     (0, _classCallCheck2["default"])(this, FcrSettingConfigStorage);
-    (0, _defineProperty2["default"])(this, "_isElectron", false);
     (0, _defineProperty2["default"])(this, "_settingConfig", {
       media: {
         autoConnectAudio: true,
         microphoneExpectedOff: true,
         cameraExpectedOff: true
+      },
+      setting: {
+        shouldDisplayPreviewDialog: true,
+        shouldHideNonVideoParticipants: false,
+        displayedMaxAttendees: 16,
+        autoAdjustmentSpeakerVolume: true,
+        autoAdjustmentMicrophoneVolume: (0, _env.isElectron)(),
+        noiseReduce: _fcrCore.FcrAiDenoiseLevel.LOW,
+        recordingPath: '',
+        videoHD: false,
+        videoLowLight: false,
+        hardwareForReception: false,
+        videoNoise: false,
+        audioHiFi: false,
+        audioEchoCancellation: true,
+        audioStereo: false,
+        audioVoiceChanger: true,
+        spotlightEnabled: true,
+        isPlaySound: true,
+        language: (0, _tools.getBrowserLanguage)(),
+        shouldHideMyVideo: false
       }
     });
-    this._isElectron = (0, _env.isElectron)();
-    this._localStorageProvider = localStorageProvider;
+    this._userSettingStorageProvider = userSettingStorageProvider;
     this._initSettingConfig();
   }
   return (0, _createClass2["default"])(FcrSettingConfigStorage, [{
@@ -58,49 +75,26 @@ var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/fun
       this._setSettingConfig(this._settingConfig);
     }
   }, {
-    key: "_initMediaConfig",
-    value: function _initMediaConfig() {
-      var localSetting = this._localStorageProvider.read(_store.SETTING_KEY);
-      if (localSetting) {
-        var _localSetting$cameraE, _localSetting$microph, _localSetting$autoCon;
-        this._settingConfig.media = {
-          cameraExpectedOff: (_localSetting$cameraE = localSetting.cameraExpectedOff) !== null && _localSetting$cameraE !== void 0 ? _localSetting$cameraE : this._settingConfig.media.cameraExpectedOff,
-          microphoneExpectedOff: (_localSetting$microph = localSetting.microphoneExpectedOff) !== null && _localSetting$microph !== void 0 ? _localSetting$microph : this._settingConfig.media.microphoneExpectedOff,
-          autoConnectAudio: (_localSetting$autoCon = localSetting.autoConnectAudio) !== null && _localSetting$autoCon !== void 0 ? _localSetting$autoCon : this._settingConfig.media.autoConnectAudio
-        };
-      }
+    key: "setting",
+    get: function get() {
+      return this._settingConfig.setting;
     }
   }, {
     key: "_initSettingConfig",
     value: function _initSettingConfig() {
-      if (this._isElectron) {
-        var settingConfig = window.runtime.getUserSettingData();
-        if (Object.keys(settingConfig).length === 0) {
-          window.runtime.setUserSettingData(this._settingConfig);
-        } else {
-          this._settingConfig = settingConfig;
-        }
+      var settingConfig = this._userSettingStorageProvider.read();
+      if (!settingConfig || Object.keys(settingConfig).length === 0) {
+        this._userSettingStorageProvider.write(this._settingConfig);
       } else {
-        var _settingConfig = this._localStorageProvider.read(settingConfigStorageKey);
-        if (!_settingConfig) return;
-        try {
-          this._settingConfig = JSON.parse(_settingConfig);
-        } catch (e) {
-          this._localStorageProvider.write(settingConfigStorageKey, JSON.stringify(this._settingConfig));
-        }
+        this._settingConfig = settingConfig;
       }
-      this._initMediaConfig();
       this._settingConfig.media = this._createMediaProxy(this._settingConfig.media);
     }
   }, {
     key: "_setSettingConfig",
     value: function _setSettingConfig(settingConfig) {
       this._settingConfig = settingConfig;
-      if (this._isElectron) {
-        window.runtime.setUserSettingData(settingConfig);
-      } else {
-        this._localStorageProvider.write(settingConfigStorageKey, JSON.stringify(settingConfig));
-      }
+      this._userSettingStorageProvider.write(settingConfig);
     }
   }, {
     key: "_createMediaProxy",

package/lib/utilities/tools.d.ts

@@ -48,7 +48,7 @@ export declare function handleCheckMouseOver(params: {
     /**
      * 当前打开的 dialog key，如果是 control bar，会计算内部控制栏的边界信息，用于精确定位其位置
      */
-    dialog?: FcrUIDialogKey.CONTROL_BAR | FcrUIDialogKey.CONFIRM;
+    dialog?: FcrUIDialogKey;
 }): NodeJS.Timeout | undefined;
 export type CurrentShareScreenWorkArea = {
     x: number;
@@ -88,6 +88,24 @@ export declare function followCorrectDisplay({ browserWindow, dialogKey, extraRe
 }): {
     nearDisplayBounds: CurrentShareBounds;
     nearDisplay: Electron.Display;
+    followControlbar: boolean;
 } | undefined;
+export declare function calcAnnotationAreaSize(
+/**
+ * @param boardView {HTMLElement} 白板容器的 dom
+ */
+boardView: HTMLElement, 
+/**
+ * @param width {number} 分享容器的宽度
+ */
+width: number, 
+/**
+ * @param height {number} 分享容器的高度
+ */
+height: number, 
+/**
+ * @param isProvider {boolean} 是否是发起端，发起端和接收端获取宽高的方式不同，所以要做出区分
+ */
+isProvider?: boolean): void;
 export declare const getBrowserLanguage: () => "zh" | "en";
 export {};