fcr-ui-scene 3.3.1 → 3.4.1

package/lib/modules/whiteboard/index.js

@@ -112,15 +112,14 @@ var _dayjs = _interopRequireDefault(require("dayjs"));
 var _multiWindow = require("./components/multi-window");
 var _constant = require("../../utilities/constant");
 var _store = require("./components/toolbar/store");
-var _rendererEvent = require("../../utilities/renderer-event");
 var _base = require("../../base");
 var _store2 = require("./components/control-bar/store");
 var _reactDom = _interopRequireDefault(require("react-dom"));
-var _type2 = require("agora-edu-core/lib/type");
-var _agoraEduCore = require("agora-edu-core");
-var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
+var _type2 = require("fcr-core/lib/type");
+var _fcrCore = require("fcr-core");
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _libs = _interopRequireDefault(require("./components/switch-theme/libs"));
-var _types = require("agora-edu-core/lib/room-control/whiteboard-control/types");
+var _types = require("fcr-core/lib/room-control/whiteboard-control/types");
 var _type3 = require("../layout/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type4 = require("agora-ui-foundation/lib/components/icon/type");
@@ -153,14 +152,13 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
     var uiEventStore = _ref2.uiEventStore,
       userControl = _ref2.userControl,
       roomControl = _ref2.roomControl,
-      whiteboardControl = _ref2.whiteboardControl,
       streamControl = _ref2.streamControl,
       securityStore = _ref2.securityStore;
     (0, _classCallCheck2["default"])(this, FcrWhiteboardUIModule);
     _this = _callSuper(this, FcrWhiteboardUIModule);
     //@ts-ignore
     (0, _defineProperty2["default"])(_this, _ref, (_initProto(_this), []));
-    (0, _defineProperty2["default"])(_this, "_connectionState", _agoraEduCore.FcrConnectionState.DISCONNECTED);
+    (0, _defineProperty2["default"])(_this, "_connectionState", _fcrCore.FcrConnectionState.DISCONNECTED);
     (0, _defineProperty2["default"])(_this, "_defaultBoardState", {
       tool: _enums.FcrBoardToolType.LASER_POINTER,
       strokeColor: '#fed130',
@@ -188,7 +186,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
     _this._userControl = userControl;
     _this._roomControl = roomControl;
     _this._securityStore = securityStore;
-    _this._whiteboardControl = whiteboardControl;
+    _this._whiteboardControl = roomControl.getBoardControl();
     _this._whiteboardControl.addObserver(_this._boardObservble());
     _this._toolbarStore = new _store.ToolbarStore();
     _this._controlbarStore = new _store2.WhiteboardControlBarStore({
@@ -197,7 +195,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       userControl: userControl,
       securityStore: securityStore
     });
-    whiteboardControl.addObserver({
+    _this._whiteboardControl.addObserver({
       onActive: function onActive(ownerId, operatorUser) {
         _this.onPropertiesUpdate({
           operatorUser: operatorUser
@@ -247,10 +245,6 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         if (event.modifiedUser.userId === _this._localUser.userId) {
           _this._localUser = event.modifiedUser;
           _this._isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes(_this._localUser.userRole);
-          (0, _rendererEvent.sendEvent)({
-            action: _constant.RendererEventAction.SET_LOCAL_USER,
-            payload: event.modifiedUser
-          });
         }
       }
     });
@@ -261,12 +255,12 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
     _this._localUser = _this._userControl.getLocalUser();
     _this._isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes(_this._localUser.userRole);
     window.addEventListener('resize', _this._resetCanvasPosition);
-    var activeInfo = whiteboardControl.getBoardActiveInfo();
+    var activeInfo = _this._whiteboardControl.getBoardActiveInfo();
     _this._isActive = activeInfo.isActive;
     if (_this._isActive) {
       _this._checkBoard();
       _this._ownerUser = _this._userControl.getUser(activeInfo.ownerUserId);
-      _this._boardBackground = whiteboardControl.getBackgroundColor();
+      _this._boardBackground = _this._whiteboardControl.getBackgroundColor();
     }
     return _this;
   }
@@ -412,33 +406,6 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
           break;
       }
     }
-  }, {
-    key: "onProcessEvent",
-    value: function onProcessEvent(event) {
-      var action = event.action,
-        payload = event.payload;
-      // if (Object.values(ToolbarEvents).includes(action)) {
-      //   this._caseToolbarEvents(action as ToolbarEvents, payload);
-      // }
-      // if (Object.values(WhiteboardEvents).includes(action)) {
-      //   this._boardObservble()[action as WhiteboardEvents](payload);
-      // }
-      // if (Object.values(WhiteboardUIEvents).includes(action)) {
-      //   this._boardUIEvents(payload)[action as WhiteboardUIEvents](payload);
-      // }
-      if (action === _constant.RendererEventAction.GET_LOCAL_USER) {
-        (0, _rendererEvent.sendEvent)({
-          action: _constant.RendererEventAction.SET_LOCAL_USER,
-          payload: this._localUser
-        });
-      }
-      if (action === _constant.RendererEventAction.GET_OWNER_USER) {
-        (0, _rendererEvent.sendEvent)({
-          action: _constant.RendererEventAction.SET_OWNER_USER,
-          payload: this._ownerUser
-        });
-      }
-    }
   }, {
     key: "onPropertiesUpdate",
     value: function onPropertiesUpdate(params) {
@@ -497,10 +464,6 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
             action: _type.WhiteboardBaseEvents.SET_OWNER_USER_ID,
             payload: activeInfo.ownerUserId
           });
-          (0, _rendererEvent.sendEvent)({
-            action: _constant.RendererEventAction.SET_OWNER_USER,
-            payload: this._userControl.getUser(activeInfo.ownerUserId)
-          });
         }
       }
     }
