fcr-ui-scene 3.6.1 → 3.6.2

package/lib/ui-scene.js

@@ -85,6 +85,7 @@ 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");
@@ -140,6 +141,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,6 +172,7 @@ 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._roomProvider = new _roomProvider.FcrUIRoomProviderImpl(this._eventProvider, this._config, engine, this._messageProvider);
@@ -189,6 +192,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 +215,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 +247,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 +256,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 +279,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 +318,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 +326,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 +360,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({
@@ -372,7 +397,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 +412,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 +420,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                     }
                   }, _callee);
                 }));
-                return function (_x4) {
+                return function (_x5) {
                   return _ref.apply(this, arguments);
                 };
               }());
@@ -421,7 +436,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 +444,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 +457,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 +468,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;

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",
@@ -144,6 +149,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) {
@@ -150,6 +155,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/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;
@@ -89,5 +89,22 @@ export declare function followCorrectDisplay({ browserWindow, dialogKey, extraRe
     nearDisplayBounds: CurrentShareBounds;
     nearDisplay: Electron.Display;
 } | 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 {};

package/lib/utilities/tools.js

@@ -5,7 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.convertToFixedNumber = exports.PARTICIPANT_POSITION = exports.ASIDE_WIDTH = void 0;
+exports.PARTICIPANT_POSITION = exports.ASIDE_WIDTH = void 0;
+exports.calcAnnotationAreaSize = calcAnnotationAreaSize;
+exports.convertToFixedNumber = void 0;
 exports.followCorrectDisplay = followCorrectDisplay;
 exports.getBrowserLanguage = void 0;
 exports.getCurrentSharingWorkArea = getCurrentSharingWorkArea;
@@ -306,7 +308,7 @@ function getCurrentSharingWorkArea(params) {
   var _window$screen = window.screen,
     availWidth = _window$screen.availWidth,
     availHeight = _window$screen.availHeight;
-  var nearDisplay = window.runtime.screen.getDisplayNearestPoint(currentShareBounds);
+  var nearDisplay = (0, _env.isElectron)() ? window.runtime.screen.getDisplayNearestPoint(currentShareBounds) : null;
   var dataStruct = {
     bounds: {
       x: 0,
@@ -383,6 +385,50 @@ function followCorrectDisplay(_ref6) {
     nearDisplay: nearDisplay
   };
 }
+function calcAnnotationAreaSize(
+/**
+ * @param boardView {HTMLElement} 白板容器的 dom
+ */
+boardView,
+/**
+ * @param width {number} 分享容器的宽度
+ */
+width,
+/**
+ * @param height {number} 分享容器的高度
+ */
+height) {
+  var isProvider = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  /**
+   * 如果宽大于高, 则把 boardView 的高度设置为 100vh, 然后获取 boardView 最新的高度
+   * 用新的高度计算宽高比为 16:9 的比例下的宽度是否大于原宽度，如果大于等于原宽度，则把 boardView 的高度设置为当前高度
+   * 以新的高度计算出宽高比为 16:9 的宽度，设置为当前宽度
+   * 否则，把 boardView 的宽度设置为100vw，并重新获取 boardView 的最新宽度，用新的宽度计算宽高比为 16:9 的高度
+   * 并分别设置 boardView 的高度和宽度
+   * 如果宽小于高，则把 boardView 的高度设置为 100vh, 然后获取 boardView 最新的高度
+   * 用新的高度计算宽高比为 16:9 的比例下宽度是否大于宽度，如果大于等于宽度，则把 boardView 的尺寸设置为当前宽度和高度
+   * */
+  if (width > height) {
+    boardView.style.height = isProvider ? "100vh" : "".concat(boardView.getBoundingClientRect().height, "px");
+    var newHeight = boardView.offsetHeight;
+    var ratioWidth = newHeight / 9 * 16;
+    if (ratioWidth >= width) {
+      boardView.style.width = "".concat(ratioWidth, "px");
+      boardView.style.height = "".concat(newHeight, "px");
+    } else {
+      boardView.style.width = isProvider ? "100vw" : "".concat(width, "px");
+      var newWidth = boardView.offsetWidth;
+      boardView.style.width = "".concat(newWidth, "px");
+      boardView.style.height = "".concat(newWidth / 16 * 9, "px");
+    }
+  } else {
+    boardView.style.height = isProvider ? "100vh" : "".concat(boardView.getBoundingClientRect().height, "px");
+    var _newHeight = boardView.offsetHeight;
+    boardView.style.width = "".concat(_newHeight / 9 * 16, "px");
+    boardView.style.height = "".concat(_newHeight, "px");
+  }
+  console.log('annotation compute area size: ', boardView.style.width, '=====', boardView.style.height);
+}
 var getBrowserLanguage = exports.getBrowserLanguage = function getBrowserLanguage() {
   var usrlang = navigator.language;
   if (usrlang.startsWith('zh')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -21,14 +21,14 @@
     "@electron/remote": "2.0.1",
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
-    "agora-electron-sdk": "4.3.2-build.145-rc.3",
-    "agora-foundation": "~3.6.1",
-    "agora-ui-foundation": "~3.6.1",
+    "agora-electron-sdk": "4.3.2-build.145-rc.4",
+    "agora-foundation": "^3.6.2",
+    "agora-ui-foundation": "^3.6.2",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "~3.6.1",
+    "fcr-core": "^3.6.2",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -59,7 +59,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "~3.6.1",
+    "agora-toolchain": "^3.6.2",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",

package/public/assets/fcr_chat_reddot.svg

@@ -1,5 +1,5 @@
 <svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.61335 6C2.14518 6 2.57632 5.55228 2.57632 5C2.57632 4.44772 2.14518 4 1.61335 4C1.08152 4 0.650391 4.44772 0.650391 5C0.650391 5.55228 1.08152 6 1.61335 6Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.98372 6C5.51555 6 5.94669 5.55228 5.94669 5C5.94669 4.44772 5.51555 4 4.98372 4C4.45189 4 4.02076 4.44772 4.02076 5C4.02076 5.55228 4.45189 6 4.98372 6Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.3541 6C8.88593 6 9.31706 5.55228 9.31706 5C9.31706 4.44772 8.88593 4 8.3541 4C7.82227 4 7.39113 4.44772 7.39113 5C7.39113 5.55228 7.82227 6 8.3541 6Z" fill="white"/>
+<path fillRule="evenodd" clipRule="evenodd" d="M1.61335 6C2.14518 6 2.57632 5.55228 2.57632 5C2.57632 4.44772 2.14518 4 1.61335 4C1.08152 4 0.650391 4.44772 0.650391 5C0.650391 5.55228 1.08152 6 1.61335 6Z" fill="white"/>
+<path fillRule="evenodd" clipRule="evenodd" d="M4.98372 6C5.51555 6 5.94669 5.55228 5.94669 5C5.94669 4.44772 5.51555 4 4.98372 4C4.45189 4 4.02076 4.44772 4.02076 5C4.02076 5.55228 4.45189 6 4.98372 6Z" fill="white"/>
+<path fillRule="evenodd" clipRule="evenodd" d="M8.3541 6C8.88593 6 9.31706 5.55228 9.31706 5C9.31706 4.44772 8.88593 4 8.3541 4C7.82227 4 7.39113 4.44772 7.39113 5C7.39113 5.55228 7.82227 6 8.3541 6Z" fill="white"/>
 </svg>

package/public/assets/fcr_grid_big.svg

@@ -1,3 +1,3 @@
 <svg width="68" height="38" viewBox="0 0 68 38" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path id="fcr_grid_big" fill-rule="evenodd" clip-rule="evenodd" d="M2.72 0C1.21779 0 0 1.21523 0 2.71429V9.21213C0 9.84809 0.516635 10.3636 1.15394 10.3636H14.2797C14.917 10.3636 15.4336 9.84809 15.4336 9.21213V1.15152C15.4336 0.515551 14.917 0 14.2797 0H2.72ZM18.7373 0C18.1 0 17.5833 0.51555 17.5833 1.15152V9.21213C17.5833 9.84809 18.1 10.3636 18.7373 10.3636H31.863C32.5003 10.3636 33.0169 9.84809 33.0169 9.21213V1.15152C33.0169 0.515551 32.5003 0 31.863 0H18.7373ZM52.5664 1.15152C52.5664 0.51555 53.083 0 53.7203 0H65.28C66.7822 0 68 1.21523 68 2.71429V9.21213C68 9.84809 67.4834 10.3636 66.8461 10.3636H53.7203C53.083 10.3636 52.5664 9.84809 52.5664 9.21213V1.15152ZM36.2291 0C35.5918 0 35.0752 0.51555 35.0752 1.15152V9.21213C35.0752 9.84809 35.5918 10.3636 36.2291 10.3636H49.3549C49.9922 10.3636 50.5088 9.84809 50.5088 9.21213V1.15152C50.5088 0.515551 49.9922 0 49.3549 0H36.2291ZM17.5833 27.6364C17.5833 27.0004 18.1 26.4848 18.7373 26.4848H31.863C32.5003 26.4848 33.0169 27.0004 33.0169 27.6364V36.8485C33.0169 37.4845 32.5003 38 31.863 38H18.7373C18.1 38 17.5833 37.4845 17.5833 36.8485V27.6364ZM1.15394 26.4848C0.516636 26.4848 0 27.0004 0 27.6364V35.2857C0 36.7848 1.21778 38 2.72 38H14.2797C14.917 38 15.4336 37.4845 15.4336 36.8485V27.6364C15.4336 27.0004 14.917 26.4848 14.2797 26.4848H1.15394ZM52.5664 27.6364C52.5664 27.0004 53.083 26.4848 53.7203 26.4848H66.8461C67.4834 26.4848 68 27.0004 68 27.6364V35.2857C68 36.7848 66.7822 38 65.28 38H53.7203C53.083 38 52.5664 37.4845 52.5664 36.8485V27.6364ZM36.2291 26.4848C35.5918 26.4848 35.0752 27.0004 35.0752 27.6364V36.8485C35.0752 37.4845 35.5918 38 36.2291 38H49.3549C49.9922 38 50.5088 37.4845 50.5088 36.8485V27.6364C50.5088 27.0004 49.9922 26.4848 49.3549 26.4848H36.2291ZM17.5833 13.8184C17.5833 13.1824 18.1 12.6669 18.7373 12.6669H31.863C32.5003 12.6669 33.0169 13.1824 33.0169 13.8184V23.0305C33.0169 23.6665 32.5003 24.1821 31.863 24.1821H18.7373C18.1 24.1821 17.5833 23.6665 17.5833 23.0305V13.8184ZM1.15394 12.6669C0.516636 12.6669 0 13.1824 0 13.8184V23.0305C0 23.6665 0.516635 24.1821 1.15394 24.1821H14.2797C14.917 24.1821 15.4336 23.6665 15.4336 23.0305V13.8184C15.4336 13.1824 14.917 12.6669 14.2797 12.6669H1.15394ZM52.5664 13.8184C52.5664 13.1824 53.083 12.6669 53.7203 12.6669H66.8461C67.4834 12.6669 68 13.1824 68 13.8184V23.0305C68 23.6665 67.4834 24.1821 66.8461 24.1821H53.7203C53.083 24.1821 52.5664 23.6665 52.5664 23.0305V13.8184ZM36.2291 12.6669C35.5918 12.6669 35.0752 13.1824 35.0752 13.8184V23.0305C35.0752 23.6665 35.5918 24.1821 36.2291 24.1821H49.3549C49.9922 24.1821 50.5088 23.6665 50.5088 23.0305V13.8184C50.5088 13.1824 49.9922 12.6669 49.3549 12.6669H36.2291Z" fill="#E5EAF3" fillOpacity="0.9"/>
+<path id="fcr_grid_big" fillRule="evenodd" clipRule="evenodd" d="M2.72 0C1.21779 0 0 1.21523 0 2.71429V9.21213C0 9.84809 0.516635 10.3636 1.15394 10.3636H14.2797C14.917 10.3636 15.4336 9.84809 15.4336 9.21213V1.15152C15.4336 0.515551 14.917 0 14.2797 0H2.72ZM18.7373 0C18.1 0 17.5833 0.51555 17.5833 1.15152V9.21213C17.5833 9.84809 18.1 10.3636 18.7373 10.3636H31.863C32.5003 10.3636 33.0169 9.84809 33.0169 9.21213V1.15152C33.0169 0.515551 32.5003 0 31.863 0H18.7373ZM52.5664 1.15152C52.5664 0.51555 53.083 0 53.7203 0H65.28C66.7822 0 68 1.21523 68 2.71429V9.21213C68 9.84809 67.4834 10.3636 66.8461 10.3636H53.7203C53.083 10.3636 52.5664 9.84809 52.5664 9.21213V1.15152ZM36.2291 0C35.5918 0 35.0752 0.51555 35.0752 1.15152V9.21213C35.0752 9.84809 35.5918 10.3636 36.2291 10.3636H49.3549C49.9922 10.3636 50.5088 9.84809 50.5088 9.21213V1.15152C50.5088 0.515551 49.9922 0 49.3549 0H36.2291ZM17.5833 27.6364C17.5833 27.0004 18.1 26.4848 18.7373 26.4848H31.863C32.5003 26.4848 33.0169 27.0004 33.0169 27.6364V36.8485C33.0169 37.4845 32.5003 38 31.863 38H18.7373C18.1 38 17.5833 37.4845 17.5833 36.8485V27.6364ZM1.15394 26.4848C0.516636 26.4848 0 27.0004 0 27.6364V35.2857C0 36.7848 1.21778 38 2.72 38H14.2797C14.917 38 15.4336 37.4845 15.4336 36.8485V27.6364C15.4336 27.0004 14.917 26.4848 14.2797 26.4848H1.15394ZM52.5664 27.6364C52.5664 27.0004 53.083 26.4848 53.7203 26.4848H66.8461C67.4834 26.4848 68 27.0004 68 27.6364V35.2857C68 36.7848 66.7822 38 65.28 38H53.7203C53.083 38 52.5664 37.4845 52.5664 36.8485V27.6364ZM36.2291 26.4848C35.5918 26.4848 35.0752 27.0004 35.0752 27.6364V36.8485C35.0752 37.4845 35.5918 38 36.2291 38H49.3549C49.9922 38 50.5088 37.4845 50.5088 36.8485V27.6364C50.5088 27.0004 49.9922 26.4848 49.3549 26.4848H36.2291ZM17.5833 13.8184C17.5833 13.1824 18.1 12.6669 18.7373 12.6669H31.863C32.5003 12.6669 33.0169 13.1824 33.0169 13.8184V23.0305C33.0169 23.6665 32.5003 24.1821 31.863 24.1821H18.7373C18.1 24.1821 17.5833 23.6665 17.5833 23.0305V13.8184ZM1.15394 12.6669C0.516636 12.6669 0 13.1824 0 13.8184V23.0305C0 23.6665 0.516635 24.1821 1.15394 24.1821H14.2797C14.917 24.1821 15.4336 23.6665 15.4336 23.0305V13.8184C15.4336 13.1824 14.917 12.6669 14.2797 12.6669H1.15394ZM52.5664 13.8184C52.5664 13.1824 53.083 12.6669 53.7203 12.6669H66.8461C67.4834 12.6669 68 13.1824 68 13.8184V23.0305C68 23.6665 67.4834 24.1821 66.8461 24.1821H53.7203C53.083 24.1821 52.5664 23.6665 52.5664 23.0305V13.8184ZM36.2291 12.6669C35.5918 12.6669 35.0752 13.1824 35.0752 13.8184V23.0305C35.0752 23.6665 35.5918 24.1821 36.2291 24.1821H49.3549C49.9922 24.1821 50.5088 23.6665 50.5088 23.0305V13.8184C50.5088 13.1824 49.9922 12.6669 49.3549 12.6669H36.2291Z" fill="#E5EAF3" fillOpacity="0.9"/>
 </svg>