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

package/lib/providers/whiteboard-provider.js

@@ -0,0 +1,128 @@
+"use strict";
+
+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.error.cause.js");
+require("core-js/modules/es.error.to-string.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");
+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");
+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-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.function.metadata.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");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+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.iterator.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUIWhiteboardProviderImpl = void 0;
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _base = require("../base");
+var _logger = require("../utilities/logger");
+var _decorator = require("agora-foundation/lib/decorator");
+var _FcrUIWhiteboardProviderImpl;
+var _initProto;
+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); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+var FcrUIWhiteboardProviderImpl = exports.FcrUIWhiteboardProviderImpl = /*#__PURE__*/function () {
+  function FcrUIWhiteboardProviderImpl(_whiteboardControl, _sharedWhiteboardDataSource, _userControl) {
+    var _this = this;
+    (0, _classCallCheck2["default"])(this, FcrUIWhiteboardProviderImpl);
+    (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrUIWhiteboardProvider'
+    })));
+    (0, _defineProperty2["default"])(this, "_whiteboardObserver", {
+      onBackgroundColorUpdated: function onBackgroundColorUpdated(color) {
+        _this.logger.info("[whiteboard-provider]: onBackgroundColorUpdated ".concat(color));
+        _this._sharedWhiteboardDataSource.setBackgroundColor(color);
+      },
+      onActive: function onActive(ownerId, operatorUser) {
+        _this.logger.info("[whiteboard-provider]: onActive ".concat(ownerId, ", ").concat(JSON.stringify(operatorUser)));
+        var owner = _this._userControl.getUser(ownerId);
+        _this._sharedWhiteboardDataSource.setSharingUser(owner);
+        _this._ownerUser = owner;
+      },
+      onInactive: function onInactive(reason, operatorUser) {
+        _this.logger.info("[whiteboard-provider]: onInactive ".concat(reason, ", ").concat(JSON.stringify(operatorUser)));
+        _this._sharedWhiteboardDataSource.setSharingUser(undefined);
+      },
+      onConnectionStateUpdated: function onConnectionStateUpdated(state) {
+        _this.logger.info("[whiteboard-provider]: onConnectionStateUpdated ".concat(state));
+      }
+    });
+    this._whiteboardControl = _whiteboardControl;
+    this._sharedWhiteboardDataSource = _sharedWhiteboardDataSource;
+    this._userControl = _userControl;
+    _whiteboardControl.addObserver(this._whiteboardObserver);
+  }
+  return (0, _createClass2["default"])(FcrUIWhiteboardProviderImpl, [{
+    key: "backgroundColor",
+    get: function get() {
+      var bgColor = this._whiteboardControl.getBackgroundColor();
+      if (!bgColor) {
+        return '#ffffff';
+      }
+      return bgColor;
+    }
+  }, {
+    key: "isActive",
+    get: function get() {
+      var isActive = this._whiteboardControl.getActivity();
+      return isActive;
+    }
+  }, {
+    key: "connectionState",
+    get: function get() {
+      return this._whiteboardControl.getConnectionState();
+    }
+  }, {
+    key: "ownerUser",
+    get: function get() {
+      return this._ownerUser;
+    }
+  }, {
+    key: "setBackground",
+    value: function setBackground(color) {
+      var _this$_whiteboardCont;
+      (_this$_whiteboardCont = this._whiteboardControl) === null || _this$_whiteboardCont === void 0 || _this$_whiteboardCont.setBackgroundColor(color);
+    }
+  }]);
+}();
+_FcrUIWhiteboardProviderImpl = FcrUIWhiteboardProviderImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIWhiteboardProviderImpl, [[_decorator.bound, 2, "setBackground"]], []).e, 1);
+_initProto = _applyDecs$e[0];
+(0, _base.registerDependency)('whiteboardProvider');

package/lib/runtime.d.ts

@@ -38,6 +38,7 @@ declare global {
         dom: Element,
         browserWindow: Electron.BrowserWindow,
         newRendererWindow: Window,
+        baseUrl: string,
       ) => void,
       windowOptions: import('electron').BrowserWindowConstructorOptions,
     ): void;

package/lib/scenes/main-scene.d.ts

@@ -38,6 +38,9 @@ import { FcrUIApplistProvider } from '../providers/app-list-provider';
 import { FcrUISharedApplistSourceImpl } from '../shared-data-source/app-list-data';
 import { FcrUISharedConfirmDataSource } from '../shared-data-source/confirm-data';
 import { FcrUISharedAnnotationSource } from '../shared-data-source/annotation-data';
