fcr-ui-scene 3.7.9-alpha → 3.8.0

package/lib/providers/app-list-provider.js

@@ -5,6 +5,7 @@ require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
@@ -13,11 +14,15 @@ require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
+require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -33,6 +38,7 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -60,8 +66,13 @@ var _type2 = require("agora-ui-foundation/lib/components/icon/type");
 var _type3 = require("fcr-core/lib/type");
 var _imports = require("fcr-core/lib/imports");
 var _type4 = require("../modules/setting/type");
+var _captionMenu = require("../modules/components/caption-menu");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _translationSettingOptions = require("../modules/components/caption-menu/translation-setting-options");
 var _FcrUIApplistProviderImpl;
 var _initProto, _clickWidgetDecs, _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 _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -72,11 +83,13 @@ var FcrUIApplistItemType = exports.FcrUIApplistItemType = /*#__PURE__*/function
   FcrUIApplistItemType[FcrUIApplistItemType["LIVE_STREAMING"] = 1] = "LIVE_STREAMING";
   FcrUIApplistItemType[FcrUIApplistItemType["BEAUTY_BACKGROUND"] = 2] = "BEAUTY_BACKGROUND";
   FcrUIApplistItemType[FcrUIApplistItemType["WIDGETS"] = 3] = "WIDGETS";