@@ -521,10 +484,6 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
           action: _type.WhiteboardBaseEvents.SET_OWNER_USER_ID,
           payload: null
         });
-        (0, _rendererEvent.sendEvent)({
-          action: _constant.RendererEventAction.SET_OWNER_USER,
-          payload: null
-        });
         this._ownerUser = undefined;
         this._initialized = false;
         this._close();
@@ -619,16 +578,6 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         }
       };
     }
-  }, {
-    key: "_caseToolbarEvents",
-    value: function _caseToolbarEvents(action, payload) {
-      var observables = this._toolbarStore.observables;
-      this._createToolbarUIContext()[action](payload);
-      (0, _rendererEvent.sendEvent)({
-        action: _constant.RendererEventAction.UPDATE_TOOLBAR,
-        payload: observables
-      });
-    }
   }, {
     key: "_setCanvasBound",
     value: function _setCanvasBound(oprate) {
@@ -950,13 +899,14 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
     value: function () {
       var _getSnapshotImage2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var _this5 = this;
-        var mainWindow, _this$_roomControl$ge, progress, imageData, fileName;
+        var mainWindow, progress, imageData;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              this._boardStore.observables.progress = 0;
               mainWindow = this._boardMainWindow;
               if (!mainWindow) {
-                _context.next = 11;
+                _context.next = 8;
                 break;
               }
               progress = setInterval(function () {
@@ -965,20 +915,25 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
                 } else {
                   clearInterval(progress);
                 }
-              }, 10);
-              _context.next = 5;
+              }, 4);
+              _context.next = 6;
               return mainWindow.getSnapshotImage();
-            case 5:
+            case 6:
               imageData = _context.sent;