+import { FcrUIMultiDisplayProvider } from '../providers/multi-display-provider';
+import { FcrUISharedWhiteboardDataSource } from '../shared-data-source/whiteboard-data';
+import { FcrUIWhiteboardProvider } from '../providers/whiteboard-provider';
 export type FcrMainUISceneArgs = {
     engine: FcrCoreEngine;
     eventProvider: FcrUIEventProvider;
@@ -84,6 +87,8 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     annotationProvider: FcrUIAnnotationProvider;
     sharingProvider: FcrUISharingProvider;
     applistProvider: FcrUIApplistProvider;
+    multiDisplayProvider: FcrUIMultiDisplayProvider;
+    whiteboardProvider: FcrUIWhiteboardProvider;
     sharedConfigDataSource: FcrUISharedConfigDataSource;
     sharedInterpreterDataSource: FcrUISharedInterpreterDataSource;
     sharedSettingDataSource: FcrUISharedSettingDataSource;
@@ -101,6 +106,7 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     sharedApplistDataSource: FcrUISharedApplistSourceImpl;
     sharedConfirmDataSource: FcrUISharedConfirmDataSource;
     sharedAnnotationDataSource: FcrUISharedAnnotationSource;
+    sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource;
     private _isWaitingRoomNotify;
     constructor(args: FcrMainUISceneArgs);
     private _addObservers;

package/lib/scenes/main-scene.js

@@ -132,10 +132,16 @@ var _appListData = require("../shared-data-source/app-list-data");
 var _confirmLeaveMeeting = require("../modules/dialog/dialogs/confirm-leave-meeting");
 var _endMeeting = require("../modules/dialog/dialogs/end-meeting");
 var _annotationData = require("../shared-data-source/annotation-data");
+var _subWindow = require("../modules/dialog/dialogs/sub-window");
+var _secondaryWindow = require("../modules/secondary-window");
+var _multiDisplayProvider = require("../providers/multi-display-provider");
+var _whiteboardData = require("../shared-data-source/whiteboard-data");
+var _whiteboardProvider = require("../providers/whiteboard-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 var _FcrMainUIScene;
 var _initProto; // import DeviceSettingDialog from '../modules/dialog/dialogs/device-setting';
 // import { RemoveAdmitWaitingRoomDialog } from '../modules/dialog/components/remove-admit-waiting-room';
+// import { SettingUIModule } from '../modules/setting';
 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)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 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)]; } }; }
@@ -198,7 +204,6 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider);
     var monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(engine.getMonitorControl());
     var chatProvider = new _chatProvider.FcrUIChatProviderImpl(currentRoomControlProvider.currentRoomControl, roomProvider);
-    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource);
     var sharedWaitingRoomDataSource = new _waitingRoom.FcrUISharedWaitingRoomDataSourceImpl(roomProvider, eventProvider);
     var phoneAudioConnectorProvider = new _phoneAudioProvider.FcrUIPhoneAudioConnectorProviderImpl({
       roomControl: mainRoomControl,
@@ -210,7 +215,23 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       mainRoomControl: mainRoomControl
     });
     var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource, eventProvider, mainRoomControl.getSharingControl().getBoardControl());
-    var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource);
+    var fcrUIMainWindowRenderer = new _secondaryWindow.FcrUIMainWindowRendererImpl();
+    // @ts-ignore
+    window.FcrUIMainWindowRenderer = fcrUIMainWindowRenderer;
+    var sharedWhiteboardDataSource = new _whiteboardData.FcrUISharedWhiteboardDataSourceImpl(sharingControl.getBoardControl(), privilegeProvider, fcrUIMainWindowRenderer);
+    var whiteboardProvider = new _whiteboardProvider.FcrUIWhiteboardProviderImpl(sharingControl.getBoardControl(), sharedWhiteboardDataSource, userControl);
+    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource, sharedWhiteboardDataSource, whiteboardProvider, userControl);
+    var multiDisplayProvider = new _multiDisplayProvider.FcrUIMultiDisplayProviderImpl({
+      eventProvider: eventProvider,
+      sharedSettingDataSource: sharedSettingDataSource,
+      sharedMemberDataSource: sharedMemberDataSource,
+      sharedVideoWindowDataSource: sharedVideoWindowDataSource,
+      sharingProvider: sharingProvider,
+      sharedScreenShareSharedDataSource: sharedScreenShareSharedDataSource,
+      fcrUIMainWindowRenderer: fcrUIMainWindowRenderer,
+      sharedWhiteboardDataSource: sharedWhiteboardDataSource
+    });
+    var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource, privilegeProvider);
     var annotationProvider = new _annotationProvider.FcrUIAnnotationProviderImpl(dialogProvider, sharedVideoWindowDataSource, privilegeProvider, sharedScreenShareSharedDataSource);
     var sharedSecurityDataSource = new _securityData.FcrUISecuritySharedDataSourceImpl(privilegeProvider, sharedMemberDataSource);
     var sharedApplistDataSource = new _appListData.FcrUISharedApplistSourceImpl(abilityProvider, privilegeProvider, roomProvider, widgetProvider, sharedMemberDataSource, sharedInterpreterDataSource);
