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
|
@@ -95,24 +95,22 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
|
|
|
95
95
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
96
96
|
var _fcrCore = require("fcr-core");
|
|
97
97
|
var _type = require("fcr-core/lib/type");
|
|
98
|
-
var _type2 = require("agora-rte-sdk/lib/type");
|
|
99
98
|
var _attendee = require("agora-ui-foundation/lib/components/participants/attendee");
|
|
100
99
|
var _mobx = require("mobx");
|
|
101
100
|
var _constant = require("../../utilities/constant");
|
|
102
101
|
var _decorator = require("agora-foundation/lib/decorator");
|
|
103
102
|
var _mobxUtils = require("mobx-utils");
|
|
104
|
-
var
|
|
103
|
+
var _type2 = require("./type");
|
|
105
104
|
var _i18n = require("agora-ui-foundation/lib/i18n");
|
|
106
105
|
var _i18n2 = require("../../hooks/i18n");
|
|
107
|
-
var
|
|
106
|
+
var _type3 = require("fcr-core/lib/room-control/user-control/type");
|
|
108
107
|
var _react = require("react");
|
|
109
108
|
var _confirmInput = require("./components/confirm-input");
|
|
110
|
-
var
|
|
109
|
+
var _type4 = require("fcr-core/lib/room-control/privilege-control/type");
|
|
111
110
|
var _env = require("agora-foundation/lib/utilities/env");
|
|
112
|
-
var
|
|
111
|
+
var _type5 = require("../../type");
|
|
113
112
|
var _operateWaitingroomMember = require("./components/operate-waitingroom-member");
|
|
114
113
|
var _muteAll = require("./components/mute-all");
|
|
115
|
-
var _imports = require("fcr-core/lib/imports");
|
|
116
114
|
var _logger = require("../../utilities/logger");
|
|
117
115
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
118
116
|
var _ParticipantStore;
|
|
@@ -200,13 +198,13 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
200
198
|
onWaitingRoomManageCanceled: function onWaitingRoomManageCanceled() {
|
|
201
199
|
_this._waitingRoomControl = undefined;
|
|
202
200
|
_this._waitingRoomUserControl = undefined;
|
|
203
|
-
_this.handleActiveTab(
|
|
201
|
+
_this.handleActiveTab(_type5.FcrUIRoomType.MAIN_ROOM);
|
|
204
202
|
}
|
|
205
203
|
});
|
|
206
204
|
(0, _defineProperty2["default"])(this, "_privilegeControlObserver", {
|
|
207
205
|
onSecurityInfoUpdated: function onSecurityInfoUpdated(roomId, event) {
|
|
208
206
|
var _event$securityInfo$i;
|
|
209
|
-
if (((_event$securityInfo$i = event.securityInfo.info) === null || _event$securityInfo$i === void 0 ? void 0 : _event$securityInfo$i.action) ===
|
|
207
|
+
if (((_event$securityInfo$i = event.securityInfo.info) === null || _event$securityInfo$i === void 0 ? void 0 : _event$securityInfo$i.action) === _type4.FcrSecurityAction.ChangeName) {
|
|
210
208
|
if (!event.securityInfo.enable) {
|
|
211
209
|
_this._closeChangeNameDialog();
|
|
212
210
|
}
|
|
@@ -241,7 +239,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
241
239
|
// @observable accessor enableSpotlight: boolean = true;
|
|
242
240
|
_classPrivateFieldInitSpec(this, _G, _init_mergeConfirmDialog(this, false));
|
|
243
241
|
_classPrivateFieldInitSpec(this, _H, _init_mergeUserId(this, ''));
|
|
244
|
-
_classPrivateFieldInitSpec(this, _I, _init_activeTab(this,
|
|
242
|
+
_classPrivateFieldInitSpec(this, _I, _init_activeTab(this, _type5.FcrUIRoomType.MAIN_ROOM));
|
|
245
243
|
_classPrivateFieldInitSpec(this, _J, _init_interpreterInputLanguageList(this, []));
|
|
246
244
|
_classPrivateFieldInitSpec(this, _K, _init_newName(this, ''));
|
|
247
245
|
_classPrivateFieldInitSpec(this, _L, _init_allowUnmute(this, false));
|
|
@@ -262,7 +260,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
262
260
|
(0, _defineProperty2["default"])(this, "_formatUser", function (user) {
|
|
263
261
|
var userStreams = user.streams;
|
|
264
262
|
var hasShareScreen = userStreams.some(function (stream) {
|
|
265
|
-
return stream.videoSourceType ===
|
|
263
|
+
return stream.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN;
|
|
266
264
|
});
|
|
267
265
|
var isSelf = user.userId === _this.localUser.userId;
|
|
268
266
|
var hasAudioPublishedAndStarted = function hasAudioPublishedAndStarted(stream) {
|
|
@@ -272,7 +270,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
272
270
|
return (stream === null || stream === void 0 ? void 0 : stream.videoSourceState) === _fcrCore.FcrMediaSourceState.OPEN;
|
|
273
271
|
};
|
|
274
272
|
var isHideMicroIcon = function isHideMicroIcon(stream) {
|
|
275
|
-
return !hasAudioPublishedAndStarted(stream) || (stream === null || stream === void 0 ? void 0 : stream.streamType) ===
|
|
273
|
+
return !hasAudioPublishedAndStarted(stream) || (stream === null || stream === void 0 ? void 0 : stream.streamType) === _type.FcrStreamType.NONE || (stream === null || stream === void 0 ? void 0 : stream.streamType) === _type.FcrStreamType.VIDEO;
|
|
276
274
|
};
|
|
277
275
|
var hasAudio = false;
|
|
278
276
|
var hasVideo = false;
|
|
@@ -282,7 +280,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
282
280
|
var userType = 'normal';
|
|
283
281
|
var getDefaultStream = function getDefaultStream() {
|
|
284
282
|
return userStreams.find(function (stream) {
|
|
285
|
-
return stream.videoSourceType ===
|
|
283
|
+
return stream.videoSourceType === _fcrCore.FcrVideoSourceType.CAMERA;
|
|
286
284
|
});
|
|
287
285
|
};
|
|
288
286
|
var getPstnStream = function getPstnStream() {
|
|
@@ -539,7 +537,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
539
537
|
}, {
|
|
540
538
|
key: "userListSource",
|
|
541
539
|
get: function get() {
|
|
542
|
-
if (this.activeTab ===
|
|
540
|
+
if (this.activeTab === _type5.FcrUIRoomType.MAIN_ROOM) {
|
|
543
541
|
return this._sharedMemberDataSource.memberList;
|
|
544
542
|
} else {
|
|
545
543
|
return this._sharedWaitingRoomDataSource.waitingRoomDataSource.list;
|
|
@@ -864,10 +862,10 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
864
862
|
}),
|
|
865
863
|
onOk: function onOk() {
|
|
866
864
|
if (params.type === 'remove') {
|
|
867
|
-
_this6.removeWaitingRoomUser(params.userId, _this6._isChecked[params.type] ?
|
|
865
|
+
_this6.removeWaitingRoomUser(params.userId, _this6._isChecked[params.type] ? _type3.FcrUserKickedOutType.Forever : _type3.FcrUserKickedOutType.Once);
|
|
868
866
|
}
|
|
869
867
|
if (params.type === 'removeAll') {
|
|
870
|
-
_this6.kickOutWaitingRoomAllMember(_this6._isChecked[params.type] ?
|
|
868
|
+
_this6.kickOutWaitingRoomAllMember(_this6._isChecked[params.type] ? _type3.FcrUserKickedOutType.Forever : _type3.FcrUserKickedOutType.Once);
|
|
871
869
|
}
|
|
872
870
|
if (params.type === 'admitAll') {
|
|
873
871
|
_this6.moveToMainRoomAllMember();
|
|
@@ -947,7 +945,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
947
945
|
this._privateChat(userId);
|
|
948
946
|
break;
|
|
949
947
|
case _attendee.ParticipantActionType.KICK_OUT:
|
|
950
|
-
if (this.activeTab ===
|
|
948
|
+
if (this.activeTab === _type5.FcrUIRoomType.MAIN_ROOM) {
|
|
951
949
|
this._kickOutUser(userId);
|
|
952
950
|
} else {
|
|
953
951
|
var _this$userMap$get4;
|
|
@@ -1026,7 +1024,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1026
1024
|
var isPSTN = (user === null || user === void 0 ? void 0 : user.userInfo.connectorType) === _fcrCore.FcrRoomConnectorType.PSTN;
|
|
1027
1025
|
var streams = user === null || user === void 0 ? void 0 : user.streams;
|
|
1028
1026
|
var streamId = streams === null || streams === void 0 || (_streams$find = streams.find(function (stream) {
|
|
1029
|
-
return stream.videoSourceType ===
|
|
1027
|
+
return stream.videoSourceType === _fcrCore.FcrVideoSourceType.CAMERA || isPSTN && stream.videoSourceType === _fcrCore.FcrVideoSourceType.NONE;
|
|
1030
1028
|
})) === null || _streams$find === void 0 ? void 0 : _streams$find.streamId;
|
|
1031
1029
|
return streamId;
|
|
1032
1030
|
}
|
|
@@ -1051,7 +1049,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1051
1049
|
}, {
|
|
1052
1050
|
key: "_handleUserInfoUpdated",
|
|
1053
1051
|
value: function _handleUserInfoUpdated(roomId, event) {
|
|
1054
|
-
if (event.reason ===
|
|
1052
|
+
if (event.reason === _type.FcrUserUpdatedReason.ROLE && event.modifiedUser.userRole === _type.FcrUserRole.HOST) {
|
|
1055
1053
|
this.showBecomeHostButton = false;
|
|
1056
1054
|
}
|
|
1057
1055
|
}
|
|
@@ -1134,7 +1132,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1134
1132
|
case 3:
|
|
1135
1133
|
_context2.prev = 3;
|
|
1136
1134
|
_t = _context2["catch"](1);
|
|
1137
|
-
if (!(_t.code ===
|
|
1135
|
+
if (!(_t instanceof _type.FcrError && _t.code === _constant.ErrorCode.FAILED_TO_MOVE_USER_TO_WAITING_ROOM)) {
|
|
1138
1136
|
_context2.next = 4;
|
|
1139
1137
|
break;
|
|
1140
1138
|
}
|
|
@@ -1291,7 +1289,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1291
1289
|
value: function handleActiveTab(tab) {
|
|
1292
1290
|
this.activeTab = tab;
|
|
1293
1291
|
// this._uiEventStore.sendEvent(FcrUIAction.CURRENT_PARTITIPANT_TAB, tab);
|
|
1294
|
-
if (this.activeTab ===
|
|
1292
|
+
if (this.activeTab === _type5.FcrUIRoomType.WAITING_ROOM) {
|
|
1295
1293
|
this._sharedWaitingRoomDataSource.unReadState = false;
|
|
1296
1294
|
}
|
|
1297
1295
|
}
|
|
@@ -1305,7 +1303,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1305
1303
|
return stream.connectorType !== _fcrCore.FcrRoomConnectorType.NONE;
|
|
1306
1304
|
});
|
|
1307
1305
|
var normalStream = userStreams.find(function (stream) {
|
|
1308
|
-
return stream.videoSourceType ===
|
|
1306
|
+
return stream.videoSourceType === _fcrCore.FcrVideoSourceType.CAMERA;
|
|
1309
1307
|
});
|
|
1310
1308
|
var isSelf = user === this.localUser.userId;
|
|
1311
1309
|
if (isSelf) {
|
|
@@ -1324,7 +1322,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1324
1322
|
value: function _unmuteUserAudio(userId) {
|
|
1325
1323
|
var streamInfos = this._streamControl.getStreamsByUserId(userId);
|
|
1326
1324
|
var hardStream = streamInfos.find(function (streamInfo) {
|
|
1327
|
-
return streamInfo.connectorType !==
|
|
1325
|
+
return streamInfo.connectorType !== _fcrCore.FcrRoomConnectorType.NONE;
|
|
1328
1326
|
});
|
|
1329
1327
|
// const normalStream = streamInfos.find(streamInfo => streamInfo.videoSourceType === AgoraRteVideoSourceType.CAMERA);
|
|
1330
1328
|
var isSelf = userId === this.localUser.userId;
|
|
@@ -1391,7 +1389,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1391
1389
|
} else {
|
|
1392
1390
|
var targetUsers = this._streamControl.getStreamsByUserId(user);
|
|
1393
1391
|
var targetUser = targetUsers.find(function (user) {
|
|
1394
|
-
return user.videoSourceType ===
|
|
1392
|
+
return user.videoSourceType === _fcrCore.FcrVideoSourceType.CAMERA;
|
|
1395
1393
|
});
|
|
1396
1394
|
if (!targetUser) {
|
|
1397
1395
|
return;
|
|
@@ -1422,7 +1420,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1422
1420
|
}
|
|
1423
1421
|
this._unmuteVideoTimestamp.set(userId, now);
|
|
1424
1422
|
this._peerSessionControl.startPeerSession({
|
|
1425
|
-
sessionKey:
|
|
1423
|
+
sessionKey: _type2.FcrUISessionKey.REQUEST_OPEN_CAMERA,
|
|
1426
1424
|
receiverId: userId,
|
|
1427
1425
|
duration: SESSION_DURATION,
|
|
1428
1426
|
payload: {
|
|
@@ -1481,7 +1479,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1481
1479
|
reason2: (_this$userMap$get7 = this.userMap.get(userId)) === null || _this$userMap$get7 === void 0 ? void 0 : _this$userMap$get7.userInfo.userName
|
|
1482
1480
|
}),
|
|
1483
1481
|
onOk: function onOk() {
|
|
1484
|
-
_this1._userControl.kickOut(userId,
|
|
1482
|
+
_this1._userControl.kickOut(userId, _type3.FcrUserKickedOutType.Once);
|
|
1485
1483
|
_this1._dialogProvider.closeConfirm(dialogId);
|
|
1486
1484
|
},
|
|
1487
1485
|
height: 160
|
|
@@ -1530,17 +1528,19 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1530
1528
|
case 3:
|
|
1531
1529
|
_context5.prev = 3;
|
|
1532
1530
|
_t2 = _context5["catch"](1);
|
|
1533
|
-
|
|
1534
|
-
|
|
1535
|
-
|
|
1536
|
-
|
|
1537
|
-
|
|
1538
|
-
|
|
1539
|
-
|
|
1540
|
-
|
|
1541
|
-
|
|
1542
|
-
|
|
1543
|
-
|
|
1531
|
+
if (_t2 instanceof _type.FcrError) {
|
|
1532
|
+
errCode = _t2.code;
|
|
1533
|
+
if (errCode === _constant.ErrorCode.FAILED_TO_UPDATE_USER_ROLE_DUE_TO_PRIVILEGE) {
|
|
1534
|
+
_this10._messageProvider.showToast({
|
|
1535
|
+
type: 'error',
|
|
1536
|
+
message: (0, _i18n.transI18n)('fmt_attendies_button_revokehost_error')
|
|
1537
|
+
});
|
|
1538
|
+
} else if (errCode === _constant.ErrorCode.FAILED_TO_UPDATE_USER_ROLE_DUE_TO_LIMIT_REACHED) {
|
|
1539
|
+
_this10._messageProvider.showToast({
|
|
1540
|
+
type: 'error',
|
|
1541
|
+
message: (0, _i18n.transI18n)('fmt_attendies_toast_cohost_upper_limit')
|
|
1542
|
+
});
|
|
1543
|
+
}
|
|
1544
1544
|
}
|
|
1545
1545
|
_this10.logger.error(_t2);
|
|
1546
1546
|
case 4:
|
|
@@ -1680,7 +1680,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1680
1680
|
return;
|
|
1681
1681
|
}
|
|
1682
1682
|
var localUser = this._streamControl.getStreamsByUserId(localUserUid).find(function (user) {
|
|
1683
|
-
return user.videoSourceType ===
|
|
1683
|
+
return user.videoSourceType === _fcrCore.FcrVideoSourceType.CAMERA;
|
|
1684
1684
|
});
|
|
1685
1685
|
if (!localUser) {
|
|
1686
1686
|
return;
|
|
@@ -1689,7 +1689,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1689
1689
|
var localUserHasVideo = this._deviceStore.cameraEnabled;
|
|
1690
1690
|
var sessionKey = session.sessionKey,
|
|
1691
1691
|
payload = session.payload;
|
|
1692
|
-
if (sessionKey ===
|
|
1692
|
+
if (sessionKey === _type2.FcrUISessionKey.REQUEST_OPEN_CAMERA) {
|
|
1693
1693
|
this.logger.info('participant store onPeerSessionReceived handle REQUEST_OPEN_CAMERA', localUserHasVideo);
|
|
1694
1694
|
if (localUserHasVideo) {
|
|
1695
1695
|
this._peerSessionControl.acceptPeerSession(session);
|
|
@@ -1715,10 +1715,10 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1715
1715
|
_this11._peerSessionControl.rejectPeerSession(session);
|
|
1716
1716
|
_this11._dialogProvider.closeConfirm(dialogId);
|
|
1717
1717
|
}
|
|
1718
|
-
},
|
|
1718
|
+
}, _type2.FcrUISessionKey.REQUEST_OPEN_CAMERA);
|
|
1719
1719
|
return;
|
|
1720
1720
|
}
|
|
1721
|
-
if (sessionKey ===
|
|
1721
|
+
if (sessionKey === _type2.FcrUISessionKey.REQUEST_OPEN_MICROPHONE) {
|
|
1722
1722
|
if (localUserHasAudio) {
|
|
1723
1723
|
this._peerSessionControl.acceptPeerSession(session);
|
|
1724
1724
|
return;
|
|
@@ -1745,7 +1745,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1745
1745
|
_this11._dialogProvider.closeConfirm(_dialogId);
|
|
1746
1746
|
},
|
|
1747
1747
|
height: 166
|
|
1748
|
-
},
|
|
1748
|
+
}, _type2.FcrUISessionKey.REQUEST_OPEN_MICROPHONE);
|
|
1749
1749
|
}
|
|
1750
1750
|
}
|
|
1751
1751
|
}, {
|
|
@@ -1764,10 +1764,10 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1764
1764
|
var responderId = session.responderId,
|
|
1765
1765
|
sessionKey = session.sessionKey;
|
|
1766
1766
|
switch (sessionKey) {
|
|
1767
|
-
case
|
|
1767
|
+
case _type2.FcrUISessionKey.REQUEST_OPEN_CAMERA:
|
|
1768
1768
|
this._unmuteVideoTimestamp["delete"](responderId);
|
|
1769
1769
|
break;
|
|
1770
|
-
case
|
|
1770
|
+
case _type2.FcrUISessionKey.REQUEST_OPEN_MICROPHONE:
|
|
1771
1771
|
this._unmuteAudioTimestamp["delete"](responderId);
|
|
1772
1772
|
break;
|
|
1773
1773
|
}
|
|
@@ -43,7 +43,8 @@ export declare class FcrUIMainWindowRendererImpl implements FcrUIMainWindowRende
|
|
|
43
43
|
get ownerUser(): FcrUserInfo | undefined;
|
|
44
44
|
get backgroundColor(): string;
|
|
45
45
|
get hasWriteBoardPermission(): boolean;
|
|
46
|
-
notifyObservers(event: keyof FcrUIMainWindowRendererObserver, args
|
|
46
|
+
notifyObservers(event: keyof FcrUIMainWindowRendererObserver, args?: any): void;
|
|
47
47
|
addObserver(observer: FcrUIMainWindowRendererObserver): void;
|
|
48
48
|
removeObserver(observer: FcrUIMainWindowRendererObserver): void;
|
|
49
|
+
removeAllObservers(): void;
|
|
49
50
|
}
|
|
@@ -104,5 +104,10 @@ var FcrUIMainWindowRendererImpl = exports.FcrUIMainWindowRendererImpl = /*#__PUR
|
|
|
104
104
|
value: function removeObserver(observer) {
|
|
105
105
|
this._observers.removeObserver(observer);
|
|
106
106
|
}
|
|
107
|
+
}, {
|
|
108
|
+
key: "removeAllObservers",
|
|
109
|
+
value: function removeAllObservers() {
|
|
110
|
+
this._observers.removeAllObservers();
|
|
111
|
+
}
|
|
107
112
|
}]);
|
|
108
113
|
}();
|
|
@@ -73,26 +73,30 @@ export type FcrUIMainWindowRendererObserver = {
|
|
|
73
73
|
onUndoStepsUpdated?: (steps: boolean) => void;
|
|
74
74
|
onRedoStepsUpdated?: (steps: boolean) => void;
|
|
75
75
|
onConnectionStateUpdated?: (state: FcrConnectionState) => void;
|
|
76
|
-
onSaveDraft?: (
|
|
76
|
+
onSaveDraft?: () => void;
|
|
77
77
|
onDraftSaved?: (image: FcrImageData) => void;
|
|
78
|
-
onWhiteboardInActive?: (
|
|
78
|
+
onWhiteboardInActive?: () => void;
|
|
79
79
|
};
|
|
80
80
|
export interface FcrUIMainWindowRenderer {
|
|
81
81
|
get ownerUser(): FcrUserInfo | undefined;
|
|
82
82
|
get backgroundColor(): string;
|
|
83
83
|
get hasWriteBoardPermission(): boolean;
|
|
84
|
-
notifyObservers(event:
|
|
85
|
-
notifyObservers(event:
|
|
86
|
-
notifyObservers(event:
|
|
84
|
+
notifyObservers(event: 'onSharingUserUpdated', userInfo: FcrUserInfo): void;
|
|
85
|
+
notifyObservers(event: 'onBackgroundColorUpdated', color: string): void;
|
|
86
|
+
notifyObservers(event: 'onWhiteboardToolSelected', tool: {
|
|
87
87
|
action: WhiteboardToolAction;
|
|
88
88
|
tool: FcrBoardToolType | FcrBoardShape | string | number;
|
|
89
89
|
}): void;
|
|
90
|
-
notifyObservers(event:
|
|
91
|
-
notifyObservers(event:
|
|
92
|
-
notifyObservers(event:
|
|
93
|
-
notifyObservers(event:
|
|
90
|
+
notifyObservers(event: 'onConnectionStateUpdated', state: FcrConnectionState): void;
|
|
91
|
+
notifyObservers(event: 'onUndoStepsUpdated'): void;
|
|
92
|
+
notifyObservers(event: 'onRedoStepsUpdated'): void;
|
|
93
|
+
notifyObservers(event: 'onPermissionUpdated', hasWriteBoardPermission: boolean): void;
|
|
94
|
+
notifyObservers(event: 'onSaveDraft'): void;
|
|
95
|
+
notifyObservers(event: 'onWhiteboardInActive'): void;
|
|
96
|
+
notifyObservers(event: 'onDraftSaved', image: FcrImageData): void;
|
|
94
97
|
addObserver(observer: FcrUIMainWindowRendererObserver): void;
|
|
95
98
|
removeObserver(observer: FcrUIMainWindowRendererObserver): void;
|
|
99
|
+
removeAllObservers(): void;
|
|
96
100
|
}
|
|
97
101
|
export type VideoWindowDataReturn<T extends `${FcrUIDisplayDistributionContentType}`> = T extends `${FcrUIDisplayDistributionContentType.HIDDEN}` ? undefined : FcrUIVideoWindowData;
|
|
98
102
|
export declare enum WhiteboardToolAction {
|
|
@@ -10,13 +10,13 @@ var _mobxReact = require("mobx-react");
|
|
|
10
10
|
var _useElectron = require("../dialog/hooks/useElectron");
|
|
11
11
|
var _react = require("react");
|
|
12
12
|
var _store = require("./store");
|
|
13
|
-
var
|
|
13
|
+
var _type = require("fcr-core/lib/type");
|
|
14
14
|
var _memberWindow = require("../components/member-window");
|
|
15
15
|
var _controlBar = require("../components/control-bar");
|
|
16
16
|
var _loading = require("../components/control-bar/components/loading");
|
|
17
17
|
var _toolbar = require("../components/toolbar");
|
|
18
18
|
var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
|
|
19
|
-
var
|
|
19
|
+
var _type2 = require("./type");
|
|
20
20
|
var _progress = _interopRequireDefault(require("../components/control-bar/components/progress"));
|
|
21
21
|
var _i18n = require("agora-ui-foundation/lib/i18n");
|
|
22
22
|
var _portal = require("../components/leave-meeting/portal");
|
|
@@ -136,15 +136,15 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
|
|
|
136
136
|
canShowSpeakerSpotlight: true,
|
|
137
137
|
width: Infinity,
|
|
138
138
|
height: Infinity,
|
|
139
|
-
videoRenderMode:
|
|
140
|
-
videoStreamType:
|
|
139
|
+
videoRenderMode: _type.FcrVideoRenderMode.FIT,
|
|
140
|
+
videoStreamType: _type.FcrVideoStreamType.HIGH_STREAM,
|
|
141
141
|
windowData: videoWindowData,
|
|
142
142
|
showAvatar: true,
|
|
143
143
|
isVideoSuspended: false,
|
|
144
144
|
enableZoom: true,
|
|
145
145
|
scalcValue: scalValue,
|
|
146
146
|
onScaleChange: setScaleValue
|
|
147
|
-
}), secondaryWindowContentType ===
|
|
147
|
+
}), secondaryWindowContentType === _type2.FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION && annotationHasStart && /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
|
|
148
148
|
ref: handleIframeLoad,
|
|
149
149
|
allow: "webview",
|
|
150
150
|
src: "".concat(baseUrl, "/whiteboard.html?type=annotation"),
|
|
@@ -209,43 +209,43 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
|
|
|
209
209
|
setCommonColors: setCommonColors,
|
|
210
210
|
setStrokeWidth: function setStrokeWidth(width) {
|
|
211
211
|
setWhiteboardTool({
|
|
212
|
-
action:
|
|
212
|
+
action: _type2.WhiteboardToolAction.WIDTH,
|
|
213
213
|
tool: width
|
|
214
214
|
});
|
|
215
215
|
},
|
|
216
216
|
setTool: function setTool(tool) {
|
|
217
217
|
setWhiteboardTool({
|
|
218
|
-
action:
|
|
218
|
+
action: _type2.WhiteboardToolAction.TOOL,
|
|
219
219
|
tool: tool
|
|
220
220
|
});
|
|
221
221
|
},
|
|
222
222
|
setShape: function setShape(shape) {
|
|
223
223
|
setWhiteboardTool({
|
|
224
|
-
action:
|
|
224
|
+
action: _type2.WhiteboardToolAction.SHAPE,
|
|
225
225
|
tool: shape
|
|
226
226
|
});
|
|
227
227
|
},
|
|
228
228
|
setStrokeColor: function setStrokeColor(color) {
|
|
229
229
|
setWhiteboardTool({
|
|
230
|
-
action:
|
|
230
|
+
action: _type2.WhiteboardToolAction.COLOR,
|
|
231
231
|
tool: color
|
|
232
232
|
});
|
|
233
233
|
},
|
|
234
234
|
undo: function undo() {
|
|
235
235
|
return setWhiteboardTool({
|
|
236
|
-
action:
|
|
236
|
+
action: _type2.WhiteboardToolAction.UNDO,
|
|
237
237
|
tool: _enums.FcrBoardToolType.NONE
|
|
238
238
|
});
|
|
239
239
|
},
|
|
240
240
|
redo: function redo() {
|
|
241
241
|
return setWhiteboardTool({
|
|
242
|
-
action:
|
|
242
|
+
action: _type2.WhiteboardToolAction.REDO,
|
|
243
243
|
tool: _enums.FcrBoardToolType.NONE
|
|
244
244
|
});
|
|
245
245
|
},
|
|
246
246
|
clean: function clean() {
|
|
247
247
|
return setWhiteboardTool({
|
|
248
|
-
action:
|
|
248
|
+
action: _type2.WhiteboardToolAction.CLEAR,
|
|
249
249
|
tool: _enums.FcrBoardToolType.NONE
|
|
250
250
|
});
|
|
251
251
|
},
|
|
@@ -104,6 +104,8 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
|
|
|
104
104
|
_useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
|
|
105
105
|
mediaSetting = _useState4[0],
|
|
106
106
|
setMediaSetting = _useState4[1];
|
|
107
|
+
var speakerVolumeLevel = speakerDetecting ? speakerTestVolumeLevel / 100 : 0;
|
|
108
|
+
var microphoneVolumeLevel = microphoneDetecting ? microphoneTestVolumeLevel / 100 : 0;
|
|
107
109
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
|
|
108
110
|
className: ns.b(),
|
|
109
111
|
ref: containerRef,
|
|
@@ -129,7 +131,7 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
|
|
|
129
131
|
className: ns.e('form-label'),
|
|
130
132
|
children: t('fmt_setting_label_oututlevel')
|
|
131
133
|
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_volumeIndicator.FcrVolumeIndicator, {
|
|
132
|
-
value:
|
|
134
|
+
value: speakerVolumeLevel,
|
|
133
135
|
barCount: 13
|
|
134
136
|
})]
|
|
135
137
|
}), (0, _env.isElectron)() && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
|
|
@@ -169,7 +171,7 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
|
|
|
169
171
|
className: ns.e('form-label'),
|
|
170
172
|
children: t('fmt_internalsetting_label_inputlevel')
|
|
171
173
|
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_volumeIndicator.FcrVolumeIndicator, {
|
|
172
|
-
value:
|
|
174
|
+
value: microphoneVolumeLevel,
|
|
173
175
|
barCount: 13
|
|
174
176
|
})]
|
|
175
177
|
}), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
|
|
@@ -5,6 +5,7 @@ export declare const defaultCameraVideoEncoderConfig: {
|
|
|
5
5
|
};
|
|
6
6
|
frameRate: number;
|
|
7
7
|
bitrate: number;
|
|
8
|
+
isMirror: boolean;
|
|
8
9
|
};
|
|
9
10
|
export declare const hdCameraVideoEncoderConfig: {
|
|
10
11
|
dimensions: {
|
|
@@ -13,6 +14,7 @@ export declare const hdCameraVideoEncoderConfig: {
|
|
|
13
14
|
};
|
|
14
15
|
frameRate: number;
|
|
15
16
|
bitrate: number;
|
|
17
|
+
isMirror: boolean;
|
|
16
18
|
};
|
|
17
19
|
export declare const clearityEncoderConfig: {
|
|
18
20
|
dimensions: {
|
|
@@ -21,6 +23,7 @@ export declare const clearityEncoderConfig: {
|
|
|
21
23
|
};
|
|
22
24
|
frameRate: number;
|
|
23
25
|
bitrate: number;
|
|
26
|
+
isMirror: boolean;
|
|
24
27
|
};
|
|
25
28
|
export declare const smoothEncoderConfig: {
|
|
26
29
|
dimensions: {
|
|
@@ -29,4 +32,5 @@ export declare const smoothEncoderConfig: {
|
|
|
29
32
|
};
|
|
30
33
|
frameRate: number;
|
|
31
34
|
bitrate: number;
|
|
35
|
+
isMirror: boolean;
|
|
32
36
|
};
|
|
@@ -13,7 +13,8 @@ var hdCameraVideoEncoderConfig = exports.hdCameraVideoEncoderConfig = {
|
|
|
13
13
|
height: 1080
|
|
14
14
|
},
|
|
15
15
|
frameRate: 20,
|
|
16
|
-
bitrate: 2500
|
|
16
|
+
bitrate: 2500,
|
|
17
|
+
isMirror: false
|
|
17
18
|
};
|
|
18
19
|
var clearityEncoderConfig = exports.clearityEncoderConfig = {
|
|
19
20
|
dimensions: {
|
|
@@ -21,7 +22,8 @@ var clearityEncoderConfig = exports.clearityEncoderConfig = {
|
|
|
21
22
|
height: 1080
|
|
22
23
|
},
|
|
23
24
|
frameRate: 15,
|
|
24
|
-
bitrate: 1500
|
|
25
|
+
bitrate: 1500,
|
|
26
|
+
isMirror: false
|
|
25
27
|
};
|
|
26
28
|
var smoothEncoderConfig = exports.smoothEncoderConfig = {
|
|
27
29
|
dimensions: {
|
|
@@ -29,5 +31,6 @@ var smoothEncoderConfig = exports.smoothEncoderConfig = {
|
|
|
29
31
|
height: 1080
|
|
30
32
|
},
|
|
31
33
|
frameRate: 25,
|
|
32
|
-
bitrate: 1200
|
|
34
|
+
bitrate: 1200,
|
|
35
|
+
isMirror: false
|
|
33
36
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { FcrBeautyOptions } from 'fcr-core/lib/media-control/type';
|
|
2
2
|
import { FcrDeviceInfo, FcrPerformanceInfo } from 'fcr-core/lib/type';
|
|
3
|
-
import {
|
|
3
|
+
import { FcrNetworkStats } from 'fcr-core/lib/type';
|
|
4
4
|
import { FcrUIHighlightElement } from '../../utilities/constant';
|
|
5
5
|
import { DEFAULT_BEAUTY_VALUE } from 'agora-ui-foundation/lib/components/local-video-player';
|
|
6
6
|
import { FcrUIAiDenoiseLevel } from '../../type';
|
|
@@ -15,6 +15,10 @@ import { FcrUIDialogProvider } from '../../providers/dialog-provider';
|
|
|
15
15
|
import { FcrUIRoomProvider } from '../../providers/room-provider';
|
|
16
16
|
import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
|
|
17
17
|
import { FcrUISharedInterpreterDataSource } from '../../shared-data-source/interpreter';
|
|
18
|
+
export declare enum MeetingStatus {
|
|
19
|
+
PENDING = "pending",
|
|
20
|
+
ACTIVE = "active"
|
|
21
|
+
}
|
|
18
22
|
export interface FcrDeviceObserver {
|
|
19
23
|
onCameraChanged?(cameraId: string): void;
|
|
20
24
|
onMicrophoneChanged?(microphoneId: string): void;
|
|
@@ -92,10 +96,11 @@ export default class SettingStore {
|
|
|
92
96
|
private _roomObserver;
|
|
93
97
|
private _streamObserver;
|
|
94
98
|
accessor loudestStreamVolumeLevel: number;
|
|
99
|
+
accessor meetingStatus: MeetingStatus;
|
|
95
100
|
accessor microphoneVolumeLevel: number;
|
|
96
101
|
accessor isWifiConnected: boolean;
|
|
97
102
|
accessor dialogConfig: DeviceSettingDialogConfig;
|
|
98
|
-
accessor networkState:
|
|
103
|
+
accessor networkState: FcrNetworkStats;
|
|
99
104
|
accessor performanceState: FcrPerformanceInfo & {
|
|
100
105
|
cpuOtherAppUsage: number;
|
|
101
106
|
memoryOtherAppUsageRatio: number;
|
|
@@ -174,7 +179,6 @@ export default class SettingStore {
|
|
|
174
179
|
get speakerDetecting(): boolean;
|
|
175
180
|
get setting(): FcrUICustomSetting;
|
|
176
181
|
get media(): import("../../type").FcrUIMediaConfig;
|
|
177
|
-
get isPreMeetingSettingsStore(): boolean;
|
|
178
182
|
get sceneConfig(): {
|
|
179
183
|
roomToken: string;
|
|
180
184
|
roomId: string;
|
|
@@ -198,6 +202,7 @@ export default class SettingStore {
|
|
|
198
202
|
sharedInterpreterDataSource?: FcrUISharedInterpreterDataSource;
|
|
199
203
|
});
|
|
200
204
|
get messageProvider(): FcrUIMessageProvider;
|
|
205
|
+
startMeeting(): void;
|
|
201
206
|
initSettingConfig(): void;
|
|
202
207
|
enableVirtualBackground(enable: boolean, source?: VirtualBackground): void;
|
|
203
208
|
setEditBeautyKey(key: BeautyKey): void;
|