fcr-ui-scene 3.7.3 → 3.7.4-rc.1

package/lib/creator.d.ts

@@ -22,6 +22,8 @@ export declare class FcrUISceneCreator {
     unregisterWidget(widgetId: string): void;
     renewUserToken(token: string): void;
     setParameters(parameters: Record<string, unknown>): void;
+    getVersion(): string;
+    getDependencyVersions(): Record<string, string>;
     openSetting(): void;
     closeSetting(): void;
     private _releaseProviders;

package/lib/creator.js

@@ -90,6 +90,7 @@ var _logger = require("./utilities/logger");
 var _uiResources = require("./utilities/ui-resources");
 var _userSettingStorageProvider = require("./providers/user-setting-storage-provider");
 var _layoutData = require("./shared-data-source/layout-data");
+var _packageInfo = require("./utilities/package-info");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["rtc.microphone.keep.recording"];
 var _FcrUISceneCreator;
@@ -316,6 +317,18 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
       (_this$_engine = this._engine) === null || _this$_engine === void 0 || _this$_engine.setParameters(filteredParameters);
       this._sharedConfigDataSource.setParameters(parameters);
     }
+  }, {
+    key: "getVersion",
+    value: function getVersion() {
+      return (0, _packageInfo.getVersion)();
+    }
+  }, {
+    key: "getDependencyVersions",
+    value: function getDependencyVersions() {
+      return _objectSpread({
+        core: this._engine.getVersion()
+      }, this._engine.getDependencyVersions());
+    }
   }, {
     key: "openSetting",
     value: function openSetting() {
@@ -430,6 +443,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
       var monitorProvider = this._monitorProvider;
       var sharedLayoutDataSource = this._sharedLayoutDataSource;
       (_this$observableSetti3 = this.observableSettingStore.value) === null || _this$observableSetti3 === void 0 || _this$observableSetti3.release();
+      this.logger.debug('create SettingStore');
       this.observableSettingStore.value = new _store["default"]({
         eventProvider: eventProvider,
         deviceProvider: deviceProvider,

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

@@ -12,7 +12,6 @@ export declare const engineRestConfig: {
             bitrate: number;
             orientationMode: undefined;
             degradationPreference: undefined;
-            isMirror: undefined;
         };
         lowVideoEncoderConfig: {
             dimensions: {
@@ -23,9 +22,8 @@ export declare const engineRestConfig: {
             bitrate: number;
             orientationMode: undefined;
             degradationPreference: undefined;
-            isMirror: undefined;
         };
-        enableDualStreamMode: boolean;
+        enableDualStreamMode: false;
     };
     dualScreenVideoStreamConfig: {
         highVideoEncoderConfig: {
@@ -37,7 +35,6 @@ export declare const engineRestConfig: {
             bitrate: number;
             orientationMode: undefined;
             degradationPreference: undefined;
-            isMirror: undefined;
         };
         lowVideoEncoderConfig: {
             dimensions: {
@@ -48,8 +45,12 @@ export declare const engineRestConfig: {
             bitrate: number;
             orientationMode: undefined;
             degradationPreference: undefined;
-            isMirror: undefined;
         };
-        enableDualStreamMode: boolean;
+        enableDualStreamMode: false;
+    };
+    parameters: {
+        rte: {
+            rtcClientIsDisabled: boolean;
+        };
     };
 };

package/lib/fragments/annotation/libs.js

@@ -49,8 +49,7 @@ var engineRestConfig = exports.engineRestConfig = {
       frameRate: 0,
       bitrate: 0,
       orientationMode: undefined,
-      degradationPreference: undefined,
-      isMirror: undefined
+      degradationPreference: undefined
     },
     lowVideoEncoderConfig: {
       dimensions: {
@@ -60,8 +59,7 @@ var engineRestConfig = exports.engineRestConfig = {
       frameRate: 0,
       bitrate: 0,
       orientationMode: undefined,
-      degradationPreference: undefined,
-      isMirror: undefined
+      degradationPreference: undefined
     },
     enableDualStreamMode: false
   },
@@ -74,8 +72,7 @@ var engineRestConfig = exports.engineRestConfig = {
       frameRate: 0,
       bitrate: 0,
       orientationMode: undefined,
-      degradationPreference: undefined,
-      isMirror: undefined
+      degradationPreference: undefined
     },
     lowVideoEncoderConfig: {
       dimensions: {
@@ -85,9 +82,13 @@ var engineRestConfig = exports.engineRestConfig = {
       frameRate: 0,
       bitrate: 0,
       orientationMode: undefined,
-      degradationPreference: undefined,
-      isMirror: undefined
+      degradationPreference: undefined
     },
     enableDualStreamMode: false
+  },
+  parameters: {
+    rte: {
+      rtcClientIsDisabled: true
+    }
   }
 };

package/lib/fragments/whiteboard/store.js

@@ -142,8 +142,8 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
           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);
         }
       },
-      onWhiteboardInActive: function onWhiteboardInActive(inActive) {
-        _this.logger.info("[whiteboard-fragment]: onWhiteboardInActive ".concat(inActive));
+      onWhiteboardInActive: function onWhiteboardInActive() {
+        _this.logger.info("[whiteboard-fragment]: onWhiteboardInActive");
         _this.unload();
       },
       onWhiteboardToolSelected: function onWhiteboardToolSelected(tools) {
@@ -178,13 +178,13 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
         }
       },
       onSaveDraft: function () {
-        var _onSaveDraft = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(saveDraft) {
+        var _onSaveDraft = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var _this$_boardInstance9;
           var image;
           return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                _this.logger.info("[whiteboard-fragment]: onSaveDraft ".concat(saveDraft));
+                _this.logger.info("[whiteboard-fragment]: onSaveDraft");
                 _context.next = 1;
                 return (_this$_boardInstance9 = _this._boardInstance) === null || _this$_boardInstance9 === void 0 ? void 0 : _this$_boardInstance9.getSnapshotImage();
               case 1:
@@ -198,7 +198,7 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
             }
           }, _callee);
         }));
-        function onSaveDraft(_x) {
+        function onSaveDraft() {
           return _onSaveDraft.apply(this, arguments);
         }
         return onSaveDraft;
@@ -271,11 +271,15 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
   }, {
     key: "unload",
     value: function unload() {
-      var _this$_engine;
+      var _this$_engine, _this$_engine2;
       this.logger.info('[whiteboard-fragment][unload]: start unload');
       this._boardControl.removeObserver(this._boardObserver);
       (_this$_engine = this._engine) === null || _this$_engine === void 0 || _this$_engine.removeObserver(this._engineObserver);
+      // @ts-ignore
+      window.parent.FcrUIMainWindowRenderer.removeObserver(this._mainWindowObserver);
       this._unmount();
+      this._boardControl.close();
+      (_this$_engine2 = this._engine) === null || _this$_engine2 === void 0 || _this$_engine2.logout();
       this._engine = null;
     }
   }, {
@@ -332,7 +336,8 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
                 onConnectionStateUpdated: function onConnectionStateUpdated(state) {
                   if (state === _fcrCore.FcrConnectionState.CONNECTED) {
                     _this2._engine = engine;
-                    _this2._sharingType === 'whiteboard' ? _this2._initWhiteboardControl() : _this2._initAnnotationControl();
+                    _this2._sharingType === 'whiteboard' ? _this2._initWhiteboardControl() : null;
+                    // : this._initAnnotationControl();
                     _this2.logger.info("[whiteboard-fragment][initEngine]: engine connection state updated => CONNECTED}");
                   }
                   if (state === _fcrCore.FcrConnectionState.DISCONNECTED) {
@@ -359,7 +364,7 @@ var FragmentWhiteboardStore = exports.FragmentWhiteboardStore = /*#__PURE__*/fun
           }
         }, _callee2, this);
       }));