@@ -243,6 +264,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     _this.applistProvider = applistProvider;
     _this.widgetProvider = widgetProvider;
     _this.abilityProvider = abilityProvider;
+    _this.multiDisplayProvider = multiDisplayProvider;
+    _this.whiteboardProvider = whiteboardProvider;
     _this.sharedSpeakerSpotlightDataSource = sharedSpeakerSpotlightDataSource;
     _this.sharedPinDataSource = sharedPinDataSource;
     _this.sharedConfigDataSource = sharedConfigDataSource;
@@ -260,6 +283,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     _this.sharedApplistDataSource = sharedApplistDataSource;
     _this.sharedConfirmDataSource = sharedConfirmDataSource;
     _this.sharedAnnotationDataSource = sharedAnnotationDataSource;
+    _this.sharedWhiteboardDataSource = sharedWhiteboardDataSource;
     _this._addObservers();
     return _this;
   }
@@ -355,6 +379,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       var phoneAudioConnection = new _phoneAudioConnect.PhoneAudioConnectionUIModule(this, this);
       var webWidgetUIModule = new _widget2.WebWidgetUIModule(this, this);
       var annotationUIModule = new _annotation.AnnotationUIModule(this, this);
+      var displayDistributionModule = new _secondaryWindow.FcrUISecondaryWindowModule(this, this);
       this.addSubNode(chatModule);
       this.addSubNode(audioStreamUIModule);
       this.addSubNode(soundEffectUIModule);
@@ -378,6 +403,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       this.addSubNode(phoneAudioConnection);
       this.addSubNode(webWidgetUIModule);
       this.addSubNode(annotationUIModule);
+      this.addSubNode(displayDistributionModule);
       var getView = function getView() {
         dialogModule.addDialogs([
         // {
@@ -532,6 +558,13 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
               params: props.params
             }, "EndMeetingDialog");
           }
+        }, {
+          key: _constant.FcrUIDialogKey.SUB_WINDOW,
+          component: function component() {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_subWindow.SubWindowDialog, {
+              children: displayDistributionModule.component(shareScreenModule)
+            }, "SubWindowDialog");
+          }
         }]);
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_videoTrackRenderContext.FcrVideoTrackRenderContext.Provider, {
           value: {
@@ -561,11 +594,18 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
         });
       };
       _reactDom["default"].render(getView(), dom);