+  FcrUIApplistItemType[FcrUIApplistItemType["CAPTION"] = 4] = "CAPTION";
+  FcrUIApplistItemType[FcrUIApplistItemType["SUBTITLES_HISTORY"] = 5] = "SUBTITLES_HISTORY";
   return FcrUIApplistItemType;
 }({});
 _ref = (_clickWidgetDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/function () {
-  function FcrUIApplistProviderImpl(_dialogProvider, _eventProvider, _widgetProvider, _sharedApplistDataSource) {
+  function FcrUIApplistProviderImpl(_dialogProvider, _eventProvider, _widgetProvider, _sharedApplistDataSource, _messageProvider, _sttProvider, _sharedSttSettingDataSource, _screenShareProvider, _sharedSettingDataSource) {
     (0, _classCallCheck2["default"])(this, FcrUIApplistProviderImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _imports.createLogger)({
       prefix: 'FcrUIApplistProviderImpl'
@@ -86,6 +99,11 @@ var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/f
     this._eventProvider = _eventProvider;
     this._widgetProvider = _widgetProvider;
     this._sharedApplistDataSource = _sharedApplistDataSource;
+    this._messageProvider = _messageProvider;
+    this._sttProvider = _sttProvider;
+    this._sharedSttSettingDataSource = _sharedSttSettingDataSource;
+    this._screenShareProvider = _screenShareProvider;
+    this._sharedSettingDataSource = _sharedSettingDataSource;
   }
   return (0, _createClass2["default"])(FcrUIApplistProviderImpl, [{
     key: "isInterpreterEnabled",
@@ -97,6 +115,36 @@ var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/f
     get: function get() {
       return this._sharedApplistDataSource.liveStreamingState;
     }
+  }, {
+    key: "isCaptionEnabled",
+    get: function get() {
+      return this._sttProvider.captionState;
+    }
+  }, {
+    key: "isTranscribeEnabled",
+    get: function get() {
+      return this._sttProvider.transcribingState;
+    }
+  }, {
+    key: "hasEnableCaptionAbility",
+    get: function get() {
+      return this._sharedApplistDataSource.hasEnableCaptionAbility;
+    }
+  }, {
+    key: "hasEnableTranscribeAbility",
+    get: function get() {
+      return this._sharedApplistDataSource.hasEnableTranscribeAbility;
+    }
+  }, {
+    key: "hasStartCaptionPermission",
+    get: function get() {
+      return this._sharedApplistDataSource.hasStartCaptionPermission;
+    }
+  }, {
+    key: "hasStartTranscribePermission",
+    get: function get() {
+      return this._sharedApplistDataSource.hasStartTranscribePermission;
+    }
   }, {
     key: "hasEnableInterpreterPermission",
     get: function get() {
@@ -112,18 +160,54 @@ var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/f
     get: function get() {
       return this._sharedApplistDataSource.widgetConfigs;
     }
+  }, {
+    key: "captionState",
+    get: function get() {
+      return this._sttProvider.captionState;
+    }
+  }, {
+    key: "transcribingState",
+    get: function get() {
+      return this._sttProvider.transcribingState;
+    }
+  }, {
+    key: "hasEverEnabledTranscribing",
+    get: function get() {
+      return this._sttProvider.hasEverEnabledTranscribing;
+    }
   }, {
     key: "appItemOptions",
     get: function get() {
-      var appItems = [this.interpreterProps, this.liveStreamingProps, this.beautyBackgroundProps].concat((0, _toConsumableArray2["default"])(this.widgetListProps)).filter(function (appItem) {
+      var appItems = [this.captionProps, this.transcribeProps, this.interpreterProps, this.liveStreamingProps, this.beautyBackgroundProps].concat((0, _toConsumableArray2["default"])(this.widgetListProps)).filter(function (appItem) {
         return appItem.permission;
       });
       return appItems;
     }
+  }, {
+    key: "toggleCaptionState",
+    value: function toggleCaptionState() {
+      if (this._sttProvider.captionState) {
+        this._sttProvider.stopCaption();
+        if (this._screenShareProvider.isLocalUserScreenSharing) {
+          this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.CHAT);
+        }
+      } else {
+        this._sttProvider.startCaption();
+        if (this._screenShareProvider.isLocalUserScreenSharing) {
+          this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CHAT);
+        }
+      }
+    }
+  }, {
+    key: "openSubtitlesHistoryDialog",
+    value: function openSubtitlesHistoryDialog() {
+      this._eventProvider.sendEvent(_constant.FcrUIAction.TOGGLE_SUBTITLES_HISTORY_VIEW, true);
+    }
   }, {
     key: "openDeviceSettingDialog",
     value: function openDeviceSettingDialog(arg) {
       this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SETTINGS, arg);
+      this._sharedSettingDataSource.setDialogConfig(arg);
     }
   }, {
     key: "openInterpreterDialog",
@@ -145,13 +229,65 @@ var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/f
       }
     }
   }, {
-    key: "interpreterProps",
+    key: "captionProps",
     get: function get() {
       var _this = this;
+      var name = this.isCaptionEnabled ? 'fmt_ai_subtitles_button_disable_caption' : 'fmt_ai_subtitles_button_enable_caption';
+      var type = this.isCaptionEnabled ? _type2.FcrIconType.FCR_SUBTITIESHISTORY_ON : _type2.FcrIconType.FCR_SUBTITIESHISTORY_OFF;
+      return {
+        name: name,
+        onClick: function onClick() {
+          return _this._notifyClick(_this.toggleCaptionState, FcrUIApplistItemType.CAPTION);
+        },
+        fcrIconProps: {
+          type: type,
+          iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
+        },
+        permission: this.hasEnableCaptionAbility && !this._screenShareProvider.isLocalUserScreenSharing,
+        disabledConfig: {
+          onDisabledClick: function onDisabledClick() {
+            _this.hostDisabledCaptionPermissionToast();
+          },
+          disabled: !this.hasStartCaptionPermission
+        },
+        moreBtnConfig: {
+          component: _captionMenu.CaptionMenu,
+          componentProps: this._sharedSttSettingDataSource.captionMenuProps
+        }
+      };
+    }
+  }, {
+    key: "transcribeProps",
+    get: function get() {
+      var _this2 = this;
+      var name = 'fmt_ai_transcriptions_toolbar_button_realtime_transcription';
+      var type = this.isTranscribeEnabled ? _type2.FcrIconType.FCR_SUBTITIESHISTORY_ON : _type2.FcrIconType.FCR_SUBTITIESHISTORY_OFF;
+      return {
+        name: name,
+        onClick: function onClick() {
+          return _this2._notifyClick(_this2.openSubtitlesHistoryDialog, FcrUIApplistItemType.SUBTITLES_HISTORY);
+        },
+        fcrIconProps: {
+          type: type,
+          iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
+        },
+        permission: this.hasEnableTranscribeAbility,
+        moreBtnConfig: {
+          component: _captionMenu.CaptionMenu,
+          componentProps: _objectSpread(_objectSpread({}, this._sharedSttSettingDataSource.captionMenuProps), {}, {
+            menuType: _translationSettingOptions.FcrUICaptionMenuType.TRANSCRIBING
+          })
+        }
+      };
+    }
+  }, {
+    key: "interpreterProps",
+    get: function get() {
+      var _this3 = this;
       return {
         name: 'fmt_interpretation_setting_controller_option_simultaneous_interpretation',
         onClick: function onClick() {
-          return _this._notifyClick(_this.openInterpreterDialog, FcrUIApplistItemType.INTERPRETER);
+          return _this3._notifyClick(_this3.openInterpreterDialog, FcrUIApplistItemType.INTERPRETER);
         },
         fcrToolTipProps: {
           content: this.isInterpreterEnabled ? 'fmt_interpretation_setting_controller_toast_turn_off_simultaneous_interpretation' : 'fmt_interpretation_setting_controller_toast_turn_on_simultaneous_interpretation'
@@ -166,12 +302,12 @@ var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/f
   }, {
     key: "liveStreamingProps",
     get: function get() {
-      var _this2 = this;
+      var _this4 = this;
       var isStarted = this.liveStreamingState === _type3.FcrLiveStreamingState.STARTED;
       return {
         name: isStarted ? 'fmt_tips_button_Stopolive' : 'fmt_tips_button_Golive',
         onClick: function onClick() {
-          return _this2._notifyClick(_this2.openLiveStreamingDialog, FcrUIApplistItemType.LIVE_STREAMING);
+          return _this4._notifyClick(_this4.openLiveStreamingDialog, FcrUIApplistItemType.LIVE_STREAMING);
         },
         fcrToolTipProps: {
           content: isStarted ? 'fmt_actionbar_livestreaming_option_livenow' : 'fmt_actionbar_livestreaming_option_customlive'
@@ -188,12 +324,12 @@ var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/f
   }, {
     key: "beautyBackgroundProps",
     get: function get() {
-      var _this3 = this;
+      var _this5 = this;
       return {
         name: 'fmt_internalsetting_beauty_background',
         onClick: function onClick() {
-          return _this3._notifyClick(function () {
-            return _this3.openDeviceSettingDialog({
+          return _this5._notifyClick(function () {
+            return _this5.openDeviceSettingDialog({
               activeTab: _type4.DeviceSettingTab.VIDEO,
               videoActiveTab: 'virtual-background'
             });
@@ -208,7 +344,7 @@ var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/f
   }, {
     key: "widgetListProps",
     get: function get() {
-      var _this4 = this;
+      var _this6 = this;
       return this.widgetConfigs.map(function (widgetConfig) {
         return {
           name: widgetConfig.name,
@@ -216,8 +352,8 @@ var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/f
             content: widgetConfig.name
           },
           onClick: function onClick() {
-            return _this4._notifyClick(function () {
-              return _this4.clickWidget(widgetConfig);
+            return _this6._notifyClick(function () {
+              return _this6.clickWidget(widgetConfig);
             }, FcrUIApplistItemType.WIDGETS);
           },
           imgSrc: widgetConfig.icon,
@@ -225,6 +361,14 @@ var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/f
         };
       });
     }
+  }, {
+    key: "hostDisabledCaptionPermissionToast",
+    value: function hostDisabledCaptionPermissionToast() {
+      this._messageProvider.showToast({
+        type: 'error',
+        message: (0, _i18n.transI18n)('fmt_ai_subtitles_toast_host_disabled_subtitles')
+      });
+    }
   }, {
     key: "addObserver",
     value: function addObserver(observer) {
@@ -247,7 +391,7 @@ var FcrUIApplistProviderImpl = exports.FcrUIApplistProviderImpl = /*#__PURE__*/f
   }]);
 }();
 _FcrUIApplistProviderImpl = FcrUIApplistProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIApplistProviderImpl, [[_mobx.computed, 3, "appItemOptions"], [_decorator.bound, 2, "openDeviceSettingDialog"], [_decorator.bound, 2, "openInterpreterDialog"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_clickWidgetDecs, 18, "clickWidget"], [_mobx.computed, 3, "interpreterProps"], [_mobx.computed, 3, "liveStreamingProps"], [_mobx.computed, 3, "beautyBackgroundProps"], [_mobx.computed, 3, "widgetListProps"], [_decorator.bound, 2, "_notifyClick"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrUIApplistProviderImpl, [[_mobx.computed, 3, "appItemOptions"], [_decorator.bound, 2, "toggleCaptionState"], [_decorator.bound, 2, "openSubtitlesHistoryDialog"], [_decorator.bound, 2, "openDeviceSettingDialog"], [_decorator.bound, 2, "openInterpreterDialog"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_clickWidgetDecs, 18, "clickWidget"], [_mobx.computed, 3, "captionProps"], [_mobx.computed, 3, "transcribeProps"], [_mobx.computed, 3, "interpreterProps"], [_mobx.computed, 3, "liveStreamingProps"], [_mobx.computed, 3, "beautyBackgroundProps"], [_mobx.computed, 3, "widgetListProps"], [_decorator.bound, 2, "hostDisabledCaptionPermissionToast"], [_decorator.bound, 2, "_notifyClick"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/providers/board-share/bar-control/base.d.ts

@@ -1,16 +1,15 @@
 import { FcrImageData } from 'fcr-core/lib/imports';
-import { FcrBoardToolType, FcrBoardShape } from 'fcr-core/lib/room-control/whiteboard-control/enums';
-import { FcrConnectionState, FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrBoardToolType, FcrBoardShape } from 'fcr-core';
+import { FcrConnectionState, FcrUserInfo, FcrWhiteboardControl } from 'fcr-core/lib/type';
 import { FcrToolbarState } from '../../../modules/components/toolbar/types';
 import { FcrUIMainWindowRendererObserver, WhiteboardToolAction } from '../../../modules/secondary-window/type';
 import { WhiteboardThemeType } from '../../../modules/whiteboard/type';
 import { FcrUIPrivilegeProvider } from '../../../providers/privilege-provider';
 import { FcrUIBoardBarControl } from '../type';
-import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 export declare abstract class FcrUIBoardControlShareProviderBase implements FcrUIBoardBarControl {
     private readonly _privilegeProvider;
     private readonly _boardControl;
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("fcr-core/lib/imports").Logger;
     private _roomName;
     private get _boardMainRoom();
     private accessor _showLoading;
@@ -24,7 +23,7 @@ export declare abstract class FcrUIBoardControlShareProviderBase implements FcrU
     abstract get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
     get showLoading(): boolean;
     get canWriteBoard(): boolean;
-    constructor(_privilegeProvider: FcrUIPrivilegeProvider, _boardControl: FcrPrivilegedWhiteboardControl);
+    constructor(_privilegeProvider: FcrUIPrivilegeProvider, _boardControl: FcrWhiteboardControl);
     setControlEnable(enable: boolean): void;
     setSharingUser(userInfo: FcrUserInfo): void;
     updateSubProcessBackgroundColor(color: string): void;

package/lib/providers/board-share/bar-control/base.js

@@ -53,7 +53,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("fcr-core/lib/imports");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 var _type = require("fcr-core/lib/type");
 var _type2 = require("../../../modules/secondary-window/type");
 var _mobx = require("mobx");
@@ -98,10 +98,10 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
     _classPrivateFieldInitSpec(this, _G, _init_joinSuccess(this, false));
     _classPrivateFieldInitSpec(this, _H, _init_toolbarState(this, {
       controlEnable: false,
-      currentTool: _enums.FcrBoardToolType.LASER_POINTER,
+      currentTool: _fcrCore.FcrBoardToolType.LASER_POINTER,
       currentStrokeWidth: 2,
       currentColor: _toolbar.colors[7],
-      currentShape: _enums.FcrBoardShape.Rectangle,
+      currentShape: _fcrCore.FcrBoardShape.Rectangle,
       redoSteps: false,
       undoSteps: false,
       themeColors: this.currentTheme.colors,
@@ -286,7 +286,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
     value: function resetWhiteboardTool() {
       this.setWhiteboardTool({
         action: _type2.WhiteboardToolAction.TOOL,
-        tool: _enums.FcrBoardToolType.LASER_POINTER
+        tool: _fcrCore.FcrBoardToolType.LASER_POINTER
       });
       this.setWhiteboardTool({
         action: _type2.WhiteboardToolAction.WIDTH,

package/lib/providers/board-share/bar-control/browser.d.ts

@@ -1,10 +1,10 @@
 import { FcrUIPrivilegeProvider } from '../../../providers/privilege-provider';
-import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 import { FcrUIBoardControlShareProviderBase } from './base';
 import { FcrUIMainWindowRendererObserver } from '../../../modules/secondary-window/type';
+import { FcrWhiteboardControl } from 'fcr-core/lib/type';
 export declare class FcrUIBoardControlShareProviderImpl extends FcrUIBoardControlShareProviderBase {
     get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
-    constructor(privilegeProvider: FcrUIPrivilegeProvider, boardControl: FcrPrivilegedWhiteboardControl);
+    constructor(privilegeProvider: FcrUIPrivilegeProvider, boardControl: FcrWhiteboardControl);
     inActive(): void;
     setIsDualDisplayMode(): void;
 }

package/lib/providers/board-share/bar-control/electron.d.ts

@@ -1,18 +1,17 @@
-import { FcrBoardToolType, FcrBoardShape } from 'fcr-core/lib/room-control/whiteboard-control/enums';
-import { FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrBoardToolType, FcrBoardShape } from 'fcr-core';
+import { FcrUserInfo, FcrWhiteboardControl } from 'fcr-core/lib/type';
 import { FcrUIMainWindowRenderer, FcrUIMainWindowRendererObserver, WhiteboardToolAction } from '../../../modules/secondary-window/type';
 import { WhiteboardThemeType } from '../../../modules/whiteboard/type';
 import { FcrUIPrivilegeProvider } from '../../../providers/privilege-provider';
-import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 import { FcrUIBoardControlShareProviderBase } from './base';
 export declare class FcrUIBoardControlShareProviderImpl extends FcrUIBoardControlShareProviderBase {
     private readonly _fcrUIMainWindowRenderer;
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("fcr-core/lib/imports").Logger;
     private _disposers;
     private _isDualDisplayMode;
     private _toolbarStateObserver;
     get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
-    constructor(privilegeProvider: FcrUIPrivilegeProvider, boardControl: FcrPrivilegedWhiteboardControl, _fcrUIMainWindowRenderer: FcrUIMainWindowRenderer);
+    constructor(privilegeProvider: FcrUIPrivilegeProvider, boardControl: FcrWhiteboardControl, _fcrUIMainWindowRenderer: FcrUIMainWindowRenderer);
     setControlEnable(enable: boolean): void;
     setSharingUser(userInfo: FcrUserInfo): void;
     updateSubProcessBackgroundColor(color: string): void;

package/lib/providers/board-share/bar-control/electron.js

@@ -173,6 +173,8 @@ var FcrUIBoardControlShareProviderImpl = exports.FcrUIBoardControlShareProviderI
       this._isDualDisplayMode = isDualDisplayMode;
       if (isDualDisplayMode) {
         this._fcrUIMainWindowRenderer.addObserver(this._toolbarStateObserver);
+        // 激活双屏模式时，先触发 onPermissionUpdated 一次, 让子窗口同步权限状态
+        this._fcrUIMainWindowRenderer.notifyObservers('onPermissionUpdated', this.canWriteBoard);
         this._disposers.push((0, _mobx.reaction)(function () {
           return _this2.canWriteBoard;
         }, function (canWrite) {

package/lib/providers/board-share/provider.base.d.ts

@@ -1,17 +1,17 @@
 import { FcrUIManagedObject, FcrUIObjectManager } from '../../object-manager';
 import { FcrUIRoomProvider } from '../room-provider/room-provider';
 import { FcrUIBoardBarControl, FcrUIBoardShareObserver, FcrUIBoardShareProvider } from './type';
-import { FcrBoardMainWindow, FcrColor } from 'fcr-core/lib/room-control/whiteboard-control/types';
-import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardMainWindow, FcrColor, FcrBoardToolType } from 'fcr-core';
 import { FcrConnectionState } from 'fcr-core';
 import { FcrUserInfo, FcrWhiteboardState } from 'fcr-core/lib/type';
-import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
 export declare abstract class FcrUIBoardShareProviderBase implements FcrUIBoardShareProvider, FcrUIManagedObject {
     private readonly objectManager;
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("fcr-core/lib/imports").Logger;
+    private _disposers;
     protected _roomProvider: FcrUIRoomProvider;
-    protected _boardControl: FcrPrivilegedWhiteboardControl;
+    protected _boardControl: FcrWhiteboardControl;
     protected _observable: AgoraObservable<FcrUIBoardShareObserver>;
     private _sharingControl;
     private _privilegeProvider;
@@ -34,7 +34,7 @@ export declare abstract class FcrUIBoardShareProviderBase implements FcrUIBoardS
         platform: number;
         avatar: string;
     };
-    get backgroundColor(): string | undefined;
+    get backgroundColor(): string;
     get isActive(): boolean;
     get isMyBoard(): boolean;
     get canWriteBoard(): boolean;

package/lib/providers/board-share/provider.base.js

@@ -4,7 +4,6 @@ require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
 require("core-js/modules/es.array.is-array.js");
-require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
@@ -40,14 +39,18 @@ require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -56,7 +59,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectManager = require("../../object-manager");
 var _logger = require("../../utilities/logger");
-var _types = require("fcr-core/lib/room-control/whiteboard-control/types");
 var _fcrCore = require("fcr-core");
 var _mobx = require("mobx");
 var _type = require("fcr-core/lib/type");
@@ -66,6 +68,7 @@ var _decorator = require("agora-foundation/lib/decorator");
 var _imports = require("fcr-core/lib/imports");
 var _constant = require("../../utilities/constant");
 var _theme = _interopRequireDefault(require("../../modules/whiteboard/libs/theme"));
+var _enum = require("fcr-core/lib/room-control/whiteboard-control/enum");
 var _FcrUIBoardShareProviderBase;
 var _initProto, _init_loading, _init_boardState, _init_connectionState, _init_joined, _handleStartedDecs, _handleEndedDecs, _handleConnectionStateUpdatedDecs, _handleConnectedDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -85,10 +88,12 @@ var _D = /*#__PURE__*/new WeakMap();
 _ref = (_handleStartedDecs = [_mobx.action, _mobx.action.bound], _handleEndedDecs = [_mobx.action, _mobx.action.bound], _handleConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleConnectedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PURE__*/function () {
   function FcrUIBoardShareProviderBase(objectManager) {
+    var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUIBoardShareProviderBase);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUIBoardShareProviderBase'
     })));
+    (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_observer", {
       // onWhiteboardStarted is active event callback
@@ -120,6 +125,14 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
     if (this.isActive) {
       this._boardControl.open();
     }
+    this._disposers.push((0, _mobx.reaction)(function () {
+      return _this.canWriteBoard;
+    }, function (canWriteBoard) {
+      // 权限被移除时，重置白板工具
+      if (!canWriteBoard) {
+        _this.boardBarControl.resetWhiteboardTool();
+      }
+    }));
   }
   return (0, _createClass2["default"])(FcrUIBoardShareProviderBase, [{
     key: "boardMainWindow",
@@ -266,6 +279,10 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
   }, {
     key: "release",
     value: function release() {
+      this._disposers.forEach(function (dispose) {
+        return dispose();
+      });
+      this._disposers = [];
       this._sharingControl.removeObserver(this._observer);
       this._boardControl.removeObserver(this._boardObserver);
     }
@@ -313,7 +330,7 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
       this.logger.info("Board share ended with reason: ".concat(reason, ", operatorUser: ").concat((0, _imports.jsonstring)(operatorUser), "."));
       this._boardControl.close();
       this.boardState = _type.FcrWhiteboardState.END;
-      if (reason === _types.FcrBoardInactiveReason.SEIZE) {
+      if (reason === _enum.FcrBoardInactiveReason.SEIZE) {
         this._observable.notifyObservers('onBoardShareStopped', {
           reason: _struct.FcrUIBoardShareStopReason.STOPPED_BY_OTHER,
           operatorUser: operatorUser

package/lib/providers/board-share/provider.browser.js

@@ -57,7 +57,7 @@ var _browser = require("./bar-control/browser");
 var _provider = require("./provider.base");
 var _mobx = require("mobx");
 var _decorator = require("agora-foundation/lib/decorator");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _fcrCore = require("fcr-core");
 var _FcrUIBoardShareProviderImpl;
 var _initProto, _handleStateUpdatedDecs, _handleRedoStateUpdatedDecs, _handleUndoStateUpdatedDecs, _ref;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -130,7 +130,7 @@ var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PUR
   }, {
     key: "_resetWhiteboardTool",
     value: function _resetWhiteboardTool() {
-      this.boardMainWindow.setToolType(_enums.FcrBoardToolType.LASER_POINTER);
+      this.boardMainWindow.setToolType(_fcrCore.FcrBoardToolType.LASER_POINTER);
       this.boardMainWindow.setStrokeWidth(2);
       this.boardMainWindow.setStrokeColor(this._boardBarControl.currentTheme.colors[2]);
       this.boardBarControl.resetWhiteboardTool();

package/lib/providers/board-share/provider.electron.js

@@ -53,7 +53,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectManager2 = require("../../object-manager");
 var _logger = require("../../utilities/logger");
-var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _fcrCore = require("fcr-core");
 var _mobx = require("mobx");
 var _decorator = require("agora-foundation/lib/decorator");
@@ -150,7 +149,7 @@ var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PUR
   }, {
     key: "_resetWhiteboardTool",
     value: function _resetWhiteboardTool() {
-      this.boardMainWindow.setToolType(_enums.FcrBoardToolType.LASER_POINTER);
+      this.boardMainWindow.setToolType(_fcrCore.FcrBoardToolType.LASER_POINTER);
       this.boardMainWindow.setStrokeWidth(2);
       this.boardMainWindow.setStrokeColor(this._boardBarControl.currentTheme.colors[2]);
       this.boardBarControl.resetWhiteboardTool();

package/lib/providers/board-share/type.d.ts

@@ -3,8 +3,7 @@ import { FcrConnectionState, FcrUserInfo, FcrWhiteboardState } from 'fcr-core/li
 import { WhiteboardThemeType } from '../../modules/whiteboard/type';
 import { FcrToolbarState } from '../../modules/components/toolbar/types';
 import { FcrUIMainWindowRendererObserver, WhiteboardToolAction } from '../../modules/secondary-window/type';
-import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
-import { FcrColor } from 'fcr-core/lib/room-control/whiteboard-control/types';
+import { FcrBoardShape, FcrBoardToolType, FcrColor } from 'fcr-core';
 export interface FcrUIBoardShareObserver {
     /**
      * 白板共享开启