fcr-ui-scene 3.7.8 → 3.8.0-alpha

package/lib/electron/sdk-helper.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.onWidgetClicked = exports.onUserTokenWillExpire = exports.onExitUiScene = exports.getBundleType = void 0;
+exports.setUIMediaConfig = exports.onWidgetClicked = exports.onUserTokenWillExpire = exports.onExitUiScene = exports.onDependencyVersionsResponse = exports.getUIMediaConfig = exports.getBundleType = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.date.to-string.js");
@@ -128,6 +128,31 @@ var onWidgetClicked = exports.onWidgetClicked = function onWidgetClicked(widgetI
 var onExitUiScene = exports.onExitUiScene = function onExitUiScene() {
   _renderer.ipcRenderer.send('exit-ui-scene');
 };
+var getUIMediaConfig = exports.getUIMediaConfig = /*#__PURE__*/function () {
+  var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    return _regenerator["default"].wrap(function (_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _context4.next = 1;
+          return _renderer.ipcRenderer.invoke('getUIMediaConfig');
+        case 1:
+          return _context4.abrupt("return", _context4.sent);
+        case 2:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return function getUIMediaConfig() {
+    return _ref4.apply(this, arguments);
+  };
+}();
+var setUIMediaConfig = exports.setUIMediaConfig = function setUIMediaConfig(mediaConfig) {
+  _renderer.ipcRenderer.send('setUIMediaConfig', mediaConfig);
+};
+var onDependencyVersionsResponse = exports.onDependencyVersionsResponse = function onDependencyVersionsResponse(dependencyVersions) {
+  _renderer.ipcRenderer.send('current-dependency-versions', dependencyVersions);
+};
 var cppSdkHelper = {
   getLaunchOptions: getLaunchOptions,
   getBundleType: getBundleType,
@@ -145,6 +170,9 @@ var cppSdkHelper = {
   onUserTokenWillExpire: onUserTokenWillExpire,
   onWidgetClicked: onWidgetClicked,
   onExitUiScene: onExitUiScene,
+  getUIMediaConfig: getUIMediaConfig,
+  setUIMediaConfig: setUIMediaConfig,
+  onDependencyVersionsResponse: onDependencyVersionsResponse,
   // 需要在 index.html 中设置的回调
   // onCreatorInit
   onCreatorInit: function onCreatorInit() {},
@@ -159,7 +187,10 @@ var cppSdkHelper = {
   // onLaunchMeeting
   onLaunchMeeting: function onLaunchMeeting() {},
   // exitUiScene
-  exitUiScene: function exitUiScene() {}
+  exitUiScene: function exitUiScene() {},
+  getDependencyVersions: function getDependencyVersions() {
+    return {};
+  }
 };
 
 // @ts-ignore
@@ -201,7 +232,8 @@ _renderer.ipcRenderer.on(_type.IPCMessageCMD.SetParameters, function (_event, va
 _renderer.ipcRenderer.on(_type.IPCMessageCMD.LaunchMeeting, function (_event, value) {
   console.log('LaunchMeeting in sdk-helper', value);
   if (cppSdkHelper.onLaunchMeeting) {
-    var data = value;
+    var data = value.data,
+      lastInitParams = value.lastInitParams;
     try {
       if (typeof value == 'string') {
         data = JSON.parse(value);
@@ -209,7 +241,10 @@ _renderer.ipcRenderer.on(_type.IPCMessageCMD.LaunchMeeting, function (_event, va
     } catch (e) {
       console.error("windows_release Failed to parse launch options:, ".concat(JSON.stringify(e), ", typeof value: ").concat((0, _typeof2["default"])(value), ", value: ").concat(value));
     }
-    cppSdkHelper.onLaunchMeeting(data);
+    cppSdkHelper.onLaunchMeeting({
+      data: data,
+      lastInitParams: lastInitParams
+    });
   }
 });
 _renderer.ipcRenderer.on(_type.IPCMessageCMD.RenewUserToken, function (_event, value) {
@@ -217,6 +252,12 @@ _renderer.ipcRenderer.on(_type.IPCMessageCMD.RenewUserToken, function (_event, v
     cppSdkHelper.onRenewUserToken(value);
   }
 });
+_renderer.ipcRenderer.on(_type.IPCMessageCMD.GetDependencyVersions, function (_event, value) {
+  console.log('GetDependencyVersions in sdk-helper', !!cppSdkHelper.getDependencyVersions);
+  if (cppSdkHelper.getDependencyVersions) {
+    cppSdkHelper.getDependencyVersions();
+  }
+});
 _renderer.ipcRenderer.on(_type.IPCMessageCMD.ExitUiScene, function (_event, value) {
   if (cppSdkHelper.exitUiScene) {
     cppSdkHelper.exitUiScene();

package/lib/electron/until.js

@@ -54,7 +54,10 @@ var DetailErrorCode = /*#__PURE__*/function (DetailErrorCode) {
 var generaErrorCode = exports.generaErrorCode = function generaErrorCode(serviceCode, uiSceneCode, detailCode) {
   return serviceCode * 1000000 + uiSceneCode * 1000 + detailCode;
 };
+
+// 800010082
 var windowHideErrorCode = exports.windowHideErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHidden);
+// // 800010083
 var closeWindowBeforeLaunchSuccessErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.closeWindowBeforeLaunchSuccess);
 var meetingLaunchProcessingErrorCode = exports.meetingLaunchProcessingErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.meetingLaunchProcessing);
 

package/lib/fragments/annotation/libs.d.ts

@@ -1,5 +1,5 @@
 import { FcrWhiteboardToolType } from 'fcr-core/lib/imports';
-import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardToolType } from 'fcr-core';
 export declare function convertTool(type: FcrBoardToolType): FcrWhiteboardToolType;
 export declare const engineRestConfig: {
     dualCameraVideoStreamConfig: {

package/lib/fragments/annotation/libs.js

@@ -6,34 +6,34 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.convertTool = convertTool;
 exports.engineRestConfig = void 0;
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 function convertTool(type) {
   switch (type) {
-    case _enums.FcrBoardToolType.ARROW:
+    case _fcrCore.FcrBoardToolType.ARROW:
       return 'arrow';
-    case _enums.FcrBoardToolType.CURVE:
+    case _fcrCore.FcrBoardToolType.CURVE:
       return 'curve';
-    case _enums.FcrBoardToolType.ELLIPSE:
+    case _fcrCore.FcrBoardToolType.ELLIPSE:
       return 'ellipse';
-    case _enums.FcrBoardToolType.ERASER:
+    case _fcrCore.FcrBoardToolType.ERASER:
       return 'eraser';
-    case _enums.FcrBoardToolType.LASER_POINTER:
+    case _fcrCore.FcrBoardToolType.LASER_POINTER:
       return 'laser';
-    case _enums.FcrBoardToolType.TEXT:
+    case _fcrCore.FcrBoardToolType.TEXT:
       return 'text';
-    case _enums.FcrBoardToolType.RECTANGLE:
+    case _fcrCore.FcrBoardToolType.RECTANGLE:
       return 'rectangle';
-    case _enums.FcrBoardToolType.TRIANGLE:
+    case _fcrCore.FcrBoardToolType.TRIANGLE:
       return 'triangle';
-    case _enums.FcrBoardToolType.SELECTOR:
+    case _fcrCore.FcrBoardToolType.SELECTOR:
       return 'selector';
-    case _enums.FcrBoardToolType.STRAIGHT:
+    case _fcrCore.FcrBoardToolType.STRAIGHT:
       return 'line';
     // case FcrBoardToolType.PENTAGRAM:
     //   return 'pentagram';
     // case FcrBoardToolType.RHOMBUS:
     //   return 'rhombus';
-    case _enums.FcrBoardToolType.HAND:
+    case _fcrCore.FcrBoardToolType.HAND:
       return 'grab';
     default:
       return 'curve';

package/lib/fragments/annotation/store.d.ts

@@ -1,6 +1,6 @@
 import { RendererCustomEvent } from '../../runtime';
 export declare class FragmentAnnotationStore {
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("fcr-core/lib/imports").Logger;
     private _engine;
     private _FORGE_WHITEBOARD_APP_ID;
     private _boardInstance;

package/lib/fragments/annotation/toolbar/components/graphic-tool/graphic-panel/libs.d.ts

@@ -1,5 +1,5 @@
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
-import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core';
 export declare const tools: {
     iconType: FcrIconType;
     shape: FcrBoardShape;

package/lib/fragments/annotation/toolbar/components/graphic-tool/graphic-panel/libs.js

@@ -7,27 +7,27 @@ Object.defineProperty(exports, "__esModule", {
 exports.convertShapeToBoardToolType = convertShapeToBoardToolType;
 exports.tools = exports.lineWidths = void 0;
 var _type = require("agora-ui-foundation/lib/components/icon/type");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _fcrCore = require("fcr-core");
 var tools = exports.tools = [{
   iconType: _type.FcrIconType.FCR_WHITEBOARD_SHAP_SQUARE,
-  shape: _enums.FcrBoardShape.Rectangle,
+  shape: _fcrCore.FcrBoardShape.Rectangle,
   tip: (0, _i18n.transI18n)('fmt_whiteboard_tips_rectangle')
 }, {
   iconType: _type.FcrIconType.FCR_WHITEBOARD_SHAP_CIRCLE,
-  shape: _enums.FcrBoardShape.Ellipse,
+  shape: _fcrCore.FcrBoardShape.Ellipse,
   tip: (0, _i18n.transI18n)('fmt_whiteboard_tips_circle')
 }, {
   iconType: _type.FcrIconType.FCR_WHITEBOARD_SHAP_TRIANGLE,
-  shape: _enums.FcrBoardShape.Triangle,
+  shape: _fcrCore.FcrBoardShape.Triangle,
   tip: (0, _i18n.transI18n)('fmt_whiteboard_tips_triangle')
 }, {
   iconType: _type.FcrIconType.FCR_WHITEBOARD_SHAP_LINE,
-  shape: _enums.FcrBoardShape.Straight,
+  shape: _fcrCore.FcrBoardShape.Straight,
   tip: (0, _i18n.transI18n)('fmt_whiteboard_tips_straight')
 }, {
   iconType: _type.FcrIconType.FCR_WHITEBOARD_SHAP_ARROW,
-  shape: _enums.FcrBoardShape.Arrow,
+  shape: _fcrCore.FcrBoardShape.Arrow,
   tip: (0, _i18n.transI18n)('fmt_whiteboard_tips_arrow')
 }];
 var lineWidths = exports.lineWidths = [{
@@ -45,21 +45,21 @@ var lineWidths = exports.lineWidths = [{
 }];
 function convertShapeToBoardToolType(shape) {
   switch (shape) {
-    case _enums.FcrBoardShape.Arrow:
-      return _enums.FcrBoardToolType.ARROW;
-    case _enums.FcrBoardShape.Curve:
-      return _enums.FcrBoardToolType.CURVE;
-    case _enums.FcrBoardShape.Ellipse:
-      return _enums.FcrBoardToolType.ELLIPSE;
-    case _enums.FcrBoardShape.Pentagram:
-      return _enums.FcrBoardToolType.PENTAGRAM;
-    case _enums.FcrBoardShape.Rectangle:
-      return _enums.FcrBoardToolType.RECTANGLE;
-    case _enums.FcrBoardShape.Straight:
-      return _enums.FcrBoardToolType.STRAIGHT;
-    case _enums.FcrBoardShape.Triangle:
-      return _enums.FcrBoardToolType.TRIANGLE;
+    case _fcrCore.FcrBoardShape.Arrow:
+      return _fcrCore.FcrBoardToolType.ARROW;
+    case _fcrCore.FcrBoardShape.Curve:
+      return _fcrCore.FcrBoardToolType.CURVE;
+    case _fcrCore.FcrBoardShape.Ellipse:
+      return _fcrCore.FcrBoardToolType.ELLIPSE;
+    case _fcrCore.FcrBoardShape.Pentagram:
+      return _fcrCore.FcrBoardToolType.PENTAGRAM;
+    case _fcrCore.FcrBoardShape.Rectangle:
+      return _fcrCore.FcrBoardToolType.RECTANGLE;
+    case _fcrCore.FcrBoardShape.Straight:
+      return _fcrCore.FcrBoardToolType.STRAIGHT;
+    case _fcrCore.FcrBoardShape.Triangle:
+      return _fcrCore.FcrBoardToolType.TRIANGLE;
     default:
-      return _enums.FcrBoardToolType.NONE;
+      return _fcrCore.FcrBoardToolType.NONE;
   }
 }

package/lib/fragments/annotation/toolbar/components/pen-tool/index.js

@@ -14,7 +14,7 @@ var _penPanel = require("./pen-panel");
 var _mobxReact = require("mobx-react");
 var _store = require("../../store");
 var _react = require("react");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _hostAreaContainer = require("../../../../../modules/dialog/components/host-area-container");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -35,7 +35,7 @@ var AnnotationPenTool = exports.AnnotationPenTool = (0, _mobxReact.observer)(fun
   var handleClick = function handleClick() {
     setVisible(!visible);
     setPopoverVisible(!visible);
-    setTool(_enums.FcrBoardToolType.CURVE);
+    setTool(_fcrCore.FcrBoardToolType.CURVE);
   };
   var handleVisibleChange = function handleVisibleChange(visible) {
     setVisible(visible);
@@ -45,7 +45,7 @@ var AnnotationPenTool = exports.AnnotationPenTool = (0, _mobxReact.observer)(fun
     !popoverVisible && setVisible(false);
   }, [popoverVisible]);
   var t = (0, _i18n.useI18n)();
-  var penMap = (0, _defineProperty2["default"])({}, _enums.FcrBoardToolType.CURVE, _type.FcrIconType.FCR_WHITEBOARD_PED5);
+  var penMap = (0, _defineProperty2["default"])({}, _fcrCore.FcrBoardToolType.CURVE, _type.FcrIconType.FCR_WHITEBOARD_PED5);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
     placement: placement,
     active: currentTool in penMap,

package/lib/fragments/annotation/toolbar/store.d.ts

@@ -1,5 +1,5 @@
-import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 import { FcrUIObjectManager } from '../../../object-manager';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core';
 type AnnotationToolbarStoreArgs = {
     objectManager: FcrUIObjectManager;
 };

package/lib/fragments/annotation/toolbar/store.js

@@ -56,10 +56,10 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _mobx = require("mobx");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("../../../utilities/logger");
 var _objectManager = require("../../../object-manager");
+var _fcrCore = require("fcr-core");
 var _AnnotationToolbarStore;
 var _initProto, _init_observables, _init_isTipsVisible, _init_popoverVisible, _init_toolbarCoords, _setToolDecs, _setPenDecs, _setShapeDecs, _setStrokeColorDecs, _setStrokeWidthDecs, _setToolbarCoordsDecs, _updatePositionDecs, _onTooltipMountDecs, _onTooltipUnmountDecs, _setPopoverVisibleDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -89,14 +89,14 @@ var AnnotationToolbarStore = exports.AnnotationToolbarStore = /*#__PURE__*/funct
     (0, _defineProperty2["default"])(this, "_tipsTimer", null);
     (0, _defineProperty2["default"])(this, "_disposer", []);
     _classPrivateFieldInitSpec(this, _A, _init_observables(this, {
-      currentTool: _enums.FcrBoardToolType.CURVE,
-      currentShape: _enums.FcrBoardShape.Ellipse,
+      currentTool: _fcrCore.FcrBoardToolType.CURVE,
+      currentShape: _fcrCore.FcrBoardShape.Ellipse,
       currentColor: colors[7],
       currentStrokeWidth: 2,
       redoSteps: false,
       undoSteps: false,
-      lastPen: _enums.FcrBoardToolType.CURVE,
-      lastShape: _enums.FcrBoardShape.Ellipse,
+      lastPen: _fcrCore.FcrBoardToolType.CURVE,
+      lastShape: _fcrCore.FcrBoardShape.Ellipse,
       colors: colors
     }));
     _classPrivateFieldInitSpec(this, _B, _init_isTipsVisible(this, true));
@@ -159,7 +159,7 @@ var AnnotationToolbarStore = exports.AnnotationToolbarStore = /*#__PURE__*/funct
   }, {
     key: "allowAnnotationWriteState",
     get: function get() {
-      return this._privilegeProvider.allowAnnotationWriteState();
+      return this._privilegeProvider.isAnnotationWriteAllowed();
     }
   }, {
     key: "mousePosition",
@@ -192,8 +192,8 @@ var AnnotationToolbarStore = exports.AnnotationToolbarStore = /*#__PURE__*/funct
     value: function setPen(shape) {
       // renderer.sendEvent({ action: ToolbarEvents.SET_PEN, payload: shape });
       this.observables.currentShape = shape;
-      this.observables.lastPen = _enums.FcrBoardToolType.CURVE;
-      this.observables.currentTool = _enums.FcrBoardToolType.CURVE;
+      this.observables.lastPen = _fcrCore.FcrBoardToolType.CURVE;
+      this.observables.currentTool = _fcrCore.FcrBoardToolType.CURVE;
     }
   }, {
     key: "setShape",
@@ -201,7 +201,7 @@ var AnnotationToolbarStore = exports.AnnotationToolbarStore = /*#__PURE__*/funct
       // renderer.sendEvent({ action: ToolbarEvents.SET_SHAPE, payload: shape });
       this.observables.currentShape = shape;
       this.observables.lastShape = shape;
-      this.observables.currentTool = _enums.FcrBoardToolType.CURVE;
+      this.observables.currentTool = _fcrCore.FcrBoardToolType.CURVE;
     }
   }, {
     key: "setStrokeColor",
@@ -277,7 +277,7 @@ var AnnotationToolbarStore = exports.AnnotationToolbarStore = /*#__PURE__*/funct
   }, {
     key: "setAllowAnnotationWrite",
     value: function setAllowAnnotationWrite(allow) {
-      this._privilegeProvider.setAllowAnnotation(allow);
+      this._privilegeProvider.allowWriteAnnotation(allow);
     }
   }, {
     key: "release",

package/lib/fragments/annotation/toolbar/view.js

@@ -15,7 +15,7 @@ var _colorTool = require("./components/color-tool");
 var _penTool = require("./components/pen-tool");
 var _graphicTool = require("./components/graphic-tool");
 var _store = require("./store");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 var _tips = require("./components/tips");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 require("./style.css");
@@ -89,24 +89,24 @@ var AnnotationToolbar = exports.AnnotationToolbar = (0, _mobxReact.observer)(fun
     children: [isTipsVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tips.AnnotationToolbarTips, {}), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "annotation-toolbar-inner",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
-        active: currentTool === _enums.FcrBoardToolType.LASER_POINTER,
+        active: currentTool === _fcrCore.FcrBoardToolType.LASER_POINTER,
         onClick: function onClick() {
-          return setTool(_enums.FcrBoardToolType.LASER_POINTER);
+          return setTool(_fcrCore.FcrBoardToolType.LASER_POINTER);
         },
         iconType: _type.FcrIconType.FCR_WHITEBOARD_LASERPEN1,
         color: "#FF0005",
         title: t('fmt_screenshare_whiteboard_button_laserpen')
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
-        active: currentTool === _enums.FcrBoardToolType.SELECTOR,
+        active: currentTool === _fcrCore.FcrBoardToolType.SELECTOR,
         onClick: function onClick() {
-          return setTool(_enums.FcrBoardToolType.SELECTOR);
+          return setTool(_fcrCore.FcrBoardToolType.SELECTOR);
         },
         iconType: _type.FcrIconType.FCR_WHITECHOOSE,
         title: t('fmt_screenshare_whiteboard_button_boxselection')
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_penTool.AnnotationPenTool, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_graphicTool.AnnotationGraphicTool, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
-        active: currentTool === _enums.FcrBoardToolType.ERASER,
+        active: currentTool === _fcrCore.FcrBoardToolType.ERASER,
         onClick: function onClick() {
-          return setTool(_enums.FcrBoardToolType.ERASER);
+          return setTool(_fcrCore.FcrBoardToolType.ERASER);
         },
         iconType: _type.FcrIconType.FCR_WHITEBOARD_ERASER2,
         title: t('fmt_screenshare_whiteboard_button_eraser')

package/lib/fragments/whiteboard/store.d.ts

@@ -1,6 +1,6 @@
-import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardShape, FcrBoardToolType } from 'fcr-core';
 export declare class FragmentWhiteboardStore {
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("fcr-core/lib/imports").Logger;
     private _engine;
     private _whiteboardControl?;
     private _annotationControl?;

package/lib/fragments/whiteboard/store.js

@@ -75,7 +75,6 @@ var _logger = require("../../utilities/logger");
 var _libs = require("../annotation/libs");
 var _decorator = require("agora-foundation/lib/decorator");
 var _imports = require("fcr-core/lib/imports");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _type = require("../../modules/secondary-window/type");
 var _libs2 = require("../annotation/toolbar/components/graphic-tool/graphic-panel/libs");
 var _mobx = require("mobx");
@@ -133,11 +132,12 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
       onPermissionUpdated: function onPermissionUpdated(hasWriteBoardPermission) {
         _this.logger.info("[whiteboard-fragment]: onPermissionUpdated ".concat(hasWriteBoardPermission));
         if (_this._sharingType === 'whiteboard') {
-          var _this$_whiteboardCont, _this$_whiteboardCont2;
-          hasWriteBoardPermission ? (_this$_whiteboardCont = _this._whiteboardControl) === null || _this$_whiteboardCont === void 0 ? void 0 : _this$_whiteboardCont.addPermission(_imports.FcrWhiteboardPermissionFlag.all) : (_this$_whiteboardCont2 = _this._whiteboardControl) === null || _this$_whiteboardCont2 === void 0 ? void 0 : _this$_whiteboardCont2.removePermission(_imports.FcrWhiteboardPermissionFlag.all);
+          // 子窗口的白板需要独立更新权限, FcrMainRoomControlImpl 内只处理了主窗口权限更新
+          if (_this._whiteboardControl) {
+            _this._whiteboardControl.setOperationPrivilege(hasWriteBoardPermission);
+          }
         } else {
-          var _this$_annotationCont, _this$_annotationCont2;
-          hasWriteBoardPermission ? (_this$_annotationCont = _this._annotationControl) === null || _this$_annotationCont === void 0 ? void 0 : _this$_annotationCont.addPermission(_imports.FcrWhiteboardPermissionFlag.all) : (_this$_annotationCont2 = _this._annotationControl) === null || _this$_annotationCont2 === void 0 ? void 0 : _this$_annotationCont2.removePermission(_imports.FcrWhiteboardPermissionFlag.all);
+          // TODO
         }
       },
       onWhiteboardInActive: function onWhiteboardInActive() {
@@ -202,7 +202,7 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
       }()
     });
     (0, _defineProperty2["default"])(this, "_engineObserver", {});
-    _classPrivateFieldInitSpec(this, _A, _init_currentTool(this, _enums.FcrBoardToolType.NONE));
+    _classPrivateFieldInitSpec(this, _A, _init_currentTool(this, _fcrCore.FcrBoardToolType.NONE));
     var urlParams = new URLSearchParams(window.location.search);
     var type = urlParams.get('type');
     window.require = parent.window.require;
@@ -318,10 +318,10 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
       // @ts-ignore
       window.parent.FcrUIMainWindowRenderer.notifyObservers('onConnectionStateUpdated', state);
       if (state === _fcrCore.FcrConnectionState.CONNECTED) {
-        var _this$_annotationCont3, _this$_boardInstance0;
+        var _this$_annotationCont, _this$_boardInstance0;
         this.logger.info(// @ts-ignore
         "[whiteboard-fragment]: connection state updated: ".concat(_fcrCore.FcrConnectionState[state], ", background color: ").concat(window.parent.FcrUIMainWindowRenderer.backgroundColor));
-        this._boardInstance = this._sharingType === 'whiteboard' ? this._boardControl.getMainWindow() : (_this$_annotationCont3 = this._annotationControl) === null || _this$_annotationCont3 === void 0 ? void 0 : _this$_annotationCont3.getMainWindow();
+        this._boardInstance = this._sharingType === 'whiteboard' ? this._boardControl.getMainWindow() : (_this$_annotationCont = this._annotationControl) === null || _this$_annotationCont === void 0 ? void 0 : _this$_annotationCont.getMainWindow();
         var backgroundColor = this._sharingType === 'whiteboard' ?
         // @ts-ignore
         window.parent.FcrUIMainWindowRenderer.backgroundColor : 'transparent';
@@ -379,7 +379,7 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
     key: "_initWhiteboardControl",
     value: function () {
       var _initWhiteboardControl2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-        var nickName, boardOptions, _JSON$parse2, boardAppId, boardId, boardRegion, boardToken, userId, config;
+        var nickName, boardOptions, _JSON$parse2, boardAppId, boardId, boardRegion, boardToken, userId, config, hasPrivilege;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -397,9 +397,12 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
                 }
               };
               this.logger.info("[whiteboard-fragment]: start create whiteboard sub process with config: ".concat(JSON.stringify(config)));
-              this._whiteboardControl = new _imports.FcrWhiteboardControlFactoryImpl(
+              hasPrivilege = this.mainWindowRenderer.hasWriteBoardPermission;
+              this._whiteboardControl = new _imports.FcrWhiteboardControlFactoryImpl().createForSubProcess(
+              // @ts-ignore
+              this._engine._rteEngine._rtmClient._client, hasPrivilege,
               // @ts-ignore
-              this._engine._rteEngine._rtmClient._client).createForSubProcess(config);
+              config);
               this.logger.info("[whiteboard-fragment]: whiteboard sub process created, the control is ".concat(this._whiteboardControl));
               this.mainWindowRenderer.addObserver(this._mainWindowObserver);
               this._whiteboardControl.addObserver(this._boardObserver);
@@ -422,7 +425,7 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
     key: "_initAnnotationControl",
     value: function () {
       var _initAnnotationControl2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var nickName, annotationOptions, _JSON$parse3, boardAppId, boardId, region, boardToken, userId, config;
+        var nickName, annotationOptions, _JSON$parse3, boardAppId, boardId, region, boardToken, userId, config, hasPrivilege;
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -431,22 +434,25 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
               _JSON$parse3 = JSON.parse(annotationOptions || '{}'), boardAppId = _JSON$parse3.boardAppId, boardId = _JSON$parse3.boardId, region = _JSON$parse3.boardRegion, boardToken = _JSON$parse3.boardToken, userId = _JSON$parse3.boardUserUuid;
               config = {
                 userId: userId,
-                nickName: nickName,
-                extra: {
-                  boardAppId: boardAppId,
-                  boardId: boardId,
-                  region: region,
-                  boardToken: boardToken
-                },
+                userName: nickName,
+                boardRatio: 1,
+                roomId: boardId,
+                // extra: {
+                //   boardAppId,
+                //   boardId,
+                //   region,
+                //   boardToken,
+                // },
                 size: {
                   width: 1920,
                   height: 1220
                 }
               };
               this.logger.info("[whiteboard-fragment]: start create annotation sub process with config: ".concat(JSON.stringify(config)));
-              this._annotationControl = new _imports.FcrAnnotationControlFactoryImpl(
+              hasPrivilege = false;
+              this._annotationControl = new _imports.FcrAnnotationControlFactoryImpl().createForSubProcess(
               // @ts-ignore
-              this._engine._rteEngine._rtmClient._client).createForSubProcess(config);
+              this._engine._rteEngine._rtmClient._client, hasPrivilege, config);
               this.logger.info("[whiteboard-fragment]: annotation sub process created, the control is ".concat(this._annotationControl));
               this._annotationControl.addObserver(this._boardObserver);
               _context4.next = 1;

package/lib/fragments/whiteboard/view.js

@@ -8,14 +8,14 @@ exports["default"] = void 0;
 var _react = require("react");
 var _store = require("./store");
 var _mobxReact = require("mobx-react");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 require("./style.css");
 require("./cursor.css");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var View = (0, _mobxReact.observer)(function () {
   var store = (0, _react.useContext)(_store.FragmentWhiteboardStoreContext);
   var cursor = (0, _react.useMemo)(function () {
-    return _enums.FcrBoardToolType[store === null || store === void 0 ? void 0 : store.currentTool].toLowerCase();
+    return _fcrCore.FcrBoardToolType[store === null || store === void 0 ? void 0 : store.currentTool].toLowerCase();
   }, [store === null || store === void 0 ? void 0 : store.currentTool]);
   (0, _react.useEffect)(function () {
     return function () {

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import './global.css';
 import './utilities/debug';
-export { FcrUISceneCreator } from './creator';
+export { FcrUISceneCreator } from './creator/index';
 export { FcrUIExitReason, FcrUserRole, FcrRegion, FcrStreamLatencyLevel } from './type';
 import './plugins/browser-runtime-plugin';
 import './plugins/css-preset-plugin';

package/lib/index.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "FcrUIExitReason", {
 Object.defineProperty(exports, "FcrUISceneCreator", {
   enumerable: true,
   get: function get() {
-    return _creator.FcrUISceneCreator;
+    return _index.FcrUISceneCreator;
   }
 });
 Object.defineProperty(exports, "FcrUserRole", {
@@ -39,7 +39,7 @@ require("./global.css");
 require("./utilities/debug");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _duration = _interopRequireDefault(require("dayjs/plugin/duration"));
-var _creator = require("./creator");
+var _index = require("./creator/index");
 var _type = require("./type");
 require("./plugins/browser-runtime-plugin");
 require("./plugins/css-preset-plugin");
@@ -47,10 +47,17 @@ require("./plugins/electron-rtc-plugin");
 require("./plugins/multi-lang-plugin");
 require("./plugins/rtm-plugin");
 require("./plugins/web-rtc-plugin");
+var _logger = require("./utilities/logger");
+var _imports = require("fcr-core/lib/imports");
 // import { configure } from 'mobx';
 
 // configure({
 //   enforceActions: 'always',
 // });
 
-_dayjs["default"].extend(_duration["default"]);
+_dayjs["default"].extend(_duration["default"]);
+// @ts-ignore
+window.__AgoraLogger = (0, _logger.getLogger)();
+
+// @ts-ignore
+window.__AgoraMutex = new _imports.Mutex();