+
+      // for debug use only
+      // @ts-ignore
+      window._mainScene = this;
     }
   }, {
     key: "unmount",
     value: function unmount(dom) {
       _reactDom["default"].unmountComponentAtNode(dom);
+
+      // @ts-ignore
+      window._mainScene = null;
     }
   }, {
     key: "onNodeWillActive",
@@ -581,12 +621,14 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       this.devicePrivilegeProvider.release();
       this.privilegeProvider.release();
       this.deviceStreamProvider.release();
+      this.multiDisplayProvider.release();
       this.sharedInterpreterDataSource.release();
       this.sharedMemberDataSource.release();
       this.sharedMeetingTimeDataSource.release(); // 修复：添加对会议时间数据源的释放
       this.sharedWaitingRoomDataSource.release(); // 修复：添加对等候室数据源的释放
       this.sharedSecuritySharedDataSource.release(); // 修复：添加对安全数据源的释放
       this.sharedVideoWindowDataSource.release(); // 修复：添加对视频窗口数据源的释放
+      this.sharedWhiteboardDataSource.release();
     }
   }, {
     key: "_setIsWaitingRoomNotify",

package/lib/scenes/waiting-scene.d.ts

@@ -22,7 +22,6 @@ import { FcrUIMemberSharedDataSource } from '../shared-data-source/member-data';
 import { FcrUIWidgetProvider } from '../providers/widget-provider';
 import { FcrUISharedWaitingRoomDataSource } from '../shared-data-source/waiting-room';
 import { FcrUIAbilityProviderImpl } from '../providers/ability-provider';
-import { FcrUIScreenShareProviderImpl } from '../providers/screen-share-provider';
 import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
 import { FcrUISharedConfirmDataSource } from '../shared-data-source/confirm-data';
 import { FcrUIApplistProvider } from '../providers/app-list-provider';
@@ -62,7 +61,6 @@ export declare class FcrWaitingUIScene extends FcrBaseUIScene {
     monitorProvider: FcrUIMonitorProviderImpl;
     deviceStreamProvider: FcrUIDeviceStreamProviderImpl;
     widgetProvider: FcrUIWidgetProvider;
-    screenShareProvider: FcrUIScreenShareProviderImpl;
     applistProvider: FcrUIApplistProvider;
     sharedConfigDataSource: FcrUISharedConfigDataSource;
     messageProvider: FcrUIMessageProvider;

package/lib/scenes/waiting-scene.js

@@ -42,8 +42,6 @@ var _eventConfirm = require("../modules/event-confirm");
 var _memberData = require("../shared-data-source/member-data");
 var _waitingRoom = require("../shared-data-source/waiting-room");
 var _abilityProvider = require("../providers/ability-provider");
-var _screenShareProvider = require("../providers/screen-share-provider");
-var _sharingProvider = require("../providers/sharing-provider");
 var _appListProvider = require("../providers/app-list-provider");
 var _appListData = require("../shared-data-source/app-list-data");
 var _endMeeting = require("../modules/dialog/dialogs/end-meeting");
@@ -97,11 +95,8 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     var monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(engine.getMonitorControl());
     var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(waitingRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource);
     var sharedChatDataSource = new _chatData.FcrUISharedChatDataSourceImpl(chatProvider);
-    var sharingControl = waitingRoomControl.getSharingControl();
-    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource);
     var sharedInterpreterDataSource = new _interpreter.FcrUISharedInterpreterDataSourceImpl();
     var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource, eventProvider);
-    var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource);
     var privilegeProvider = waitingRoomControlProvider.privilegeProvider;
     var sharedApplistDataSource = new _appListData.FcrUISharedApplistSourceImpl(abilityProvider, privilegeProvider, roomProvider, widgetProvider, sharedMemberDataSource);
     var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource);
@@ -133,7 +128,6 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     _this.deviceStreamProvider = deviceStreamProvider;
     _this.sharedMemberDataSource = sharedMemberDataSource;
     _this.sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
-    _this.screenShareProvider = screenShareProvider;
     _this.widgetProvider = widgetProvider;
     _this.sharedWaitingRoomDataSource = sharedWaitingRoomDataSource;
     _this.abilityProvider = abilityProvider;

package/lib/schema.d.ts

@@ -128,15 +128,15 @@ export type FcrUISceneConfigSchema = z.infer<typeof fcrUISceneConfigSchema>;
 export declare const fcrUISceneCallbackSchema: z.ZodFunction<z.ZodTuple<[z.ZodString], z.ZodUnknown>, z.ZodVoid>;
 export type FcrUISceneCallbackSchema = z.infer<typeof fcrUISceneCallbackSchema>;
 export declare const fcrUISceneFailureCallbackSchema: z.ZodFunction<z.ZodTuple<[z.ZodString, z.ZodObject<{
-    code: z.ZodString;
+    code: z.ZodNumber;
     message: z.ZodString;
     origin: z.ZodOptional<z.ZodUnion<[z.ZodType<Error, z.ZodTypeDef, Error>, z.ZodUndefined]>>;
 }, "strip", z.ZodTypeAny, {
-    code: string;
+    code: number;
     message: string;
     origin?: Error | undefined;
 }, {
-    code: string;
+    code: number;
     message: string;
     origin?: Error | undefined;
 }>], z.ZodUnknown>, z.ZodVoid>;

package/lib/schema.js

@@ -78,7 +78,7 @@ var fcrUISceneConfigSchema = exports.fcrUISceneConfigSchema = _schema.z.object({
   avatar: _schema.stringSchema.optional()
 });
 var fcrErrorSchema = _schema.z.object({
-  code: _schema.z.string(),
+  code: _schema.z.number(),
   message: _schema.z.string(),
   origin: _schema.z.union([_schema.z["instanceof"](Error), _schema.z.undefined()]).optional()
 });

