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
|
@@ -10,12 +10,27 @@ require("core-js/modules/es.array.push.js");
|
|
|
10
10
|
require("core-js/modules/es.date.to-primitive.js");
|
|
11
11
|
require("core-js/modules/es.function.bind.js");
|
|
12
12
|
require("core-js/modules/es.function.name.js");
|
|
13
|
-
require("core-js/modules/es.map.js");
|
|
14
13
|
require("core-js/modules/es.number.constructor.js");
|
|
15
14
|
require("core-js/modules/es.object.create.js");
|
|
16
15
|
require("core-js/modules/es.object.define-property.js");
|
|
17
16
|
require("core-js/modules/es.object.get-own-property-descriptor.js");
|
|
18
17
|
require("core-js/modules/esnext.function.metadata.js");
|
|
18
|
+
require("core-js/modules/esnext.symbol.metadata.js");
|
|
19
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
20
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
21
|
+
Object.defineProperty(exports, "__esModule", {
|
|
22
|
+
value: true
|
|
23
|
+
});
|
|
24
|
+
exports.FcrUISharedConfirmDataSourceImpl = void 0;
|
|
25
|
+
require("core-js/modules/es.array.for-each.js");
|
|
26
|
+
require("core-js/modules/es.array.iterator.js");
|
|
27
|
+
require("core-js/modules/es.map.js");
|
|
28
|
+
require("core-js/modules/es.object.to-string.js");
|
|
29
|
+
require("core-js/modules/es.set.js");
|
|
30
|
+
require("core-js/modules/es.string.iterator.js");
|
|
31
|
+
require("core-js/modules/es.weak-map.js");
|
|
32
|
+
require("core-js/modules/esnext.iterator.constructor.js");
|
|
33
|
+
require("core-js/modules/esnext.iterator.for-each.js");
|
|
19
34
|
require("core-js/modules/esnext.map.delete-all.js");
|
|
20
35
|
require("core-js/modules/esnext.map.emplace.js");
|
|
21
36
|
require("core-js/modules/esnext.map.every.js");
|
|
@@ -30,19 +45,32 @@ require("core-js/modules/esnext.map.merge.js");
|
|
|
30
45
|
require("core-js/modules/esnext.map.reduce.js");
|
|
31
46
|
require("core-js/modules/esnext.map.some.js");
|
|
32
47
|
require("core-js/modules/esnext.map.update.js");
|
|
33
|
-
require("core-js/modules/esnext.
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
require("core-js/modules/
|
|
41
|
-
require("core-js/modules/
|
|
42
|
-
require("core-js/modules/
|
|
43
|
-
require("core-js/modules/
|
|
48
|
+
require("core-js/modules/esnext.set.add-all.js");
|
|
49
|
+
require("core-js/modules/esnext.set.delete-all.js");
|
|
50
|
+
require("core-js/modules/esnext.set.difference.v2.js");
|
|
51
|
+
require("core-js/modules/esnext.set.difference.js");
|
|
52
|
+
require("core-js/modules/esnext.set.every.js");
|
|
53
|
+
require("core-js/modules/esnext.set.filter.js");
|
|
54
|
+
require("core-js/modules/esnext.set.find.js");
|
|
55
|
+
require("core-js/modules/esnext.set.intersection.v2.js");
|
|
56
|
+
require("core-js/modules/esnext.set.intersection.js");
|
|
57
|
+
require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
|
|
58
|
+
require("core-js/modules/esnext.set.is-disjoint-from.js");
|
|
59
|
+
require("core-js/modules/esnext.set.is-subset-of.v2.js");
|
|
60
|
+
require("core-js/modules/esnext.set.is-subset-of.js");
|
|
61
|
+
require("core-js/modules/esnext.set.is-superset-of.v2.js");
|
|
62
|
+
require("core-js/modules/esnext.set.is-superset-of.js");
|
|
63
|
+
require("core-js/modules/esnext.set.join.js");
|
|
64
|
+
require("core-js/modules/esnext.set.map.js");
|
|
65
|
+
require("core-js/modules/esnext.set.reduce.js");
|
|
66
|
+
require("core-js/modules/esnext.set.some.js");
|
|
67
|
+
require("core-js/modules/esnext.set.symmetric-difference.v2.js");
|
|
68
|
+
require("core-js/modules/esnext.set.symmetric-difference.js");
|
|
69
|
+
require("core-js/modules/esnext.set.union.v2.js");
|
|
70
|
+
require("core-js/modules/esnext.set.union.js");
|
|
44
71
|
require("core-js/modules/esnext.weak-map.delete-all.js");
|
|
45
72
|
require("core-js/modules/esnext.weak-map.emplace.js");
|
|
73
|
+
require("core-js/modules/web.dom-collections.for-each.js");
|
|
46
74
|
require("core-js/modules/web.dom-collections.iterator.js");
|
|
47
75
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
48
76
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
@@ -51,8 +79,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
51
79
|
var _mobx = require("mobx");
|
|
52
80
|
var _base = require("../base");
|
|
53
81
|
var _logger = require("../utilities/logger");
|
|
82
|
+
var _imports = require("fcr-core/lib/imports");
|
|
54
83
|
var _FcrUISharedConfirmDataSourceImpl;
|
|
55
|
-
var _initProto, _init_position;
|
|
84
|
+
var _initProto, _init_position, _init_windows, _init_mouseOverState;
|
|
56
85
|
function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
|
|
57
86
|
function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
|
|
58
87
|
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
|
|
|
64
93
|
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; }
|
|
65
94
|
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; }
|
|
66
95
|
var _A = /*#__PURE__*/new WeakMap();
|
|
96
|
+
var _B = /*#__PURE__*/new WeakMap();
|
|
97
|
+
var _C = /*#__PURE__*/new WeakMap();
|
|
67
98
|
var FcrUISharedConfirmDataSourceImpl = exports.FcrUISharedConfirmDataSourceImpl = /*#__PURE__*/function () {
|
|
68
99
|
function FcrUISharedConfirmDataSourceImpl() {
|
|
69
100
|
(0, _classCallCheck2["default"])(this, FcrUISharedConfirmDataSourceImpl);
|
|
70
101
|
(0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
|
|
71
102
|
prefix: 'FcrUISharedConfirmDataSourceImpl'
|
|
72
103
|
})));
|
|
104
|
+
(0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
|
|
73
105
|
_classPrivateFieldInitSpec(this, _A, _init_position(this, {
|
|
74
106
|
x: 0,
|
|
75
107
|
y: 0
|
|
76
108
|
}));
|
|
109
|
+
_classPrivateFieldInitSpec(this, _B, _init_windows(this, new Map()));
|
|
110
|
+
_classPrivateFieldInitSpec(this, _C, _init_mouseOverState(this, new Set()));
|
|
111
|
+
this._addLogObserver();
|
|
77
112
|
}
|
|
78
113
|
return (0, _createClass2["default"])(FcrUISharedConfirmDataSourceImpl, [{
|
|
79
114
|
key: "position",
|
|
@@ -83,15 +118,84 @@ var FcrUISharedConfirmDataSourceImpl = exports.FcrUISharedConfirmDataSourceImpl
|
|
|
83
118
|
set: function set(v) {
|
|
84
119
|
_classPrivateFieldSet(_A, this, v);
|
|
85
120
|
}
|
|
121
|
+
}, {
|
|
122
|
+
key: "windows",
|
|
123
|
+
get: function get() {
|
|
124
|
+
return _classPrivateFieldGet(_B, this);
|
|
125
|
+
},
|
|
126
|
+
set: function set(v) {
|
|
127
|
+
_classPrivateFieldSet(_B, this, v);
|
|
128
|
+
}
|
|
129
|
+
}, {
|
|
130
|
+
key: "mouseOverState",
|
|
131
|
+
get: function get() {
|
|
132
|
+
return _classPrivateFieldGet(_C, this);
|
|
133
|
+
},
|
|
134
|
+
set: function set(v) {
|
|
135
|
+
_classPrivateFieldSet(_C, this, v);
|
|
136
|
+
}
|
|
86
137
|
}, {
|
|
87
138
|
key: "setPosition",
|
|
88
139
|
value: function setPosition(position) {
|
|
140
|
+
var _this = this;
|
|
89
141
|
this.position = position;
|
|
142
|
+
if (this.windows.size > 0) {
|
|
143
|
+
this.windows.forEach(function (window, key) {
|
|
144
|
+
if (typeof window.width !== 'number' || typeof window.height !== 'number' || typeof window.x !== 'number' || typeof window.y !== 'number') {
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
if (position.x >= window.x && position.y >= window.y && position.x <= window.x + window.width && position.y <= window.y + window.height) {
|
|
148
|
+
if (!_this.mouseOverState.has(key)) {
|
|
149
|
+
_this.mouseOverState.add(key);
|
|
150
|
+
_this._observable.notifyObservers('onMouseOver', key);
|
|
151
|
+
}
|
|
152
|
+
} else {
|
|
153
|
+
if (_this.mouseOverState.has(key)) {
|
|
154
|
+
_this.mouseOverState["delete"](key);
|
|
155
|
+
_this._observable.notifyObservers('onMouseOut', key);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}, {
|
|
162
|
+
key: "setWindowBounds",
|
|
163
|
+
value: function setWindowBounds(key, window) {
|
|
164
|
+
this.windows.set(key, window);
|
|
165
|
+
}
|
|
166
|
+
}, {
|
|
167
|
+
key: "removeWindowBounds",
|
|
168
|
+
value: function removeWindowBounds(key) {
|
|
169
|
+
this.mouseOverState["delete"](key);
|
|
170
|
+
this.windows["delete"](key);
|
|
171
|
+
}
|
|
172
|
+
}, {
|
|
173
|
+
key: "addObserver",
|
|
174
|
+
value: function addObserver(observer) {
|
|
175
|
+
this._observable.addObserver(observer);
|
|
176
|
+
}
|
|
177
|
+
}, {
|
|
178
|
+
key: "removeObserver",
|
|
179
|
+
value: function removeObserver(observer) {
|
|
180
|
+
this._observable.removeObserver(observer);
|
|
181
|
+
}
|
|
182
|
+
}, {
|
|
183
|
+
key: "release",
|
|
184
|
+
value: function release() {
|
|
185
|
+
this.windows.clear();
|
|
186
|
+
this.mouseOverState.clear();
|
|
187
|
+
}
|
|
188
|
+
}, {
|
|
189
|
+
key: "_addLogObserver",
|
|
190
|
+
value: function _addLogObserver() {
|
|
191
|
+
this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onMouseOver', 'onMouseOut']));
|
|
90
192
|
}
|
|
91
193
|
}]);
|
|
92
194
|
}();
|
|
93
195
|
_FcrUISharedConfirmDataSourceImpl = FcrUISharedConfirmDataSourceImpl;
|
|
94
|
-
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedConfirmDataSourceImpl, [[_mobx.observable, 1, "position"]], []).e,
|
|
196
|
+
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedConfirmDataSourceImpl, [[_mobx.observable, 1, "position"], [_mobx.observable, 1, "windows"], [_mobx.observable, 1, "mouseOverState"]], []).e, 4);
|
|
95
197
|
_init_position = _applyDecs$e[0];
|
|
96
|
-
|
|
198
|
+
_init_windows = _applyDecs$e[1];
|
|
199
|
+
_init_mouseOverState = _applyDecs$e[2];
|
|
200
|
+
_initProto = _applyDecs$e[3];
|
|
97
201
|
(0, _base.registerDependency)('sharedConfirmDataSource');
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { FcrConnectionState, FcrMediaSourceState } from 'fcr-core';
|
|
2
2
|
import { FcrUserInfo } from 'fcr-core/lib/type';
|
|
3
|
-
import { FcrScreenScenarioType
|
|
3
|
+
import { FcrScreenScenarioType } from 'fcr-core/lib/imports';
|
|
4
4
|
import { FcrUIDisplayCaptureSource } from '../modules/share-screen/types';
|
|
5
5
|
import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
|
|
6
|
-
import {
|
|
6
|
+
import { FcrDisplayInfo, FcrWindowInfo, FcrScreenCaptureType } from 'fcr-core/lib/type';
|
|
7
7
|
import { CurrentShareBounds } from '../modules/control-bar/types';
|
|
8
8
|
import { FcrUIConnectionProvider } from '../providers/room-provider';
|
|
9
9
|
import { FcrLoopbackTrack, FcrScreenTrack } from 'fcr-core/lib/media-control/type';
|
|
@@ -19,7 +19,7 @@ export interface FcrUIScreenShareSharedDataSource {
|
|
|
19
19
|
* 获取可用于应用窗口捕获的源列表
|
|
20
20
|
* @returns 本地用户可用于应用窗口捕获的源列表,每个元素包含窗口信息
|
|
21
21
|
*/
|
|
22
|
-
get applicationCaptureSources():
|
|
22
|
+
get applicationCaptureSources(): FcrWindowInfo[];
|
|
23
23
|
/**
|
|
24
24
|
* 获取可用于屏幕捕获的源列表
|
|
25
25
|
* @returns 本地用户可用于屏幕捕获的源列表,每个元素包含显示设备信息
|
|
@@ -39,7 +39,7 @@ export interface FcrUIScreenShareSharedDataSource {
|
|
|
39
39
|
* 获取当前选中的共享内容类型
|
|
40
40
|
* @returns 当前选中的共享内容类型:SCREEN(1) 表示整个屏幕,WINDOW(2) 表示应用窗口
|
|
41
41
|
*/
|
|
42
|
-
get currentSelectionType():
|
|
42
|
+
get currentSelectionType(): FcrScreenCaptureType;
|
|
43
43
|
/**
|
|
44
44
|
* 检查当前屏幕共享是否包含音频
|
|
45
45
|
* @returns 如果屏幕共享包含音频流则返回 true,否则返回 false
|
|
@@ -64,12 +64,12 @@ export interface FcrUIScreenShareSharedDataSource {
|
|
|
64
64
|
* 获取当前屏幕共享内容的类型
|
|
65
65
|
* @returns 当前屏幕共享内容的类型:SCREEN(1) 或 WINDOW(2)
|
|
66
66
|
*/
|
|
67
|
-
get currentShareType():
|
|
67
|
+
get currentShareType(): FcrScreenCaptureType;
|
|
68
68
|
/**
|
|
69
69
|
* 获取当前屏幕共享流的唯一标识符
|
|
70
70
|
* @returns 当前屏幕共享流的唯一标识符
|
|
71
71
|
*/
|
|
72
|
-
get currentShareStreamId(): string;
|
|
72
|
+
get currentShareStreamId(): string | undefined;
|
|
73
73
|
/**
|
|
74
74
|
* 获取当前屏幕共享的媒体轨道对象
|
|
75
75
|
* @returns 当前屏幕共享的媒体轨道对象,如果未开始共享则返回 null
|
|
@@ -79,17 +79,17 @@ export interface FcrUIScreenShareSharedDataSource {
|
|
|
79
79
|
* 异步获取可用的应用窗口列表
|
|
80
80
|
* @returns 返回一个 Promise,解析为可用的应用窗口信息列表
|
|
81
81
|
*/
|
|
82
|
-
get appWindowList(): Promise<
|
|
82
|
+
get appWindowList(): Promise<FcrWindowInfo[]>;
|
|
83
83
|
/**
|
|
84
84
|
* 异步获取可用的显示设备列表
|
|
85
85
|
* @returns 返回一个 Promise,解析为可用的显示设备信息列表
|
|
86
86
|
*/
|
|
87
|
-
get displayList(): Promise<
|
|
87
|
+
get displayList(): Promise<FcrDisplayInfo[]>;
|
|
88
88
|
/**
|
|
89
89
|
* 获取当前环路back音频源的标识符, 用于设置屏幕共享开启共享音频时的音频源
|
|
90
90
|
* @returns 当前环路back音频源的唯一标识符
|
|
91
91
|
*/
|
|
92
|
-
get loopbackAudioSourceId(): string;
|
|
92
|
+
get loopbackAudioSourceId(): string | null;
|
|
93
93
|
/**
|
|
94
94
|
* 获取当前屏幕共享的音频轨道对象
|
|
95
95
|
* @returns 当前屏幕共享的音频轨道对象,如果未共享音频则返回 null
|
|
@@ -218,12 +218,12 @@ export interface FcrUIScreenShareSharedDataSource {
|
|
|
218
218
|
* 设置当前屏幕共享内容的类型
|
|
219
219
|
* @param type - 屏幕共享内容的类型:SCREEN(1) 或 WINDOW(2)
|
|
220
220
|
*/
|
|
221
|
-
setCurrentShareType(type:
|
|
221
|
+
setCurrentShareType(type: FcrScreenCaptureType): void;
|
|
222
222
|
/**
|
|
223
223
|
* 设置当前屏幕共享流的唯一标识符
|
|
224
224
|
* @param streamId - 屏幕共享流的唯一标识符
|
|
225
225
|
*/
|
|
226
|
-
setCurrentShareStreamId(streamId: string): void;
|
|
226
|
+
setCurrentShareStreamId(streamId: string | undefined): void;
|
|
227
227
|
/**
|
|
228
228
|
* 设置屏幕共享是否包含音频
|
|
229
229
|
* @param status - 布尔值,表示是否在屏幕共享中包含音频
|
|
@@ -238,7 +238,7 @@ export interface FcrUIScreenShareSharedDataSource {
|
|
|
238
238
|
* 设置当前选中的共享内容类型
|
|
239
239
|
* @param type - 共享内容的类型:SCREEN(1) 或 WINDOW(2)
|
|
240
240
|
*/
|
|
241
|
-
setCurrentSelectionType(type:
|
|
241
|
+
setCurrentSelectionType(type: FcrScreenCaptureType): void;
|
|
242
242
|
/**
|
|
243
243
|
* 设置当前选中的共享区域边界信息
|
|
244
244
|
* @param bounds - 共享区域的位置和尺寸信息
|
|
@@ -250,14 +250,14 @@ export interface FcrUIScreenShareSharedDataSource {
|
|
|
250
250
|
* @param type - 共享内容的类型
|
|
251
251
|
* @param bounds - 共享区域的边界信息
|
|
252
252
|
*/
|
|
253
|
-
setCurrentSelection(id: string, type:
|
|
253
|
+
setCurrentSelection(id: string, type: FcrScreenCaptureType, bounds?: CurrentShareBounds): void;
|
|
254
254
|
/**
|
|
255
255
|
* 设置当前屏幕共享的完整信息
|
|
256
256
|
* @param id - 共享会话的唯一标识符
|
|
257
257
|
* @param type - 共享内容的类型
|
|
258
258
|
* @param bounds - 共享区域的边界信息
|
|
259
259
|
*/
|
|
260
|
-
setCurrentShareIdInfos(id: string, type:
|
|
260
|
+
setCurrentShareIdInfos(id: string, type: FcrScreenCaptureType, bounds: CurrentShareBounds): void;
|
|
261
261
|
/**
|
|
262
262
|
* 设置当前屏幕共享的媒体流状态
|
|
263
263
|
* @param state - 屏幕共享的媒体流状态,枚举类型 FcrMediaSourceState
|
|
@@ -267,7 +267,7 @@ export interface FcrUIScreenShareSharedDataSource {
|
|
|
267
267
|
* 设置可用的应用窗口捕获源列表
|
|
268
268
|
* @param windowInfos - 应用窗口信息列表
|
|
269
269
|
*/
|
|
270
|
-
setApplicationCaptureSources(windowInfos:
|
|
270
|
+
setApplicationCaptureSources(windowInfos: FcrWindowInfo[]): void;
|
|
271
271
|
/**
|
|
272
272
|
* 设置可用的屏幕捕获源列表
|
|
273
273
|
* @param sources - 屏幕捕获源信息列表
|
|
@@ -297,11 +297,11 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
|
|
|
297
297
|
accessor isSharingScreen: boolean;
|
|
298
298
|
accessor screenSharingOwner: FcrUserInfo | undefined;
|
|
299
299
|
accessor localUserScreenSharingState: FcrMediaSourceState;
|
|
300
|
-
accessor applicationCaptureSources:
|
|
300
|
+
accessor applicationCaptureSources: FcrWindowInfo[];
|
|
301
301
|
accessor screenCaptureSources: FcrUIDisplayCaptureSource[];
|
|
302
302
|
accessor currentShareAudioProcessingChannel: AudioProcessingChannel;
|
|
303
303
|
accessor currentSelectionId: string;
|
|
304
|
-
accessor currentSelectionType:
|
|
304
|
+
accessor currentSelectionType: FcrScreenCaptureType;
|
|
305
305
|
accessor shareWithAudio: boolean;
|
|
306
306
|
accessor boardOwnerUser: FcrUserInfo | undefined;
|
|
307
307
|
accessor currentSelectionBounds: CurrentShareBounds;
|
|
@@ -322,11 +322,11 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
|
|
|
322
322
|
screenTrack: FcrScreenTrack | null;
|
|
323
323
|
shareWithAudioTrack: FcrLoopbackTrack | null;
|
|
324
324
|
currentShareId: string;
|
|
325
|
-
currentShareType:
|
|
326
|
-
currentShareStreamId: string;
|
|
327
|
-
loopbackAudioSourceId: string;
|
|
328
|
-
get appWindowList(): Promise<AgoraRtcWindowInfo[]>;
|
|
329
|
-
get displayList(): Promise<AgoraRtcDisplayInfo[]>;
|
|
325
|
+
currentShareType: FcrScreenCaptureType;
|
|
326
|
+
currentShareStreamId: string | undefined;
|
|
327
|
+
loopbackAudioSourceId: string | null;
|
|
328
|
+
get appWindowList(): Promise<import("fcr-core/lib/imports").AgoraRtcWindowInfo[]>;
|
|
329
|
+
get displayList(): Promise<import("fcr-core/lib/imports").AgoraRtcDisplayInfo[]>;
|
|
330
330
|
get isZoomMaxmum(): boolean;
|
|
331
331
|
get isZoomMinimum(): boolean;
|
|
332
332
|
get isFullScreenAdaptived(): boolean;
|
|
@@ -345,19 +345,20 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
|
|
|
345
345
|
setShareWithAudioTrack(shareWithAudioTrack: FcrLoopbackTrack | null): void;
|
|
346
346
|
setLoopbackAudioSourceId(sourceId: string): void;
|
|
347
347
|
setScreenTrack(screenTrack: FcrScreenTrack | null): void;
|
|
348
|
-
setCurrentShareType(type:
|
|
348
|
+
setCurrentShareType(type: FcrScreenCaptureType): void;
|
|
349
349
|
setCurrentShareId(id: string): void;
|
|
350
|
-
setCurrentShareStreamId(streamId
|
|
350
|
+
setCurrentShareStreamId(streamId?: string): void;
|
|
351
351
|
setCurrentShareAudioProcessingChannel(channel: AudioProcessingChannel): void;
|
|
352
352
|
setScreenCaptureSources(sources: FcrUIDisplayCaptureSource[]): void;
|
|
353
|
-
setApplicationCaptureSources(windowInfos:
|
|
353
|
+
setApplicationCaptureSources(windowInfos: FcrWindowInfo[]): void;
|
|
354
354
|
setLocalUserScreenSharingState(state: FcrMediaSourceState): void;
|
|
355
|
-
setCurrentShareIdInfos(currentShareId: string, type:
|
|
356
|
-
setCurrentSelection(id: string, type:
|
|
355
|
+
setCurrentShareIdInfos(currentShareId: string, type: FcrScreenCaptureType, bounds: CurrentShareBounds): void;
|
|
356
|
+
setCurrentSelection(id: string, type: FcrScreenCaptureType, bounds?: CurrentShareBounds): void;
|
|
357
357
|
setCurrentSelectionId(id: string): void;
|
|
358
|
-
setCurrentSelectionType(type:
|
|
358
|
+
setCurrentSelectionType(type: FcrScreenCaptureType): void;
|
|
359
359
|
setCurrentSelectionBounds(bounds: CurrentShareBounds): void;
|
|
360
360
|
setShareWithAudio(withAudio: boolean): void;
|
|
361
361
|
release(): void;
|
|
362
362
|
private _handleOnConnectionStateUpdated;
|
|
363
|
+
private _setLoopbackAudioSourceId;
|
|
363
364
|
}
|
|
@@ -58,10 +58,10 @@ var _base = require("../base");
|
|
|
58
58
|
var _logger = require("../utilities/logger");
|
|
59
59
|
var _imports = require("fcr-core/lib/imports");
|
|
60
60
|
var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
|
|
61
|
-
var _type = require("
|
|
61
|
+
var _type = require("fcr-core/lib/type");
|
|
62
62
|
var _env = require("agora-foundation/lib/utilities/env");
|
|
63
63
|
var _FcrUIScreenShareSharedDataSourceImpl;
|
|
64
|
-
var _initProto, _init_isSharingScreen, _init_screenSharingOwner, _init_localUserScreenSharingState, _init_applicationCaptureSources, _init_screenCaptureSources, _init_currentShareAudioProcessingChannel, _init_currentSelectionId, _init_currentSelectionType, _init_shareWithAudio, _init_boardOwnerUser, _init_currentSelectionBounds, _init_connectionState, _init_isSeizeStream, _init_screenShareScalcValue, _init_screenShareVideoRatio, _init_screenShareVideoSize, _init_screenShareSpeakerViewSize, _init_screenShareScenarioType, _init_isCurrentScreenShareInSmoothType, _init_sharingInReplace, _setScreenShareScenarioTypeDecs, _setScreenShareSpeakerViewSizeDecs, _setScreenShareVideoRatioDecs, _setScreenShareVideoSizeDecs, _setScreenShareScalcValueDecs, _setIsSeizeStreamDecs, _setIsSharingScreenDecs, _setSharingInReplaceDecs, _setScreenSharingOwnerDecs, _setShareWithAudioTrackDecs, _setLoopbackAudioSourceIdDecs, _setScreenTrackDecs, _setCurrentShareTypeDecs, _setCurrentShareIdDecs, _setCurrentShareStreamIdDecs, _setCurrentShareAudioProcessingChannelDecs, _setScreenCaptureSourcesDecs, _setApplicationCaptureSourcesDecs, _setLocalUserScreenSharingStateDecs, _setCurrentShareIdInfosDecs, _setCurrentSelectionDecs, _setCurrentSelectionIdDecs, _setCurrentSelectionTypeDecs, _setCurrentSelectionBoundsDecs, _setShareWithAudioDecs, _handleOnConnectionStateUpdatedDecs, _ref;
|
|
64
|
+
var _initProto, _init_isSharingScreen, _init_screenSharingOwner, _init_localUserScreenSharingState, _init_applicationCaptureSources, _init_screenCaptureSources, _init_currentShareAudioProcessingChannel, _init_currentSelectionId, _init_currentSelectionType, _init_shareWithAudio, _init_boardOwnerUser, _init_currentSelectionBounds, _init_connectionState, _init_isSeizeStream, _init_screenShareScalcValue, _init_screenShareVideoRatio, _init_screenShareVideoSize, _init_screenShareSpeakerViewSize, _init_screenShareScenarioType, _init_isCurrentScreenShareInSmoothType, _init_sharingInReplace, _setScreenShareScenarioTypeDecs, _setScreenShareSpeakerViewSizeDecs, _setScreenShareVideoRatioDecs, _setScreenShareVideoSizeDecs, _setScreenShareScalcValueDecs, _setIsSeizeStreamDecs, _setIsSharingScreenDecs, _setSharingInReplaceDecs, _setScreenSharingOwnerDecs, _setShareWithAudioTrackDecs, _setLoopbackAudioSourceIdDecs, _setScreenTrackDecs, _setCurrentShareTypeDecs, _setCurrentShareIdDecs, _setCurrentShareStreamIdDecs, _setCurrentShareAudioProcessingChannelDecs, _setScreenCaptureSourcesDecs, _setApplicationCaptureSourcesDecs, _setLocalUserScreenSharingStateDecs, _setCurrentShareIdInfosDecs, _setCurrentSelectionDecs, _setCurrentSelectionIdDecs, _setCurrentSelectionTypeDecs, _setCurrentSelectionBoundsDecs, _setShareWithAudioDecs, _handleOnConnectionStateUpdatedDecs, _setLoopbackAudioSourceIdDecs2, _ref;
|
|
65
65
|
function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
|
|
66
66
|
function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
|
|
67
67
|
function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
|
|
@@ -92,7 +92,7 @@ var _Q = /*#__PURE__*/new WeakMap();
|
|
|
92
92
|
var _R = /*#__PURE__*/new WeakMap();
|
|
93
93
|
var _S = /*#__PURE__*/new WeakMap();
|
|
94
94
|
var _T = /*#__PURE__*/new WeakMap();
|
|
95
|
-
_ref = (_setScreenShareScenarioTypeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareSpeakerViewSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoRatioDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareScalcValueDecs = [_mobx.action, _mobx.action.bound], _setIsSeizeStreamDecs = [_mobx.action, _mobx.action.bound], _setIsSharingScreenDecs = [_mobx.action, _mobx.action.bound], _setSharingInReplaceDecs = [_mobx.action, _mobx.action.bound], _setScreenSharingOwnerDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioTrackDecs = [_mobx.action, _mobx.action.bound], _setLoopbackAudioSourceIdDecs = [_mobx.action, _mobx.action.bound], _setScreenTrackDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareStreamIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _setScreenCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setApplicationCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setLocalUserScreenSharingStateDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdInfosDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionBoundsDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioDecs = [_mobx.action, _mobx.action.bound], _handleOnConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
|
|
95
|
+
_ref = (_setScreenShareScenarioTypeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareSpeakerViewSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoRatioDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareScalcValueDecs = [_mobx.action, _mobx.action.bound], _setIsSeizeStreamDecs = [_mobx.action, _mobx.action.bound], _setIsSharingScreenDecs = [_mobx.action, _mobx.action.bound], _setSharingInReplaceDecs = [_mobx.action, _mobx.action.bound], _setScreenSharingOwnerDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioTrackDecs = [_mobx.action, _mobx.action.bound], _setLoopbackAudioSourceIdDecs = [_mobx.action, _mobx.action.bound], _setScreenTrackDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareStreamIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _setScreenCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setApplicationCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setLocalUserScreenSharingStateDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdInfosDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionBoundsDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioDecs = [_mobx.action, _mobx.action.bound], _handleOnConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _setLoopbackAudioSourceIdDecs2 = [_mobx.action, _mobx.action.bound], "logger");
|
|
96
96
|
var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSourceImpl = /*#__PURE__*/function () {
|
|
97
97
|
function FcrUIScreenShareSharedDataSourceImpl(_connectionProvider, _deviceProvider) {
|
|
98
98
|
(0, _classCallCheck2["default"])(this, FcrUIScreenShareSharedDataSourceImpl);
|
|
@@ -110,7 +110,7 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
|
|
|
110
110
|
_classPrivateFieldInitSpec(this, _E, _init_screenCaptureSources(this, []));
|
|
111
111
|
_classPrivateFieldInitSpec(this, _F, _init_currentShareAudioProcessingChannel(this, _shareAudio.AudioProcessingChannel.MONO));
|
|
112
112
|
_classPrivateFieldInitSpec(this, _G, _init_currentSelectionId(this, (0, _env.isElectron)() ? '' : 'default'));
|
|
113
|
-
_classPrivateFieldInitSpec(this, _H, _init_currentSelectionType(this, _type.
|
|
113
|
+
_classPrivateFieldInitSpec(this, _H, _init_currentSelectionType(this, _type.FcrScreenCaptureType.WINDOW));
|
|
114
114
|
_classPrivateFieldInitSpec(this, _I, _init_shareWithAudio(this, !(0, _env.isElectron)()));
|
|
115
115
|
// electron 默认 false,web 默认 true
|
|
116
116
|
_classPrivateFieldInitSpec(this, _J, _init_boardOwnerUser(this, undefined));
|
|
@@ -137,12 +137,13 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
|
|
|
137
137
|
(0, _defineProperty2["default"])(this, "screenTrack", null);
|
|
138
138
|
(0, _defineProperty2["default"])(this, "shareWithAudioTrack", null);
|
|
139
139
|
(0, _defineProperty2["default"])(this, "currentShareId", '');
|
|
140
|
-
(0, _defineProperty2["default"])(this, "currentShareType", _type.
|
|
141
|
-
(0, _defineProperty2["default"])(this, "currentShareStreamId",
|
|
142
|
-
(0, _defineProperty2["default"])(this, "loopbackAudioSourceId",
|
|
140
|
+
(0, _defineProperty2["default"])(this, "currentShareType", _type.FcrScreenCaptureType.SCREEN);
|
|
141
|
+
(0, _defineProperty2["default"])(this, "currentShareStreamId", undefined);
|
|
142
|
+
(0, _defineProperty2["default"])(this, "loopbackAudioSourceId", null);
|
|
143
143
|
this._connectionProvider = _connectionProvider;
|
|
144
144
|
this._deviceProvider = _deviceProvider;
|
|
145
145
|
this._connectionProvider.addObserver(this._connectionObserver);
|
|
146
|
+
this._setLoopbackAudioSourceId();
|
|
146
147
|
}
|
|
147
148
|
return (0, _createClass2["default"])(FcrUIScreenShareSharedDataSourceImpl, [{
|
|
148
149
|
key: "isSharingScreen",
|
|
@@ -486,10 +487,15 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
|
|
|
486
487
|
value: function _handleOnConnectionStateUpdated(state) {
|
|
487
488
|
this.connectionState = state;
|
|
488
489
|
}
|
|
490
|
+
}, {
|
|
491
|
+
key: "_setLoopbackAudioSourceId",
|
|
492
|
+
value: function _setLoopbackAudioSourceId() {
|
|
493
|
+
this.loopbackAudioSourceId = this._deviceProvider.getLoopbackDeviceId();
|
|
494
|
+
}
|
|
489
495
|
}]);
|
|
490
496
|
}();
|
|
491
497
|
_FcrUIScreenShareSharedDataSourceImpl = FcrUIScreenShareSharedDataSourceImpl;
|
|
492
|
-
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareSharedDataSourceImpl, [[_mobx.observable, 1, "isSharingScreen"], [_mobx.observable, 1, "screenSharingOwner"], [_mobx.observable, 1, "localUserScreenSharingState"], [_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "currentSelectionId"], [_mobx.observable, 1, "currentSelectionType"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentSelectionBounds"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "isSeizeStream"], [_mobx.observable, 1, "screenShareScalcValue"], [_mobx.observable, 1, "screenShareVideoRatio"], [_mobx.observable, 1, "screenShareVideoSize"], [_mobx.observable, 1, "screenShareSpeakerViewSize"], [_mobx.observable, 1, "screenShareScenarioType"], [_mobx.observable, 1, "isCurrentScreenShareInSmoothType"], [_mobx.observable, 1, "sharingInReplace"], [_setScreenShareScenarioTypeDecs, 18, "setScreenShareScenarioType"], [_setScreenShareSpeakerViewSizeDecs, 18, "setScreenShareSpeakerViewSize"], [_setScreenShareVideoRatioDecs, 18, "setScreenShareVideoRatio"], [_setScreenShareVideoSizeDecs, 18, "setScreenShareVideoSize"], [_setScreenShareScalcValueDecs, 18, "setScreenShareScalcValue"], [_setIsSeizeStreamDecs, 18, "setIsSeizeStream"], [_setIsSharingScreenDecs, 18, "setIsSharingScreen"], [_setSharingInReplaceDecs, 18, "setSharingInReplace"], [_setScreenSharingOwnerDecs, 18, "setScreenSharingOwner"], [_setShareWithAudioTrackDecs, 18, "setShareWithAudioTrack"], [_setLoopbackAudioSourceIdDecs, 18, "setLoopbackAudioSourceId"], [_setScreenTrackDecs, 18, "setScreenTrack"], [_setCurrentShareTypeDecs, 18, "setCurrentShareType"], [_setCurrentShareIdDecs, 18, "setCurrentShareId"], [_setCurrentShareStreamIdDecs, 18, "setCurrentShareStreamId"], [_setCurrentShareAudioProcessingChannelDecs, 18, "setCurrentShareAudioProcessingChannel"], [_setScreenCaptureSourcesDecs, 18, "setScreenCaptureSources"], [_setApplicationCaptureSourcesDecs, 18, "setApplicationCaptureSources"], [_setLocalUserScreenSharingStateDecs, 18, "setLocalUserScreenSharingState"], [_setCurrentShareIdInfosDecs, 18, "setCurrentShareIdInfos"], [_setCurrentSelectionDecs, 18, "setCurrentSelection"], [_setCurrentSelectionIdDecs, 18, "setCurrentSelectionId"], [_setCurrentSelectionTypeDecs, 18, "setCurrentSelectionType"], [_setCurrentSelectionBoundsDecs, 18, "setCurrentSelectionBounds"], [_setShareWithAudioDecs, 18, "setShareWithAudio"], [_handleOnConnectionStateUpdatedDecs, 18, "_handleOnConnectionStateUpdated"]], []).e, 21);
|
|
498
|
+
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareSharedDataSourceImpl, [[_mobx.observable, 1, "isSharingScreen"], [_mobx.observable, 1, "screenSharingOwner"], [_mobx.observable, 1, "localUserScreenSharingState"], [_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "currentSelectionId"], [_mobx.observable, 1, "currentSelectionType"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentSelectionBounds"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "isSeizeStream"], [_mobx.observable, 1, "screenShareScalcValue"], [_mobx.observable, 1, "screenShareVideoRatio"], [_mobx.observable, 1, "screenShareVideoSize"], [_mobx.observable, 1, "screenShareSpeakerViewSize"], [_mobx.observable, 1, "screenShareScenarioType"], [_mobx.observable, 1, "isCurrentScreenShareInSmoothType"], [_mobx.observable, 1, "sharingInReplace"], [_setScreenShareScenarioTypeDecs, 18, "setScreenShareScenarioType"], [_setScreenShareSpeakerViewSizeDecs, 18, "setScreenShareSpeakerViewSize"], [_setScreenShareVideoRatioDecs, 18, "setScreenShareVideoRatio"], [_setScreenShareVideoSizeDecs, 18, "setScreenShareVideoSize"], [_setScreenShareScalcValueDecs, 18, "setScreenShareScalcValue"], [_setIsSeizeStreamDecs, 18, "setIsSeizeStream"], [_setIsSharingScreenDecs, 18, "setIsSharingScreen"], [_setSharingInReplaceDecs, 18, "setSharingInReplace"], [_setScreenSharingOwnerDecs, 18, "setScreenSharingOwner"], [_setShareWithAudioTrackDecs, 18, "setShareWithAudioTrack"], [_setLoopbackAudioSourceIdDecs, 18, "setLoopbackAudioSourceId"], [_setScreenTrackDecs, 18, "setScreenTrack"], [_setCurrentShareTypeDecs, 18, "setCurrentShareType"], [_setCurrentShareIdDecs, 18, "setCurrentShareId"], [_setCurrentShareStreamIdDecs, 18, "setCurrentShareStreamId"], [_setCurrentShareAudioProcessingChannelDecs, 18, "setCurrentShareAudioProcessingChannel"], [_setScreenCaptureSourcesDecs, 18, "setScreenCaptureSources"], [_setApplicationCaptureSourcesDecs, 18, "setApplicationCaptureSources"], [_setLocalUserScreenSharingStateDecs, 18, "setLocalUserScreenSharingState"], [_setCurrentShareIdInfosDecs, 18, "setCurrentShareIdInfos"], [_setCurrentSelectionDecs, 18, "setCurrentSelection"], [_setCurrentSelectionIdDecs, 18, "setCurrentSelectionId"], [_setCurrentSelectionTypeDecs, 18, "setCurrentSelectionType"], [_setCurrentSelectionBoundsDecs, 18, "setCurrentSelectionBounds"], [_setShareWithAudioDecs, 18, "setShareWithAudio"], [_handleOnConnectionStateUpdatedDecs, 18, "_handleOnConnectionStateUpdated"], [_setLoopbackAudioSourceIdDecs2, 18, "_setLoopbackAudioSourceId"]], []).e, 21);
|
|
493
499
|
_init_isSharingScreen = _applyDecs$e[0];
|
|
494
500
|
_init_screenSharingOwner = _applyDecs$e[1];
|
|
495
501
|
_init_localUserScreenSharingState = _applyDecs$e[2];
|
|
@@ -57,12 +57,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
57
57
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
58
58
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
59
59
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
60
|
-
var _imports = require("agora-rte-sdk/lib/imports");
|
|
61
60
|
var _type = require("../type");
|
|
62
61
|
var _parameters = require("../utilities/parameters");
|
|
63
62
|
var _mobx = require("mobx");
|
|
64
63
|
var _base = require("../base");
|
|
65
64
|
var _merge = _interopRequireDefault(require("lodash/merge"));
|
|
65
|
+
var _env = require("agora-foundation/lib/utilities/env");
|
|
66
66
|
var _FcrUISharedSettingDataSourceImpl;
|
|
67
67
|
var _initProto, _init__settingConfig, _preHandleSettingDecs, _setSettingDecs, _setMediaDecs, _ref;
|
|
68
68
|
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; }
|
|
@@ -98,7 +98,7 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
|
|
|
98
98
|
shouldHideNonVideoParticipants: false,
|
|
99
99
|
displayedMaxAttendees: 16,
|
|
100
100
|
autoAdjustmentSpeakerVolume: true,
|
|
101
|
-
autoAdjustmentMicrophoneVolume: (0,
|
|
101
|
+
autoAdjustmentMicrophoneVolume: (0, _env.isElectron)(),
|
|
102
102
|
noiseReduce: _type.FcrUIAiDenoiseLevel.LOW,
|
|
103
103
|
recordingPath: '',
|
|
104
104
|
videoHD: false,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FcrConnectionState, FcrUserInfo } from 'fcr-core/lib/type';
|
|
2
|
-
import { WhiteboardToolAction } from '../modules/secondary-window/type';
|
|
2
|
+
import { FcrUIMainWindowRenderer, FcrUIMainWindowRendererObserver, WhiteboardToolAction } from '../modules/secondary-window/type';
|
|
3
3
|
import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
|
|
4
4
|
import { WhiteboardThemeType } from '../modules/whiteboard/type';
|
|
5
5
|
import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
|
|
@@ -14,7 +14,8 @@ export interface FcrUISharedWhiteboardDataSource {
|
|
|
14
14
|
get showLoading(): boolean;
|
|
15
15
|
get joinSuccess(): boolean;
|
|
16
16
|
get toolbarState(): FcrToolbarState;
|
|
17
|
-
|
|
17
|
+
get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
|
|
18
|
+
setSharingUser: (userInfo: FcrUserInfo | undefined) => void;
|
|
18
19
|
setBackgroundColor: (color: string) => void;
|
|
19
20
|
setWhiteboardTool: (tool: {
|
|
20
21
|
action: WhiteboardToolAction;
|
|
@@ -33,10 +34,10 @@ export interface FcrUISharedWhiteboardDataSource {
|
|
|
33
34
|
export declare class FcrUISharedWhiteboardDataSourceImpl implements FcrUISharedWhiteboardDataSource {
|
|
34
35
|
private _whiteboardControl;
|
|
35
36
|
private _privilegeProvider;
|
|
37
|
+
private _fcrUIMainWindowRenderer;
|
|
36
38
|
protected logger: import("agora-foundation/lib/logger").Logger;
|
|
37
39
|
private _showLoading;
|
|
38
40
|
private _disposers;
|
|
39
|
-
private _fcrUIMainWindowRenderer;
|
|
40
41
|
private _toolbarStateObserver;
|
|
41
42
|
accessor currentTheme: Required<WhiteboardThemeType>;
|
|
42
43
|
accessor sharingUserInfo: FcrUserInfo | undefined;
|
|
@@ -45,11 +46,12 @@ export declare class FcrUISharedWhiteboardDataSourceImpl implements FcrUISharedW
|
|
|
45
46
|
accessor connectionState: FcrConnectionState;
|
|
46
47
|
accessor joinSuccess: boolean;
|
|
47
48
|
accessor toolbarState: FcrToolbarState;
|
|
49
|
+
get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
|
|
48
50
|
get showLoading(): boolean;
|
|
49
51
|
get canWriteBoard(): boolean;
|
|
50
|
-
constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _privilegeProvider: FcrUIPrivilegeProvider);
|
|
52
|
+
constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _privilegeProvider: FcrUIPrivilegeProvider, _fcrUIMainWindowRenderer: FcrUIMainWindowRenderer);
|
|
51
53
|
setControlEnable(enable: boolean): void;
|
|
52
|
-
setSharingUser(userInfo: FcrUserInfo): void;
|
|
54
|
+
setSharingUser(userInfo: FcrUserInfo | undefined): void;
|
|
53
55
|
setBackgroundColor(color: string): void;
|
|
54
56
|
setWhiteboardTool(tool: {
|
|
55
57
|
action: WhiteboardToolAction;
|
|
@@ -60,7 +60,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
60
60
|
var _type = require("fcr-core/lib/type");
|
|
61
61
|
var _base = require("../base");
|
|
62
62
|
var _mobx = require("mobx");
|
|
63
|
-
var _secondaryWindow = require("../modules/secondary-window");
|
|
64
63
|
var _type2 = require("../modules/secondary-window/type");
|
|
65
64
|
var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
|
|
66
65
|
var _toolbar = require("../modules/components/toolbar");
|
|
@@ -90,7 +89,7 @@ var _F = /*#__PURE__*/new WeakMap();
|
|
|
90
89
|
var _G = /*#__PURE__*/new WeakMap();
|
|
91
90
|
_ref = (_setControlEnableDecs = [_mobx.action, _mobx.action.bound], _setSharingUserDecs = [_mobx.action, _mobx.action.bound], _setBackgroundColorDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardToolDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setShowLoadingDecs = [_mobx.action, _mobx.action.bound], _setCommonColorsDecs = [_mobx.action, _mobx.action.bound], _setProgressDecs = [_mobx.action, _mobx.action.bound], _setJoinSuccessDecs = [_mobx.action, _mobx.action.bound], _handleConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
|
|
92
91
|
var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourceImpl = /*#__PURE__*/function () {
|
|
93
|
-
function FcrUISharedWhiteboardDataSourceImpl(_whiteboardControl, _privilegeProvider) {
|
|
92
|
+
function FcrUISharedWhiteboardDataSourceImpl(_whiteboardControl, _privilegeProvider, _fcrUIMainWindowRenderer) {
|
|
94
93
|
var _this = this;
|
|
95
94
|
(0, _classCallCheck2["default"])(this, FcrUISharedWhiteboardDataSourceImpl);
|
|
96
95
|
(0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
|
|
@@ -131,10 +130,7 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
|
|
|
131
130
|
}));
|
|
132
131
|
this._whiteboardControl = _whiteboardControl;
|
|
133
132
|
this._privilegeProvider = _privilegeProvider;
|
|
134
|
-
this._fcrUIMainWindowRenderer =
|
|
135
|
-
// @ts-ignore
|
|
136
|
-
window.FcrUIMainWindowRenderer = this._fcrUIMainWindowRenderer;
|
|
137
|
-
this._fcrUIMainWindowRenderer.addObserver(this._toolbarStateObserver);
|
|
133
|
+
this._fcrUIMainWindowRenderer = _fcrUIMainWindowRenderer;
|
|
138
134
|
this._disposers.push((0, _mobx.reaction)(function () {
|
|
139
135
|
return _this.canWriteBoard;
|
|
140
136
|
}, function (canWrite) {
|
|
@@ -198,6 +194,11 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
|
|
|
198
194
|
set: function set(v) {
|
|
199
195
|
_classPrivateFieldSet(_G, this, v);
|
|
200
196
|
}
|
|
197
|
+
}, {
|
|
198
|
+
key: "toolbarStateObserver",
|
|
199
|
+
get: function get() {
|
|
200
|
+
return this._toolbarStateObserver;
|
|
201
|
+
}
|
|
201
202
|
}, {
|
|
202
203
|
key: "showLoading",
|
|
203
204
|
get: function get() {
|
|
@@ -273,7 +274,7 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
|
|
|
273
274
|
key: "saveDraft",
|
|
274
275
|
value: function saveDraft() {
|
|
275
276
|
var _this$_fcrUIMainWindo5;
|
|
276
|
-
(_this$_fcrUIMainWindo5 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo5 === void 0 || _this$_fcrUIMainWindo5.notifyObservers('onSaveDraft'
|
|
277
|
+
(_this$_fcrUIMainWindo5 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo5 === void 0 || _this$_fcrUIMainWindo5.notifyObservers('onSaveDraft');
|
|
277
278
|
}
|
|
278
279
|
}, {
|
|
279
280
|
key: "setProgress",
|
|
@@ -289,7 +290,7 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
|
|
|
289
290
|
key: "inActive",
|
|
290
291
|
value: function inActive() {
|
|
291
292
|
var _this$_fcrUIMainWindo6;
|
|
292
|
-
(_this$_fcrUIMainWindo6 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo6 === void 0 || _this$_fcrUIMainWindo6.notifyObservers('onWhiteboardInActive'
|
|
293
|
+
(_this$_fcrUIMainWindo6 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo6 === void 0 || _this$_fcrUIMainWindo6.notifyObservers('onWhiteboardInActive');
|
|
293
294
|
}
|
|
294
295
|
}, {
|
|
295
296
|
key: "release",
|
package/lib/ui-scene.d.ts
CHANGED
|
@@ -12,11 +12,13 @@ import { FcrRegisteredWidgetConfigs } from './modules/widget/type';
|
|
|
12
12
|
import { FcrUIMonitorProviderImpl } from './providers/monitor-provider';
|
|
13
13
|
export type FcrUISceneObserver = FcrUISceneObserverBase & FcrUIDeviceSettingObserver;
|
|
14
14
|
export declare class FcrUIDefaultScene {
|
|
15
|
+
private _config;
|
|
15
16
|
private _creatorConfig;
|
|
16
17
|
private _dom;
|
|
17
18
|
private _registeredWidgetConfigs;
|
|
18
19
|
private _engine;
|
|
19
20
|
private _joinSuccess;
|
|
21
|
+
private _joinAbortController;
|
|
20
22
|
constructor({ config, creatorConfig, dom, registeredWidgetConfigs, engine, eventProvider, monitorProvider, deviceProvider, messageProvider, dialogProvider, localStorageProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, }: {
|
|
21
23
|
config: FcrUISceneConfig;
|
|
22
24
|
creatorConfig: FcrUISceneCreatorConfig;
|