-              this._boardStore.observables.progress = 100;
-              clearInterval(progress);
-              fileName = "".concat((_this$_roomControl$ge = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge === void 0 ? void 0 : _this$_roomControl$ge.roomName, "_").concat((0, _dayjs["default"])().format('YYYYMMDD_HHmmSSS'), ".jpg");
-              (0, _utils.downloadImageData)(imageData, fileName);
-              this._uiEventStore.showToast({
-                type: 'info',
-                message: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_savedsuccessfully')
+              (0, _mobx.runInAction)(function () {
+                setTimeout(function () {
+                  var _this5$_roomControl$g;
+                  _this5._boardStore.observables.progress = 100;
+                  clearInterval(progress);
+                  var fileName = "".concat((_this5$_roomControl$g = _this5._roomControl.getRoomInfo()) === null || _this5$_roomControl$g === void 0 ? void 0 : _this5$_roomControl$g.roomName, "_").concat((0, _dayjs["default"])().format('YYYYMMDD_HHmmSSS'), ".jpg");
+                  (0, _utils.downloadImageData)(imageData, fileName);
+                  _this5._uiEventStore.showToast({
+                    type: 'info',
+                    message: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_savedsuccessfully')
+                  });
+                }, 400);
               });
-            case 11:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -1017,7 +972,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
                 case 0:
                   _this6.logger.info('Fcr board connection state changed to', state);
                   _this6._setConnectionState(state);
-                  if (state === _agoraEduCore.FcrConnectionState.DISCONNECTED) {
+                  if (state === _fcrCore.FcrConnectionState.DISCONNECTED) {
                     if (_this6._joined) {
                       (_this6$_whiteboardCon = _this6._whiteboardControl) === null || _this6$_whiteboardCon === void 0 || _this6$_whiteboardCon.open();
                     } else {
@@ -1025,7 +980,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
                       _this6.unload();
                     }
                   }
-                  if (state === _agoraEduCore.FcrConnectionState.CONNECTED) {
+                  if (state === _fcrCore.FcrConnectionState.CONNECTED) {
                     _this6._setJoinSuccessed(true);
                     mainWindow = _this6._whiteboardControl.getMainWindow();
                     _this6.logger.info('Fcr board join success');
@@ -1092,11 +1047,13 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         showCancel: false,
         icon: _type4.FcrIconType.FCR_SCREENSHARING,
         onOk: function onOk() {
-          _this8._uiEventStore.closeDialog(dialogId);
+          _this8._uiEventStore.closeConfirm(dialogId);
         },
         onCancel: function onCancel() {
-          _this8._uiEventStore.closeDialog(dialogId);
-        }
+          _this8._uiEventStore.closeConfirm(dialogId);
+        },
+        width: 400,
+        height: 140
       });
     }
   }, {
@@ -1126,7 +1083,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
   }]);
 }(_base.UIModule);
 _FcrWhiteboardUIModule = FcrWhiteboardUIModule;
-var _applyDecs$e = _applyDecs(_FcrWhiteboardUIModule, [[_mobx.observable, 1, "_lonelyWindowState"], [_mobx.observable, 1, "_ownerUser"], [_mobx.observable, 1, "_isHost"], [_mobx.observable, 1, "_boardBackground"], [_mobx.observable, 1, "_localUser"], [_mobx.computed, 3, "hasPrivilege"], [_decorator.bound, 2, "onProcessEvent"], [_onPropertiesUpdateDecs, 18, "onPropertiesUpdate"], [_mountDecs, 18, "mount"], [_unmountDecs, 18, "unmount"], [_unloadDecs, 18, "unload"], [_boardUIEventsDecs, 18, "_boardUIEvents"], [_decorator.bound, 2, "_setCanvasBound"], [_decorator.bound, 2, "_resetCanvasPosition"], [_createToolbarUIContextDecs, 18, "_createToolbarUIContext"], [_decorator.bound, 2, "_updateDockPosition"], [_decorator.bound, 2, "_updateDockPlacement"], [_repositionToolbarDecs, 18, "_repositionToolbar"], [_decorator.bound, 2, "_updateMaxVisibleTools"], [_decorator.bound, 2, "_setBackgroundColor"], [_updateRedoDecs, 18, "_updateRedo"], [_updateUndoDecs, 18, "_updateUndo"], [_setConnectionStateDecs, 18, "_setConnectionState"], [_decorator.bound, 2, "_close"], [_getSnapshotImageDecs, 18, "_getSnapshotImage"], [_openLonelyWindowDecs, 18, "_openLonelyWindow"], [_setJoinSuccessedDecs, 18, "_setJoinSuccessed"]], [], 0, void 0, _base.UIModule).e;
+var _applyDecs$e = _applyDecs(_FcrWhiteboardUIModule, [[_mobx.observable, 1, "_lonelyWindowState"], [_mobx.observable, 1, "_ownerUser"], [_mobx.observable, 1, "_isHost"], [_mobx.observable, 1, "_boardBackground"], [_mobx.observable, 1, "_localUser"], [_mobx.computed, 3, "hasPrivilege"], [_onPropertiesUpdateDecs, 18, "onPropertiesUpdate"], [_mountDecs, 18, "mount"], [_unmountDecs, 18, "unmount"], [_unloadDecs, 18, "unload"], [_boardUIEventsDecs, 18, "_boardUIEvents"], [_decorator.bound, 2, "_setCanvasBound"], [_decorator.bound, 2, "_resetCanvasPosition"], [_createToolbarUIContextDecs, 18, "_createToolbarUIContext"], [_decorator.bound, 2, "_updateDockPosition"], [_decorator.bound, 2, "_updateDockPlacement"], [_repositionToolbarDecs, 18, "_repositionToolbar"], [_decorator.bound, 2, "_updateMaxVisibleTools"], [_decorator.bound, 2, "_setBackgroundColor"], [_updateRedoDecs, 18, "_updateRedo"], [_updateUndoDecs, 18, "_updateUndo"], [_setConnectionStateDecs, 18, "_setConnectionState"], [_decorator.bound, 2, "_close"], [_getSnapshotImageDecs, 18, "_getSnapshotImage"], [_openLonelyWindowDecs, 18, "_openLonelyWindow"], [_setJoinSuccessedDecs, 18, "_setJoinSuccessed"]], [], 0, void 0, _base.UIModule).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 6);
 _init__lonelyWindowState = _applyDecs$e2[0];
 _init__ownerUser = _applyDecs$e2[1];