package/lib/shared-data-source/confirm-data.d.ts

@@ -1,3 +1,4 @@
+import { CurrentShareBounds } from '../modules/control-bar/types';
 export interface FcrUISharedConfirmDataSource {
     get position(): {
         x: number;
@@ -11,15 +12,33 @@ export interface FcrUISharedConfirmDataSource {
         x: number;
         y: number;
     }): void;
+    setWindowBounds(key: string, window: CurrentShareBounds): void;
+    removeWindowBounds(key: string): void;
+    addObserver(observer: FcrMousePositionObserver): void;
+    removeObserver(observer: FcrMousePositionObserver): void;
 }
+export type FcrMousePositionObserver = {
+    onMouseOver(key: string): void;
+    onMouseOut(key: string): void;
+};
 export declare class FcrUISharedConfirmDataSourceImpl implements FcrUISharedConfirmDataSource {
     protected logger: import("agora-foundation/lib/logger").Logger;
+    private _observable;
     accessor position: {
         x: number;
         y: number;
     };
+    accessor windows: Map<string, CurrentShareBounds>;
+    accessor mouseOverState: Set<unknown>;
+    constructor();
     setPosition(position: {
         x: number;
         y: number;
     }): void;
+    setWindowBounds(key: string, window: CurrentShareBounds): void;
+    removeWindowBounds(key: string): void;
+    addObserver(observer: FcrMousePositionObserver): void;
+    removeObserver(observer: FcrMousePositionObserver): void;
+    release(): void;
+    private _addLogObserver;
 }

package/lib/shared-data-source/confirm-data.js

@@ -10,12 +10,27 @@ 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");
-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-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.symbol.metadata.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUISharedConfirmDataSourceImpl = void 0;
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.set.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.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");
@@ -30,19 +45,32 @@ require("core-js/modules/esnext.map.merge.js");
 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");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FcrUISharedConfirmDataSourceImpl = void 0;
-require("core-js/modules/es.array.iterator.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.set.add-all.js");
+require("core-js/modules/esnext.set.delete-all.js");
+require("core-js/modules/esnext.set.difference.v2.js");
+require("core-js/modules/esnext.set.difference.js");
+require("core-js/modules/esnext.set.every.js");
+require("core-js/modules/esnext.set.filter.js");
+require("core-js/modules/esnext.set.find.js");
+require("core-js/modules/esnext.set.intersection.v2.js");
+require("core-js/modules/esnext.set.intersection.js");
+require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
+require("core-js/modules/esnext.set.is-disjoint-from.js");
+require("core-js/modules/esnext.set.is-subset-of.v2.js");
+require("core-js/modules/esnext.set.is-subset-of.js");
+require("core-js/modules/esnext.set.is-superset-of.v2.js");
+require("core-js/modules/esnext.set.is-superset-of.js");
+require("core-js/modules/esnext.set.join.js");
+require("core-js/modules/esnext.set.map.js");
+require("core-js/modules/esnext.set.reduce.js");
+require("core-js/modules/esnext.set.some.js");
+require("core-js/modules/esnext.set.symmetric-difference.v2.js");
+require("core-js/modules/esnext.set.symmetric-difference.js");
+require("core-js/modules/esnext.set.union.v2.js");
+require("core-js/modules/esnext.set.union.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 _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -51,8 +79,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _mobx = require("mobx");
 var _base = require("../base");
 var _logger = require("../utilities/logger");
+var _imports = require("fcr-core/lib/imports");
 var _FcrUISharedConfirmDataSourceImpl;
-var _initProto, _init_position;
+var _initProto, _init_position, _init_windows, _init_mouseOverState;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -64,16 +93,22 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var _A = /*#__PURE__*/new WeakMap();
+var _B = /*#__PURE__*/new WeakMap();
+var _C = /*#__PURE__*/new WeakMap();
 var FcrUISharedConfirmDataSourceImpl = exports.FcrUISharedConfirmDataSourceImpl = /*#__PURE__*/function () {
   function FcrUISharedConfirmDataSourceImpl() {
     (0, _classCallCheck2["default"])(this, FcrUISharedConfirmDataSourceImpl);
     (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUISharedConfirmDataSourceImpl'
     })));
