fcr-ui-scene 3.6.0 → 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,9 +279,8 @@ 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 dom = this._dom;
       var observable = this._observable;
       var sceneConfig = this._config;
       roomProvider.addObserver({
@@ -298,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'
@@ -306,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);
@@ -336,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({
@@ -373,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) {
@@ -388,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":
@@ -406,7 +420,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                     }
                   }, _callee);
                 }));
-                return function (_x4) {
+                return function (_x5) {
                   return _ref.apply(this, arguments);
                 };
               }());
@@ -422,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;
@@ -430,13 +444,12 @@ 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 dom, type;
+        var type;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              dom = this._dom;
               type = (_roomControl$getRoomI = roomControl.getRoomInfo()) === null || _roomControl$getRoomI === void 0 ? void 0 : _roomControl$getRoomI.roomType;
               if (type === _type2.FcrRoomType.Mainroom) {
                 if ((0, _parameters.isRobotPullingMode)(this._creatorConfig.parameters)) {
@@ -444,18 +457,18 @@ 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 3:
+            case 2:
             case "end":
               return _context3.stop();
           }
         }, _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;
@@ -62,9 +62,49 @@ export type CurrentShareScreenWorkArea = {
 export declare function getCurrentSharingWorkArea(params: {
     currentShareBounds: CurrentShareBounds;
 }): CurrentShareScreenWorkArea;
-export declare function followCorrectDisplay(dailogKey: FcrUIDialogKey | FcrUIDialogKey[], extraRefControlbarCondition?: boolean): {
-    bounds: CurrentShareBounds;
+export declare function followCorrectDisplay({ browserWindow, dialogKey, extraRefControlbarCondition, follow, alwaysFollowScreen, }: {
+    /**
+     * browserWindow 是 Electron 的窗口对象，如果传入，则直接设置 bounds，否则会根据 dialogKey 设置 bounds
+     */
+    browserWindow?: Electron.BrowserWindow;
+    /**
+     * 如果不使用 browserWindow ，则需要传入 dialogKey 设置 bounds，如果 browserWindow 和 dialogKey 都未传入，则抛出错误
+     */
+    dialogKey?: FcrUIDialogKey | FcrUIDialogKey[];
+    /**
+     * 始终 follow control bar 的位置，默认是 true
+     */
+    extraRefControlbarCondition?: boolean;
+    /**
+     * 根据屏幕或者应用主窗口居中显示，默认是 screen，如果需要跟随主窗口，则设置为 main-window,
+     * 在屏幕共享时，普通 dialog 窗口会以 controlbar 所在的屏幕为基准水平居中对齐
+     * 在非屏幕共享状态下，则会以主窗口为基准水平居中对齐
+     */
+    follow?: 'screen' | 'main-window';
+    /**
+     * 是否是全屏幕覆盖的透明窗口, 此设置主要针对 toast 和 confirm 弹窗
+     */
+    alwaysFollowScreen?: boolean;
+}): {
+    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;
@@ -14,6 +16,8 @@ exports.getLanguage = void 0;
 exports.handleCheckMouseOver = handleCheckMouseOver;
 exports.waitUntil = exports.uint8ArrayToImageData = exports.storage = exports.setLanguage = exports.renderMeetingName = exports.renderMeetingId = exports.matchVirtualSoundCardPattern = exports.isZipUrl = exports.isPngOrJpg = exports.isMp4 = exports.isMp3OrWav = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.is-array.js");
@@ -304,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,
@@ -338,33 +342,93 @@ function getCurrentSharingWorkArea(params) {
     scaleFactor: scaleFactor
   };
 }
-function followCorrectDisplay(dailogKey) {
-  var extraRefControlbarCondition = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+function followCorrectDisplay(_ref6) {
+  var browserWindow = _ref6.browserWindow,
+    dialogKey = _ref6.dialogKey,
+    _ref6$extraRefControl = _ref6.extraRefControlbarCondition,
+    extraRefControlbarCondition = _ref6$extraRefControl === void 0 ? true : _ref6$extraRefControl,
+    _ref6$follow = _ref6.follow,
+    follow = _ref6$follow === void 0 ? 'screen' : _ref6$follow,
+    _ref6$alwaysFollowScr = _ref6.alwaysFollowScreen,
+    alwaysFollowScreen = _ref6$alwaysFollowScr === void 0 ? false : _ref6$alwaysFollowScr;
   if (!(0, _env.isElectron)()) return;
-  var objectDialog = Array.isArray(dailogKey) ? dailogKey.map(function (dialog) {
+  if (!browserWindow && !dialogKey) throw new Error('browserWindow or dialogKey is required');
+  var objectDialog = dialogKey ? Array.isArray(dialogKey) ? dialogKey.map(function (dialog) {
     return _dialogs.dialogWindows.get(dialog);
-  }) : _dialogs.dialogWindows.get(dailogKey);
+  }) : _dialogs.dialogWindows.get(dialogKey) : browserWindow;
   var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
+  var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
   // 按当前的窗口管理方式，在关闭 controlbar 的时候，controlbar 实际上是隐藏了自己，所以，依然能够通过 controlbar 访问到，所以需要判断是否是 visible 状态
   var followControlbar = controlbar && (extraRefControlbarCondition || controlbar.isVisible());
-  // 屏幕抢占时，需要判断是否是抢占屏幕，决定是取 controlbar 的位置计算热区，还是走原有逻辑，此类条件通过 extraRefControlbarCondition 传入
-  var nearestPoint = followControlbar ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : window.runtime.browserWindow.getBounds();
+  // 屏幕抢占时，需要判断是否是抢占屏幕，决定是取 controlbar 所在屏幕计算热区，还是以主窗口所在屏幕计算热区，此类条件通过 extraRefControlbarCondition 传入
+  var nearestPoint = followControlbar ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : mainAppWindowBounds;
   var nearDisplay = window.runtime.screen.getDisplayNearestPoint(nearestPoint);
-  var nearDisplayBounds = nearDisplay.bounds;
-  var bounds = {
-    x: Math.floor(nearDisplayBounds.x),
-    y: Math.floor(nearDisplayBounds.y),
-    width: Math.floor(nearDisplayBounds.width),
-    height: Math.floor(nearDisplayBounds.height)
+  var nearBounds = nearDisplay.bounds;
+  var nearDisplayBounds = {
+    x: Math.floor(nearBounds.x),
+    y: Math.floor(nearBounds.y),
+    width: Math.floor(nearBounds.width),
+    height: Math.floor(nearBounds.height)
+  };
+  var followBounds = function followBounds(theWindowBounds) {
+    var targetBounds = follow === 'screen' || extraRefControlbarCondition ? nearBounds : mainAppWindowBounds;
+    return alwaysFollowScreen ? nearDisplayBounds : {
+      x: Math.floor(targetBounds.x + (targetBounds.width - theWindowBounds.width) / 2),
+      y: Math.floor(targetBounds.y + (targetBounds.height - theWindowBounds.height) / 2)
+    };
   };
   Array.isArray(objectDialog) ? objectDialog.forEach(function (dialog) {
-    return dialog === null || dialog === void 0 ? void 0 : dialog.setBounds(bounds);
-  }) : objectDialog === null || objectDialog === void 0 ? void 0 : objectDialog.setBounds(bounds);
+    return dialog === null || dialog === void 0 ? void 0 : dialog.setBounds(followBounds(dialog.getBounds()));
+  }) : objectDialog === null || objectDialog === void 0 ? void 0 : objectDialog.setBounds(followBounds(objectDialog.getBounds()));
   return {
-    bounds: bounds,
+    nearDisplayBounds: nearDisplayBounds,
     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/lib/waiting-room-control-manager.js

@@ -46,7 +46,7 @@ var FcrUIWaitingRoomControlManager = exports["default"] = /*#__PURE__*/function
     (0, _defineProperty2["default"])(this, "_waitingRoomControl", null);
     (0, _defineProperty2["default"])(this, "_isJoining", false);
     (0, _defineProperty2["default"])(this, "_mainRoomUserObserver", {
-      onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
+      onUserInfoUpdated: function onUserInfoUpdated(_roomId, event) {
         var isLocalUserInfoUpdated = event.modifiedUser.userId === _this._mainRoomControl.getUserControl().getLocalUser().userId;
 
         // 权限变更的时候

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.6.0",
+  "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.11-rc.1",
-    "agora-foundation": "^3.6.0",
-    "agora-ui-foundation": "^3.6.0",
+    "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.0",
+    "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.0",
+    "agora-toolchain": "^3.6.2",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",
@@ -71,4 +71,4 @@
   "lint-staged": {
     "*.{ts,tsx,html,css}": "prettier --write"
   }
-}
+}