package/lib/modules/whiteboard/type.d.ts

@@ -1,4 +1,4 @@
-import { FcrBoardToolType } from 'agora-edu-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 export declare enum FcrBoardShape {
     Curve = 1,
     Straight = 2,

package/lib/plugins/browser-runtime-plugin.js

@@ -1,5 +1,8 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
 if (!window.runtime) {
@@ -16,7 +19,6 @@ if (!window.runtime) {
       return Promise.resolve(undefined);
     },
     showItemInFolder: function showItemInFolder() {},
-    setAlwaysOnTop: function setAlwaysOnTop() {},
     openRendererWindow: function openRendererWindow() {},
     closeRendererWindow: function closeRendererWindow() {},
     getLaunchOptions: function getLaunchOptions() {
@@ -52,7 +54,7 @@ if (!window.runtime) {
       return undefined;
     },
     captureScreen: function captureScreen() {},
-    getVirtualBgResource: function getVirtualBgResource() {
+    getResourceByFileType: function getResourceByFileType() {
       return Promise.resolve([]);
     },
     fileToBase64: function fileToBase64() {
@@ -64,8 +66,27 @@ if (!window.runtime) {
       return [];
     },
     setInMeetingState: function setInMeetingState() {},
+    restartApp: function restartApp() {},
     getBundleType: function getBundleType() {
       return Promise.resolve('JS_BUNDLE');
-    }
+    },
+    checkMediaPermission: function () {
+      var _checkMediaPermission = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(mediaType) {
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", true);
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function checkMediaPermission(_x) {
+        return _checkMediaPermission.apply(this, arguments);
+      }
+      return checkMediaPermission;
+    }(),
+    openSystemPreferences: function openSystemPreferences() {}
   };
 }

package/lib/plugins/electron-rtc-plugin.js

@@ -1,5 +1,5 @@
 "use strict";
 
-var _agoraEduCore = require("agora-edu-core");
-var _electronRtcPlugin = require("agora-edu-core/lib/plugins/electron-rtc-plugin");
-(0, _agoraEduCore.registerPlugin)(new _electronRtcPlugin.ElectronRtcPlugin());
+var _fcrCore = require("fcr-core");
+var _electronRtcPlugin = require("fcr-core/lib/plugins/electron-rtc-plugin");
+(0, _fcrCore.registerPlugin)(new _electronRtcPlugin.ElectronRtcPlugin());

package/lib/plugins/module-dev-plugin.d.ts

@@ -1,4 +1,4 @@
-import { FcrCoreEngine } from 'agora-edu-core';
+import { FcrCoreEngine } from 'fcr-core';
 declare global {
     interface Window {
         __DEV_ENGINE__: FcrCoreEngine;

package/lib/plugins/module-dev-plugin.js

@@ -8,7 +8,7 @@ require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _agoraEduCore = require("agora-edu-core");
+var _fcrCore = require("fcr-core");
 /**
  * 创建房间
  * @param roomName
@@ -113,10 +113,10 @@ window.__DEV_ENGINE_IS_READY__ = createRoom(roomId).then(/*#__PURE__*/function (
           return _context3.abrupt("return", getUserToken(roomId, userId, userId, role).then(function (_ref4) {
             var token = _ref4.token,
               appId = _ref4.appId;
-            window.__DEV_ENGINE__ = new _agoraEduCore.FcrCoreEngine({
+            window.__DEV_ENGINE__ = new _fcrCore.FcrCoreEngine({
               appId: appId,
               token: token,
-              region: _agoraEduCore.FcrRegion.CN,
+              region: _fcrCore.FcrRegion.CN,
               userId: userId,
               dualCameraVideoStreamConfig: {
                 highVideoEncoderConfig: {

package/lib/plugins/rtm-plugin.js

@@ -1,5 +1,5 @@
 "use strict";
 
-var _agoraEduCore = require("agora-edu-core");
-var _rtmPlugin = require("agora-edu-core/lib/plugins/rtm-plugin");
-(0, _agoraEduCore.registerPlugin)(new _rtmPlugin.RtmPlugin());
+var _fcrCore = require("fcr-core");
+var _rtmPlugin = require("fcr-core/lib/plugins/rtm-plugin");
+(0, _fcrCore.registerPlugin)(new _rtmPlugin.RtmPlugin());

package/lib/plugins/web-rtc-plugin.js

@@ -1,5 +1,5 @@
 "use strict";
 
-var _agoraEduCore = require("agora-edu-core");
-var _webRtcPlugin = require("agora-edu-core/lib/plugins/web-rtc-plugin");
-(0, _agoraEduCore.registerPlugin)(new _webRtcPlugin.WebRtcPlugin());
+var _fcrCore = require("fcr-core");
+var _webRtcPlugin = require("fcr-core/lib/plugins/web-rtc-plugin");
+(0, _fcrCore.registerPlugin)(new _webRtcPlugin.WebRtcPlugin());

package/lib/providers/device-privilege-provider.d.ts

@@ -0,0 +1,30 @@
+import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'fcr-core';
+export interface FcrUIDevicePrivilegeObserver {
+    onOpenCameraPrivilegeUpdated(result: boolean): void;
+    onOpenMicrophonePrivilegeUpdated(result: boolean): void;
+    onCameraNeedClosed(): void;
+    onMicrophoneNeedClosed(): void;
+}
+export interface FcrUIDevicePrivilegeProvider {
+    setAlwaysHasCameraPrivilege(): Promise<boolean>;
+    hasOpenCameraPrivilege(): Promise<boolean>;
+    hasOpenMicrophonePrivilege(): Promise<boolean>;
+    addObserver(observer: FcrUIDevicePrivilegeObserver): void;
+    removeObserver(observer: FcrUIDevicePrivilegeObserver): void;
+}
+export declare class FcrUIDevicePrivilegeProviderImpl implements FcrUIDevicePrivilegeProvider {
+    private _privilegeControl;
+    private _streamControl;
+    private _userControl;
+    private _firstGetMicrophonePrivilege;
+    private _observable;
+    private _privilegeObserver;
+    private _streamObserver;
+    constructor(_privilegeControl: FcrPrivilegeControl, _streamControl: FcrStreamControl, _userControl: FcrUserControl);
+    release(): void;
+    setAlwaysHasCameraPrivilege(): Promise<boolean>;
+    hasOpenCameraPrivilege(): Promise<boolean>;
+    hasOpenMicrophonePrivilege(): Promise<boolean>;
+    addObserver(observer: FcrUIDevicePrivilegeObserver): void;
+    removeObserver(observer: FcrUIDevicePrivilegeObserver): void;
+}