fcr-ui-scene 3.2.0 → 3.3.1

package/lib/modules/whiteboard/index.js

@@ -123,6 +123,7 @@ var _libs = _interopRequireDefault(require("./components/switch-theme/libs"));
 var _types = require("agora-edu-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");
 var _jsxRuntime = require("react/jsx-runtime");
 var _FcrWhiteboardUIModule;
 var _initProto, _init__lonelyWindowState, _init__ownerUser, _init__isHost, _init__boardBackground, _init__localUser, _onPropertiesUpdateDecs, _mountDecs, _unmountDecs, _unloadDecs, _boardUIEventsDecs, _createToolbarUIContextDecs, _repositionToolbarDecs, _updateRedoDecs, _updateUndoDecs, _setConnectionStateDecs, _getSnapshotImageDecs, _openLonelyWindowDecs, _setJoinSuccessedDecs, _ref;
@@ -526,6 +527,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         });
         this._ownerUser = undefined;
         this._initialized = false;
+        this._close();
       }
       this._mounted = false;
       if (this._timer) clearTimeout(this._timer);
@@ -576,7 +578,6 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
     value: function _checkBoard() {
       if (!this._initialized) {
         this._open();
-        this._initialized = true;
       }
     }
   }, {
@@ -588,18 +589,22 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
           _this2._boardDom = ref;
           if (_this2._boardDom) {
             _this2.mount();
+          } else {
+            _this2._mounted = false;
           }
         },
         handleCollectorDomLoad: function handleCollectorDomLoad(ref) {
           _this2._collectorDom = ref;
         },
         handleClose: function handleClose() {
-          _this2._close();
-          _this2._isActive = false;
-          _this2.unmount();
+          // this._close();
+          // this._isActive = false;
+          // this.unmount();
+          // console.log('whiteboard close');
         },
         handleOpen: function handleOpen() {
-          _this2._open();
+          // console.log('whiteboard open');
+          // !this._initialized && this._open();
         },
         setPrivilege: function setPrivilege(canOperate) {
           observables.canOperate = canOperate;
@@ -608,6 +613,9 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
           observables.writeEnabled = enable;
           observables.canOperate = enable;
           _this2._repositionToolbar();
+        },
+        setWhiteboardVisible: function setWhiteboardVisible(visible) {
+          observables.whiteboardVisible = visible;
         }
       };
     }
@@ -701,7 +709,8 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         connectionState: this._connectionState,
         joinSuccessed: this._joinSuccessed,
         progress: 0,
-        writeEnabled: this._isHost
+        writeEnabled: this._isHost,
+        whiteboardVisible: false
       });
       return _objectSpread({
         observables: observables
@@ -784,6 +793,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         setTheme: (0, _mobx.action)(function (theme) {
           _this4._setBackgroundColor(theme.background);
           observables.colors = theme.colors;
+          observables.currentThemeType = theme;
         }),
         setCommonColor: (0, _mobx.action)(function (color) {
           if (observables.commonColors.length < 2) observables.commonColors.push(color);
@@ -923,6 +933,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
     value: function _open() {
       var _this$_whiteboardCont4;
       this._joined = true;
+      this._initialized = true;
       (_this$_whiteboardCont4 = this._whiteboardControl) === null || _this$_whiteboardCont4 === void 0 || _this$_whiteboardCont4.open();
     }
   }, {
@@ -1009,6 +1020,9 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
                   if (state === _agoraEduCore.FcrConnectionState.DISCONNECTED) {
                     if (_this6._joined) {
                       (_this6$_whiteboardCon = _this6._whiteboardControl) === null || _this6$_whiteboardCon === void 0 || _this6$_whiteboardCon.open();
+                    } else {
+                      _this6.unmount();
+                      _this6.unload();
                     }
                   }
                   if (state === _agoraEduCore.FcrConnectionState.CONNECTED) {
@@ -1075,6 +1089,8 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         title: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_stoppedboard'),
         content: (_type2.FcrUserRole.HOST === userRole ? (0, _i18n.transI18n)('fmt_role_host') : _type2.FcrUserRole.COHOST === userRole ? (0, _i18n.transI18n)('fmt_role_cohost') : '') + "".concat(userName, " ").concat((0, _i18n.transI18n)('fmt_screenshare_whiteboard_lables_newshare')),
         okText: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_button_gotit'),
+        showCancel: false,
+        icon: _type4.FcrIconType.FCR_SCREENSHARING,
         onOk: function onOk() {
           _this8._uiEventStore.closeDialog(dialogId);
         },

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

@@ -63,6 +63,9 @@ if (!window.runtime) {
     getMediaSourceIdList: function getMediaSourceIdList() {
       return [];
     },
-    releaseAllWindows: function releaseAllWindows() {}
+    setInMeetingState: function setInMeetingState() {},
+    getBundleType: function getBundleType() {
+      return Promise.resolve('JS_BUNDLE');
+    }
   };
 }

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

@@ -155,14 +155,16 @@ window.__DEV_ENGINE_IS_READY__ = createRoom(roomId).then(/*#__PURE__*/function (
                   bitrate: 400
                 },
                 enableDualStreamMode: false
+              },
+              parameters: {
+                rte: {
+                  rteIpList: ['http://api-solutions-dev.bj2.agoralab.co']
+                },
+                core: {
+                  coreIpList: ['http://api-solutions-dev.bj2.agoralab.co']
+                }
               }
             });
-            var params = {
-              rte: {
-                restfulApiHost: 'http://api-solutions-dev.bj2.agoralab.co'
-              }
-            };
-            window.__DEV_ENGINE__.setParameters(params);
             window.__DEV_ROOM_ID__ = roomId;
             window.__DEV_USER_ID__ = userId;
             window.__DEV_USER_ROLE__ = role;

package/lib/runtime.d.ts

@@ -75,7 +75,8 @@ declare global {
     registerListenerReady(): void;
     releaseSubAllWindowRefs(): void;
     getMediaSourceIdList(): { title: string; mediaSourceId: string }[];
-    releaseAllWindows(): void;
+    setInMeetingState(state: 0 | 1): void;
+    getBundleType(): Promise<'JS_BUNDLE' | 'NATIVE_BUNDLE'>;
   }
 
   interface Window {