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
|
@@ -72,7 +72,7 @@ var _dialogUtils = require("../../utilities/dialog-utils");
|
|
|
72
72
|
var _env = require("agora-foundation/lib/utilities/env");
|
|
73
73
|
var _imports = require("fcr-core/lib/imports");
|
|
74
74
|
var _ConfirmStore;
|
|
75
|
-
var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _resetIsReplaceDecs, _setMousePositionDecs, _handleConfirmEventDecs, _ref;
|
|
75
|
+
var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _removeObserverWindowDecs, _setObserverWindowDecs, _resetIsReplaceDecs, _setMousePositionDecs, _handleConfirmEventDecs, _handleMousePositionObserverMouseOverDecs, _handleMousePositionObserverMouseOutDecs, _ref;
|
|
76
76
|
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; }
|
|
77
77
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
78
78
|
function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
|
|
@@ -90,7 +90,7 @@ var _B = /*#__PURE__*/new WeakMap();
|
|
|
90
90
|
var _C = /*#__PURE__*/new WeakMap();
|
|
91
91
|
var _D = /*#__PURE__*/new WeakMap();
|
|
92
92
|
var _E = /*#__PURE__*/new WeakMap();
|
|
93
|
-
_ref = (_addConfirmDecs = [_mobx.action, _mobx.action.bound], _resetIsReplaceDecs = [_mobx.action, _mobx.action.bound], _setMousePositionDecs = [_mobx.action, _mobx.action.bound], _handleConfirmEventDecs = [_mobx.action, _mobx.action.bound], "logger");
|
|
93
|
+
_ref = (_addConfirmDecs = [_mobx.action, _mobx.action.bound], _removeObserverWindowDecs = [_mobx.action, _mobx.action.bound], _setObserverWindowDecs = [_mobx.action, _mobx.action.bound], _resetIsReplaceDecs = [_mobx.action, _mobx.action.bound], _setMousePositionDecs = [_mobx.action, _mobx.action.bound], _handleConfirmEventDecs = [_mobx.action, _mobx.action.bound], _handleMousePositionObserverMouseOverDecs = [_mobx.action, _mobx.action.bound], _handleMousePositionObserverMouseOutDecs = [_mobx.action, _mobx.action.bound], "logger");
|
|
94
94
|
var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
95
95
|
function ConfirmStore(_ref2) {
|
|
96
96
|
var _this = this;
|
|
@@ -107,6 +107,10 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
107
107
|
(0, _defineProperty2["default"])(this, "_handleConfirmEventObserver", {
|
|
108
108
|
onEvent: this._handleConfirmEvent.bind(this)
|
|
109
109
|
});
|
|
110
|
+
(0, _defineProperty2["default"])(this, "_handleMousePositionObserver", {
|
|
111
|
+
onMouseOver: this._handleMousePositionObserverMouseOver,
|
|
112
|
+
onMouseOut: this._handleMousePositionObserverMouseOut
|
|
113
|
+
});
|
|
110
114
|
_classPrivateFieldInitSpec(this, _A, _init_isReplaceShare(this, false));
|
|
111
115
|
_classPrivateFieldInitSpec(this, _B, _init_calculateMethods(this, new Map()));
|
|
112
116
|
_classPrivateFieldInitSpec(this, _C, _init_reposition(this, 0));
|
|
@@ -118,6 +122,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
118
122
|
this._sharedConfirmDataSource = sharedConfirmDataSource;
|
|
119
123
|
this._uiEventProvider.addObserver(this._handleConfirmEventObserver);
|
|
120
124
|
this._dialogProvider.addObserver(this._handleConfirmEventObserver);
|
|
125
|
+
this._sharedConfirmDataSource.addObserver(this._handleMousePositionObserver);
|
|
121
126
|
this._disposers.push((0, _mobx.reaction)(function () {
|
|
122
127
|
return _this.confirmList;
|
|
123
128
|
}, function () {
|
|
@@ -198,22 +203,25 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
198
203
|
}
|
|
199
204
|
}, {
|
|
200
205
|
key: "screenBounds",
|
|
201
|
-
get:
|
|
206
|
+
get: // get mousePosition() {
|
|
207
|
+
// return this._sharedConfirmDataSource.position;
|
|
208
|
+
// }
|
|
209
|
+
function get() {
|
|
202
210
|
return _classPrivateFieldGet(_E, this);
|
|
203
211
|
},
|
|
204
212
|
set: function set(v) {
|
|
205
213
|
_classPrivateFieldSet(_E, this, v);
|
|
206
214
|
}
|
|
207
|
-
}, {
|
|
208
|
-
key: "mousePosition",
|
|
209
|
-
get: function get() {
|
|
210
|
-
return this._sharedConfirmDataSource.position;
|
|
211
|
-
}
|
|
212
215
|
}, {
|
|
213
216
|
key: "confirmList",
|
|
214
217
|
get: function get() {
|
|
215
|
-
var result = Array.from(this.confirms.values()).map(function (
|
|
216
|
-
|
|
218
|
+
var result = Array.from(this.confirms.values()).map(function (_ref4) {
|
|
219
|
+
var id = _ref4.id,
|
|
220
|
+
params = _ref4.params;
|
|
221
|
+
return {
|
|
222
|
+
id: id,
|
|
223
|
+
params: params
|
|
224
|
+
};
|
|
217
225
|
});
|
|
218
226
|
return result;
|
|
219
227
|
}
|
|
@@ -232,14 +240,17 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
232
240
|
var timer = setTimeout(function () {
|
|
233
241
|
(0, _mobx.runInAction)(function () {
|
|
234
242
|
_this2.confirms["delete"](dialogId);
|
|
243
|
+
_this2.removeObserverWindow(dialogId);
|
|
235
244
|
});
|
|
236
245
|
clearTimeout(timer);
|
|
237
246
|
}, params.duration || 3000);
|
|
238
247
|
} : undefined;
|
|
239
248
|
var confirmParams = {
|
|
249
|
+
id: dialogId,
|
|
240
250
|
params: _objectSpread(_objectSpread({}, params), {}, {
|
|
241
251
|
onClose: function onClose() {
|
|
242
252
|
_this2.confirms["delete"](dialogId);
|
|
253
|
+
_this2.removeObserverWindow(dialogId);
|
|
243
254
|
}
|
|
244
255
|
}),
|
|
245
256
|
timer: timer
|
|
@@ -250,6 +261,12 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
250
261
|
});
|
|
251
262
|
} else {
|
|
252
263
|
this.confirms.set(dialogId, confirmParams);
|
|
264
|
+
this.setObserverWindow(dialogId, {
|
|
265
|
+
x: 0,
|
|
266
|
+
y: 0,
|
|
267
|
+
width: confirmParams.params.width || 320,
|
|
268
|
+
height: confirmParams.params.height || 150
|
|
269
|
+
});
|
|
253
270
|
}
|
|
254
271
|
var confirmInstance = this.confirms.get(dialogId);
|
|
255
272
|
if (confirmInstance) {
|
|
@@ -280,6 +297,16 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
280
297
|
}
|
|
281
298
|
}
|
|
282
299
|
}
|
|
300
|
+
}, {
|
|
301
|
+
key: "removeObserverWindow",
|
|
302
|
+
value: function removeObserverWindow(key) {
|
|
303
|
+
this._sharedConfirmDataSource.removeWindowBounds(key);
|
|
304
|
+
}
|
|
305
|
+
}, {
|
|
306
|
+
key: "setObserverWindow",
|
|
307
|
+
value: function setObserverWindow(key, window) {
|
|
308
|
+
this._sharedConfirmDataSource.setWindowBounds(key, window);
|
|
309
|
+
}
|
|
283
310
|
}, {
|
|
284
311
|
key: "resetIsReplace",
|
|
285
312
|
value: function resetIsReplace() {
|
|
@@ -296,6 +323,7 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
296
323
|
}, {
|
|
297
324
|
key: "release",
|
|
298
325
|
value: function release() {
|
|
326
|
+
var _this3 = this;
|
|
299
327
|
this.confirms.clear();
|
|
300
328
|
this.calculateMethods.clear();
|
|
301
329
|
this._disposers.forEach(function (disposer) {
|
|
@@ -303,6 +331,10 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
303
331
|
});
|
|
304
332
|
this._dialogProvider.removeObserver(this._handleConfirmEventObserver);
|
|
305
333
|
this._uiEventProvider.removeObserver(this._handleConfirmEventObserver);
|
|
334
|
+
this.confirms.forEach(function (value, key) {
|
|
335
|
+
_this3.removeObserverWindow(key);
|
|
336
|
+
});
|
|
337
|
+
this._sharedConfirmDataSource.removeObserver(this._handleMousePositionObserver);
|
|
306
338
|
}
|
|
307
339
|
}, {
|
|
308
340
|
key: "log",
|
|
@@ -316,11 +348,11 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
316
348
|
switch (action) {
|
|
317
349
|
case _constant.FcrUIAction.OPEN_DIALOG:
|
|
318
350
|
if ((0, _env.isElectron)()) {
|
|
319
|
-
var
|
|
351
|
+
var _ref6 = (0, _dialogUtils.followCorrectDisplay)({
|
|
320
352
|
dialogKey: _constant.FcrUIDialogKey.CONFIRM,
|
|
321
353
|
alwaysFollowScreen: true
|
|
322
354
|
}),
|
|
323
|
-
nearDisplayBounds =
|
|
355
|
+
nearDisplayBounds = _ref6.nearDisplayBounds;
|
|
324
356
|
this.screenBounds = nearDisplayBounds;
|
|
325
357
|
this.logger.info("open confirm dialog with bounds: ".concat((0, _imports.jsonstring)(nearDisplayBounds)));
|
|
326
358
|
}
|
|
@@ -328,14 +360,31 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
328
360
|
break;
|
|
329
361
|
case _constant.FcrUIAction.CLOSE_DIALOG:
|
|
330
362
|
this.confirms["delete"](payload.dialogId);
|
|
363
|
+
this.removeObserverWindow(payload.dialogId);
|
|
331
364
|
break;
|
|
332
365
|
}
|
|
333
366
|
}
|
|
334
367
|
}
|
|
368
|
+
}, {
|
|
369
|
+
key: "_handleMousePositionObserverMouseOver",
|
|
370
|
+
value: function _handleMousePositionObserverMouseOver(key) {
|
|
371
|
+
var confirm = this.confirms.get(key);
|
|
372
|
+
if (confirm) {
|
|
373
|
+
confirm.params.className = 'confirm-mouseover';
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
}, {
|
|
377
|
+
key: "_handleMousePositionObserverMouseOut",
|
|
378
|
+
value: function _handleMousePositionObserverMouseOut(key) {
|
|
379
|
+
var confirm = this.confirms.get(key);
|
|
380
|
+
if (confirm) {
|
|
381
|
+
confirm.params.className = '';
|
|
382
|
+
}
|
|
383
|
+
}
|
|
335
384
|
}]);
|
|
336
385
|
}();
|
|
337
386
|
_ConfirmStore = ConfirmStore;
|
|
338
|
-
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConfirmStore, [[_mobx.observable, 1, "isReplaceShare"], [_mobx.observable, 1, "calculateMethods"], [_mobx.observable, 1, "reposition"], [_mobx.observable, 1, "confirms"], [_mobx.observable, 1, "screenBounds"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_resetIsReplaceDecs, 18, "resetIsReplace"], [_setMousePositionDecs, 18, "setMousePosition"], [_decorator.bound, 2, "log"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"]], []).e, 6);
|
|
387
|
+
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConfirmStore, [[_mobx.observable, 1, "isReplaceShare"], [_mobx.observable, 1, "calculateMethods"], [_mobx.observable, 1, "reposition"], [_mobx.observable, 1, "confirms"], [_mobx.observable, 1, "screenBounds"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_removeObserverWindowDecs, 18, "removeObserverWindow"], [_setObserverWindowDecs, 18, "setObserverWindow"], [_resetIsReplaceDecs, 18, "resetIsReplace"], [_setMousePositionDecs, 18, "setMousePosition"], [_decorator.bound, 2, "log"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"], [_handleMousePositionObserverMouseOverDecs, 18, "_handleMousePositionObserverMouseOver"], [_handleMousePositionObserverMouseOutDecs, 18, "_handleMousePositionObserverMouseOut"]], []).e, 6);
|
|
339
388
|
_init_isReplaceShare = _applyDecs$e[0];
|
|
340
389
|
_init_calculateMethods = _applyDecs$e[1];
|
|
341
390
|
_init_reposition = _applyDecs$e[2];
|
|
@@ -27,26 +27,28 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
|
|
|
27
27
|
browserWindow = _ref.browserWindow;
|
|
28
28
|
(0, _react.useEffect)(function () {
|
|
29
29
|
window.addEventListener('mousemove', setMousePosition);
|
|
30
|
+
return function () {
|
|
31
|
+
window.removeEventListener('mousemove', setMousePosition);
|
|
32
|
+
};
|
|
33
|
+
}, []);
|
|
34
|
+
(0, _react.useEffect)(function () {
|
|
30
35
|
if ((0, _toConsumableArray2["default"])(confirmList).length === 0) {
|
|
31
36
|
browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
|
|
32
37
|
forward: true
|
|
33
38
|
});
|
|
34
39
|
browserWindow === null || browserWindow === void 0 || browserWindow.blur();
|
|
35
40
|
} else {
|
|
36
|
-
// browserWindow?.setIgnoreMouseEvents(false);
|
|
37
41
|
browserWindow === null || browserWindow === void 0 || browserWindow.setAlwaysOnTop(true, 'screen-saver');
|
|
38
42
|
}
|
|
39
|
-
|
|
40
|
-
window.removeEventListener('mousemove', setMousePosition);
|
|
41
|
-
};
|
|
42
|
-
}, [confirmList]);
|
|
43
|
+
}, [confirmList.length]);
|
|
43
44
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
|
44
45
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
45
46
|
className: "fcr-event-confirm-wrapper fcr-event-confirm-container",
|
|
46
47
|
children: (0, _toConsumableArray2["default"])(confirmList).map(function (confirm) {
|
|
47
48
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_window.ConfirmWindow, {
|
|
48
|
-
|
|
49
|
-
|
|
49
|
+
id: confirm.id,
|
|
50
|
+
confirm: confirm.params
|
|
51
|
+
}, confirm.params.title);
|
|
50
52
|
})
|
|
51
53
|
})
|
|
52
54
|
});
|
package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-user/index.js
CHANGED
|
@@ -29,7 +29,6 @@ var _select = require("agora-ui-foundation/lib/components/select");
|
|
|
29
29
|
var _store = require("../../../../store");
|
|
30
30
|
var _mobxReact = require("mobx-react");
|
|
31
31
|
var _type = require("fcr-core/lib/type");
|
|
32
|
-
var _type2 = require("agora-rte-sdk/lib/core/scene/type");
|
|
33
32
|
var _i18n = require("agora-ui-foundation/lib/i18n");
|
|
34
33
|
var _optionItem = _interopRequireDefault(require("./option-Item"));
|
|
35
34
|
require("./index.css");
|
|
@@ -72,7 +71,7 @@ var PickUser = function PickUser(props) {
|
|
|
72
71
|
userId: userId,
|
|
73
72
|
userName: userName,
|
|
74
73
|
userRole: _type.FcrUserRole.PARTICIPANT,
|
|
75
|
-
connectorType:
|
|
74
|
+
connectorType: _type.FcrRoomConnectorType.NONE,
|
|
76
75
|
isOffLine: true,
|
|
77
76
|
platform: _type.FcrPlatform.WEB_DESKTOP,
|
|
78
77
|
avatar: avatar || ''
|
|
@@ -100,14 +100,12 @@ var _type = require("fcr-core/lib/type");
|
|
|
100
100
|
var _uuid = require("uuid");
|
|
101
101
|
var _dialogContent = require("./dialog-content");
|
|
102
102
|
var _constant = require("../../utilities/constant");
|
|
103
|
-
var _type2 = require("agora-rte-sdk/lib/core/scene/type");
|
|
104
103
|
var _react = require("react");
|
|
105
104
|
var _useLanguageConfig = require("./interpreter-list/interpreter-item/components/pick-language/useLanguageConfig");
|
|
106
|
-
var
|
|
105
|
+
var _type2 = require("./type");
|
|
107
106
|
var _utils = require("./utils");
|
|
108
|
-
var
|
|
107
|
+
var _type3 = require("../../type");
|
|
109
108
|
var _fcrCore = require("fcr-core");
|
|
110
|
-
var _type5 = require("agora-rte-sdk/lib/type");
|
|
111
109
|
var _logger = require("../../utilities/logger");
|
|
112
110
|
var _excluded = ["randomKey"];
|
|
113
111
|
var _InterpreterStore;
|
|
@@ -222,7 +220,7 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
222
220
|
userInfoList: events.map(function (ele) {
|
|
223
221
|
return ele.userInfo;
|
|
224
222
|
})
|
|
225
|
-
},
|
|
223
|
+
}, _type2.UpdateType.JOIN);
|
|
226
224
|
},
|
|
227
225
|
//成员离开
|
|
228
226
|
onRemoteUsersLeft: function onRemoteUsersLeft(roomId, events) {
|
|
@@ -230,7 +228,7 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
230
228
|
userInfoList: events.map(function (ele) {
|
|
231
229
|
return ele.userInfo;
|
|
232
230
|
})
|
|
233
|
-
},
|
|
231
|
+
}, _type2.UpdateType.LEFT);
|
|
234
232
|
},
|
|
235
233
|
onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
|
|
236
234
|
_this._updateUsers({
|
|
@@ -428,10 +426,10 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
428
426
|
if (!isSelfOperation) {
|
|
429
427
|
if (state.enable) {
|
|
430
428
|
this._messageProvider.showNotification({
|
|
431
|
-
type:
|
|
429
|
+
type: _type3.FcrUINotificationContentType.INTERPRETER_STATUS,
|
|
432
430
|
placement: 'topLeft',
|
|
433
431
|
onClose: function onClose() {
|
|
434
|
-
_this3._messageProvider.closeNotification(
|
|
432
|
+
_this3._messageProvider.closeNotification(_type3.FcrUINotificationContentType.INTERPRETER_STATUS);
|
|
435
433
|
},
|
|
436
434
|
data: {
|
|
437
435
|
operatorUser: operatorUser,
|
|
@@ -516,7 +514,7 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
516
514
|
var mainRoomUsers = this._userControl.getUserList();
|
|
517
515
|
if (mainRoomUsers) {
|
|
518
516
|
this.initUsers = mainRoomUsers.filter(function (user) {
|
|
519
|
-
return user.connectorType ===
|
|
517
|
+
return user.connectorType === _type.FcrRoomConnectorType.NONE;
|
|
520
518
|
}).map(function (ele) {
|
|
521
519
|
return _objectSpread(_objectSpread({}, ele), {}, {
|
|
522
520
|
isOffLine: false
|
|
@@ -537,15 +535,15 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
537
535
|
if (initUsersCopy[index]) {
|
|
538
536
|
if (type) {
|
|
539
537
|
initUsersCopy[index] = _objectSpread(_objectSpread(_objectSpread({}, initUsersCopy[index]), userInfo), {}, {
|
|
540
|
-
isOffLine:
|
|
538
|
+
isOffLine: _type2.UpdateType.LEFT === type
|
|
541
539
|
});
|
|
542
540
|
} else {
|
|
543
541
|
initUsersCopy[index] = _objectSpread(_objectSpread({}, initUsersCopy[index]), userInfo);
|
|
544
542
|
}
|
|
545
543
|
}
|
|
546
|
-
} else if (userInfo.connectorType ===
|
|
544
|
+
} else if (userInfo.connectorType === _type.FcrRoomConnectorType.NONE) {
|
|
547
545
|
initUsersCopy.push(_objectSpread(_objectSpread({}, userInfo), {}, {
|
|
548
|
-
isOffLine:
|
|
546
|
+
isOffLine: _type2.UpdateType.LEFT === type
|
|
549
547
|
}));
|
|
550
548
|
}
|
|
551
549
|
});
|
|
@@ -590,7 +588,7 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
590
588
|
mainStreamControl = this._mainRoomControl.getStreamControl();
|
|
591
589
|
localStreamList = mainStreamControl.getStreamsByUserId(this._userControl.getLocalUser().userId);
|
|
592
590
|
micStreams = localStreamList.filter(function (ele) {
|
|
593
|
-
return ele.audioSourceType ===
|
|
591
|
+
return ele.audioSourceType === _type.FcrAudioSourceType.MICROPHONE;
|
|
594
592
|
});
|
|
595
593
|
streamId = !!micStreams.length ? micStreams[0].streamId : null;
|
|
596
594
|
if (!streamId) {
|
|
@@ -14,9 +14,9 @@ require("core-js/modules/esnext.iterator.map.js");
|
|
|
14
14
|
var _store = require("../store");
|
|
15
15
|
var _type = require("../type");
|
|
16
16
|
var _boardContext = _interopRequireDefault(require("../../../utilities/board-context"));
|
|
17
|
-
var
|
|
17
|
+
var _type2 = require("fcr-core/lib/type");
|
|
18
18
|
var _memberActions = require("../../components/member-window/components/member-actions");
|
|
19
|
-
var
|
|
19
|
+
var _env = require("agora-foundation/lib/utilities/env");
|
|
20
20
|
var _memberWindow = require("../../components/member-window");
|
|
21
21
|
var _screen = require("../../../utilities/screen");
|
|
22
22
|
var _react = require("react");
|
|
@@ -62,7 +62,7 @@ var useCommonProps = function useCommonProps(layoutType) {
|
|
|
62
62
|
var isMask = isGridLayout ? !isMainWindow : true;
|
|
63
63
|
var isToggleMainStream = isGridLayout && layout === _type.FcrUIVideoWindowLayoutType.Speaker && isMainWindow;
|
|
64
64
|
var memberWindowPreviewType = isGridLayout ? _type.FcrUILayoutType.GALLERY : _type.FcrUILayoutType.CAROUSEL;
|
|
65
|
-
var videoStreamType = isGridLayout ? galleryList.length > 4 ?
|
|
65
|
+
var videoStreamType = isGridLayout ? galleryList.length > 4 ? _type2.FcrVideoStreamType.LOW_STREAM : _type2.FcrVideoStreamType.HIGH_STREAM : _type2.FcrVideoStreamType.LOW_STREAM;
|
|
66
66
|
var iconSize = isGridLayout ? 24 : 16;
|
|
67
67
|
var windowSize = isGridLayout ? 'large' : 'normal';
|
|
68
68
|
return {
|
|
@@ -151,7 +151,7 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
|
|
|
151
151
|
muteAudio: muteAudio,
|
|
152
152
|
openPrivateChat: openPrivateChat,
|
|
153
153
|
windowData: windowData,
|
|
154
|
-
showRotation: (0,
|
|
154
|
+
showRotation: (0, _env.isElectron)(),
|
|
155
155
|
interpreterUserList: interpreterUserList,
|
|
156
156
|
isInterpreterEnabled: isInterpreterEnabled,
|
|
157
157
|
handleRename: openRenameDialog,
|
|
@@ -213,7 +213,7 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
|
|
|
213
213
|
width: dimensions.width,
|
|
214
214
|
height: dimensions.height,
|
|
215
215
|
slot: !isMainWindowInScreenSharing && renderMemberWindowActions(windowData, false),
|
|
216
|
-
videoRenderMode:
|
|
216
|
+
videoRenderMode: _type2.FcrVideoRenderMode.FIT,
|
|
217
217
|
videoStreamType: commonProps.videoStreamType,
|
|
218
218
|
windowData: windowData,
|
|
219
219
|
showAvatar: true,
|
|
@@ -1183,20 +1183,6 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1183
1183
|
}
|
|
1184
1184
|
}, {
|
|
1185
1185
|
fireImmediately: true
|
|
1186
|
-
}), (0, _mobx.reaction)(function () {
|
|
1187
|
-
return {
|
|
1188
|
-
cameraEnabled: _this5._deviceProvider.cameraEnabled,
|
|
1189
|
-
cameraId: _this5._deviceProvider.cameraId
|
|
1190
|
-
};
|
|
1191
|
-
}, function (_ref6) {
|
|
1192
|
-
var cameraEnabled = _ref6.cameraEnabled,
|
|
1193
|
-
cameraId = _ref6.cameraId;
|
|
1194
|
-
if (!cameraEnabled && _this5._localView) {
|
|
1195
|
-
_this5.stopLocalPreview(_this5._localView);
|
|
1196
|
-
}
|
|
1197
|
-
if (cameraEnabled && cameraId && _this5._localView) {
|
|
1198
|
-
_this5.startLocalPreview(_this5._localView);
|
|
1199
|
-
}
|
|
1200
1186
|
}), (0, _mobx.reaction)(function () {
|
|
1201
1187
|
return _this5.barLocked;
|
|
1202
1188
|
}, function (barLocked) {
|
|
@@ -1215,8 +1201,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1215
1201
|
return {
|
|
1216
1202
|
enableSpotlight: _this5.enableSpotlight
|
|
1217
1203
|
};
|
|
1218
|
-
}, function (
|
|
1219
|
-
var enableSpotlight =
|
|
1204
|
+
}, function (_ref6) {
|
|
1205
|
+
var enableSpotlight = _ref6.enableSpotlight;
|
|
1220
1206
|
_this5._videoWindowDataSource.setSpotlightEnabled(enableSpotlight);
|
|
1221
1207
|
}),
|
|
1222
1208
|
// 录制的特殊逻辑:
|
|
@@ -1371,8 +1357,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1371
1357
|
key: "_onStreamsAdded",
|
|
1372
1358
|
value: function _onStreamsAdded(roomId, events) {
|
|
1373
1359
|
var _this8 = this;
|
|
1374
|
-
events.forEach(function (
|
|
1375
|
-
var modifiedStream =
|
|
1360
|
+
events.forEach(function (_ref7) {
|
|
1361
|
+
var modifiedStream = _ref7.modifiedStream;
|
|
1376
1362
|
_this8._handleStreamAdded(modifiedStream);
|
|
1377
1363
|
});
|
|
1378
1364
|
}
|
|
@@ -1380,8 +1366,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1380
1366
|
key: "_onStreamsUpdated",
|
|
1381
1367
|
value: function _onStreamsUpdated(roomId, events) {
|
|
1382
1368
|
var _this9 = this;
|
|
1383
|
-
events.forEach(function (
|
|
1384
|
-
var modifiedStream =
|
|
1369
|
+
events.forEach(function (_ref8) {
|
|
1370
|
+
var modifiedStream = _ref8.modifiedStream;
|
|
1385
1371
|
_this9._videoWindowDataSource.update(modifiedStream);
|
|
1386
1372
|
});
|
|
1387
1373
|
}
|
|
@@ -1389,8 +1375,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1389
1375
|
key: "_onStreamsRemoved",
|
|
1390
1376
|
value: function _onStreamsRemoved(roomId, events) {
|
|
1391
1377
|
var _this0 = this;
|
|
1392
|
-
events.forEach(function (
|
|
1393
|
-
var modifiedStream =
|
|
1378
|
+
events.forEach(function (_ref9) {
|
|
1379
|
+
var modifiedStream = _ref9.modifiedStream;
|
|
1394
1380
|
_this0._videoWindowDataSource["delete"](modifiedStream);
|
|
1395
1381
|
});
|
|
1396
1382
|
var hasScreenStream = events === null || events === void 0 ? void 0 : events.find(function (event) {
|
|
@@ -66,8 +66,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
|
|
|
66
66
|
var _mobx = require("mobx");
|
|
67
67
|
var _type = require("./type");
|
|
68
68
|
var _type2 = require("fcr-core/lib/type");
|
|
69
|
-
var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
|
|
70
|
-
var _type4 = require("agora-rte-sdk/lib/core/scene/type");
|
|
71
69
|
var _FcrUIMemberListDataSourceImpl;
|
|
72
70
|
var _initProto, _init_list, _resetListDecs, _addDecs, _updateStreamInfoDecs, _updateUserInfoDecs, _updateWithStreamAddDecs, _updateWithStreamRemoveDecs, _deleteDecs, _clearAllUserBoardStateDecs, _insertEndByPriorityDecs, _ref;
|
|
73
71
|
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; }
|
|
@@ -138,10 +136,10 @@ var FcrUIMemberDataImpl = exports.FcrUIMemberDataImpl = /*#__PURE__*/function ()
|
|
|
138
136
|
return _type.FcrUIMemberSortingPriority.CO_HOST;
|
|
139
137
|
}
|
|
140
138
|
var cameraStream = this.streams.find(function (s) {
|
|
141
|
-
return s.videoSourceType ===
|
|
139
|
+
return s.videoSourceType === _type2.FcrVideoSourceType.CAMERA;
|
|
142
140
|
});
|
|
143
|
-
var cameraOpen = (cameraStream === null || cameraStream === void 0 ? void 0 : cameraStream.videoSourceState) ===
|
|
144
|
-
var microphoneOpen = (cameraStream === null || cameraStream === void 0 ? void 0 : cameraStream.audioSourceState) ===
|
|
141
|
+
var cameraOpen = (cameraStream === null || cameraStream === void 0 ? void 0 : cameraStream.videoSourceState) === _type2.FcrMediaSourceState.OPEN && ((cameraStream === null || cameraStream === void 0 ? void 0 : cameraStream.streamType) === _type2.FcrStreamType.VIDEO || (cameraStream === null || cameraStream === void 0 ? void 0 : cameraStream.streamType) === _type2.FcrStreamType.BOTH);
|
|
142
|
+
var microphoneOpen = (cameraStream === null || cameraStream === void 0 ? void 0 : cameraStream.audioSourceState) === _type2.FcrMediaSourceState.OPEN && ((cameraStream === null || cameraStream === void 0 ? void 0 : cameraStream.streamType) === _type2.FcrStreamType.AUDIO || (cameraStream === null || cameraStream === void 0 ? void 0 : cameraStream.streamType) === _type2.FcrStreamType.BOTH);
|
|
145
143
|
if (cameraOpen && microphoneOpen) {
|
|
146
144
|
return _type.FcrUIMemberSortingPriority.BOTH_OPEN;
|
|
147
145
|
}
|