+    (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
     _classPrivateFieldInitSpec(this, _A, _init_position(this, {
       x: 0,
       y: 0
     }));
+    _classPrivateFieldInitSpec(this, _B, _init_windows(this, new Map()));
+    _classPrivateFieldInitSpec(this, _C, _init_mouseOverState(this, new Set()));
+    this._addLogObserver();
   }
   return (0, _createClass2["default"])(FcrUISharedConfirmDataSourceImpl, [{
     key: "position",
@@ -83,15 +118,84 @@ var FcrUISharedConfirmDataSourceImpl = exports.FcrUISharedConfirmDataSourceImpl
     set: function set(v) {
       _classPrivateFieldSet(_A, this, v);
     }
+  }, {
+    key: "windows",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "mouseOverState",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
   }, {
     key: "setPosition",
     value: function setPosition(position) {
+      var _this = this;
       this.position = position;
+      if (this.windows.size > 0) {
+        this.windows.forEach(function (window, key) {
+          if (typeof window.width !== 'number' || typeof window.height !== 'number' || typeof window.x !== 'number' || typeof window.y !== 'number') {
+            return;
+          }
+          if (position.x >= window.x && position.y >= window.y && position.x <= window.x + window.width && position.y <= window.y + window.height) {
+            if (!_this.mouseOverState.has(key)) {
+              _this.mouseOverState.add(key);
+              _this._observable.notifyObservers('onMouseOver', key);
+            }
+          } else {
+            if (_this.mouseOverState.has(key)) {
+              _this.mouseOverState["delete"](key);
+              _this._observable.notifyObservers('onMouseOut', key);
+            }
+          }
+        });
+      }
+    }
+  }, {
+    key: "setWindowBounds",
+    value: function setWindowBounds(key, window) {
+      this.windows.set(key, window);
+    }
+  }, {
+    key: "removeWindowBounds",
+    value: function removeWindowBounds(key) {
+      this.mouseOverState["delete"](key);
+      this.windows["delete"](key);
+    }
+  }, {
+    key: "addObserver",
+    value: function addObserver(observer) {
+      this._observable.addObserver(observer);
+    }
+  }, {
+    key: "removeObserver",
+    value: function removeObserver(observer) {
+      this._observable.removeObserver(observer);
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      this.windows.clear();
+      this.mouseOverState.clear();
+    }
+  }, {
+    key: "_addLogObserver",
+    value: function _addLogObserver() {
+      this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onMouseOver', 'onMouseOut']));
     }
   }]);
 }();
 _FcrUISharedConfirmDataSourceImpl = FcrUISharedConfirmDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedConfirmDataSourceImpl, [[_mobx.observable, 1, "position"]], []).e, 2);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedConfirmDataSourceImpl, [[_mobx.observable, 1, "position"], [_mobx.observable, 1, "windows"], [_mobx.observable, 1, "mouseOverState"]], []).e, 4);
 _init_position = _applyDecs$e[0];
-_initProto = _applyDecs$e[1];
+_init_windows = _applyDecs$e[1];
+_init_mouseOverState = _applyDecs$e[2];
+_initProto = _applyDecs$e[3];
 (0, _base.registerDependency)('sharedConfirmDataSource');

package/lib/shared-data-source/member-data.d.ts

@@ -4,7 +4,7 @@ import { FcrUserControl } from 'fcr-core/lib/room-control/user-control/type';
 import { FcrRemoteVideoStats } from 'fcr-core/lib/room-control/stream-control/type';
 import { FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 import { FcrUIScreenShareSharedDataSource } from './screen-share-data';
 import { FcrUIEventProvider } from '../providers/event-provider';
 export interface FcrUIMemberSharedDataSource {
@@ -116,7 +116,7 @@ export declare class FcrUIMemberSharedDataSourceImpl implements FcrUIMemberShare
     get remoteMembersUserInfosList(): FcrUserInfo[];
     get memberList(): FcrUIMemberDataImpl[];
     get memberUserInfoList(): FcrUserInfo[];
-    constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _eventProvider: FcrUIEventProvider, _whiteBoardControl?: FcrWhiteboardControl | undefined);
+    constructor(_mainRoomUserControl: FcrUserControl, _streamControl: FcrStreamControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _eventProvider: FcrUIEventProvider, _whiteBoardControl?: FcrPrivilegedWhiteboardControl | undefined);
     private _addEventListeners;
     private _removeEventListeners;
     private _handleOnEvent;