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
|
@@ -34,7 +34,7 @@ Object.defineProperty(exports, "DEFAULT_BEAUTY_VALUE", {
|
|
|
34
34
|
return _localVideoPlayer.DEFAULT_BEAUTY_VALUE;
|
|
35
35
|
}
|
|
36
36
|
});
|
|
37
|
-
exports["default"] = exports.StoreContext = exports.DeviceSettingTab = void 0;
|
|
37
|
+
exports["default"] = exports.StoreContext = exports.MeetingStatus = exports.DeviceSettingTab = void 0;
|
|
38
38
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
39
39
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
40
40
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
@@ -102,7 +102,7 @@ var _logger = require("../../utilities/logger");
|
|
|
102
102
|
var _roomProvider = require("../../providers/room-provider");
|
|
103
103
|
var _excluded = ["dialogId"];
|
|
104
104
|
var _SettingStore;
|
|
105
|
-
var _initProto, _init_loudestStreamVolumeLevel, _init_microphoneVolumeLevel, _init_isWifiConnected, _init_dialogConfig, _init_networkState, _init_performanceState, _init_localAudioStreamMap, _init_remoteAudioStreamMap, _init_localVideoStreamMap, _init_remoteVideoStreamMap, _init_systemMemorySize, _init_systemCpuDesc, _init_getSystemInfoTimer, _setDialogConfigDecs, _setSettingDecs, _onEventDecs, _onNetworkStatsUpdatedDecs, _clearGetSystemInfoIntervalDecs, _closeDialogDecs, _onLocalAudioStatsUpdatedDecs, _onRemoteAudioStatsUpdatedDecs, _onLocalVideoStatsUpdatedDecs, _onRemoteVideoStatsUpdatedDecs, _onStreamsAddedDecs, _onStreamsUpdatedDecs, _onStreamsRemovedDecs, _onPerformanceUpdatedDecs, _onAudioVolumeUpdatedDecs, _preHandleSettingDecs, _setMeetingSettingsToLocalStorageDecs, _changeMediaSettingDecs, _ref;
|
|
105
|
+
var _initProto, _init_loudestStreamVolumeLevel, _init_meetingStatus, _init_microphoneVolumeLevel, _init_isWifiConnected, _init_dialogConfig, _init_networkState, _init_performanceState, _init_localAudioStreamMap, _init_remoteAudioStreamMap, _init_localVideoStreamMap, _init_remoteVideoStreamMap, _init_systemMemorySize, _init_systemCpuDesc, _init_getSystemInfoTimer, _setDialogConfigDecs, _setSettingDecs, _onEventDecs, _onNetworkStatsUpdatedDecs, _clearGetSystemInfoIntervalDecs, _closeDialogDecs, _onLocalAudioStatsUpdatedDecs, _onRemoteAudioStatsUpdatedDecs, _onLocalVideoStatsUpdatedDecs, _onRemoteVideoStatsUpdatedDecs, _onStreamsAddedDecs, _onStreamsUpdatedDecs, _onStreamsRemovedDecs, _onPerformanceUpdatedDecs, _onAudioVolumeUpdatedDecs, _preHandleSettingDecs, _setMeetingSettingsToLocalStorageDecs, _changeMediaSettingDecs, _ref;
|
|
106
106
|
function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
|
|
107
107
|
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
108
108
|
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
@@ -118,6 +118,11 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
|
|
|
118
118
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
119
119
|
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; }
|
|
120
120
|
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; }
|
|
121
|
+
var MeetingStatus = exports.MeetingStatus = /*#__PURE__*/function (MeetingStatus) {
|
|
122
|
+
MeetingStatus["PENDING"] = "pending";
|
|
123
|
+
MeetingStatus["ACTIVE"] = "active";
|
|
124
|
+
return MeetingStatus;
|
|
125
|
+
}({});
|
|
121
126
|
var DeviceSettingTab = exports.DeviceSettingTab = /*#__PURE__*/function (DeviceSettingTab) {
|
|
122
127
|
DeviceSettingTab["GENERAL"] = "general";
|
|
123
128
|
DeviceSettingTab["AUDIO"] = "audio";
|
|
@@ -165,6 +170,7 @@ var _J = /*#__PURE__*/new WeakMap();
|
|
|
165
170
|
var _K = /*#__PURE__*/new WeakMap();
|
|
166
171
|
var _L = /*#__PURE__*/new WeakMap();
|
|
167
172
|
var _M = /*#__PURE__*/new WeakMap();
|
|
173
|
+
var _N = /*#__PURE__*/new WeakMap();
|
|
168
174
|
_ref = (_setDialogConfigDecs = [_mobx.action, _mobx.action.bound], _setSettingDecs = [_mobx.action, _mobx.action.bound], _onEventDecs = [_mobx.action, _mobx.action.bound], _onNetworkStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _clearGetSystemInfoIntervalDecs = [_mobx.action, _mobx.action.bound], _closeDialogDecs = [_mobx.action, _mobx.action.bound], _onLocalAudioStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _onRemoteAudioStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _onLocalVideoStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _onRemoteVideoStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _onStreamsAddedDecs = [_mobx.action, _mobx.action.bound], _onStreamsUpdatedDecs = [_mobx.action, _mobx.action.bound], _onStreamsRemovedDecs = [_mobx.action, _mobx.action.bound], _onPerformanceUpdatedDecs = [_mobx.action, _mobx.action.bound], _onAudioVolumeUpdatedDecs = [_mobx.action, _mobx.action.bound], _preHandleSettingDecs = [_mobx.action, _mobx.action.bound], _setMeetingSettingsToLocalStorageDecs = [_mobx.action, _mobx.action.bound], _changeMediaSettingDecs = [_mobx.action, _mobx.action.bound], "logger");
|
|
169
175
|
var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
170
176
|
function SettingStore(_ref2) {
|
|
@@ -215,15 +221,16 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
215
221
|
onStreamVolumeIndicationUpdated: this._onAudioVolumeUpdated
|
|
216
222
|
});
|
|
217
223
|
_classPrivateFieldInitSpec(this, _A, _init_loudestStreamVolumeLevel(this, 0));
|
|
218
|
-
_classPrivateFieldInitSpec(this, _B,
|
|
219
|
-
_classPrivateFieldInitSpec(this, _C,
|
|
220
|
-
_classPrivateFieldInitSpec(this, _D,
|
|
224
|
+
_classPrivateFieldInitSpec(this, _B, _init_meetingStatus(this, MeetingStatus.PENDING));
|
|
225
|
+
_classPrivateFieldInitSpec(this, _C, _init_microphoneVolumeLevel(this, 0));
|
|
226
|
+
_classPrivateFieldInitSpec(this, _D, _init_isWifiConnected(this, false));
|
|
227
|
+
_classPrivateFieldInitSpec(this, _E, _init_dialogConfig(this, {
|
|
221
228
|
// activeTab: DeviceSettingTab.AUDIO,
|
|
222
229
|
activeTab: DeviceSettingTab.GENERAL,
|
|
223
230
|
highlightSelector: undefined,
|
|
224
231
|
videoActiveTab: 'basic'
|
|
225
232
|
}));
|
|
226
|
-
_classPrivateFieldInitSpec(this,
|
|
233
|
+
_classPrivateFieldInitSpec(this, _F, _init_networkState(this, {
|
|
227
234
|
txPacketLoss: -1,
|
|
228
235
|
rxPacketLoss: -1,
|
|
229
236
|
rtt: 0,
|
|
@@ -238,7 +245,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
238
245
|
rxVideoKBitrate: 0,
|
|
239
246
|
rxVideoKBytes: 0
|
|
240
247
|
}));
|
|
241
|
-
_classPrivateFieldInitSpec(this,
|
|
248
|
+
_classPrivateFieldInitSpec(this, _G, _init_performanceState(this, {
|
|
242
249
|
cpuTotalUsage: 0,
|
|
243
250
|
cpuAppUsage: 0,
|
|
244
251
|
cpuOtherAppUsage: 0,
|
|
@@ -248,13 +255,13 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
248
255
|
memoryAppUsageInKbytes: 0,
|
|
249
256
|
memoryOtherAppUsageInKbytes: 0
|
|
250
257
|
}));
|
|
251
|
-
_classPrivateFieldInitSpec(this,
|
|
252
|
-
_classPrivateFieldInitSpec(this,
|
|
253
|
-
_classPrivateFieldInitSpec(this,
|
|
254
|
-
_classPrivateFieldInitSpec(this,
|
|
255
|
-
_classPrivateFieldInitSpec(this,
|
|
256
|
-
_classPrivateFieldInitSpec(this,
|
|
257
|
-
_classPrivateFieldInitSpec(this,
|
|
258
|
+
_classPrivateFieldInitSpec(this, _H, _init_localAudioStreamMap(this, new Map()));
|
|
259
|
+
_classPrivateFieldInitSpec(this, _I, _init_remoteAudioStreamMap(this, new Map()));
|
|
260
|
+
_classPrivateFieldInitSpec(this, _J, _init_localVideoStreamMap(this, new Map()));
|
|
261
|
+
_classPrivateFieldInitSpec(this, _K, _init_remoteVideoStreamMap(this, new Map()));
|
|
262
|
+
_classPrivateFieldInitSpec(this, _L, _init_systemMemorySize(this, 0));
|
|
263
|
+
_classPrivateFieldInitSpec(this, _M, _init_systemCpuDesc(this, ''));
|
|
264
|
+
_classPrivateFieldInitSpec(this, _N, _init_getSystemInfoTimer(this, null));
|
|
258
265
|
this._monitorProvider = monitorProvider;
|
|
259
266
|
this._sharedConfigDataSource = sharedConfigDataSource;
|
|
260
267
|
this._eventProvider = eventProvider;
|
|
@@ -264,6 +271,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
264
271
|
this._dialogProvider = dialogProvider;
|
|
265
272
|
this._sharedSettingDataSource = sharedSettingDataSource;
|
|
266
273
|
this._sharedInterpreterDataSource = sharedInterpreterDataSource;
|
|
274
|
+
this.logger.debug("constructor SettingStore hasRoomProvider:".concat(!!roomProvider, ",hasCurrentRoomControl:").concat(!!(roomProvider !== null && roomProvider !== void 0 && roomProvider.currentRoomControl)));
|
|
267
275
|
if (roomProvider !== null && roomProvider !== void 0 && roomProvider.currentRoomControl) {
|
|
268
276
|
this._currentRoomControl = new _roomProvider.FcrUICurrentRoomControlProviderImpl(roomProvider.currentRoomControl).currentRoomControl;
|
|
269
277
|
this._currentRoomControl.addObserver(this._roomObserver);
|
|
@@ -282,7 +290,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
282
290
|
if (this._deviceProvider.defaultMirror) {
|
|
283
291
|
this._deviceProvider.toggleLocalMirror(true);
|
|
284
292
|
}
|
|
285
|
-
if (this._deviceProvider.cameraId) {
|
|
293
|
+
if (this._deviceProvider.cameraId && this._deviceProvider.cameraTrack) {
|
|
286
294
|
this._cameraTrack = this._deviceProvider.cameraTrack;
|
|
287
295
|
}
|
|
288
296
|
if (this.dialogConfig.activeTab === DeviceSettingTab.STATE) {
|
|
@@ -301,7 +309,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
301
309
|
_classPrivateFieldSet(_A, this, v);
|
|
302
310
|
}
|
|
303
311
|
}, {
|
|
304
|
-
key: "
|
|
312
|
+
key: "meetingStatus",
|
|
305
313
|
get: function get() {
|
|
306
314
|
return _classPrivateFieldGet(_B, this);
|
|
307
315
|
},
|
|
@@ -309,7 +317,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
309
317
|
_classPrivateFieldSet(_B, this, v);
|
|
310
318
|
}
|
|
311
319
|
}, {
|
|
312
|
-
key: "
|
|
320
|
+
key: "microphoneVolumeLevel",
|
|
313
321
|
get: function get() {
|
|
314
322
|
return _classPrivateFieldGet(_C, this);
|
|
315
323
|
},
|
|
@@ -317,7 +325,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
317
325
|
_classPrivateFieldSet(_C, this, v);
|
|
318
326
|
}
|
|
319
327
|
}, {
|
|
320
|
-
key: "
|
|
328
|
+
key: "isWifiConnected",
|
|
321
329
|
get: function get() {
|
|
322
330
|
return _classPrivateFieldGet(_D, this);
|
|
323
331
|
},
|
|
@@ -325,7 +333,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
325
333
|
_classPrivateFieldSet(_D, this, v);
|
|
326
334
|
}
|
|
327
335
|
}, {
|
|
328
|
-
key: "
|
|
336
|
+
key: "dialogConfig",
|
|
329
337
|
get: function get() {
|
|
330
338
|
return _classPrivateFieldGet(_E, this);
|
|
331
339
|
},
|
|
@@ -333,7 +341,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
333
341
|
_classPrivateFieldSet(_E, this, v);
|
|
334
342
|
}
|
|
335
343
|
}, {
|
|
336
|
-
key: "
|
|
344
|
+
key: "networkState",
|
|
337
345
|
get: function get() {
|
|
338
346
|
return _classPrivateFieldGet(_F, this);
|
|
339
347
|
},
|
|
@@ -341,7 +349,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
341
349
|
_classPrivateFieldSet(_F, this, v);
|
|
342
350
|
}
|
|
343
351
|
}, {
|
|
344
|
-
key: "
|
|
352
|
+
key: "performanceState",
|
|
345
353
|
get: function get() {
|
|
346
354
|
return _classPrivateFieldGet(_G, this);
|
|
347
355
|
},
|
|
@@ -349,7 +357,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
349
357
|
_classPrivateFieldSet(_G, this, v);
|
|
350
358
|
}
|
|
351
359
|
}, {
|
|
352
|
-
key: "
|
|
360
|
+
key: "localAudioStreamMap",
|
|
353
361
|
get: function get() {
|
|
354
362
|
return _classPrivateFieldGet(_H, this);
|
|
355
363
|
},
|
|
@@ -357,7 +365,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
357
365
|
_classPrivateFieldSet(_H, this, v);
|
|
358
366
|
}
|
|
359
367
|
}, {
|
|
360
|
-
key: "
|
|
368
|
+
key: "remoteAudioStreamMap",
|
|
361
369
|
get: function get() {
|
|
362
370
|
return _classPrivateFieldGet(_I, this);
|
|
363
371
|
},
|
|
@@ -365,7 +373,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
365
373
|
_classPrivateFieldSet(_I, this, v);
|
|
366
374
|
}
|
|
367
375
|
}, {
|
|
368
|
-
key: "
|
|
376
|
+
key: "localVideoStreamMap",
|
|
369
377
|
get: function get() {
|
|
370
378
|
return _classPrivateFieldGet(_J, this);
|
|
371
379
|
},
|
|
@@ -373,7 +381,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
373
381
|
_classPrivateFieldSet(_J, this, v);
|
|
374
382
|
}
|
|
375
383
|
}, {
|
|
376
|
-
key: "
|
|
384
|
+
key: "remoteVideoStreamMap",
|
|
377
385
|
get: function get() {
|
|
378
386
|
return _classPrivateFieldGet(_K, this);
|
|
379
387
|
},
|
|
@@ -381,7 +389,7 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
381
389
|
_classPrivateFieldSet(_K, this, v);
|
|
382
390
|
}
|
|
383
391
|
}, {
|
|
384
|
-
key: "
|
|
392
|
+
key: "systemMemorySize",
|
|
385
393
|
get: function get() {
|
|
386
394
|
return _classPrivateFieldGet(_L, this);
|
|
387
395
|
},
|
|
@@ -389,13 +397,21 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
389
397
|
_classPrivateFieldSet(_L, this, v);
|
|
390
398
|
}
|
|
391
399
|
}, {
|
|
392
|
-
key: "
|
|
400
|
+
key: "systemCpuDesc",
|
|
393
401
|
get: function get() {
|
|
394
402
|
return _classPrivateFieldGet(_M, this);
|
|
395
403
|
},
|
|
396
404
|
set: function set(v) {
|
|
397
405
|
_classPrivateFieldSet(_M, this, v);
|
|
398
406
|
}
|
|
407
|
+
}, {
|
|
408
|
+
key: "getSystemInfoTimer",
|
|
409
|
+
get: function get() {
|
|
410
|
+
return _classPrivateFieldGet(_N, this);
|
|
411
|
+
},
|
|
412
|
+
set: function set(v) {
|
|
413
|
+
_classPrivateFieldSet(_N, this, v);
|
|
414
|
+
}
|
|
399
415
|
}, {
|
|
400
416
|
key: "maxVideoSendInfo",
|
|
401
417
|
get: function get() {
|
|
@@ -550,11 +566,6 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
550
566
|
get: function get() {
|
|
551
567
|
return this._sharedSettingDataSource.media;
|
|
552
568
|
}
|
|
553
|
-
}, {
|
|
554
|
-
key: "isPreMeetingSettingsStore",
|
|
555
|
-
get: function get() {
|
|
556
|
-
return !this._currentRoomControl;
|
|
557
|
-
}
|
|
558
569
|
}, {
|
|
559
570
|
key: "sceneConfig",
|
|
560
571
|
get: function get() {
|
|
@@ -565,6 +576,11 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
565
576
|
get: function get() {
|
|
566
577
|
return this._messageProvider;
|
|
567
578
|
}
|
|
579
|
+
}, {
|
|
580
|
+
key: "startMeeting",
|
|
581
|
+
value: function startMeeting() {
|
|
582
|
+
this.meetingStatus = MeetingStatus.ACTIVE;
|
|
583
|
+
}
|
|
568
584
|
}, {
|
|
569
585
|
key: "initSettingConfig",
|
|
570
586
|
value: function initSettingConfig() {
|
|
@@ -752,10 +768,12 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
752
768
|
this._videoView4Setting = view;
|
|
753
769
|
this.startCameraTest();
|
|
754
770
|
var cameraTrack = this._deviceProvider.cameraTrack;
|
|
755
|
-
cameraTrack
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
|
|
771
|
+
if (cameraTrack) {
|
|
772
|
+
cameraTrack.startPreview({
|
|
773
|
+
renderMode: _fcrCore.FcrVideoRenderMode.HIDDEN,
|
|
774
|
+
isMirror: isMirror
|
|
775
|
+
}, view);
|
|
776
|
+
}
|
|
759
777
|
}
|
|
760
778
|
}, {
|
|
761
779
|
key: "stopVideo",
|
|
@@ -763,7 +781,9 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
763
781
|
this.stopCameraTest();
|
|
764
782
|
if (!this._videoView4Setting) return;
|
|
765
783
|
var cameraTrack = this._deviceProvider.cameraTrack;
|
|
766
|
-
cameraTrack
|
|
784
|
+
if (cameraTrack) {
|
|
785
|
+
cameraTrack.stopPreview(this._videoView4Setting);
|
|
786
|
+
}
|
|
767
787
|
}
|
|
768
788
|
}, {
|
|
769
789
|
key: "handleForceOpenVideoEffect",
|
|
@@ -838,14 +858,14 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
838
858
|
if (!this._deviceProvider.cameraId) return;
|
|
839
859
|
var track = this._deviceProvider.cameraTrack;
|
|
840
860
|
if (enable) {
|
|
841
|
-
track
|
|
842
|
-
|
|
843
|
-
}
|
|
861
|
+
if (track) {
|
|
862
|
+
track.setCaptureParams(_objectSpread({}, _config.hdCameraVideoEncoderConfig));
|
|
863
|
+
}
|
|
844
864
|
this._setVideoEncoderConfigForCameraStream(_config.hdCameraVideoEncoderConfig);
|
|
845
865
|
} else {
|
|
846
|
-
track
|
|
847
|
-
|
|
848
|
-
}
|
|
866
|
+
if (track) {
|
|
867
|
+
track.setCaptureParams(_objectSpread({}, _config.defaultCameraVideoEncoderConfig));
|
|
868
|
+
}
|
|
849
869
|
this._setVideoEncoderConfigForCameraStream(_config.defaultCameraVideoEncoderConfig);
|
|
850
870
|
}
|
|
851
871
|
}
|
|
@@ -878,10 +898,12 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
878
898
|
value: function _enableLowlightEnhancement(enable) {
|
|
879
899
|
if (!this._deviceProvider.cameraId) return;
|
|
880
900
|
var track = this._deviceProvider.cameraTrack;
|
|
881
|
-
if (
|
|
882
|
-
|
|
883
|
-
|
|
884
|
-
|
|
901
|
+
if (track) {
|
|
902
|
+
if (enable) {
|
|
903
|
+
track.getVideoEffectEnhancer().enableLowlightEnhancement();
|
|
904
|
+
} else {
|
|
905
|
+
track.getVideoEffectEnhancer().disableLowlightEnhancement();
|
|
906
|
+
}
|
|
885
907
|
}
|
|
886
908
|
}
|
|
887
909
|
// 视频降噪
|
|
@@ -890,10 +912,12 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
890
912
|
value: function _enableVideoDenoiser(enable) {
|
|
891
913
|
if (!this._deviceProvider.cameraId) return;
|
|
892
914
|
var track = this._deviceProvider.cameraTrack;
|
|
893
|
-
if (
|
|
894
|
-
|
|
895
|
-
|
|
896
|
-
|
|
915
|
+
if (track) {
|
|
916
|
+
if (enable) {
|
|
917
|
+
track.getVideoEffectEnhancer().enableVideoDenoiser();
|
|
918
|
+
} else {
|
|
919
|
+
track.getVideoEffectEnhancer().disableVideoDenoiser();
|
|
920
|
+
}
|
|
897
921
|
}
|
|
898
922
|
}
|
|
899
923
|
|
|
@@ -903,10 +927,12 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
903
927
|
value: function _enableHardwareForReception(enable) {
|
|
904
928
|
if (!this._deviceProvider.cameraId) return;
|
|
905
929
|
var track = this._deviceProvider.cameraTrack;
|
|
906
|
-
if (
|
|
907
|
-
|
|
908
|
-
|
|
909
|
-
|
|
930
|
+
if (track) {
|
|
931
|
+
if (enable) {
|
|
932
|
+
track.getVideoEffectEnhancer().enableHardwareEncoder();
|
|
933
|
+
} else {
|
|
934
|
+
track.getVideoEffectEnhancer().disableHardwareEncoder();
|
|
935
|
+
}
|
|
910
936
|
}
|
|
911
937
|
}
|
|
912
938
|
}, {
|
|
@@ -914,17 +940,21 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
914
940
|
value: function startCameraTest() {
|
|
915
941
|
if (!this.cameraDeviceId) return;
|
|
916
942
|
var cameraVideoTrack = this._deviceProvider.cameraTrack;
|
|
917
|
-
cameraVideoTrack
|
|
943
|
+
if (cameraVideoTrack) {
|
|
944
|
+
cameraVideoTrack.startTest();
|
|
945
|
+
}
|
|
918
946
|
}
|
|
919
947
|
}, {
|
|
920
948
|
key: "stopCameraTest",
|
|
921
949
|
value: function stopCameraTest() {
|
|
922
950
|
if (!this.cameraDeviceId) return;
|
|
923
951
|
var cameraVideoTrack = this._deviceProvider.cameraTrack;
|
|
924
|
-
if (
|
|
925
|
-
|
|
952
|
+
if (cameraVideoTrack) {
|
|
953
|
+
if (this._videoView4Setting) {
|
|
954
|
+
cameraVideoTrack.stopPreview(this._videoView4Setting);
|
|
955
|
+
}
|
|
956
|
+
cameraVideoTrack.stopTest();
|
|
926
957
|
}
|
|
927
|
-
cameraVideoTrack.stopTest();
|
|
928
958
|
}
|
|
929
959
|
}, {
|
|
930
960
|
key: "startMicrophoneTest",
|
|
@@ -1028,7 +1058,6 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1028
1058
|
}
|
|
1029
1059
|
},
|
|
1030
1060
|
cameraId: function cameraId(value) {
|
|
1031
|
-
_this6._deviceProvider.setCameraId(value);
|
|
1032
1061
|
if (_this6._deviceProvider.cameraList.find(function (item) {
|
|
1033
1062
|
return item.deviceId === value;
|
|
1034
1063
|
})) {
|
|
@@ -1273,19 +1302,20 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1273
1302
|
}]);
|
|
1274
1303
|
}();
|
|
1275
1304
|
_SettingStore = SettingStore;
|
|
1276
|
-
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SettingStore, [[_mobx.observable, 1, "loudestStreamVolumeLevel"], [_mobx.observable, 1, "microphoneVolumeLevel"], [_mobx.observable, 1, "isWifiConnected"], [_mobx.observable, 1, "dialogConfig"], [_mobx.observable, 1, "networkState"], [_mobx.observable, 1, "performanceState"], [_mobx.observable, 1, "localAudioStreamMap"], [_mobx.observable, 1, "remoteAudioStreamMap"], [_mobx.observable, 1, "localVideoStreamMap"], [_mobx.observable, 1, "remoteVideoStreamMap"], [_mobx.observable, 1, "systemMemorySize"], [_mobx.observable, 1, "systemCpuDesc"], [_mobx.observable, 1, "getSystemInfoTimer"], [_mobx.computed, 3, "maxVideoSendInfo"], [_mobx.computed, 3, "maxVideoReceiveInfo"], [_mobx.computed, 3, "sendScreenShareInfo"], [_mobx.computed, 3, "receiveScreenShareInfo"], [_mobx.computed, 3, "microphoneVolumeDb"], [_mobx.computed, 3, "speakerVolumeDb"], [_mobx.computed, 3, "speakerTestVolumeLevel"], [_mobx.computed, 3, "microphoneTestVolumeLevel"], [_mobx.computed, 3, "speakerVolume"], [_mobx.computed, 3, "microphoneVolume"], [_mobx.computed, 3, "isLocalMirrorEnabled"], [_mobx.computed, 3, "isLocalEditBeautyOptions"], [_mobx.computed, 3, "currentBeautyKey"], [_mobx.computed, 3, "beautyOptions"], [_mobx.computed, 3, "cameraDeviceId"], [_mobx.computed, 3, "cameraEnabled"], [_mobx.computed, 3, "showForceOpenEffectDialog"], [_mobx.computed, 3, "currentVirtualBackgroundName"], [_mobx.computed, 3, "cameraDeviceList"], [_mobx.computed, 3, "microphoneDeviceId"], [_mobx.computed, 3, "speakerDeviceId"], [_mobx.computed, 3, "speakerDeviceList"], [_mobx.computed, 3, "microphoneDeviceList"], [_mobx.computed, 3, "enableBeauty"], [_mobx.computed, 3, "virtualBackgroundList"], [_mobx.computed, 3, "currentIsMirror"], [_mobx.computed, 3, "microphoneDetecting"], [_mobx.computed, 3, "speakerDetecting"], [_mobx.computed, 3, "setting"], [_mobx.computed, 3, "media"], [_mobx.computed, 3, "
|
|
1305
|
+
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SettingStore, [[_mobx.observable, 1, "loudestStreamVolumeLevel"], [_mobx.observable, 1, "meetingStatus"], [_mobx.observable, 1, "microphoneVolumeLevel"], [_mobx.observable, 1, "isWifiConnected"], [_mobx.observable, 1, "dialogConfig"], [_mobx.observable, 1, "networkState"], [_mobx.observable, 1, "performanceState"], [_mobx.observable, 1, "localAudioStreamMap"], [_mobx.observable, 1, "remoteAudioStreamMap"], [_mobx.observable, 1, "localVideoStreamMap"], [_mobx.observable, 1, "remoteVideoStreamMap"], [_mobx.observable, 1, "systemMemorySize"], [_mobx.observable, 1, "systemCpuDesc"], [_mobx.observable, 1, "getSystemInfoTimer"], [_mobx.computed, 3, "maxVideoSendInfo"], [_mobx.computed, 3, "maxVideoReceiveInfo"], [_mobx.computed, 3, "sendScreenShareInfo"], [_mobx.computed, 3, "receiveScreenShareInfo"], [_mobx.computed, 3, "microphoneVolumeDb"], [_mobx.computed, 3, "speakerVolumeDb"], [_mobx.computed, 3, "speakerTestVolumeLevel"], [_mobx.computed, 3, "microphoneTestVolumeLevel"], [_mobx.computed, 3, "speakerVolume"], [_mobx.computed, 3, "microphoneVolume"], [_mobx.computed, 3, "isLocalMirrorEnabled"], [_mobx.computed, 3, "isLocalEditBeautyOptions"], [_mobx.computed, 3, "currentBeautyKey"], [_mobx.computed, 3, "beautyOptions"], [_mobx.computed, 3, "cameraDeviceId"], [_mobx.computed, 3, "cameraEnabled"], [_mobx.computed, 3, "showForceOpenEffectDialog"], [_mobx.computed, 3, "currentVirtualBackgroundName"], [_mobx.computed, 3, "cameraDeviceList"], [_mobx.computed, 3, "microphoneDeviceId"], [_mobx.computed, 3, "speakerDeviceId"], [_mobx.computed, 3, "speakerDeviceList"], [_mobx.computed, 3, "microphoneDeviceList"], [_mobx.computed, 3, "enableBeauty"], [_mobx.computed, 3, "virtualBackgroundList"], [_mobx.computed, 3, "currentIsMirror"], [_mobx.computed, 3, "microphoneDetecting"], [_mobx.computed, 3, "speakerDetecting"], [_mobx.computed, 3, "setting"], [_mobx.computed, 3, "media"], [_mobx.computed, 3, "sceneConfig"], [_decorator.bound, 2, "startMeeting"], [_decorator.bound, 2, "initSettingConfig"], [_decorator.bound, 2, "enableVirtualBackground"], [_decorator.bound, 2, "setEditBeautyKey"], [_decorator.bound, 2, "enableBeautyEffect"], [_decorator.bound, 2, "_initReactions"], [_decorator.bound, 2, "setCameraDevice"], [_decorator.bound, 2, "setMicrophoneDevice"], [_decorator.bound, 2, "stopSpeakerTest"], [_decorator.bound, 2, "startSpeakerTest"], [_decorator.bound, 2, "setSpeakerDevice"], [_decorator.bound, 2, "setSpeakerVolume"], [_decorator.bound, 2, "setMicrophoneVolume"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "setBeautyOptions"], [_decorator.bound, 2, "toggleLocalMirrorPreview"], [_decorator.bound, 2, "startVideo"], [_decorator.bound, 2, "stopVideo"], [_decorator.bound, 2, "handleForceOpenVideoEffect"], [_decorator.bound, 2, "handleCancelForceOpenVideoEffect"], [_decorator.bound, 2, "toggleLocalMirror"], [_decorator.bound, 2, "setSettingVideoOpened"], [_decorator.bound, 2, "_syncSystemInfo"], [_decorator.bound, 2, "startCameraTest"], [_decorator.bound, 2, "stopCameraTest"], [_decorator.bound, 2, "startMicrophoneTest"], [_decorator.bound, 2, "stopMicrophoneTest"], [_setDialogConfigDecs, 18, "setDialogConfig"], [_setSettingDecs, 18, "setSetting"], [_onEventDecs, 18, "_onEvent"], [_onNetworkStatsUpdatedDecs, 18, "_onNetworkStatsUpdated"], [_clearGetSystemInfoIntervalDecs, 18, "clearGetSystemInfoInterval"], [_closeDialogDecs, 18, "closeDialog"], [_onLocalAudioStatsUpdatedDecs, 18, "_onLocalAudioStatsUpdated"], [_onRemoteAudioStatsUpdatedDecs, 18, "_onRemoteAudioStatsUpdated"], [_onLocalVideoStatsUpdatedDecs, 18, "_onLocalVideoStatsUpdated"], [_onRemoteVideoStatsUpdatedDecs, 18, "_onRemoteVideoStatsUpdated"], [_onStreamsAddedDecs, 18, "_onStreamsAdded"], [_onStreamsUpdatedDecs, 18, "_onStreamsUpdated"], [_onStreamsRemovedDecs, 18, "_onStreamsRemoved"], [_onPerformanceUpdatedDecs, 18, "_onPerformanceUpdated"], [_decorator.bound, 2, "_handleCameraChanged"], [_decorator.bound, 2, "_handleCameraListUpdated"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_preHandleSettingDecs, 18, "_preHandleSetting"], [_setMeetingSettingsToLocalStorageDecs, 18, "_setMeetingSettingsToLocalStorage"], [_changeMediaSettingDecs, 18, "changeMediaSetting"]], []).e, 15);
|
|
1277
1306
|
_init_loudestStreamVolumeLevel = _applyDecs$e[0];
|
|
1278
|
-
|
|
1279
|
-
|
|
1280
|
-
|
|
1281
|
-
|
|
1282
|
-
|
|
1283
|
-
|
|
1284
|
-
|
|
1285
|
-
|
|
1286
|
-
|
|
1287
|
-
|
|
1288
|
-
|
|
1289
|
-
|
|
1290
|
-
|
|
1307
|
+
_init_meetingStatus = _applyDecs$e[1];
|
|
1308
|
+
_init_microphoneVolumeLevel = _applyDecs$e[2];
|
|
1309
|
+
_init_isWifiConnected = _applyDecs$e[3];
|
|
1310
|
+
_init_dialogConfig = _applyDecs$e[4];
|
|
1311
|
+
_init_networkState = _applyDecs$e[5];
|
|
1312
|
+
_init_performanceState = _applyDecs$e[6];
|
|
1313
|
+
_init_localAudioStreamMap = _applyDecs$e[7];
|
|
1314
|
+
_init_remoteAudioStreamMap = _applyDecs$e[8];
|
|
1315
|
+
_init_localVideoStreamMap = _applyDecs$e[9];
|
|
1316
|
+
_init_remoteVideoStreamMap = _applyDecs$e[10];
|
|
1317
|
+
_init_systemMemorySize = _applyDecs$e[11];
|
|
1318
|
+
_init_systemCpuDesc = _applyDecs$e[12];
|
|
1319
|
+
_init_getSystemInfoTimer = _applyDecs$e[13];
|
|
1320
|
+
_initProto = _applyDecs$e[14];
|
|
1291
1321
|
var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);
|
|
@@ -64,7 +64,7 @@ var DeviceSettingsView = exports.DeviceSettingsView = (0, _mobxReact.observer)(f
|
|
|
64
64
|
dialogConfig = _useContext.dialogConfig,
|
|
65
65
|
setDialogConfig = _useContext.setDialogConfig,
|
|
66
66
|
setSettingVideoOpened = _useContext.setSettingVideoOpened,
|
|
67
|
-
|
|
67
|
+
meetingStatus = _useContext.meetingStatus;
|
|
68
68
|
var t = (0, _i18n.useI18n)();
|
|
69
69
|
var ns = (0, _useNamespace.useNamespace)('device-settings');
|
|
70
70
|
var getListItemCls = function getListItemCls(tabKey) {
|
|
@@ -90,6 +90,7 @@ var DeviceSettingsView = exports.DeviceSettingsView = (0, _mobxReact.observer)(f
|
|
|
90
90
|
var tabContents = (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _store.DeviceSettingTab.GENERAL, /*#__PURE__*/(0, _jsxRuntime.jsx)(_generalSettings["default"], {})), _store.DeviceSettingTab.AUDIO, /*#__PURE__*/(0, _jsxRuntime.jsx)(_audioSettings["default"], {})), _store.DeviceSettingTab.VIDEO, /*#__PURE__*/(0, _jsxRuntime.jsx)(_videoSettings["default"], {})), _store.DeviceSettingTab.STATE, /*#__PURE__*/(0, _jsxRuntime.jsx)(_state["default"], {}));
|
|
91
91
|
return tabContents[dialogConfig.activeTab];
|
|
92
92
|
}, [dialogConfig.activeTab]);
|
|
93
|
+
var isHiddenStateTab = meetingStatus === _store.MeetingStatus.PENDING;
|
|
93
94
|
var deviceSettingItems = [{
|
|
94
95
|
tab: _store.DeviceSettingTab.GENERAL,
|
|
95
96
|
color: 'orange',
|
|
@@ -110,7 +111,7 @@ var DeviceSettingsView = exports.DeviceSettingsView = (0, _mobxReact.observer)(f
|
|
|
110
111
|
color: 'blue',
|
|
111
112
|
icon: _type.FcrIconType.FCR_COMPUTERDATA,
|
|
112
113
|
label: t('fmt_modules_labels_qualitystatistics'),
|
|
113
|
-
isHidden:
|
|
114
|
+
isHidden: isHiddenStateTab
|
|
114
115
|
}];
|
|
115
116
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
|
|
116
117
|
className: ns.b(),
|
|
@@ -56,7 +56,7 @@ require("core-js/modules/esnext.typed-array.to-spliced.js");
|
|
|
56
56
|
require("core-js/modules/esnext.typed-array.unique-by.js");
|
|
57
57
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
58
58
|
var _card = require("agora-ui-foundation/lib/components/card");
|
|
59
|
-
var _type = require("
|
|
59
|
+
var _type = require("fcr-core/lib/type");
|
|
60
60
|
var _button = require("agora-ui-foundation/lib/components/button");
|
|
61
61
|
var _mobxReact = require("mobx-react");
|
|
62
62
|
var _react = require("react");
|
|
@@ -126,7 +126,7 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
|
|
|
126
126
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
127
127
|
className: "share-selection-window__share-windows share-selection-window__share-card",
|
|
128
128
|
children: screenCaptureSources.map(function (screen) {
|
|
129
|
-
var type = _type.
|
|
129
|
+
var type = _type.FcrScreenCaptureType.SCREEN;
|
|
130
130
|
var isWhiteboard = screen.id.split('-')[0] === 'whiteboard';
|
|
131
131
|
var screenWithBounds = screen;
|
|
132
132
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_card.FcrCard, {
|
|
@@ -140,7 +140,7 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
|
|
|
140
140
|
handleChooseScreen(screen.id, type);
|
|
141
141
|
},
|
|
142
142
|
onDoubleClickCard: function onDoubleClickCard() {
|
|
143
|
-
if (boardOwnerUser) return;
|
|
143
|
+
if (boardOwnerUser && isWhiteboard) return;
|
|
144
144
|
handleOkClick();
|
|
145
145
|
},
|
|
146
146
|
content: screen.image instanceof Uint8Array ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ThumbnailRender, {
|
|
@@ -178,16 +178,14 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
|
|
|
178
178
|
className: "share-selection-window__share-application share-selection-window__share-card",
|
|
179
179
|
children: applicationCaptureSources.map(function (application) {
|
|
180
180
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_card.FcrCard, {
|
|
181
|
-
active: currentSelectionType === _type.
|
|
181
|
+
active: currentSelectionType === _type.FcrScreenCaptureType.WINDOW && application.id === currentSelectionId,
|
|
182
182
|
onCardClick: function onCardClick() {
|
|
183
183
|
if (application.bounds) {
|
|
184
184
|
setCardChooseBounds(application.bounds);
|
|
185
185
|
}
|
|
186
|
-
handleChooseScreen(application.id, _type.
|
|
187
|
-
},
|
|
188
|
-
onDoubleClickCard: function onDoubleClickCard() {
|
|
189
|
-
handleStartShare(application.id, _type.AgoraRtcScreenCaptureType.WINDOW, shareWithAudio, _shareAudio.AudioProcessingChannel.MONO, application.bounds);
|
|
186
|
+
handleChooseScreen(application.id, _type.FcrScreenCaptureType.WINDOW);
|
|
190
187
|
},
|
|
188
|
+
onDoubleClickCard: handleOkClick,
|
|
191
189
|
title: application.title,
|
|
192
190
|
content: /*#__PURE__*/(0, _jsxRuntime.jsx)(ThumbnailRender, {
|
|
193
191
|
image: application.image,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FcrConnectionState, FcrMediaSourceState } from 'fcr-core';
|
|
2
2
|
import { FcrScreenTrack } from 'fcr-core/lib/media-control/type';
|
|
3
3
|
import { FcrUserInfo } from 'fcr-core/lib/type';
|
|
4
|
-
import {
|
|
4
|
+
import { FcrScreenCaptureType } from 'fcr-core/lib/type';
|
|
5
5
|
import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
|
|
6
6
|
import { FcrMainRoomControl } from 'fcr-core/lib/room-control/type';
|
|
7
7
|
import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
|
|
@@ -53,23 +53,23 @@ export default class ShareScreenStore {
|
|
|
53
53
|
private _sharedAnnotationDataSource;
|
|
54
54
|
accessor boardOwnerUser: FcrUserInfo | undefined;
|
|
55
55
|
get cardChooseBounds(): CurrentShareBounds;
|
|
56
|
-
get currentShareStreamId(): string;
|
|
56
|
+
get currentShareStreamId(): string | undefined;
|
|
57
57
|
get screenTrack(): FcrScreenTrack | null;
|
|
58
|
-
get currentShareType():
|
|
58
|
+
get currentShareType(): FcrScreenCaptureType;
|
|
59
59
|
get isCurrentOriginal(): boolean;
|
|
60
60
|
get localUser(): FcrUserInfo;
|
|
61
61
|
get localUserRole(): import("fcr-core").FcrUserRole;
|
|
62
62
|
get isHost(): boolean;
|
|
63
63
|
get supportEnumScreen(): boolean;
|
|
64
|
-
get appWindowList(): Promise<AgoraRtcWindowInfo[]>;
|
|
65
|
-
get displayList(): Promise<AgoraRtcDisplayInfo[]>;
|
|
64
|
+
get appWindowList(): Promise<import("fcr-core/lib/imports").AgoraRtcWindowInfo[]>;
|
|
65
|
+
get displayList(): Promise<import("fcr-core/lib/imports").AgoraRtcDisplayInfo[]>;
|
|
66
66
|
get connectionState(): FcrConnectionState;
|
|
67
67
|
get localUserScreenSharingState(): FcrMediaSourceState;
|
|
68
|
-
get applicationCaptureSources(): AgoraRtcWindowInfo[];
|
|
68
|
+
get applicationCaptureSources(): import("fcr-core/lib/imports").AgoraRtcWindowInfo[];
|
|
69
69
|
get screenCaptureSources(): import("./types").FcrUIDisplayCaptureSource[];
|
|
70
70
|
get currentShareAudioProcessingChannel(): AudioProcessingChannel;
|
|
71
71
|
get currentSelectionId(): string;
|
|
72
|
-
get currentSelectionType():
|
|
72
|
+
get currentSelectionType(): FcrScreenCaptureType;
|
|
73
73
|
get shareWithAudio(): boolean;
|
|
74
74
|
get currentSelectionBounds(): CurrentShareBounds;
|
|
75
75
|
get shareLock(): boolean;
|
|
@@ -103,13 +103,12 @@ export default class ShareScreenStore {
|
|
|
103
103
|
multiDisplayProvider: FcrUIMultiDisplayProvider;
|
|
104
104
|
});
|
|
105
105
|
toggleIsShowToolbar(): void;
|
|
106
|
-
handleChooseScreen: (id: string, type?:
|
|
106
|
+
handleChooseScreen: (id: string, type?: FcrScreenCaptureType) => void;
|
|
107
107
|
setShareWithAudioState(withAudio: boolean): void;
|
|
108
108
|
zoomIn(): void;
|
|
109
109
|
zoomOut(): void;
|
|
110
110
|
fullContainer(): void;
|
|
111
111
|
setOriginScalc(): void;
|
|
112
|
-
hasLoopbackDevice(): Promise<boolean>;
|
|
113
112
|
setShareAudioProcessingChannel(currentShareAudioProcessingChannel: AudioProcessingChannel): void;
|
|
114
113
|
setCardChooseBounds(bounds: CurrentShareBounds): void;
|
|
115
114
|
handlerBoardShareStop(): void;
|
|
@@ -121,7 +120,7 @@ export default class ShareScreenStore {
|
|
|
121
120
|
handleStopShareByExitRoom(): void;
|
|
122
121
|
participantShareCanWeAnnotation(): boolean;
|
|
123
122
|
prepareShareScreen(): Promise<void>;
|
|
124
|
-
handleStartShare(id: string, type:
|
|
123
|
+
handleStartShare(id: string, type: FcrScreenCaptureType, withAudio: boolean, audioProcessingChannel: AudioProcessingChannel | undefined, bounds: CurrentShareBounds): Promise<void>;
|
|
125
124
|
private _openShareScreenSelection;
|
|
126
125
|
private _closeShareScreenSelection;
|
|
127
126
|
private _openVideoWindowDialog;
|