-      function _init(_x2) {
+      function _init(_x) {
         return _init2.apply(this, arguments);
       }
       return _init;

package/lib/global.css

@@ -42,3 +42,9 @@ body {
   display: flex;
   z-index: 1000;
 }
+
+#setting-container {
+  position: absolute;
+  top: 0;
+  left: 0;
+}

package/lib/modules/action-bar/components/screen-share/submenu.js

@@ -47,7 +47,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     boardOwnerUser = _useContext.boardOwnerUser,
     startScreenShare = _useContext.startScreenShare,
     hasScreenShare = _useContext.hasScreenShare,
-    hasCloseWriteBoardPermission = _useContext.hasCloseWriteBoardPermission,
+    hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission,
     sharingOwnerUser = _useContext.sharingOwnerUser,
     hasStopScreenSharePermission = _useContext.hasStopScreenSharePermission,
     closeShareScreen = _useContext.closeShareScreen,
@@ -56,7 +56,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     setAllowAnnotation = _useContext.setAllowAnnotation;
   var t = (0, _i18n.useI18n)();
   var hasHostPermission = [_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole);
-  var hasBoardControlPermission = boardOwnerUser && localUserId !== boardOwnerUser.userId && hasCloseWriteBoardPermission;
+  var hasBoardControlPermission = boardOwnerUser && localUserId !== boardOwnerUser.userId && hasAllowWriteBoardPermission;
   // 需求变更，联席主持人也可以禁用主持人的白板，注释掉联席主持人不能禁用的逻辑
   // (FcrUserRole.HOST === localUserRole ||
   //   (FcrUserRole.COHOST === localUserRole && FcrUserRole.HOST !== boardOwnerUser?.userRole));

