fcr-ui-scene 3.7.3 → 3.7.4-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/creator.d.ts +2 -0
- package/lib/creator.js +14 -0
- package/lib/fragments/annotation/libs.d.ts +7 -6
- package/lib/fragments/annotation/libs.js +9 -8
- package/lib/fragments/whiteboard/store.js +13 -8
- package/lib/global.css +6 -0
- package/lib/modules/action-bar/components/screen-share/submenu.js +2 -2
- package/lib/modules/action-bar/index.d.ts +2 -0
- package/lib/modules/action-bar/index.js +2 -1
- package/lib/modules/action-bar/store.d.ts +6 -2
- package/lib/modules/action-bar/store.js +56 -93
- package/lib/modules/annotation/annotation-toolbar-store.js +2 -2
- package/lib/modules/annotation/store.js +12 -14
- package/lib/modules/audio-stream/index.js +1 -2
- package/lib/modules/chat/components/chat-select/index.js +3 -0
- package/lib/modules/components/device-control/store.js +2 -2
- package/lib/modules/components/leave-meeting/index.js +4 -1
- package/lib/modules/components/member-window/components/video-player/components/local-video-player-with-zoom.d.ts +6 -4
- package/lib/modules/components/member-window/components/video-player/components/local-video-player-with-zoom.js +77 -41
- package/lib/modules/components/member-window/components/video-player/components/remote-video-player-with-zoom.d.ts +3 -3
- package/lib/modules/components/member-window/components/video-player/index.d.ts +3 -3
- package/lib/modules/components/member-window/types.d.ts +3 -3
- package/lib/modules/control-bar/store.d.ts +10 -8
- package/lib/modules/control-bar/store.js +47 -15
- package/lib/modules/control-bar/view.js +27 -13
- package/lib/modules/device-pretest/store.js +4 -2
- package/lib/modules/dialog/components/dialog-container/component/body.js +3 -24
- package/lib/modules/dialog/components/dialog-container/index.d.ts +4 -0
- package/lib/modules/dialog/components/dialog-container/index.js +67 -44
- package/lib/modules/dialog/components/normal-window/index.js +4 -0
- package/lib/modules/dialog/dialogs/control-bar/index.js +9 -32
- package/lib/modules/dialog/dialogs/sub-window/index.js +4 -0
- package/lib/modules/dialog/dialogs/video-window/index.js +28 -23
- package/lib/modules/dialog/hooks/useElectron.js +4 -1
- package/lib/modules/dialog/level-config.js +1 -1
- package/lib/modules/dialog/store.d.ts +4 -3
- package/lib/modules/dialog/store.js +14 -10
- package/lib/modules/event-confirm/components/window/index.d.ts +5 -2
- package/lib/modules/event-confirm/components/window/index.js +38 -14
- package/lib/modules/event-confirm/index.css +0 -2
- package/lib/modules/event-confirm/store.d.ts +10 -5
- package/lib/modules/event-confirm/store.js +62 -13
- package/lib/modules/event-confirm/view.js +9 -7
- package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-user/index.js +1 -2
- package/lib/modules/interpreter/store.js +11 -13
- package/lib/modules/layout/components/CommonVideoRenderer.js +5 -5
- package/lib/modules/layout/store.js +8 -22
- package/lib/modules/participant/member-list-data-source.js +3 -5
- package/lib/modules/participant/store.js +43 -43
- package/lib/modules/secondary-window/index.d.ts +2 -1
- package/lib/modules/secondary-window/index.js +5 -0
- package/lib/modules/secondary-window/type.d.ts +13 -9
- package/lib/modules/secondary-window/view.js +12 -12
- package/lib/modules/setting/audio-settings/audio-settings.js +4 -2
- package/lib/modules/setting/config.d.ts +4 -0
- package/lib/modules/setting/config.js +6 -3
- package/lib/modules/setting/store.d.ts +8 -3
- package/lib/modules/setting/store.js +104 -74
- package/lib/modules/setting/view.js +3 -2
- package/lib/modules/share-screen/components/selection/index.js +6 -8
- package/lib/modules/share-screen/store.d.ts +9 -10
- package/lib/modules/share-screen/store.js +65 -90
- package/lib/modules/share-screen/types.d.ts +7 -8
- package/lib/modules/video-window/components/members/index.js +3 -3
- package/lib/modules/video-window/store.js +3 -3
- package/lib/modules/whiteboard/components/control-bar/store.d.ts +3 -0
- package/lib/modules/whiteboard/components/control-bar/store.js +20 -11
- package/lib/modules/whiteboard/components/toolbar/store.js +2 -2
- package/lib/modules/whiteboard/index.d.ts +10 -4
- package/lib/modules/whiteboard/index.js +158 -124
- package/lib/plugins/module-dev-plugin.js +4 -0
- package/lib/providers/annotation-provider.js +3 -3
- package/lib/providers/device-privilege-provider.js +13 -12
- package/lib/providers/device-provider.d.ts +37 -31
- package/lib/providers/device-provider.js +692 -746
- package/lib/providers/device-stream-provider.js +4 -4
- package/lib/providers/interpreter-provider.js +7 -9
- package/lib/providers/multi-display-provider.d.ts +8 -3
- package/lib/providers/multi-display-provider.js +18 -6
- package/lib/providers/privilege-provider.d.ts +3 -11
- package/lib/providers/privilege-provider.js +2 -5
- package/lib/providers/renderer-provider.d.ts +3 -3
- package/lib/providers/renderer-provider.js +20 -32
- package/lib/providers/room-provider.js +14 -15
- package/lib/providers/screen-share-provider.d.ts +12 -10
- package/lib/providers/screen-share-provider.js +79 -59
- package/lib/providers/sharing-provider.js +7 -0
- package/lib/providers/whiteboard-provider.js +1 -0
- package/lib/scenes/main-scene.js +15 -9
- package/lib/schema.d.ts +3 -3
- package/lib/schema.js +1 -1
- package/lib/shared-data-source/confirm-data.d.ts +19 -0
- package/lib/shared-data-source/confirm-data.js +119 -15
- package/lib/shared-data-source/screen-share-data.d.ts +29 -28
- package/lib/shared-data-source/screen-share-data.js +14 -8
- package/lib/shared-data-source/setting.js +2 -2
- package/lib/shared-data-source/whiteboard-data.d.ts +7 -5
- package/lib/shared-data-source/whiteboard-data.js +9 -8
- package/lib/ui-scene.d.ts +2 -0
- package/lib/ui-scene.js +77 -21
- package/lib/utilities/constant.d.ts +5 -0
- package/lib/utilities/constant.js +7 -2
- package/lib/utilities/default-config.d.ts +4 -0
- package/lib/utilities/default-config.js +8 -4
- package/lib/utilities/dialog-utils.d.ts +3 -2
- package/lib/utilities/dialog-utils.js +33 -14
- package/lib/utilities/package-info.d.ts +3 -0
- package/lib/utilities/package-info.js +15 -0
- package/lib/waiting-room-control-manager.js +6 -6
- package/package.json +6 -6
- package/public/index.html +5 -0
|
@@ -71,13 +71,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
71
71
|
var _fcrCore = require("fcr-core");
|
|
72
72
|
var _type = require("fcr-core/lib/type");
|
|
73
73
|
var _env = require("agora-foundation/lib/utilities/env");
|
|
74
|
-
var _type2 = require("agora-rte-sdk/lib/core/rtc/type");
|
|
75
74
|
var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
|
|
76
75
|
var _mobx = require("mobx");
|
|
77
76
|
var _i18n = require("agora-ui-foundation/lib/i18n");
|
|
78
77
|
var _decorator = require("agora-foundation/lib/decorator");
|
|
79
78
|
var _react = require("react");
|
|
80
|
-
var
|
|
79
|
+
var _type2 = require("agora-ui-foundation/lib/components/icon/type");
|
|
81
80
|
var _renderer = require("../../utilities/renderer");
|
|
82
81
|
var _screenCapturePermission = require("../../utilities/screen-capture-permission");
|
|
83
82
|
var _constant = require("../../utilities/constant");
|
|
@@ -85,7 +84,7 @@ var _logger = require("../../utilities/logger");
|
|
|
85
84
|
var _parameters = require("../../utilities/parameters");
|
|
86
85
|
var _imports = require("fcr-core/lib/imports");
|
|
87
86
|
var _ShareScreenStore;
|
|
88
|
-
var _initProto, _init_boardOwnerUser, _handleChooseScreenDecs, _init_handleChooseScreen, _setShareWithAudioStateDecs, _zoomInDecs, _zoomOutDecs, _fullContainerDecs, _setOriginScalcDecs,
|
|
87
|
+
var _initProto, _init_boardOwnerUser, _handleChooseScreenDecs, _init_handleChooseScreen, _setShareWithAudioStateDecs, _zoomInDecs, _zoomOutDecs, _fullContainerDecs, _setOriginScalcDecs, _setShareAudioProcessingChannelDecs, _openRelaunchTipsDialogDecs, _startRenderSharePreviewDecs, _stopRenderSharePreviewDecs, _handleStopShareDecs, _handleStopShareByExitRoomDecs, _handleStartShareDecs, _openShareScreenSelectionDecs, _closeShareScreenSelectionDecs, _openVideoWindowDialogDecs, _closeControlBarDecs, _closeVideoWindowDialogDecs, _handleReplaceScreenDecs, _initControlbarDecs, _toggleShareWithScenarioTypeDecs, _ref;
|
|
89
88
|
function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
|
|
90
89
|
function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
|
|
91
90
|
function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
|
|
@@ -97,7 +96,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
|
|
|
97
96
|
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; }
|
|
98
97
|
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; }
|
|
99
98
|
var _A = /*#__PURE__*/new WeakMap();
|
|
100
|
-
_ref = (_handleChooseScreenDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _zoomInDecs = [_mobx.action, _mobx.action.bound], _zoomOutDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound],
|
|
99
|
+
_ref = (_handleChooseScreenDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _zoomInDecs = [_mobx.action, _mobx.action.bound], _zoomOutDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _openRelaunchTipsDialogDecs = [_mobx.action, _mobx.action.bound], _startRenderSharePreviewDecs = [_mobx.action, _mobx.action.bound], _stopRenderSharePreviewDecs = [_mobx.action, _mobx.action.bound], _handleStopShareDecs = [_mobx.action, _mobx.action.bound], _handleStopShareByExitRoomDecs = [_mobx.action, _mobx.action.bound], _handleStartShareDecs = [_mobx.action, _mobx.action.bound], _openShareScreenSelectionDecs = [_mobx.action, _mobx.action.bound], _closeShareScreenSelectionDecs = [_mobx.action, _mobx.action.bound], _openVideoWindowDialogDecs = [_mobx.action, _mobx.action.bound], _closeControlBarDecs = [_mobx.action, _mobx.action.bound], _closeVideoWindowDialogDecs = [_mobx.action, _mobx.action.bound], _handleReplaceScreenDecs = [_mobx.action, _mobx.action.bound], _initControlbarDecs = [_mobx.action, _mobx.action.bound], _toggleShareWithScenarioTypeDecs = [_mobx.action, _mobx.action.bound], "logger");
|
|
101
100
|
var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
102
101
|
function ShareScreenStore(_ref2) {
|
|
103
102
|
var _this = this;
|
|
@@ -163,7 +162,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
163
162
|
(0, _defineProperty2["default"])(this, "_videoWindowDialogId", '');
|
|
164
163
|
_classPrivateFieldInitSpec(this, _A, _init_boardOwnerUser(this, undefined));
|
|
165
164
|
(0, _defineProperty2["default"])(this, "handleChooseScreen", _init_handleChooseScreen(this, function (id) {
|
|
166
|
-
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] :
|
|
165
|
+
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _type.FcrScreenCaptureType.WINDOW;
|
|
167
166
|
_this._sharedScreenShareSharedDataSource.setCurrentSelection(id, type);
|
|
168
167
|
}));
|
|
169
168
|
this._deviceProvider = deviceProvider;
|
|
@@ -189,7 +188,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
189
188
|
this._addEventListeners();
|
|
190
189
|
if ((0, _parameters.getStartScreenSharing)(sharedConfigDataSource.creatorConfig.parameters)) {
|
|
191
190
|
var display = window.runtime.screen.getAllDisplays()[0];
|
|
192
|
-
this.handleStartShare(String(display.id),
|
|
191
|
+
this.handleStartShare(String(display.id), _type.FcrScreenCaptureType.SCREEN, false, _shareAudio.AudioProcessingChannel.MONO, display.bounds);
|
|
193
192
|
}
|
|
194
193
|
this._disposers.push((0, _mobx.reaction)(function () {
|
|
195
194
|
return _this._securityStore.hasStartScreenSharePermission();
|
|
@@ -445,30 +444,6 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
445
444
|
value: function setOriginScalc() {
|
|
446
445
|
this._screenShareProvider.setOriginScalc();
|
|
447
446
|
}
|
|
448
|
-
}, {
|
|
449
|
-
key: "hasLoopbackDevice",
|
|
450
|
-
value: function () {
|
|
451
|
-
var _hasLoopbackDevice = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
452
|
-
var res;
|
|
453
|
-
return _regenerator["default"].wrap(function (_context) {
|
|
454
|
-
while (1) switch (_context.prev = _context.next) {
|
|
455
|
-
case 0:
|
|
456
|
-
_context.next = 1;
|
|
457
|
-
return this._deviceProvider.checkLoopbackDevice();
|
|
458
|
-
case 1:
|
|
459
|
-
res = _context.sent;
|
|
460
|
-
return _context.abrupt("return", res === 0);
|
|
461
|
-
case 2:
|
|
462
|
-
case "end":
|
|
463
|
-
return _context.stop();
|
|
464
|
-
}
|
|
465
|
-
}, _callee, this);
|
|
466
|
-
}));
|
|
467
|
-
function hasLoopbackDevice() {
|
|
468
|
-
return _hasLoopbackDevice.apply(this, arguments);
|
|
469
|
-
}
|
|
470
|
-
return hasLoopbackDevice;
|
|
471
|
-
}()
|
|
472
447
|
}, {
|
|
473
448
|
key: "setShareAudioProcessingChannel",
|
|
474
449
|
value: function setShareAudioProcessingChannel(currentShareAudioProcessingChannel) {
|
|
@@ -572,14 +547,14 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
572
547
|
}, {
|
|
573
548
|
key: "prepareShareScreen",
|
|
574
549
|
value: function () {
|
|
575
|
-
var _prepareShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function
|
|
550
|
+
var _prepareShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
576
551
|
var _this3 = this;
|
|
577
552
|
var dialogId;
|
|
578
|
-
return _regenerator["default"].wrap(function (
|
|
579
|
-
while (1) switch (
|
|
553
|
+
return _regenerator["default"].wrap(function (_context2) {
|
|
554
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
580
555
|
case 0:
|
|
581
556
|
if ((0, _screenCapturePermission.hasScreenCapturePermission)()) {
|
|
582
|
-
|
|
557
|
+
_context2.next = 1;
|
|
583
558
|
break;
|
|
584
559
|
}
|
|
585
560
|
dialogId = this._dialogProvider.openConfirmDialog({
|
|
@@ -591,9 +566,9 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
591
566
|
_this3._dialogProvider.closeConfirm(dialogId);
|
|
592
567
|
},
|
|
593
568
|
onOk: function () {
|
|
594
|
-
var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function
|
|
595
|
-
return _regenerator["default"].wrap(function (
|
|
596
|
-
while (1) switch (
|
|
569
|
+
var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
570
|
+
return _regenerator["default"].wrap(function (_context) {
|
|
571
|
+
while (1) switch (_context.prev = _context.next) {
|
|
597
572
|
case 0:
|
|
598
573
|
// 检查权限
|
|
599
574
|
// corner case: 拒绝过权限后,将应用从系统中移除,打开设置后无法找到app,需要重新检查
|
|
@@ -605,9 +580,9 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
605
580
|
_this3._dialogProvider.closeConfirm(dialogId);
|
|
606
581
|
case 1:
|
|
607
582
|
case "end":
|
|
608
|
-
return
|
|
583
|
+
return _context.stop();
|
|
609
584
|
}
|
|
610
|
-
},
|
|
585
|
+
}, _callee);
|
|
611
586
|
}));
|
|
612
587
|
function onOk() {
|
|
613
588
|
return _onOk.apply(this, arguments);
|
|
@@ -616,15 +591,15 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
616
591
|
}(),
|
|
617
592
|
closable: false
|
|
618
593
|
});
|
|
619
|
-
return
|
|
594
|
+
return _context2.abrupt("return");
|
|
620
595
|
case 1:
|
|
621
596
|
this.supportEnumScreen && this._openShareScreenSelection();
|
|
622
|
-
!(0, _env.isElectron)() && this.handleStartShare(this.currentSelectionId,
|
|
597
|
+
!(0, _env.isElectron)() && this.handleStartShare(this.currentSelectionId, _type.FcrScreenCaptureType.SCREEN, true, _shareAudio.AudioProcessingChannel.MONO, this.currentSelectionBounds);
|
|
623
598
|
case 2:
|
|
624
599
|
case "end":
|
|
625
|
-
return
|
|
600
|
+
return _context2.stop();
|
|
626
601
|
}
|
|
627
|
-
},
|
|
602
|
+
}, _callee2, this);
|
|
628
603
|
}));
|
|
629
604
|
function prepareShareScreen() {
|
|
630
605
|
return _prepareShareScreen.apply(this, arguments);
|
|
@@ -634,38 +609,38 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
634
609
|
}, {
|
|
635
610
|
key: "handleStartShare",
|
|
636
611
|
value: function () {
|
|
637
|
-
var _handleStartShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function
|
|
612
|
+
var _handleStartShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(id, type, withAudio) {
|
|
638
613
|
var audioProcessingChannel,
|
|
639
614
|
bounds,
|
|
640
615
|
electronBounds,
|
|
641
616
|
needToReplaceMyself,
|
|
642
617
|
validShareStart,
|
|
643
|
-
|
|
644
|
-
return _regenerator["default"].wrap(function (
|
|
645
|
-
while (1) switch (
|
|
618
|
+
_args3 = arguments;
|
|
619
|
+
return _regenerator["default"].wrap(function (_context3) {
|
|
620
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
646
621
|
case 0:
|
|
647
|
-
audioProcessingChannel =
|
|
648
|
-
bounds =
|
|
622
|
+
audioProcessingChannel = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : _shareAudio.AudioProcessingChannel.MONO;
|
|
623
|
+
bounds = _args3.length > 4 ? _args3[4] : undefined;
|
|
649
624
|
if (!(this.connectionState !== _fcrCore.FcrConnectionState.CONNECTED || !this._isOnline)) {
|
|
650
|
-
|
|
625
|
+
_context3.next = 1;
|
|
651
626
|
break;
|
|
652
627
|
}
|
|
653
628
|
this._showToast((0, _i18n.transI18n)('fmt_screenshare_toast_network_error_unable_start_screen_share'), 'error');
|
|
654
|
-
return
|
|
629
|
+
return _context3.abrupt("return", Promise.reject(false));
|
|
655
630
|
case 1:
|
|
656
631
|
if ((0, _env.isElectron)()) this._closeShareScreenSelection();
|
|
657
632
|
if (!id.startsWith('whiteboard-')) {
|
|
658
|
-
|
|
633
|
+
_context3.next = 3;
|
|
659
634
|
break;
|
|
660
635
|
}
|
|
661
636
|
if (!(!this._securityStore.hasStartBoardPermission() && !this.isHost)) {
|
|
662
|
-
|
|
637
|
+
_context3.next = 2;
|
|
663
638
|
break;
|
|
664
639
|
}
|
|
665
|
-
return
|
|
640
|
+
return _context3.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_hostprohibits'), 'error'));
|
|
666
641
|
case 2:
|
|
667
642
|
this._eventProvider.sendEvent(_constant.FcrUIAction.OPEN_WHITEBOARD);
|
|
668
|
-
return
|
|
643
|
+
return _context3.abrupt("return");
|
|
669
644
|
case 3:
|
|
670
645
|
electronBounds = (0, _env.isElectron)() ? window.runtime.screen.getDisplayNearestPoint(bounds) : null;
|
|
671
646
|
this._sharedScreenShareSharedDataSource.setCurrentSelectionBounds((electronBounds === null || electronBounds === void 0 ? void 0 : electronBounds.bounds) || bounds);
|
|
@@ -687,39 +662,39 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
687
662
|
needToReplaceMyself = this.localUserScreenSharingState === _fcrCore.FcrMediaSourceState.OPEN;
|
|
688
663
|
this.logger.info("[screen-share][handleStartShare]: needToReplaceMyself - ".concat(needToReplaceMyself));
|
|
689
664
|
if (!needToReplaceMyself) {
|
|
690
|
-
|
|
665
|
+
_context3.next = 4;
|
|
691
666
|
break;
|
|
692
667
|
}
|
|
693
668
|
this._handleReplaceScreen(id, type, withAudio, audioProcessingChannel, bounds);
|
|
694
|
-
return
|
|
669
|
+
return _context3.abrupt("return");
|
|
695
670
|
case 4:
|
|
696
|
-
|
|
671
|
+
_context3.next = 5;
|
|
697
672
|
return this._validateShareStart(id, type);
|
|
698
673
|
case 5:
|
|
699
|
-
validShareStart =
|
|
674
|
+
validShareStart = _context3.sent;
|
|
700
675
|
this.logger.info("[screen-share][handleStartShare]: validShareStart: ".concat(validShareStart));
|
|
701
676
|
if (!(!this._hasScreenSharePermission() || !validShareStart)) {
|
|
702
|
-
|
|
677
|
+
_context3.next = 6;
|
|
703
678
|
break;
|
|
704
679
|
}
|
|
705
|
-
return
|
|
680
|
+
return _context3.abrupt("return");
|
|
706
681
|
case 6:
|
|
707
682
|
if (!this.shareLock) {
|
|
708
|
-
|
|
683
|
+
_context3.next = 7;
|
|
709
684
|
break;
|
|
710
685
|
}
|
|
711
|
-
return
|
|
686
|
+
return _context3.abrupt("return", this._showToast((0, _i18n.transI18n)('fmt_screenshare_tips_enablecollection'), 'error'));
|
|
712
687
|
case 7:
|
|
713
688
|
// 初始化 controlbar 并隐藏, controlbar 不能在 startShareScreen 之后初始化,否则获取不到窗口信息,在屏幕共享时无法排除
|
|
714
689
|
this._initControlbar();
|
|
715
690
|
this._sharedScreenShareSharedDataSource.setCurrentShareIdInfos(id, type, bounds);
|
|
716
|
-
|
|
691
|
+
_context3.next = 8;
|
|
717
692
|
return this._screenShareProvider.startShareScreen(id, type, withAudio, false);
|
|
718
693
|
case 8:
|
|
719
694
|
case "end":
|
|
720
|
-
return
|
|
695
|
+
return _context3.stop();
|
|
721
696
|
}
|
|
722
|
-
},
|
|
697
|
+
}, _callee3, this);
|
|
723
698
|
}));
|
|
724
699
|
function handleStartShare(_x, _x2, _x3) {
|
|
725
700
|
return _handleStartShare.apply(this, arguments);
|
|
@@ -729,24 +704,24 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
729
704
|
}, {
|
|
730
705
|
key: "_openShareScreenSelection",
|
|
731
706
|
value: function () {
|
|
732
|
-
var _openShareScreenSelection2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function
|
|
707
|
+
var _openShareScreenSelection2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
|
|
733
708
|
var _this4 = this;
|
|
734
709
|
var windowList, displayList;
|
|
735
|
-
return _regenerator["default"].wrap(function (
|
|
736
|
-
while (1) switch (
|
|
710
|
+
return _regenerator["default"].wrap(function (_context4) {
|
|
711
|
+
while (1) switch (_context4.prev = _context4.next) {
|
|
737
712
|
case 0:
|
|
738
713
|
this._shareSelectionDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SHARE_SCREEN, 'screen-selection');
|
|
739
|
-
|
|
714
|
+
_context4.next = 1;
|
|
740
715
|
return this.appWindowList;
|
|
741
716
|
case 1:
|
|
742
|
-
windowList =
|
|
717
|
+
windowList = _context4.sent.filter(function (item) {
|
|
743
718
|
return !['AgoraHighLighter', 'Toast', 'Confirm', 'Annotation tool bar', 'Annotation', 'Video Window', 'Control Bar', window.runtime.browserWindow.getTitle() // 主窗口和副窗口 title 一致,副窗口也需要排除在可选择列表中
|
|
744
719
|
].includes(item.title) || item.isCurrent;
|
|
745
720
|
});
|
|
746
|
-
|
|
721
|
+
_context4.next = 2;
|
|
747
722
|
return this.displayList;
|
|
748
723
|
case 2:
|
|
749
|
-
displayList =
|
|
724
|
+
displayList = _context4.sent;
|
|
750
725
|
this._windowList = windowList;
|
|
751
726
|
this._displayList = displayList;
|
|
752
727
|
(0, _mobx.runInAction)(function () {
|
|
@@ -756,14 +731,14 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
756
731
|
_this4._sharedScreenShareSharedDataSource.setScreenCaptureSources([{
|
|
757
732
|
title: (0, _i18n.transI18n)('fmt_share_options_whiteboard'),
|
|
758
733
|
id: "whiteboard-".concat(displayList[0].id),
|
|
759
|
-
image:
|
|
734
|
+
image: _type2.FcrIconType.FCR_WHITEBOARD2
|
|
760
735
|
}].concat((0, _toConsumableArray2["default"])(displayList)));
|
|
761
736
|
});
|
|
762
737
|
case 3:
|
|
763
738
|
case "end":
|
|
764
|
-
return
|
|
739
|
+
return _context4.stop();
|
|
765
740
|
}
|
|
766
|
-
},
|
|
741
|
+
}, _callee4, this);
|
|
767
742
|
}));
|
|
768
743
|
function _openShareScreenSelection() {
|
|
769
744
|
return _openShareScreenSelection2.apply(this, arguments);
|
|
@@ -901,32 +876,32 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
901
876
|
}, {
|
|
902
877
|
key: "_validateShareStart",
|
|
903
878
|
value: function () {
|
|
904
|
-
var _validateShareStart2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function
|
|
905
|
-
return _regenerator["default"].wrap(function (
|
|
906
|
-
while (1) switch (
|
|
879
|
+
var _validateShareStart2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(id, type) {
|
|
880
|
+
return _regenerator["default"].wrap(function (_context5) {
|
|
881
|
+
while (1) switch (_context5.prev = _context5.next) {
|
|
907
882
|
case 0:
|
|
908
883
|
if (!this.supportEnumScreen) {
|
|
909
|
-
|
|
884
|
+
_context5.next = 2;
|
|
910
885
|
break;
|
|
911
886
|
}
|
|
912
|
-
if (!(type ===
|
|
913
|
-
|
|
887
|
+
if (!(type === _type.FcrScreenCaptureType.WINDOW && !this._validateWindow(id))) {
|
|
888
|
+
_context5.next = 1;
|
|
914
889
|
break;
|
|
915
890
|
}
|
|
916
|
-
return
|
|
891
|
+
return _context5.abrupt("return", false);
|
|
917
892
|
case 1:
|
|
918
|
-
if (!(type ===
|
|
919
|
-
|
|
893
|
+
if (!(type === _type.FcrScreenCaptureType.SCREEN && !this._validateDisplay(id))) {
|
|
894
|
+
_context5.next = 2;
|
|
920
895
|
break;
|
|
921
896
|
}
|
|
922
|
-
return
|
|
897
|
+
return _context5.abrupt("return", false);
|
|
923
898
|
case 2:
|
|
924
|
-
return
|
|
899
|
+
return _context5.abrupt("return", true);
|
|
925
900
|
case 3:
|
|
926
901
|
case "end":
|
|
927
|
-
return
|
|
902
|
+
return _context5.stop();
|
|
928
903
|
}
|
|
929
|
-
},
|
|
904
|
+
}, _callee5, this);
|
|
930
905
|
}));
|
|
931
906
|
function _validateShareStart(_x4, _x5) {
|
|
932
907
|
return _validateShareStart2.apply(this, arguments);
|
|
@@ -968,7 +943,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
968
943
|
}]);
|
|
969
944
|
}();
|
|
970
945
|
_ShareScreenStore = ShareScreenStore;
|
|
971
|
-
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "boardOwnerUser"], [_decorator.bound, 2, "toggleIsShowToolbar"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_zoomInDecs, 18, "zoomIn"], [_zoomOutDecs, 18, "zoomOut"], [_fullContainerDecs, 18, "fullContainer"], [_setOriginScalcDecs, 18, "setOriginScalc"], [
|
|
946
|
+
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ShareScreenStore, [[_mobx.observable, 1, "boardOwnerUser"], [_decorator.bound, 2, "toggleIsShowToolbar"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_zoomInDecs, 18, "zoomIn"], [_zoomOutDecs, 18, "zoomOut"], [_fullContainerDecs, 18, "fullContainer"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_decorator.bound, 2, "setCardChooseBounds"], [_decorator.bound, 2, "handlerBoardShareStop"], [_decorator.bound, 2, "release"], [_openRelaunchTipsDialogDecs, 18, "openRelaunchTipsDialog"], [_startRenderSharePreviewDecs, 18, "startRenderSharePreview"], [_stopRenderSharePreviewDecs, 18, "stopRenderSharePreview"], [_handleStopShareDecs, 18, "handleStopShare"], [_handleStopShareByExitRoomDecs, 18, "handleStopShareByExitRoom"], [_decorator.bound, 2, "participantShareCanWeAnnotation"], [_handleStartShareDecs, 18, "handleStartShare"], [_openShareScreenSelectionDecs, 18, "_openShareScreenSelection"], [_closeShareScreenSelectionDecs, 18, "_closeShareScreenSelection"], [_openVideoWindowDialogDecs, 18, "_openVideoWindowDialog"], [_closeControlBarDecs, 18, "_closeControlBar"], [_closeVideoWindowDialogDecs, 18, "_closeVideoWindowDialog"], [_handleReplaceScreenDecs, 18, "_handleReplaceScreen"], [_decorator.bound, 2, "_handleOnline"], [_decorator.bound, 2, "_handleOffline"], [_initControlbarDecs, 18, "_initControlbar"], [_decorator.bound, 2, "_handleBrowserShow"], [_decorator.bound, 2, "_hendleBrowserHide"], [_decorator.bound, 2, "_handleOnScreenShareSeize"], [_decorator.bound, 2, "handleToggleScreenShareWithAudio"], [_toggleShareWithScenarioTypeDecs, 18, "toggleShareWithScenarioType"], [_handleChooseScreenDecs, 16, "handleChooseScreen"]], []).e, 3);
|
|
972
947
|
_init_boardOwnerUser = _applyDecs$e[0];
|
|
973
948
|
_init_handleChooseScreen = _applyDecs$e[1];
|
|
974
949
|
_initProto = _applyDecs$e[2];
|
|
@@ -1,27 +1,26 @@
|
|
|
1
|
-
import { AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
|
|
2
1
|
import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
|
|
3
2
|
import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
|
|
4
|
-
import {
|
|
3
|
+
import { FcrDisplayInfo, FcrWindowInfo, FcrScreenCaptureType } from 'fcr-core/lib/type';
|
|
5
4
|
import { CurrentShareBounds } from '../control-bar/types';
|
|
6
|
-
export type FcrUIWindowCaptureSource =
|
|
7
|
-
export type FcrUIDisplayCaptureSource = Omit<
|
|
5
|
+
export type FcrUIWindowCaptureSource = FcrWindowInfo;
|
|
6
|
+
export type FcrUIDisplayCaptureSource = Omit<FcrDisplayInfo, 'image'> & {
|
|
8
7
|
image: FcrIconType | Uint8Array;
|
|
9
8
|
};
|
|
10
9
|
export interface FcrUIShareSelectionWindowProps {
|
|
11
10
|
currentShareType: string;
|
|
12
11
|
onChangeShareType: (type: string) => void;
|
|
13
|
-
screens:
|
|
14
|
-
applications:
|
|
12
|
+
screens: FcrWindowInfo[];
|
|
13
|
+
applications: FcrDisplayInfo[];
|
|
15
14
|
}
|
|
16
15
|
export interface FcrUIShareSelectionDisplayProps {
|
|
17
16
|
currentShareAudioProcessingChannel: AudioProcessingChannel;
|
|
18
17
|
currentShareId: string;
|
|
19
|
-
currentShareType:
|
|
18
|
+
currentShareType: FcrScreenCaptureType;
|
|
20
19
|
currentShareBounds: CurrentShareBounds;
|
|
21
20
|
shareWithAudio: boolean;
|
|
22
21
|
}
|
|
23
22
|
export type CurrentShareScreenTypes = {
|
|
24
23
|
id: string;
|
|
25
|
-
type:
|
|
24
|
+
type: FcrScreenCaptureType;
|
|
26
25
|
bounds: CurrentShareBounds;
|
|
27
26
|
};
|
|
@@ -18,7 +18,7 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
|
|
|
18
18
|
var _type2 = require("agora-ui-foundation/lib/components/icon/type");
|
|
19
19
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
20
20
|
var _memberWindow = require("../../../components/member-window");
|
|
21
|
-
var _type3 = require("
|
|
21
|
+
var _type3 = require("fcr-core/lib/type");
|
|
22
22
|
require("./index.css");
|
|
23
23
|
var _env = require("agora-foundation/lib/utilities/env");
|
|
24
24
|
var _memberActions = require("../../../components/member-window/components/member-actions");
|
|
@@ -95,8 +95,8 @@ var Members = exports.Members = (0, _mobxReact.observer)(function () {
|
|
|
95
95
|
hasUnmutePermission: hasUnmutePermission,
|
|
96
96
|
hasRequestStartAudioPermission: hasRequestStartAudioPermission
|
|
97
97
|
}),
|
|
98
|
-
videoRenderMode: _type3.
|
|
99
|
-
videoStreamType: _type3.
|
|
98
|
+
videoRenderMode: _type3.FcrVideoRenderMode.FIT,
|
|
99
|
+
videoStreamType: _type3.FcrVideoStreamType.LOW_STREAM,
|
|
100
100
|
windowData: windowData,
|
|
101
101
|
showAvatar: true,
|
|
102
102
|
isVideoSuspended: false,
|
|
@@ -64,7 +64,7 @@ var _constant = require("../../utilities/constant");
|
|
|
64
64
|
var _decorator = require("agora-foundation/lib/decorator");
|
|
65
65
|
var _type = require("./type");
|
|
66
66
|
var _type2 = require("../layout/type");
|
|
67
|
-
var _type3 = require("
|
|
67
|
+
var _type3 = require("fcr-core/lib/type");
|
|
68
68
|
var _attendee = require("agora-ui-foundation/lib/components/participants/attendee");
|
|
69
69
|
var _react = require("react");
|
|
70
70
|
var _type4 = require("../../type");
|
|
@@ -245,10 +245,10 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
245
245
|
key: "filterFoldList",
|
|
246
246
|
get: function get() {
|
|
247
247
|
var sourceList = this.foldList.filter(function (i) {
|
|
248
|
-
return !i.isMySelf || i.videoSourceType !== _type3.
|
|
248
|
+
return !i.isMySelf || i.videoSourceType !== _type3.FcrVideoSourceType.SCREEN;
|
|
249
249
|
});
|
|
250
250
|
var _list = this.shouldHideNonVideoParticipants ? sourceList.filter(function (i) {
|
|
251
|
-
return i.isMySelf || i.hasVideoStream || i.videoSourceType === _type3.
|
|
251
|
+
return i.isMySelf || i.hasVideoStream || i.videoSourceType === _type3.FcrVideoSourceType.SCREEN || i.type === _type2.FcrUIWindowType.BOARD;
|
|
252
252
|
}) : sourceList;
|
|
253
253
|
return _list;
|
|
254
254
|
}
|
|
@@ -20,6 +20,8 @@ export declare class WhiteboardControlBarStore {
|
|
|
20
20
|
private _securityStore;
|
|
21
21
|
private _annotationProvider;
|
|
22
22
|
private _sharedAnnotationDataSource;
|
|
23
|
+
private _uiEventObserver;
|
|
24
|
+
private _userObserver;
|
|
23
25
|
constructor({ uiEventStore, userControl, securityStore, annotationProvider, sharedAnnotationDataSource, }: {
|
|
24
26
|
uiEventStore: FcrUIEventProvider;
|
|
25
27
|
streamControl: FcrStreamControl;
|
|
@@ -38,5 +40,6 @@ export declare class WhiteboardControlBarStore {
|
|
|
38
40
|
onClose(): void;
|
|
39
41
|
setOwnerUser(user: FcrUserInfo): void;
|
|
40
42
|
onEnable(controlEnabled: boolean): void;
|
|
43
|
+
release(): void;
|
|
41
44
|
}
|
|
42
45
|
export declare const WhiteboardControlBarUIContext: import("react").Context<WhiteboardControlBarStore>;
|
|
@@ -48,6 +48,7 @@ require("core-js/modules/web.dom-collections.iterator.js");
|
|
|
48
48
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
49
49
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
50
50
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
51
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
51
52
|
var _react = require("react");
|
|
52
53
|
var _constant = require("../../../../utilities/constant");
|
|
53
54
|
var _decorator = require("agora-foundation/lib/decorator");
|
|
@@ -79,8 +80,8 @@ var _J = /*#__PURE__*/new WeakMap();
|
|
|
79
80
|
_ref = (_setOwnerUserDecs = [_mobx.action, _mobx.action.bound], _onEnableDecs = [_mobx.action, _mobx.action.bound], "ownerUser");
|
|
80
81
|
var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*/function () {
|
|
81
82
|
function WhiteboardControlBarStore(_ref2) {
|
|
82
|
-
var
|
|
83
|
-
|
|
83
|
+
var _this = this,
|
|
84
|
+
_userControl$getLocal;
|
|
84
85
|
var uiEventStore = _ref2.uiEventStore,
|
|
85
86
|
userControl = _ref2.userControl,
|
|
86
87
|
securityStore = _ref2.securityStore,
|
|
@@ -97,14 +98,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
|
|
|
97
98
|
_classPrivateFieldInitSpec(this, _H, _init_scaleValue(this, 1));
|
|
98
99
|
_classPrivateFieldInitSpec(this, _I, _init_controlEnabled(this, false));
|
|
99
100
|
_classPrivateFieldInitSpec(this, _J, _init_isHost(this, false));
|
|
100
|
-
this
|
|
101
|
-
this._userControl = userControl;
|
|
102
|
-
this.currentUser = userControl.getLocalUser();
|
|
103
|
-
this._securityStore = securityStore;
|
|
104
|
-
this._annotationProvider = annotationProvider;
|
|
105
|
-
this._sharedAnnotationDataSource = sharedAnnotationDataSource;
|
|
106
|
-
this.isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes((_userControl$getLocal = userControl.getLocalUser()) === null || _userControl$getLocal === void 0 ? void 0 : _userControl$getLocal.userRole);
|
|
107
|
-
uiEventStore.addObserver({
|
|
101
|
+
(0, _defineProperty2["default"])(this, "_uiEventObserver", {
|
|
108
102
|
onEvent: function onEvent(action, payload) {
|
|
109
103
|
if (action === _constant.FcrUIAction.WHITEBOARD_CHANGED) {
|
|
110
104
|
if (payload.action === _type.WhiteboardBaseEvents.SET_OWNER_USER_ID) {
|
|
@@ -120,7 +114,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
|
|
|
120
114
|
}
|
|
121
115
|
}
|
|
122
116
|
});
|
|
123
|
-
|
|
117
|
+
(0, _defineProperty2["default"])(this, "_userObserver", {
|
|
124
118
|
onUserInfoUpdated: function onUserInfoUpdated(_, event) {
|
|
125
119
|
var localUser = _this._userControl.getLocalUser();
|
|
126
120
|
if (event.modifiedUser.userId === localUser.userId) {
|
|
@@ -128,6 +122,15 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
|
|
|
128
122
|
}
|
|
129
123
|
}
|
|
130
124
|
});
|
|
125
|
+
this._uiEventStore = uiEventStore;
|
|
126
|
+
this._userControl = userControl;
|
|
127
|
+
this.currentUser = userControl.getLocalUser();
|
|
128
|
+
this._securityStore = securityStore;
|
|
129
|
+
this._annotationProvider = annotationProvider;
|
|
130
|
+
this._sharedAnnotationDataSource = sharedAnnotationDataSource;
|
|
131
|
+
this.isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes((_userControl$getLocal = userControl.getLocalUser()) === null || _userControl$getLocal === void 0 ? void 0 : _userControl$getLocal.userRole);
|
|
132
|
+
this._uiEventStore.addObserver(this._uiEventObserver);
|
|
133
|
+
this._userControl.addObserver(this._userObserver);
|
|
131
134
|
}
|
|
132
135
|
return (0, _createClass2["default"])(WhiteboardControlBarStore, [{
|
|
133
136
|
key: _ref,
|
|
@@ -280,6 +283,12 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
|
|
|
280
283
|
});
|
|
281
284
|
this._uiEventStore.sendEvent(_constant.FcrUIAction.RESET_WHITEBOARD_TOOLBAR_VARS);
|
|
282
285
|
}
|
|
286
|
+
}, {
|
|
287
|
+
key: "release",
|
|
288
|
+
value: function release() {
|
|
289
|
+
this._uiEventStore.removeObserver(this._uiEventObserver);
|
|
290
|
+
this._userControl.removeObserver(this._userObserver);
|
|
291
|
+
}
|
|
283
292
|
}]);
|
|
284
293
|
}();
|
|
285
294
|
_WhiteboardControlBarStore = WhiteboardControlBarStore;
|
|
@@ -59,7 +59,7 @@ var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
|
|
|
59
59
|
var _libs = _interopRequireDefault(require("../switch-theme/libs"));
|
|
60
60
|
var _tinycolor = _interopRequireDefault(require("tinycolor2"));
|
|
61
61
|
var _decorator = require("agora-foundation/lib/decorator");
|
|
62
|
-
var
|
|
62
|
+
var _type2 = require("fcr-core/lib/type");
|
|
63
63
|
var _utils = require("../../utils");
|
|
64
64
|
var _dayjs = _interopRequireDefault(require("dayjs"));
|
|
65
65
|
var _constant = require("../../../../utilities/constant");
|
|
@@ -97,7 +97,7 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
|
|
|
97
97
|
if (!_this._whiteboardControl) {
|
|
98
98
|
return;
|
|
99
99
|
}
|
|
100
|
-
if (state ===
|
|
100
|
+
if (state === _type2.FcrConnectionState.CONNECTED) {
|
|
101
101
|
var _this$_boardMainWindo;
|
|
102
102
|
_this._boardMainWindow = _this._whiteboardControl.getMainWindow();
|
|
103
103
|
_this._lastStrokeWidth = 0;
|
|
@@ -8,12 +8,14 @@ import { FcrUIEventProvider } from '../../providers/event-provider';
|
|
|
8
8
|
import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
|
|
9
9
|
import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
|
|
10
10
|
import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
|
|
11
|
+
import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
|
|
11
12
|
export declare class FcrWhiteboardUIModule extends UIModule {
|
|
12
13
|
protected logger: import("agora-foundation/lib/logger").Logger;
|
|
13
14
|
private _disposers;
|
|
14
15
|
private _uiEventStore?;
|
|
15
16
|
private _userControl?;
|
|
16
17
|
private _roomControl?;
|
|
18
|
+
private _streamControl?;
|
|
17
19
|
private _securityStore?;
|
|
18
20
|
private _whiteboardControl?;
|
|
19
21
|
private _boardStore?;
|
|
@@ -28,6 +30,10 @@ export declare class FcrWhiteboardUIModule extends UIModule {
|
|
|
28
30
|
private _timer;
|
|
29
31
|
private _isMyBoard;
|
|
30
32
|
private _boardObserver;
|
|
33
|
+
private _multiDisplayObserver;
|
|
34
|
+
private _streamObserver;
|
|
35
|
+
private _userObserver;
|
|
36
|
+
private _eventObserver;
|
|
31
37
|
private _mounted;
|
|
32
38
|
private _initialized;
|
|
33
39
|
private _joined;
|
|
@@ -41,6 +47,8 @@ export declare class FcrWhiteboardUIModule extends UIModule {
|
|
|
41
47
|
privilegeProvider?: FcrUIPrivilegeProvider;
|
|
42
48
|
annotationProvider: FcrUIAnnotationProvider;
|
|
43
49
|
sharedAnnotationDataSource: FcrUISharedAnnotationSource;
|
|
50
|
+
multiDisplayProvider?: FcrUIMultiDisplayProvider;
|
|
51
|
+
private accessor _isMultiDisplay;
|
|
44
52
|
private accessor _lonelyWindowState;
|
|
45
53
|
private accessor _ownerUser;
|
|
46
54
|
private accessor _isHost;
|
|
@@ -65,15 +73,14 @@ export declare class FcrWhiteboardUIModule extends UIModule {
|
|
|
65
73
|
} & {
|
|
66
74
|
layout: FcrUIVideoWindowLayoutType;
|
|
67
75
|
}): void;
|
|
68
|
-
|
|
69
|
-
operatorUser: FcrUserInfo;
|
|
70
|
-
}): void;
|
|
76
|
+
private _handleActive;
|
|
71
77
|
onDestroy(params?: {
|
|
72
78
|
operatorUser?: FcrUserInfo;
|
|
73
79
|
}): void;
|
|
74
80
|
mount(): void;
|
|
75
81
|
unmount(): void;
|
|
76
82
|
unload(): void;
|
|
83
|
+
release(): void;
|
|
77
84
|
private _setBackground;
|
|
78
85
|
private _checkBoard;
|
|
79
86
|
private _boardUIEvents;
|
|
@@ -85,7 +92,6 @@ export declare class FcrWhiteboardUIModule extends UIModule {
|
|
|
85
92
|
private _setConnectionState;
|
|
86
93
|
private _open;
|
|
87
94
|
private _close;
|
|
88
|
-
private _openLonelyWindow;
|
|
89
95
|
private _setJoinSuccessed;
|
|
90
96
|
private _addDisposers;
|
|
91
97
|
private _alertWhenBeenStopByOthers;
|