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

package/lib/modules/event-confirm/components/window/index.js

@@ -39,12 +39,14 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_ref) {
   var _rndRef$current;
-  var confirm = _ref.confirm;
+  var id = _ref.id,
+    confirm = _ref.confirm;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     screenBounds = _useContext.screenBounds,
     calculateMethods = _useContext.calculateMethods,
+    removeObserverWindow = _useContext.removeObserverWindow,
     log = _useContext.log,
-    mousePosition = _useContext.mousePosition;
+    setObserverWindow = _useContext.setObserverWindow;
   var _ref2 = (0, _env.isElectron)() ? (0, _react.useContext)(_useElectron.DialogInstanceContext) : {},
     browserWindow = _ref2.browserWindow;
   var rndRef = (0, _react.useRef)(null);
@@ -86,6 +88,10 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
       x: Math.max(0, Math.min(maxX, x)),
       y: Math.max(0, Math.min(maxY, y))
     };
+    setObserverWindow(id, _objectSpread({
+      width: defaultSize.width,
+      height: rndRef.current.getBoundingClientRect().height
+    }, coord));
     setBounds(coord);
   });
   function recalculate(bounds) {
@@ -109,26 +115,44 @@ var ConfirmWindow = exports.ConfirmWindow = (0, _mobxReact.observer)(function (_
   var handleRecalculate = function handleRecalculate() {
     return recalculate();
   };
-  var initMouseEvents = function initMouseEvents(position) {
-    // 旧版本 mac 系统，ignore 会失效，所以作此处理
+  (0, _react.useEffect)(function () {
     if ((0, _env.isElectron)() && (0, _renderer.isMac)()) {
-      var x = position.x,
-        y = position.y;
-      var isInConfirm = x > bounds.x && y > bounds.y && x < bounds.x + defaultSize.width && y < bounds.y + defaultSize.height;
-      if (isInConfirm) {
-        log("[event-confirm][initMouseEvents]: is in confirm ".concat(isInConfirm));
+      if (confirm.className === 'confirm-mouseover') {
         browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(false);
       } else {
         browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
           forward: true
         });
-        log('[event-confirm][initMouseEvents]: out of confirm window');
       }
     }
-  };
-  (0, _react.useEffect)(function () {
-    initMouseEvents(mousePosition);
-  }, [mousePosition]);
+    return function () {
+      removeObserverWindow(id);
+    };
+  }, [confirm.className]);
+
+  // const initMouseEvents = (position: { x: number; y: number }) => {
+  //   // 旧版本 mac 系统，ignore 会失效，所以作此处理
+  //   if (isElectron() && isMac()) {
+  //     const { x, y } = position;
+  //     const isInConfirm =
+  //       x > bounds.x &&
+  //       y > bounds.y &&
+  //       x < bounds.x + defaultSize.width &&
+  //       y < bounds.y + defaultSize.height;
+  //     if (isInConfirm) {
+  //       log(`[event-confirm][initMouseEvents]: is in confirm ${isInConfirm}`);
+  //       browserWindow?.setIgnoreMouseEvents(false);
+  //     } else {
+  //       browserWindow?.setIgnoreMouseEvents(true, { forward: true });
+  //       log('[event-confirm][initMouseEvents]: out of confirm window');
+  //     }
+  //   }
+  // };
+
+  // useEffect(() => {
+  //   initMouseEvents(mousePosition);
+  // }, [mousePosition]);
+
   (0, _react.useEffect)(function () {
     recalculate();
     !calculateMethods.has(confirm) && calculateMethods.set(confirm, recalculate);

package/lib/modules/event-confirm/index.css

@@ -1,4 +1,4 @@
-.confirm-wrapper {
+.fcr-event-confirm-wrapper.fcr-event-confirm-container {
   width: 100vw;
   height: 100vh;
   position: absolute;
@@ -7,7 +7,8 @@
   z-index: 2000;
   pointer-events: none;
 }
-.confirm-wrapper div {
+
+.fcr-event-confirm-wrapper.fcr-event-confirm-container div {
   pointer-events: all;
 }
 

package/lib/modules/event-confirm/store.d.ts

@@ -14,19 +14,20 @@ export default class ConfirmStore {
     private _sharedScreenShareSharedDataSource;
     private _sharedConfirmDataSource;
     private _handleConfirmEventObserver;
+    private _handleMousePositionObserver;
     accessor isReplaceShare: boolean;
     accessor calculateMethods: Map<ConfirmContentProps, (bounds?: CurrentShareBounds | null) => void>;
     accessor reposition: number;
     accessor confirms: Map<string, {
+        id: string;
         params: ConfirmContentProps;
         timer?: () => void;
     }>;
     accessor screenBounds: CurrentShareBounds | Electron.Rectangle | null;
-    get mousePosition(): {
-        x: number;
-        y: number;
-    };
-    get confirmList(): ConfirmContentProps[];
+    get confirmList(): {
+        id: string;
+        params: ConfirmContentProps;
+    }[];
     get isSeizeScreen(): boolean;
     constructor({ uiEventStore, dialogProvider, screenShareProvider, sharedScreenShareSharedDataSource, sharedConfirmDataSource, }: {
         uiEventStore: FcrUIEventProvider;
@@ -36,10 +37,14 @@ export default class ConfirmStore {
         sharedConfirmDataSource: FcrUISharedConfirmDataSource;
     });
     addConfirm(payload: FcrUIDialogParams<ConfirmContentProps>): void;
+    removeObserverWindow(key: string): void;
+    setObserverWindow(key: string, window: CurrentShareBounds): void;
     resetIsReplace(): void;
     setMousePosition(e: MouseEvent): void;
     release(): void;
     log(log: string): void;
     private _handleConfirmEvent;
+    private _handleMousePositionObserverMouseOver;
+    private _handleMousePositionObserverMouseOut;
 }
 export declare const StoreContext: import("react").Context<ConfirmStore>;

package/lib/modules/event-confirm/store.js

@@ -31,9 +31,7 @@ require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.function.bind.js");
-require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
@@ -72,8 +70,9 @@ var _logger = require("../../utilities/logger");
 var _decorator = require("agora-foundation/lib/decorator");
 var _dialogUtils = require("../../utilities/dialog-utils");
 var _env = require("agora-foundation/lib/utilities/env");
+var _imports = require("fcr-core/lib/imports");
 var _ConfirmStore;
-var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _resetIsReplaceDecs, _setMousePositionDecs, _handleConfirmEventDecs, _ref;
+var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _removeObserverWindowDecs, _setObserverWindowDecs, _resetIsReplaceDecs, _setMousePositionDecs, _handleConfirmEventDecs, _handleMousePositionObserverMouseOverDecs, _handleMousePositionObserverMouseOutDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -91,7 +90,7 @@ var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
-_ref = (_addConfirmDecs = [_mobx.action, _mobx.action.bound], _resetIsReplaceDecs = [_mobx.action, _mobx.action.bound], _setMousePositionDecs = [_mobx.action, _mobx.action.bound], _handleConfirmEventDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_addConfirmDecs = [_mobx.action, _mobx.action.bound], _removeObserverWindowDecs = [_mobx.action, _mobx.action.bound], _setObserverWindowDecs = [_mobx.action, _mobx.action.bound], _resetIsReplaceDecs = [_mobx.action, _mobx.action.bound], _setMousePositionDecs = [_mobx.action, _mobx.action.bound], _handleConfirmEventDecs = [_mobx.action, _mobx.action.bound], _handleMousePositionObserverMouseOverDecs = [_mobx.action, _mobx.action.bound], _handleMousePositionObserverMouseOutDecs = [_mobx.action, _mobx.action.bound], "logger");
 var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
   function ConfirmStore(_ref2) {
     var _this = this;
@@ -108,6 +107,10 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_handleConfirmEventObserver", {
       onEvent: this._handleConfirmEvent.bind(this)
     });
+    (0, _defineProperty2["default"])(this, "_handleMousePositionObserver", {
+      onMouseOver: this._handleMousePositionObserverMouseOver,
+      onMouseOut: this._handleMousePositionObserverMouseOut
+    });
     _classPrivateFieldInitSpec(this, _A, _init_isReplaceShare(this, false));
     _classPrivateFieldInitSpec(this, _B, _init_calculateMethods(this, new Map()));
     _classPrivateFieldInitSpec(this, _C, _init_reposition(this, 0));
@@ -119,6 +122,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     this._sharedConfirmDataSource = sharedConfirmDataSource;
     this._uiEventProvider.addObserver(this._handleConfirmEventObserver);
     this._dialogProvider.addObserver(this._handleConfirmEventObserver);
+    this._sharedConfirmDataSource.addObserver(this._handleMousePositionObserver);
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.confirmList;
     }, function () {
@@ -140,11 +144,11 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
           _this.calculateMethods.forEach(function (method) {
             return method(nearDisplayBounds);
           });
-          _this.logger.info("new sharing bounds is ".concat(JSON.stringify(nearDisplayBounds)));
+          _this.logger.info("new sharing bounds is ".concat((0, _imports.jsonstring)(nearDisplayBounds)));
           _this.screenBounds = nearDisplayBounds;
         }
       } else {
-        _this.logger.error("there is have no bounds ".concat(JSON.stringify(bounds)));
+        _this.logger.error("there is have no bounds ".concat((0, _imports.jsonstring)(bounds)));
       }
     }), (0, _mobx.reaction)(function () {
       return _this.isSeizeScreen;
@@ -157,12 +161,12 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
           }),
           nearDisplayBounds = _ref3.nearDisplayBounds;
         _this.screenBounds = nearDisplayBounds;
-        _this.logger.info("new sharing bounds is ".concat(JSON.stringify(nearDisplayBounds), ", when seize screen emit"));
+        _this.logger.info("new sharing bounds is ".concat((0, _imports.jsonstring)(nearDisplayBounds), ", when seize screen emit"));
       }
     }), (0, _mobx.reaction)(function () {
       return _this.screenBounds;
     }, function (bounds) {
-      _this.logger.debug("the bounds is  changed=>", bounds);
+      _this.logger.debug("the bounds changed, bounds: ".concat((0, _imports.jsonstring)(bounds)));
     }));
   }
   return (0, _createClass2["default"])(ConfirmStore, [{
@@ -199,22 +203,25 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "screenBounds",
-    get: function get() {
+    get: // get mousePosition() {
+    //   return this._sharedConfirmDataSource.position;
+    // }
+    function get() {
       return _classPrivateFieldGet(_E, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_E, this, v);
     }
-  }, {
-    key: "mousePosition",
-    get: function get() {
-      return this._sharedConfirmDataSource.position;
-    }
   }, {
     key: "confirmList",
     get: function get() {
-      var result = Array.from(this.confirms.values()).map(function (item) {
-        return item.params;
+      var result = Array.from(this.confirms.values()).map(function (_ref4) {
+        var id = _ref4.id,
+          params = _ref4.params;
+        return {
+          id: id,
+          params: params
+        };
       });
       return result;
     }
@@ -233,14 +240,17 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         var timer = setTimeout(function () {
           (0, _mobx.runInAction)(function () {
             _this2.confirms["delete"](dialogId);
+            _this2.removeObserverWindow(dialogId);
           });
           clearTimeout(timer);
         }, params.duration || 3000);
       } : undefined;
       var confirmParams = {
+        id: dialogId,
         params: _objectSpread(_objectSpread({}, params), {}, {
           onClose: function onClose() {
             _this2.confirms["delete"](dialogId);
+            _this2.removeObserverWindow(dialogId);
           }
         }),
         timer: timer
@@ -251,6 +261,12 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         });
       } else {
         this.confirms.set(dialogId, confirmParams);
+        this.setObserverWindow(dialogId, {
+          x: 0,
+          y: 0,
+          width: confirmParams.params.width || 320,
+          height: confirmParams.params.height || 150
+        });
       }
       var confirmInstance = this.confirms.get(dialogId);
       if (confirmInstance) {
@@ -281,6 +297,16 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         }
       }
     }
+  }, {
+    key: "removeObserverWindow",
+    value: function removeObserverWindow(key) {
+      this._sharedConfirmDataSource.removeWindowBounds(key);
+    }
+  }, {
+    key: "setObserverWindow",
+    value: function setObserverWindow(key, window) {
+      this._sharedConfirmDataSource.setWindowBounds(key, window);
+    }
   }, {
     key: "resetIsReplace",
     value: function resetIsReplace() {
@@ -297,6 +323,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "release",
     value: function release() {
+      var _this3 = this;
       this.confirms.clear();
       this.calculateMethods.clear();
       this._disposers.forEach(function (disposer) {
@@ -304,6 +331,10 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       });
       this._dialogProvider.removeObserver(this._handleConfirmEventObserver);
       this._uiEventProvider.removeObserver(this._handleConfirmEventObserver);
+      this.confirms.forEach(function (value, key) {
+        _this3.removeObserverWindow(key);
+      });
+      this._sharedConfirmDataSource.removeObserver(this._handleMousePositionObserver);
     }
   }, {
     key: "log",
@@ -317,26 +348,43 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         switch (action) {
           case _constant.FcrUIAction.OPEN_DIALOG:
             if ((0, _env.isElectron)()) {
-              var _ref5 = (0, _dialogUtils.followCorrectDisplay)({
+              var _ref6 = (0, _dialogUtils.followCorrectDisplay)({
                   dialogKey: _constant.FcrUIDialogKey.CONFIRM,
                   alwaysFollowScreen: true
                 }),
-                nearDisplayBounds = _ref5.nearDisplayBounds;
+                nearDisplayBounds = _ref6.nearDisplayBounds;
               this.screenBounds = nearDisplayBounds;
-              this.logger.info("open confirm dialog with bounds ".concat(JSON.stringify(nearDisplayBounds)));
+              this.logger.info("open confirm dialog with bounds: ".concat((0, _imports.jsonstring)(nearDisplayBounds)));
             }
             this.addConfirm(payload);
             break;
           case _constant.FcrUIAction.CLOSE_DIALOG:
             this.confirms["delete"](payload.dialogId);
+            this.removeObserverWindow(payload.dialogId);
             break;
         }
       }
     }
+  }, {
+    key: "_handleMousePositionObserverMouseOver",
+    value: function _handleMousePositionObserverMouseOver(key) {
+      var confirm = this.confirms.get(key);
+      if (confirm) {
+        confirm.params.className = 'confirm-mouseover';
+      }
+    }
+  }, {
+    key: "_handleMousePositionObserverMouseOut",
+    value: function _handleMousePositionObserverMouseOut(key) {
+      var confirm = this.confirms.get(key);
+      if (confirm) {
+        confirm.params.className = '';
+      }
+    }
   }]);
 }();
 _ConfirmStore = ConfirmStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConfirmStore, [[_mobx.observable, 1, "isReplaceShare"], [_mobx.observable, 1, "calculateMethods"], [_mobx.observable, 1, "reposition"], [_mobx.observable, 1, "confirms"], [_mobx.observable, 1, "screenBounds"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_resetIsReplaceDecs, 18, "resetIsReplace"], [_setMousePositionDecs, 18, "setMousePosition"], [_decorator.bound, 2, "log"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"]], []).e, 6);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConfirmStore, [[_mobx.observable, 1, "isReplaceShare"], [_mobx.observable, 1, "calculateMethods"], [_mobx.observable, 1, "reposition"], [_mobx.observable, 1, "confirms"], [_mobx.observable, 1, "screenBounds"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_removeObserverWindowDecs, 18, "removeObserverWindow"], [_setObserverWindowDecs, 18, "setObserverWindow"], [_resetIsReplaceDecs, 18, "resetIsReplace"], [_setMousePositionDecs, 18, "setMousePosition"], [_decorator.bound, 2, "log"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"], [_handleMousePositionObserverMouseOverDecs, 18, "_handleMousePositionObserverMouseOver"], [_handleMousePositionObserverMouseOutDecs, 18, "_handleMousePositionObserverMouseOut"]], []).e, 6);
 _init_isReplaceShare = _applyDecs$e[0];
 _init_calculateMethods = _applyDecs$e[1];
 _init_reposition = _applyDecs$e[2];