package/lib/modules/action-bar/index.d.ts

@@ -21,6 +21,7 @@ import { FcrUISecuritySharedDataSource } from '../../shared-data-source/security
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 import { FcrUIApplistProvider } from '../../providers/app-list-provider';
 import { FcrUISharedApplistSource } from '../../shared-data-source/app-list-data';
+import { FcrUISharedWhiteboardDataSource } from '../../shared-data-source/whiteboard-data';
 export declare class FcrActionBarUIModule extends UIModule {
     private _store?;
     private _deviceControlStore?;
@@ -49,6 +50,7 @@ export declare class FcrActionBarUIModule extends UIModule {
     sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
     applistProvider?: FcrUIApplistProvider;
     sharedApplistDataSource?: FcrUISharedApplistSource;
+    sharedWhiteboardDataSource?: FcrUISharedWhiteboardDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;

package/lib/modules/action-bar/index.js

@@ -70,7 +70,8 @@ var FcrActionBarUIModule = exports.FcrActionBarUIModule = /*#__PURE__*/function
         sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource,
         abilityProvider: this.abilityProvider,
         applistProvider: this.applistProvider,
-        sharedApplistDataSource: this.sharedApplistDataSource
+        sharedApplistDataSource: this.sharedApplistDataSource,
+        sharedWhiteboardDataSource: this.sharedWhiteboardDataSource
       });
       this._deviceControlStore = new _store2.DeviceControlStore((_this$currentRoomCont3 = this.currentRoomControlProvider) === null || _this$currentRoomCont3 === void 0 ? void 0 : _this$currentRoomCont3.currentRoomControl, this.deviceProvider, this.dialogProvider, this.deviceStreamProvider, this.sharedDevicePrivilegeDataSource);
       this._leaveMeetingStore = new _store3.LeaveMeetingStore(privilegeProvider, this.roomProvider, (_this$currentRoomCont4 = this.currentRoomControlProvider) === null || _this$currentRoomCont4 === void 0 ? void 0 : _this$currentRoomCont4.currentRoomControl, this.sharedMemberDataSource, this.abilityProvider, this.dialogProvider);

package/lib/modules/action-bar/store.d.ts

@@ -29,6 +29,7 @@ import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/scree
 import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
 import { FcrUISharedApplistSource } from '../../shared-data-source/app-list-data';
 import { FcrUIApplistProvider } from '../../providers/app-list-provider';
+import { FcrUISharedWhiteboardDataSource } from '../../shared-data-source/whiteboard-data';
 export declare enum AudioConnectType {
     NONE = 0,
     COMPUTER = 1,
@@ -62,6 +63,7 @@ export default class ActionBarStore {
     private _abilityProvider;
     private _applistProvider;
     private _sharedApplistDataSource;
+    private _sharedWhiteboardDataSource;
     private _userObserver;
     private _roomObserver;
     private _mainRoomObserver;
@@ -78,7 +80,6 @@ export default class ActionBarStore {
     accessor cloudRecordingState: FcrRecordingState;
     accessor connectionSettingVisible: boolean;
     accessor folded: boolean;
-    accessor boardOwnerUser: FcrUserInfo | null;
     accessor showArrow: boolean;
     accessor phoneMicEnabled: boolean;
     accessor chatTabIndex: FcrUIRoomType;
@@ -110,6 +111,7 @@ export default class ActionBarStore {
         abilityProvider: FcrUIAbilityProviderImpl;
         applistProvider: FcrUIApplistProvider;
         sharedApplistDataSource: FcrUISharedApplistSource;
+        sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource;
     });
     private _handleApplistItemClick;
     get checkedStateMap(): FcrSecurityCheckedStateType;
@@ -152,7 +154,6 @@ export default class ActionBarStore {
     get hasWatermarkDisablePermission(): boolean;
     get hasEnableStartSharePermission(): boolean;
     get hasAllowWriteBoardPermission(): boolean;
-    get hasCloseWriteBoardPermission(): boolean;
     get hasScreenShare(): boolean;
     get hasAllowScreenShareAndBoardPermission(): boolean;
     get hasAllowChatPermission(): boolean;
@@ -175,6 +176,9 @@ export default class ActionBarStore {
     set newMessageCount(value: import("./types").ChatRoomStoreMap);
     get latestMessage(): import("../../providers/chat-provider").FcrChatRoomReceiveMessage | undefined;
     get hasSecurityPermissions(): boolean;
+    get isMeSharingScreen(): boolean;
+    get isMeSharingBoard(): boolean;
+    get boardOwnerUser(): FcrUserInfo | undefined;
     pauseCloudRecording(): void;
     resumeCloudRecording(): void;
     stopCloudRecording(): void;