package/lib/modules/event-confirm/view.js

@@ -27,26 +27,28 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     browserWindow = _ref.browserWindow;
   (0, _react.useEffect)(function () {
     window.addEventListener('mousemove', setMousePosition);
+    return function () {
+      window.removeEventListener('mousemove', setMousePosition);
+    };
+  }, []);
+  (0, _react.useEffect)(function () {
     if ((0, _toConsumableArray2["default"])(confirmList).length === 0) {
       browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
         forward: true
       });
       browserWindow === null || browserWindow === void 0 || browserWindow.blur();
     } else {
-      // browserWindow?.setIgnoreMouseEvents(false);
       browserWindow === null || browserWindow === void 0 || browserWindow.setAlwaysOnTop(true, 'screen-saver');
     }
-    return function () {
-      window.removeEventListener('mousemove', setMousePosition);
-    };
-  }, [confirmList]);
+  }, [confirmList.length]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "confirm-wrapper",
+      className: "fcr-event-confirm-wrapper fcr-event-confirm-container",
       children: (0, _toConsumableArray2["default"])(confirmList).map(function (confirm) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_window.ConfirmWindow, {
-          confirm: confirm
-        }, confirm.title);
+          id: confirm.id,
+          confirm: confirm.params
+        }, confirm.params.title);
       })
     })
   });

package/lib/modules/event-sound/index.d.ts

@@ -34,6 +34,7 @@ export declare class SoundEffectUIModule extends UIModule {
     private _roomObserver;
     private _streamsObserver;
     private _userObserver;
+    private _whiteboardObserver;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     release(): void;

package/lib/modules/event-sound/index.js

@@ -119,15 +119,16 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
     (0, _defineProperty2["default"])(_this, "_userObserver", {
       onRemoteUsersJoined: _this._handleUserJoined
     });
+    (0, _defineProperty2["default"])(_this, "_whiteboardObserver", {
+      onActive: _this._handleWhiteboardActive
+    });
     return _this;
   }
   (0, _inherits2["default"])(SoundEffectUIModule, _UIModule);
   return (0, _createClass2["default"])(SoundEffectUIModule, [{
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      var _this$currentRoomCont,
-        _this$sharedConfigDat,
-        _this2 = this;
+      var _this$currentRoomCont, _this$sharedConfigDat;
       if (!((_this$currentRoomCont = this.currentRoomControlProvider) !== null && _this$currentRoomCont !== void 0 && _this$currentRoomCont.currentRoomControl)) {
         return;
       }
@@ -152,11 +153,7 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
         this._roomControl.addObserver(this._roomObserver);
       }
       if (this._whiteboardControl) {
-        this._whiteboardControl.addObserver({
-          onActive: function onActive() {
-            return _this2._handleWhiteboardActive();
-          }
-        });
+        this._whiteboardControl.addObserver(this._whiteboardObserver);
       }
       if (this._userControl) {
         this._userControl.addObserver(this._userObserver);
@@ -173,21 +170,11 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
   }, {
     key: "release",
     value: function release() {
-      var _this$_chatRoomContro,
-        _this$_roomControl,
-        _this$_streamControl,
-        _this$_whiteboardCont,
-        _this3 = this,
-        _this$_connectionCont,
-        _this$_userControl;
+      var _this$_chatRoomContro, _this$_roomControl, _this$_streamControl, _this$_whiteboardCont, _this$_connectionCont, _this$_userControl;
       (_this$_chatRoomContro = this._chatRoomControl) === null || _this$_chatRoomContro === void 0 || _this$_chatRoomContro.removeObserver(this._chatRoomObserver);
       (_this$_roomControl = this._roomControl) === null || _this$_roomControl === void 0 || _this$_roomControl.removeObserver(this._roomObserver);
       (_this$_streamControl = this._streamControl) === null || _this$_streamControl === void 0 || _this$_streamControl.removeObserver(this._streamsObserver);
-      (_this$_whiteboardCont = this._whiteboardControl) === null || _this$_whiteboardCont === void 0 || _this$_whiteboardCont.removeObserver({
-        onActive: function onActive() {
-          return _this3._handleWhiteboardActive();
-        }
-      });
+      (_this$_whiteboardCont = this._whiteboardControl) === null || _this$_whiteboardCont === void 0 || _this$_whiteboardCont.removeObserver(this._whiteboardObserver);
       (_this$_connectionCont = this._connectionControl) === null || _this$_connectionCont === void 0 || _this$_connectionCont.removeObserver(this._engineObserver);
       (_this$_userControl = this._userControl) === null || _this$_userControl === void 0 || _this$_userControl.removeObserver(this._userObserver);
       this._clearSoundEffectTimer();
@@ -270,11 +257,11 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
   }, {
     key: "_handleStreamsAdded",
     value: function _handleStreamsAdded(roomId, events) {
-      var _this4 = this;
+      var _this2 = this;
       events.forEach(function (e) {
         var modifiedStream = e.modifiedStream;
         if (modifiedStream.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN) {
-          _this4.handlePlaySoundEffect(SoundEffectType.SCREEN_SHARING_STARTED);
+          _this2.handlePlaySoundEffect(SoundEffectType.SCREEN_SHARING_STARTED);
         }
       });
     }
@@ -302,7 +289,7 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
     key: "handlePlaySoundEffect",
     value: function handlePlaySoundEffect(name) {
       var _this$sharedSettingDa,
-        _this5 = this;
+        _this3 = this;
       if (!((_this$sharedSettingDa = this.sharedSettingDataSource) !== null && _this$sharedSettingDa !== void 0 && _this$sharedSettingDa.setting.isPlaySound)) {
         return;
       }
@@ -322,7 +309,7 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
         }
         var newTimer = window.setTimeout(function () {
           _player.stop();
-          _this5._soundEffectTimer["delete"](name);
+          _this3._soundEffectTimer["delete"](name);
         }, this._duration);
         this._soundEffectTimer.set(name, newTimer);
       }

package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-user/index.js

@@ -29,7 +29,6 @@ var _select = require("agora-ui-foundation/lib/components/select");
 var _store = require("../../../../store");
 var _mobxReact = require("mobx-react");
 var _type = require("fcr-core/lib/type");
-var _type2 = require("agora-rte-sdk/lib/core/scene/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _optionItem = _interopRequireDefault(require("./option-Item"));
 require("./index.css");
@@ -72,7 +71,7 @@ var PickUser = function PickUser(props) {
           userId: userId,
           userName: userName,
           userRole: _type.FcrUserRole.PARTICIPANT,
-          connectorType: _type2.AgoraRteRoomConnectorType.NONE,
+          connectorType: _type.FcrRoomConnectorType.NONE,
           isOffLine: true,
           platform: _type.FcrPlatform.WEB_DESKTOP,
           avatar: avatar || ''

package/lib/modules/interpreter/store.js

@@ -100,14 +100,12 @@ var _type = require("fcr-core/lib/type");
 var _uuid = require("uuid");
 var _dialogContent = require("./dialog-content");
 var _constant = require("../../utilities/constant");
-var _type2 = require("agora-rte-sdk/lib/core/scene/type");
 var _react = require("react");
 var _useLanguageConfig = require("./interpreter-list/interpreter-item/components/pick-language/useLanguageConfig");
-var _type3 = require("./type");
+var _type2 = require("./type");
 var _utils = require("./utils");
-var _type4 = require("../../type");
+var _type3 = require("../../type");
 var _fcrCore = require("fcr-core");
-var _type5 = require("agora-rte-sdk/lib/type");
 var _logger = require("../../utilities/logger");
 var _excluded = ["randomKey"];
 var _InterpreterStore;
@@ -222,7 +220,7 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
           userInfoList: events.map(function (ele) {
             return ele.userInfo;
           })
-        }, _type3.UpdateType.JOIN);
+        }, _type2.UpdateType.JOIN);
       },
       //成员离开
       onRemoteUsersLeft: function onRemoteUsersLeft(roomId, events) {
@@ -230,7 +228,7 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
           userInfoList: events.map(function (ele) {
             return ele.userInfo;
           })
-        }, _type3.UpdateType.LEFT);
+        }, _type2.UpdateType.LEFT);
       },
       onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
         _this._updateUsers({
@@ -428,10 +426,10 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
       if (!isSelfOperation) {
         if (state.enable) {
           this._messageProvider.showNotification({
-            type: _type4.FcrUINotificationContentType.INTERPRETER_STATUS,
+            type: _type3.FcrUINotificationContentType.INTERPRETER_STATUS,
             placement: 'topLeft',
             onClose: function onClose() {
-              _this3._messageProvider.closeNotification(_type4.FcrUINotificationContentType.INTERPRETER_STATUS);
+              _this3._messageProvider.closeNotification(_type3.FcrUINotificationContentType.INTERPRETER_STATUS);
             },
             data: {
               operatorUser: operatorUser,
@@ -516,7 +514,7 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
       var mainRoomUsers = this._userControl.getUserList();
       if (mainRoomUsers) {
         this.initUsers = mainRoomUsers.filter(function (user) {
-          return user.connectorType === _type2.AgoraRteRoomConnectorType.NONE;
+          return user.connectorType === _type.FcrRoomConnectorType.NONE;
         }).map(function (ele) {
           return _objectSpread(_objectSpread({}, ele), {}, {
             isOffLine: false
@@ -537,15 +535,15 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
           if (initUsersCopy[index]) {
             if (type) {
               initUsersCopy[index] = _objectSpread(_objectSpread(_objectSpread({}, initUsersCopy[index]), userInfo), {}, {
-                isOffLine: _type3.UpdateType.LEFT === type
+                isOffLine: _type2.UpdateType.LEFT === type
               });
             } else {
               initUsersCopy[index] = _objectSpread(_objectSpread({}, initUsersCopy[index]), userInfo);
             }
           }
-        } else if (userInfo.connectorType === _type2.AgoraRteRoomConnectorType.NONE) {
+        } else if (userInfo.connectorType === _type.FcrRoomConnectorType.NONE) {
           initUsersCopy.push(_objectSpread(_objectSpread({}, userInfo), {}, {
-            isOffLine: _type3.UpdateType.LEFT === type
+            isOffLine: _type2.UpdateType.LEFT === type
           }));
         }
       });
@@ -590,7 +588,7 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
               mainStreamControl = this._mainRoomControl.getStreamControl();
               localStreamList = mainStreamControl.getStreamsByUserId(this._userControl.getLocalUser().userId);
               micStreams = localStreamList.filter(function (ele) {
-                return ele.audioSourceType === _type5.AgoraRteAudioSourceType.MICROPHONE;
+                return ele.audioSourceType === _type.FcrAudioSourceType.MICROPHONE;
               });
               streamId = !!micStreams.length ? micStreams[0].streamId : null;
               if (!streamId) {

package/lib/modules/invite/components/pstn-invite.js

@@ -110,7 +110,6 @@ var PSTNInvite = exports.PSTNInvite = (0, _mobxReact.observer)(function () {
         case 2:
           checkPhoneNumber();
           checkInput(inviteUserName, setIsInviteUserNameError);
-          console.log('invitePhoneNumber', invitePhoneNumber);
           if (!(!inviteUserName || !invitePhoneNumber || !(0, _regex.isPhoneNumber)(invitePhoneNumber))) {
             _context.next = 3;
             break;