fcr-ui-scene 3.4.0 → 3.4.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/ scenes/base.d.ts +10 -0
- package/lib/ scenes/base.js +75 -0
- package/lib/ scenes/main-scene.d.ts +43 -0
- package/lib/ scenes/main-scene.js +368 -0
- package/lib/ scenes/waiting-scene.d.ts +31 -0
- package/lib/ scenes/waiting-scene.js +119 -0
- package/lib/common/device-store.d.ts +1 -2
- package/lib/common/device-store.js +169 -153
- package/lib/common/device-stream-store.d.ts +5 -29
- package/lib/common/device-stream-store.js +47 -93
- package/lib/common/room-store.js +4 -4
- package/lib/common/security-store.d.ts +6 -16
- package/lib/common/security-store.js +16 -17
- package/lib/common/type.d.ts +8 -0
- package/lib/common/type.js +6 -0
- package/lib/creator.js +3 -3
- package/lib/electron/app.js +21 -5
- package/lib/electron/bootstrap-sdk.js +1 -2
- package/lib/electron/injections.d.ts +1 -1
- package/lib/error-fallback.css +62 -0
- package/lib/error-fallback.d.ts +2 -0
- package/lib/error-fallback.js +19 -0
- package/lib/modules/Interpreter/action/delete-btn/index.d.ts +1 -1
- package/lib/modules/Interpreter/action/edit-btn/index.d.ts +0 -1
- package/lib/modules/Interpreter/action/edit-btn/index.js +0 -2
- package/lib/modules/Interpreter/action/switch-btn/index.css +3 -0
- package/lib/modules/Interpreter/action/switch-btn/index.d.ts +2 -4
- package/lib/modules/Interpreter/action/switch-btn/index.js +3 -3
- package/lib/modules/Interpreter/footer/index.css +4 -3
- package/lib/modules/Interpreter/index.d.ts +2 -17
- package/lib/modules/Interpreter/index.js +2 -18
- package/lib/modules/Interpreter/interpreter-list/index.css +5 -1
- package/lib/modules/Interpreter/interpreter-list/index.d.ts +1 -0
- package/lib/modules/Interpreter/interpreter-list/index.js +3 -1
- package/lib/modules/Interpreter/interpreter-list/interpreter-item/components/pick-language/index.css +0 -6
- package/lib/modules/Interpreter/interpreter-list/interpreter-item/components/pick-language/index.d.ts +1 -1
- package/lib/modules/Interpreter/interpreter-list/interpreter-item/components/pick-user/index.css +1 -3
- package/lib/modules/Interpreter/interpreter-list/interpreter-item/components/pick-user/index.d.ts +1 -6
- package/lib/modules/Interpreter/interpreter-list/interpreter-item/components/pick-user/index.js +55 -81
- package/lib/modules/Interpreter/interpreter-list/interpreter-item/components/pick-user/option-Item.d.ts +6 -0
- package/lib/modules/Interpreter/interpreter-list/interpreter-item/components/pick-user/option-Item.js +58 -0
- package/lib/modules/Interpreter/interpreter-list/interpreter-item/index.d.ts +1 -1
- package/lib/modules/Interpreter/store.d.ts +36 -29
- package/lib/modules/Interpreter/store.js +575 -606
- package/lib/modules/Interpreter/type.d.ts +41 -0
- package/lib/modules/Interpreter/type.js +20 -0
- package/lib/modules/Interpreter/utils.d.ts +12 -0
- package/lib/modules/Interpreter/utils.js +139 -0
- package/lib/modules/Interpreter/view.d.ts +0 -1
- package/lib/modules/Interpreter/view.js +3 -5
- package/lib/modules/action-bar/action-bar-collapes-items.d.ts +1 -1
- package/lib/modules/action-bar/action-bar-collapes-items.js +11 -11
- package/lib/modules/action-bar/apps/useInterpreter.js +4 -2
- package/lib/modules/action-bar/components/apps/app-item/index.css +35 -0
- package/lib/modules/action-bar/components/apps/app-item/index.d.ts +12 -0
- package/lib/modules/action-bar/components/apps/app-item/index.js +61 -0
- package/lib/modules/action-bar/components/apps/appitems.d.ts +5 -0
- package/lib/modules/action-bar/components/apps/appitems.js +45 -0
- package/lib/modules/action-bar/components/apps/index.css +8 -0
- package/lib/modules/action-bar/components/apps/index.d.ts +4 -0
- package/lib/modules/action-bar/components/apps/index.js +57 -0
- package/lib/modules/action-bar/components/apps/useAppItemOptions.d.ts +9 -0
- package/lib/modules/action-bar/components/apps/useAppItemOptions.js +29 -0
- package/lib/modules/action-bar/components/apps/useBeautyBackground.d.ts +10 -0
- package/lib/modules/action-bar/components/apps/useBeautyBackground.js +36 -0
- package/lib/modules/action-bar/components/apps/useInterpreter.d.ts +14 -0
- package/lib/modules/action-bar/components/apps/useInterpreter.js +37 -0
- package/lib/modules/action-bar/components/apps/useLiveStreaming.d.ts +16 -0
- package/lib/modules/action-bar/components/apps/useLiveStreaming.js +41 -0
- package/lib/modules/action-bar/components/board/index.d.ts +4 -0
- package/lib/modules/action-bar/components/board/index.js +34 -0
- package/lib/modules/action-bar/components/breakout-room/index.d.ts +4 -0
- package/lib/modules/action-bar/components/breakout-room/index.js +32 -0
- package/lib/modules/action-bar/components/chat/index.css +80 -0
- package/lib/modules/action-bar/components/chat/index.d.ts +5 -0
- package/lib/modules/action-bar/components/chat/index.js +154 -0
- package/lib/modules/action-bar/components/device/index.css +162 -0
- package/lib/modules/action-bar/components/device/index.d.ts +8 -0
- package/lib/modules/action-bar/components/device/index.js +611 -0
- package/lib/modules/action-bar/components/interpreter/index.d.ts +6 -0
- package/lib/modules/action-bar/components/interpreter/index.js +41 -0
- package/lib/modules/action-bar/components/item.d.ts +27 -0
- package/lib/modules/action-bar/components/item.js +164 -0
- package/lib/modules/action-bar/components/leave/assign-host.d.ts +10 -0
- package/lib/modules/action-bar/components/leave/assign-host.js +64 -0
- package/lib/modules/action-bar/components/leave/index.css +126 -0
- package/lib/modules/action-bar/components/leave/index.d.ts +3 -0
- package/lib/modules/action-bar/components/leave/index.js +159 -0
- package/lib/modules/action-bar/components/leave/leave-meeting.d.ts +18 -0
- package/lib/modules/action-bar/components/leave/leave-meeting.js +153 -0
- package/lib/modules/action-bar/components/live-streaming/index.d.ts +4 -0
- package/lib/modules/action-bar/components/live-streaming/index.js +39 -0
- package/lib/modules/action-bar/components/more/index.css +114 -0
- package/lib/modules/action-bar/components/more/index.d.ts +5 -0
- package/lib/modules/action-bar/components/more/index.js +83 -0
- package/lib/modules/action-bar/components/more/poppover-content.d.ts +8 -0
- package/lib/modules/action-bar/components/more/poppover-content.js +400 -0
- package/lib/modules/action-bar/components/participants/index.css +21 -0
- package/lib/modules/action-bar/components/participants/index.d.ts +5 -0
- package/lib/modules/action-bar/components/participants/index.js +83 -0
- package/lib/modules/action-bar/components/record/index.css +39 -0
- package/lib/modules/action-bar/components/record/index.d.ts +5 -0
- package/lib/modules/action-bar/components/record/index.js +166 -0
- package/lib/modules/action-bar/components/record/stop-record-dialog.d.ts +5 -0
- package/lib/modules/action-bar/components/record/stop-record-dialog.js +48 -0
- package/lib/modules/action-bar/components/respond/index.d.ts +4 -0
- package/lib/modules/action-bar/components/respond/index.js +32 -0
- package/lib/modules/action-bar/components/screen-share/index.d.ts +4 -0
- package/lib/modules/action-bar/components/screen-share/index.js +106 -0
- package/lib/modules/action-bar/components/screen-share/submenu.d.ts +1 -0
- package/lib/modules/action-bar/components/screen-share/submenu.js +154 -0
- package/lib/modules/action-bar/components/security/index.d.ts +4 -0
- package/lib/modules/action-bar/components/security/index.js +58 -0
- package/lib/modules/action-bar/components/settings/index.d.ts +4 -0
- package/lib/modules/action-bar/components/settings/index.js +42 -0
- package/lib/modules/action-bar/index.css +23 -1
- package/lib/modules/action-bar/index.d.ts +2 -22
- package/lib/modules/action-bar/index.dev.js +37 -16
- package/lib/modules/action-bar/notification-bar/components/interpreter/index.css +58 -0
- package/lib/modules/action-bar/notification-bar/components/interpreter/index.d.ts +8 -0
- package/lib/modules/action-bar/notification-bar/components/interpreter/index.js +100 -0
- package/lib/modules/action-bar/notification-bar/components/virtual-image/index.css +56 -0
- package/lib/modules/action-bar/notification-bar/components/virtual-image/index.d.ts +5 -0
- package/lib/modules/action-bar/notification-bar/components/virtual-image/index.js +33 -0
- package/lib/modules/action-bar/notification-bar/dome.png +0 -0
- package/lib/modules/action-bar/notification-bar/fcr_translateswitch.png +0 -0
- package/lib/modules/action-bar/notification-bar/index.css +74 -0
- package/lib/modules/action-bar/notification-bar/index.d.ts +2 -0
- package/lib/modules/action-bar/notification-bar/index.js +99 -0
- package/lib/modules/action-bar/screen-share/index.js +5 -0
- package/lib/modules/action-bar/security/index.js +1 -0
- package/lib/modules/action-bar/smaller.js +2 -2
- package/lib/modules/action-bar/store.d.ts +6 -7
- package/lib/modules/action-bar/store.js +114 -128
- package/lib/modules/action-bar/trigger-input-language-room/fcr_translateswitch.png +0 -0
- package/lib/modules/action-bar/trigger-input-language-room/index.css +86 -0
- package/lib/modules/action-bar/trigger-input-language-room/index.d.ts +15 -0
- package/lib/modules/action-bar/trigger-input-language-room/index.js +220 -0
- package/lib/modules/action-bar/trigger-output-language-room/constant.d.ts +10 -0
- package/lib/modules/action-bar/trigger-output-language-room/constant.js +8 -0
- package/lib/modules/action-bar/trigger-output-language-room/guide-tooltip/index.css +22 -0
- package/lib/modules/action-bar/trigger-output-language-room/guide-tooltip/index.d.ts +14 -0
- package/lib/modules/action-bar/trigger-output-language-room/guide-tooltip/index.js +75 -0
- package/lib/modules/action-bar/trigger-output-language-room/index.d.ts +4 -0
- package/lib/modules/action-bar/trigger-output-language-room/index.js +98 -0
- package/lib/modules/action-bar/trigger-output-language-room/trigger-language-room.d.ts +5 -0
- package/lib/modules/action-bar/trigger-output-language-room/trigger-language-room.js +66 -0
- package/lib/modules/action-bar/trigger-output-language-room/trigger-main-room.d.ts +5 -0
- package/lib/modules/action-bar/trigger-output-language-room/trigger-main-room.js +36 -0
- package/lib/modules/action-bar/trigger-output-language-room/useChangeOutputRoomTool.d.ts +12 -0
- package/lib/modules/action-bar/trigger-output-language-room/useChangeOutputRoomTool.js +138 -0
- package/lib/modules/action-bar/view.js +6 -6
- package/lib/modules/audio-stream/index.d.ts +2 -15
- package/lib/modules/audio-stream/index.js +1 -3
- package/lib/modules/chat/chat-bar/index.css +5 -0
- package/lib/modules/chat/chat-bar/index.js +16 -14
- package/lib/modules/chat/chat-select/index.css +6 -3
- package/lib/modules/chat/chat.js +7 -6
- package/lib/modules/chat/index.css +10 -0
- package/lib/modules/chat/index.d.ts +2 -12
- package/lib/modules/chat/index.dev.js +14 -3
- package/lib/modules/chat/index.js +7 -20
- package/lib/modules/chat/message-list.js +1 -0
- package/lib/modules/chat/store.js +1 -1
- package/lib/modules/components/device-control/components/audio-menu/index.js +4 -4
- package/lib/modules/components/device-control/index.css +3 -0
- package/lib/modules/components/dialog-container/component/body.d.ts +7 -0
- package/lib/modules/components/dialog-container/component/body.js +46 -0
- package/lib/modules/components/dialog-container/index.css +78 -0
- package/lib/modules/components/dialog-container/index.d.ts +11 -0
- package/lib/modules/components/dialog-container/index.js +110 -0
- package/lib/modules/components/member-window/index.css +419 -0
- package/lib/modules/components/member-window/index.d.ts +76 -0
- package/lib/modules/components/member-window/index.js +888 -0
- package/lib/modules/components/security-menu/index.css +9 -0
- package/lib/modules/components/security-menu/index.js +74 -23
- package/lib/modules/components/tab-frame/index.css +40 -0
- package/lib/modules/components/tab-frame/index.d.ts +12 -0
- package/lib/modules/components/tab-frame/index.js +57 -0
- package/lib/modules/connection-gateway/components/computer/index.css +1 -0
- package/lib/modules/connection-gateway/components/phone/index.css +1 -1
- package/lib/modules/connection-gateway/index.d.ts +2 -9
- package/lib/modules/connection-gateway/store.d.ts +3 -11
- package/lib/modules/connection-gateway/store.js +1 -17
- package/lib/modules/connection-gateway/view.js +21 -4
- package/lib/modules/control-bar/components/cloud-recording-buttons.js +1 -1
- package/lib/modules/control-bar/index.d.ts +2 -16
- package/lib/modules/control-bar/index.js +10 -19
- package/lib/modules/control-bar/store.d.ts +3 -16
- package/lib/modules/control-bar/store.js +23 -5
- package/lib/modules/control-bar/view.js +17 -10
- package/lib/modules/device-pretest/settings/virtual-background-setting.js +1 -1
- package/lib/modules/dialog/components/Interpreter/electron.js +3 -25
- package/lib/modules/dialog/components/Interpreter/index.js +14 -43
- package/lib/modules/dialog/components/chat/electron.d.ts +1 -1
- package/lib/modules/dialog/components/chat/electron.js +6 -13
- package/lib/modules/dialog/components/chat/index.d.ts +1 -4
- package/lib/modules/dialog/components/chat/index.js +35 -41
- package/lib/modules/dialog/components/confirm/index.js +6 -7
- package/lib/modules/dialog/components/connection-gateway/electron.d.ts +1 -1
- package/lib/modules/dialog/components/connection-gateway/electron.js +9 -28
- package/lib/modules/dialog/components/connection-gateway/index.d.ts +0 -1
- package/lib/modules/dialog/components/connection-gateway/index.js +11 -56
- package/lib/modules/dialog/components/control-bar/index.js +6 -7
- package/lib/modules/dialog/components/device-setting/electron.js +4 -26
- package/lib/modules/dialog/components/device-setting/index.js +13 -41
- package/lib/modules/dialog/components/invite/index.js +16 -35
- package/lib/modules/dialog/components/live-streaming/index.js +18 -53
- package/lib/modules/dialog/components/participant/electron.js +4 -17
- package/lib/modules/dialog/components/participant/index.js +35 -26
- package/lib/modules/dialog/components/remove-admit-waiting-room/electron.js +3 -6
- package/lib/modules/dialog/components/remove-admit-waiting-room/index.d.ts +1 -1
- package/lib/modules/dialog/components/remove-admit-waiting-room/index.js +4 -14
- package/lib/modules/dialog/components/share-screen-selection/index.js +20 -5
- package/lib/modules/dialog/components/system-preference/electron.js +5 -8
- package/lib/modules/dialog/components/system-preference/index.js +4 -15
- package/lib/modules/dialog/components/toast/index.js +8 -12
- package/lib/modules/dialog/dialogs.js +2 -1
- package/lib/modules/dialog/hooks/useElectron.d.ts +6 -0
- package/lib/modules/dialog/hooks/useElectron.js +51 -9
- package/lib/modules/dialog/index.css +0 -2
- package/lib/modules/dialog/index.d.ts +2 -17
- package/lib/modules/dialog/store.d.ts +7 -39
- package/lib/modules/dialog/store.js +53 -152
- package/lib/modules/dialog/types/index.d.ts +59 -0
- package/lib/modules/event-confirm/view.js +4 -1
- package/lib/modules/invite/view.d.ts +4 -0
- package/lib/modules/invite/view.js +18 -22
- package/lib/modules/invite/voip-invite.js +3 -3
- package/lib/modules/layout/components/Aside.js +11 -1
- package/lib/modules/layout/components/Carousel.js +1 -1
- package/lib/modules/layout/components/Layout.js +7 -4
- package/lib/modules/layout/components/index.css +6 -1
- package/lib/modules/layout/index.js +8 -7
- package/lib/modules/layout/member-window/index.css +22 -9
- package/lib/modules/layout/member-window/index.js +16 -3
- package/lib/modules/layout/store.d.ts +1 -1
- package/lib/modules/layout/store.js +1 -7
- package/lib/modules/layout/video-window-datasource.js +11 -3
- package/lib/modules/notification/index.css +1 -0
- package/lib/modules/participant/attendee/index.css +1 -0
- package/lib/modules/participant/attendee/index.js +2 -1
- package/lib/modules/participant/components/drop-menu/index.css +1 -0
- package/lib/modules/participant/components/drop-menu/index.js +9 -9
- package/lib/modules/participant/index.css +5 -0
- package/lib/modules/participant/index.d.ts +2 -17
- package/lib/modules/participant/index.dev.js +38 -27
- package/lib/modules/participant/store.d.ts +4 -17
- package/lib/modules/participant/store.js +13 -13
- package/lib/modules/setting/audio-settings/audio-settings.js +13 -10
- package/lib/modules/setting/audio-settings/index.css +26 -1
- package/lib/modules/setting/general-settings/index.css +1 -1
- package/lib/modules/setting/index.css +2 -1
- package/lib/modules/setting/index.d.ts +2 -15
- package/lib/modules/setting/index.dev.js +19 -10
- package/lib/modules/setting/store.d.ts +5 -18
- package/lib/modules/setting/store.js +48 -20
- package/lib/modules/setting/translate-settings/index.css +3 -1
- package/lib/modules/setting/video-settings/index.css +5 -2
- package/lib/modules/share-screen/index.dev.js +20 -19
- package/lib/modules/share-screen/selection/index.css +2 -0
- package/lib/modules/share-screen/selection/index.js +83 -97
- package/lib/modules/share-screen/store.js +16 -36
- package/lib/modules/sound-effect/index.d.ts +2 -13
- package/lib/modules/sound-effect/index.js +1 -2
- package/lib/modules/state-bar/index.css +13 -2
- package/lib/modules/state-bar/index.d.ts +1 -5
- package/lib/modules/state-bar/index.dev.js +1 -1
- package/lib/modules/state-bar/index.js +0 -27
- package/lib/modules/state-bar/layout-config.js +1 -1
- package/lib/modules/state-bar/meeting-network-state.css +1 -1
- package/lib/modules/state-bar/recording.js +7 -4
- package/lib/modules/state-bar/view.js +1 -1
- package/lib/modules/video-window/index.d.ts +2 -2
- package/lib/modules/video-window/store.d.ts +2 -1
- package/lib/modules/video-window/store.js +2 -2
- package/lib/modules/waiting-room-layout/index.css +1 -3
- package/lib/modules/waiting-room-layout/index.d.ts +3 -1
- package/lib/modules/waiting-room-layout/index.js +10 -3
- package/lib/modules/whiteboard/index.d.ts +2 -13
- package/lib/modules/whiteboard/index.js +4 -5
- package/lib/providers/device-privilege-provider.d.ts +30 -0
- package/lib/providers/device-privilege-provider.js +386 -0
- package/lib/providers/device-provider.d.ts +246 -0
- package/lib/providers/device-provider.js +1741 -0
- package/lib/providers/device-stream-provider.d.ts +36 -0
- package/lib/providers/device-stream-provider.js +460 -0
- package/lib/providers/event-provider.d.ts +108 -0
- package/lib/providers/event-provider.js +288 -0
- package/lib/providers/interpreter-provider.d.ts +25 -0
- package/lib/providers/interpreter-provider.js +151 -0
- package/lib/providers/local-storage-provider.d.ts +8 -0
- package/lib/providers/local-storage-provider.js +31 -0
- package/lib/providers/monitor-provider.d.ts +15 -0
- package/lib/providers/monitor-provider.js +29 -0
- package/lib/providers/privilege-provider.d.ts +216 -0
- package/lib/providers/privilege-provider.js +966 -0
- package/lib/providers/renderer-provider.d.ts +43 -0
- package/lib/providers/renderer-provider.js +245 -0
- package/lib/providers/room-provider.d.ts +79 -0
- package/lib/providers/room-provider.js +439 -0
- package/lib/providers/session-provider.d.ts +26 -0
- package/lib/providers/session-provider.js +49 -0
- package/lib/runtime.d.ts +1 -1
- package/lib/scenes/base.d.ts +10 -0
- package/lib/scenes/base.js +75 -0
- package/lib/scenes/main-scene.d.ts +48 -0
- package/lib/scenes/main-scene.js +390 -0
- package/lib/scenes/waiting-scene.d.ts +31 -0
- package/lib/scenes/waiting-scene.js +129 -0
- package/lib/shared-data-source/config.d.ts +16 -0
- package/lib/shared-data-source/config.js +21 -0
- package/lib/type.d.ts +26 -1
- package/lib/ui-manager.d.ts +3 -0
- package/lib/ui-manager.js +154 -233
- package/lib/ui-node.d.ts +25 -0
- package/lib/ui-node.js +156 -0
- package/lib/utilities/constant.d.ts +15 -15
- package/lib/utilities/constant.js +15 -15
- package/lib/utilities/tools.d.ts +2 -0
- package/lib/utilities/tools.js +42 -10
- package/package.json +12 -11
- package/public/assets/fcr_leave2.svg +58 -0
- package/public/index.html +150 -13
|
@@ -1,43 +1,21 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { FcrDeviceStore } from './device-store';
|
|
4
|
-
import { FcrUIEventStore } from './event-store';
|
|
5
|
-
import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
|
|
6
|
-
import { FcrRoomStore } from './room-store';
|
|
7
|
-
import { FcrInterpreterControl, FcrInterpreterRoomControl, FcrInterpreterUserInfo, FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
|
|
8
|
-
export interface InterpreterRoomControlInfoType {
|
|
9
|
-
targetLanguageRoomControl: FcrInterpreterRoomControl;
|
|
10
|
-
sourceLanguageRoomControl: FcrInterpreterRoomControl;
|
|
11
|
-
interpreter: FcrInterpreterUserInfo;
|
|
12
|
-
language: FcrLanguage;
|
|
13
|
-
}
|
|
1
|
+
import { FcrInterpreterRoomControl } from 'fcr-core/lib/room-control/interpreter-control/types';
|
|
2
|
+
import { StoreConfig } from '../type';
|
|
14
3
|
export declare class FcrDeviceStreamStore {
|
|
15
4
|
protected logger: import("agora-foundation/lib/logger").Logger;
|
|
16
|
-
private _InterpreterRoomControlInfo;
|
|
17
|
-
private _mediaControl;
|
|
18
5
|
private _roomControl;
|
|
19
6
|
private _deviceStore;
|
|
20
7
|
private _securityStore;
|
|
21
|
-
private _roomStore;
|
|
22
8
|
private _cameraDeviceId;
|
|
23
9
|
private _microphoneDeviceId;
|
|
24
10
|
private _uiEventStore;
|
|
25
|
-
private
|
|
11
|
+
private _interpreterControl;
|
|
26
12
|
private get _localUser();
|
|
27
13
|
private get _localCameraStream();
|
|
28
14
|
private get _localLoopbackStream();
|
|
29
15
|
private get _canStartLocalVideo();
|
|
30
16
|
private get _canStartLocalAudio();
|
|
31
17
|
private _firstGetMicrophonePrivilege;
|
|
32
|
-
constructor({
|
|
33
|
-
mediaControl: FcrDesktopMediaControl;
|
|
34
|
-
roomControl: FcrBaseRoomControl;
|
|
35
|
-
securityStore: FcrSecurityStore;
|
|
36
|
-
deviceStore: FcrDeviceStore;
|
|
37
|
-
uiEventStore: FcrUIEventStore;
|
|
38
|
-
roomStore: FcrRoomStore;
|
|
39
|
-
interpterControl?: FcrInterpreterControl;
|
|
40
|
-
});
|
|
18
|
+
constructor({ roomControl, securityStore, deviceStore, uiEventStore, }: Omit<StoreConfig, 'deviceStreamStore'>);
|
|
41
19
|
checkoutDevicePermission(mediaType: 'camera' | 'microphone'): Promise<boolean>;
|
|
42
20
|
enableCameraWithStream(enable: boolean): Promise<void>;
|
|
43
21
|
enableMicrophoneWithStream(enable: boolean, confirmAudioShareWhileMicOff?: boolean): Promise<void>;
|
|
@@ -48,8 +26,6 @@ export declare class FcrDeviceStreamStore {
|
|
|
48
26
|
private _bindLocalAudioStream;
|
|
49
27
|
private _bindLocalVideoStream;
|
|
50
28
|
private _handleProcessEvent;
|
|
51
|
-
setMicrophoneEnabledByChangeLanguage(microphoneEnabled: boolean): Promise<void>;
|
|
52
29
|
updateStreams(roomControl: FcrInterpreterRoomControl | null, open: boolean): Promise<void>;
|
|
53
|
-
|
|
54
|
-
_getInterpreterInfo(): FcrInterpreterUserInfo | null | undefined;
|
|
30
|
+
_getInterpreterInfo(): import("fcr-core/lib/room-control/interpreter-control/types").FcrInterpreterUserInfo | null | undefined;
|
|
55
31
|
}
|
|
@@ -76,29 +76,27 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
|
|
|
76
76
|
_ref = (_checkoutDevicePermissionDecs = [_mobx.action, _mobx.action.bound], _enableCameraWithStreamDecs = [_mobx.action, _mobx.action.bound], _enableMicrophoneWithStreamDecs = [_mobx.action, _mobx.action.bound], _getInterpreterInfoDecs = [_mobx.action, _mobx.action.bound], "logger");
|
|
77
77
|
var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function () {
|
|
78
78
|
function FcrDeviceStreamStore(_ref2) {
|
|
79
|
-
var
|
|
80
|
-
|
|
81
|
-
|
|
79
|
+
var _roomControl$getRoomI,
|
|
80
|
+
_this = this;
|
|
81
|
+
var roomControl = _ref2.roomControl,
|
|
82
82
|
securityStore = _ref2.securityStore,
|
|
83
83
|
deviceStore = _ref2.deviceStore,
|
|
84
|
-
uiEventStore = _ref2.uiEventStore
|
|
85
|
-
roomStore = _ref2.roomStore,
|
|
86
|
-
interpterControl = _ref2.interpterControl;
|
|
84
|
+
uiEventStore = _ref2.uiEventStore;
|
|
87
85
|
(0, _classCallCheck2["default"])(this, FcrDeviceStreamStore);
|
|
88
86
|
(0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
|
|
89
|
-
(0, _defineProperty2["default"])(this, "_InterpreterRoomControlInfo", null);
|
|
90
87
|
(0, _defineProperty2["default"])(this, "_cameraDeviceId", '');
|
|
91
88
|
(0, _defineProperty2["default"])(this, "_microphoneDeviceId", '');
|
|
92
|
-
(0, _defineProperty2["default"])(this, "
|
|
89
|
+
(0, _defineProperty2["default"])(this, "_interpreterControl", null);
|
|
93
90
|
(0, _defineProperty2["default"])(this, "_firstGetMicrophonePrivilege", true);
|
|
94
91
|
this._deviceStore = deviceStore;
|
|
95
92
|
this._roomControl = roomControl;
|
|
96
|
-
this._mediaControl = mediaControl;
|
|
97
93
|
this._securityStore = securityStore;
|
|
98
94
|
this._uiEventStore = uiEventStore;
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
95
|
+
if (((_roomControl$getRoomI = roomControl.getRoomInfo()) === null || _roomControl$getRoomI === void 0 ? void 0 : _roomControl$getRoomI.roomType) === _type3.FcrRoomType.Mainroom) {
|
|
96
|
+
var interpreterControl = roomControl.getInterpreterControl();
|
|
97
|
+
if (interpreterControl) {
|
|
98
|
+
this._interpreterControl = interpreterControl;
|
|
99
|
+
}
|
|
102
100
|
}
|
|
103
101
|
this._deviceStore.addObserver({
|
|
104
102
|
onCameraChanged: this._handleCameraChanged,
|
|
@@ -117,11 +115,12 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
|
|
|
117
115
|
}
|
|
118
116
|
},
|
|
119
117
|
onStreamsUpdated: function onStreamsUpdated(_, e) {
|
|
120
|
-
var
|
|
121
|
-
var localCameraStream = (_e$find2 = e.find(function (event) {
|
|
118
|
+
var localCamera = e.find(function (event) {
|
|
122
119
|
return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type2.AgoraRtcVideoSourceType.CAMERA;
|
|
123
|
-
})
|
|
120
|
+
});
|
|
121
|
+
var localCameraStream = localCamera === null || localCamera === void 0 ? void 0 : localCamera.modifiedStream;
|
|
124
122
|
if (localCameraStream) {
|
|
123
|
+
var _localCamera$operator;
|
|
125
124
|
if (localCameraStream.streamType === _type.AgoraRteMediaStreamType.AUDIO || localCameraStream.streamType === _type.AgoraRteMediaStreamType.NONE) {
|
|
126
125
|
if (_this._deviceStore.cameraEnabled) {
|
|
127
126
|
_this._deviceStore.setCameraEnabled(false);
|
|
@@ -131,15 +130,16 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
|
|
|
131
130
|
});
|
|
132
131
|
}
|
|
133
132
|
}
|
|
134
|
-
if (
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
133
|
+
if (_this._getInterpreterInfo() && ((_localCamera$operator = localCamera.operatorUser) === null || _localCamera$operator === void 0 ? void 0 : _localCamera$operator.userId) === _this._localUser.userId) {
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
if (localCameraStream.streamType === _type.AgoraRteMediaStreamType.VIDEO || localCameraStream.streamType === _type.AgoraRteMediaStreamType.NONE) {
|
|
137
|
+
if (_this._deviceStore.microphoneEnabled) {
|
|
138
|
+
_this._deviceStore.setMicrophoneEnabled(false);
|
|
139
|
+
_this._uiEventStore.showToast({
|
|
140
|
+
type: 'error',
|
|
141
|
+
message: (0, _i18n.transI18n)('fmt_uimanager_tips_urmuted')
|
|
142
|
+
});
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
_this._bindLocalAudioStream();
|
|
@@ -337,7 +337,7 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
|
|
|
337
337
|
if (hasAudioPublishPrivilege) {
|
|
338
338
|
this._deviceStore.setMicrophoneEnabled(enable);
|
|
339
339
|
}
|
|
340
|
-
_context3.next =
|
|
340
|
+
_context3.next = 25;
|
|
341
341
|
break;
|
|
342
342
|
case 9:
|
|
343
343
|
if (!(enable && hasNoSecurityPermission && isMainRoom && !this._getInterpreterInfo())) {
|
|
@@ -361,38 +361,35 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
|
|
|
361
361
|
return _context3.abrupt("return");
|
|
362
362
|
case 15:
|
|
363
363
|
if (!(isMainRoom && this._localCameraStream)) {
|
|
364
|
-
_context3.next =
|
|
364
|
+
_context3.next = 21;
|
|
365
365
|
break;
|
|
366
366
|
}
|
|
367
367
|
if (hasAudioPublishPrivilege) {
|
|
368
|
-
_context3.next =
|
|
368
|
+
_context3.next = 21;
|
|
369
369
|
break;
|
|
370
370
|
}
|
|
371
|
-
if (this._getInterpreterInfo()) {
|
|
372
|
-
this.setMicrophoneEnabledByChangeLanguage(enable);
|
|
373
|
-
}
|
|
374
371
|
if (!enable) {
|
|
375
|
-
_context3.next =
|
|
372
|
+
_context3.next = 21;
|
|
376
373
|
break;
|
|
377
374
|
}
|
|
378
375
|
if (this._getInterpreterInfo()) {
|
|
379
|
-
_context3.next =
|
|
376
|
+
_context3.next = 21;
|
|
380
377
|
break;
|
|
381
378
|
}
|
|
382
|
-
_context3.next =
|
|
379
|
+
_context3.next = 21;
|
|
383
380
|
return this._roomControl.getStreamControl().updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, this._localCameraStream.streamId, {
|
|
384
381
|
videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION,
|
|
385
382
|
audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE
|
|
386
383
|
}));
|
|
387
|
-
case
|
|
388
|
-
_context3.next =
|
|
384
|
+
case 21:
|
|
385
|
+
_context3.next = 23;
|
|
389
386
|
return this.checkoutDevicePermission('microphone');
|
|
390
|
-
case
|
|
387
|
+
case 23:
|
|
391
388
|
hasDeivcePermission = _context3.sent;
|
|
392
389
|
if (hasDeivcePermission) {
|
|
393
390
|
this._deviceStore.setMicrophoneEnabled(enable);
|
|
394
391
|
}
|
|
395
|
-
case
|
|
392
|
+
case 25:
|
|
396
393
|
case "end":
|
|
397
394
|
return _context3.stop();
|
|
398
395
|
}
|
|
@@ -468,55 +465,17 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
|
|
|
468
465
|
}
|
|
469
466
|
}
|
|
470
467
|
|
|
471
|
-
//
|
|
472
|
-
}, {
|
|
473
|
-
key: "setMicrophoneEnabledByChangeLanguage",
|
|
474
|
-
value: function () {
|
|
475
|
-
var _setMicrophoneEnabledByChangeLanguage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(microphoneEnabled) {
|
|
476
|
-
var _this$_InterpreterRoo, interpreter, targetLanguageRoomControl, language, sourceLanguageRoomControl, targetLanguage, sourceLanguage;
|
|
477
|
-
return _regenerator["default"].wrap(function _callee4$(_context4) {
|
|
478
|
-
while (1) switch (_context4.prev = _context4.next) {
|
|
479
|
-
case 0:
|
|
480
|
-
if (!this._InterpreterRoomControlInfo) {
|
|
481
|
-
_context4.next = 9;
|
|
482
|
-
break;
|
|
483
|
-
}
|
|
484
|
-
_this$_InterpreterRoo = this._InterpreterRoomControlInfo, interpreter = _this$_InterpreterRoo.interpreter, targetLanguageRoomControl = _this$_InterpreterRoo.targetLanguageRoomControl, language = _this$_InterpreterRoo.language, sourceLanguageRoomControl = _this$_InterpreterRoo.sourceLanguageRoomControl;
|
|
485
|
-
targetLanguage = interpreter.targetLanguage, sourceLanguage = interpreter.sourceLanguage;
|
|
486
|
-
if (!(language === targetLanguage)) {
|
|
487
|
-
_context4.next = 6;
|
|
488
|
-
break;
|
|
489
|
-
}
|
|
490
|
-
_context4.next = 6;
|
|
491
|
-
return this.updateStreams(targetLanguageRoomControl, microphoneEnabled);
|
|
492
|
-
case 6:
|
|
493
|
-
if (!(language === sourceLanguage)) {
|
|
494
|
-
_context4.next = 9;
|
|
495
|
-
break;
|
|
496
|
-
}
|
|
497
|
-
_context4.next = 9;
|
|
498
|
-
return this.updateStreams(sourceLanguageRoomControl, microphoneEnabled);
|
|
499
|
-
case 9:
|
|
500
|
-
case "end":
|
|
501
|
-
return _context4.stop();
|
|
502
|
-
}
|
|
503
|
-
}, _callee4, this);
|
|
504
|
-
}));
|
|
505
|
-
function setMicrophoneEnabledByChangeLanguage(_x4) {
|
|
506
|
-
return _setMicrophoneEnabledByChangeLanguage.apply(this, arguments);
|
|
507
|
-
}
|
|
508
|
-
return setMicrophoneEnabledByChangeLanguage;
|
|
509
|
-
}() // 控制翻译房间输出流权限
|
|
468
|
+
// 控制翻译房间输出流权限
|
|
510
469
|
}, {
|
|
511
470
|
key: "updateStreams",
|
|
512
471
|
value: function () {
|
|
513
|
-
var _updateStreams = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function
|
|
472
|
+
var _updateStreams = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(roomControl, open) {
|
|
514
473
|
var streamControl, streamMap, streamList, stream;
|
|
515
|
-
return _regenerator["default"].wrap(function
|
|
516
|
-
while (1) switch (
|
|
474
|
+
return _regenerator["default"].wrap(function _callee4$(_context4) {
|
|
475
|
+
while (1) switch (_context4.prev = _context4.next) {
|
|
517
476
|
case 0:
|
|
518
477
|
if (!roomControl) {
|
|
519
|
-
|
|
478
|
+
_context4.next = 9;
|
|
520
479
|
break;
|
|
521
480
|
}
|
|
522
481
|
streamControl = roomControl.getStreamControl();
|
|
@@ -525,11 +484,11 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
|
|
|
525
484
|
return streamMap[key];
|
|
526
485
|
});
|
|
527
486
|
if (!(streamList.length > 0)) {
|
|
528
|
-
|
|
487
|
+
_context4.next = 9;
|
|
529
488
|
break;
|
|
530
489
|
}
|
|
531
490
|
stream = streamList[0][0];
|
|
532
|
-
|
|
491
|
+
_context4.next = 8;
|
|
533
492
|
return streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, stream.streamId, {
|
|
534
493
|
videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION,
|
|
535
494
|
audioPrivilege: open ? _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE : _fcrCore.FcrStreamPrivilegeOperation.NOPRIVILEGE
|
|
@@ -538,28 +497,23 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
|
|
|
538
497
|
this.logger.info("interpreterLog- ".concat(open ? 'ON' : 'OFF', " interpreterRoom input streams"), stream.streamId);
|
|
539
498
|
case 9:
|
|
540
499
|
case "end":
|
|
541
|
-
return
|
|
500
|
+
return _context4.stop();
|
|
542
501
|
}
|
|
543
|
-
},
|
|
502
|
+
}, _callee4, this);
|
|
544
503
|
}));
|
|
545
|
-
function updateStreams(
|
|
504
|
+
function updateStreams(_x4, _x5) {
|
|
546
505
|
return _updateStreams.apply(this, arguments);
|
|
547
506
|
}
|
|
548
507
|
return updateStreams;
|
|
549
508
|
}()
|
|
550
|
-
}, {
|
|
551
|
-
key: "setInterpreterRoomControlInfo",
|
|
552
|
-
value: function setInterpreterRoomControlInfo(payload) {
|
|
553
|
-
this._InterpreterRoomControlInfo = payload;
|
|
554
|
-
}
|
|
555
509
|
}, {
|
|
556
510
|
key: "_getInterpreterInfo",
|
|
557
511
|
value: function
|
|
558
512
|
// 获取本地用户关联的翻译官信息
|
|
559
513
|
_getInterpreterInfo() {
|
|
560
514
|
var _this2 = this;
|
|
561
|
-
if (this.
|
|
562
|
-
var interpreterUsers = this.
|
|
515
|
+
if (this._interpreterControl) {
|
|
516
|
+
var interpreterUsers = this._interpreterControl.getInterpreterUserList(); //翻译官列表
|
|
563
517
|
if (interpreterUsers) {
|
|
564
518
|
var interpreter = interpreterUsers.find(function (ele) {
|
|
565
519
|
return ele.userId === _this2._localUser.userId;
|
|
@@ -572,7 +526,7 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
|
|
|
572
526
|
}]);
|
|
573
527
|
}();
|
|
574
528
|
_FcrDeviceStreamStore = FcrDeviceStreamStore;
|
|
575
|
-
var _applyDecs$e = _applyDecs(_FcrDeviceStreamStore, [[_checkoutDevicePermissionDecs, 18, "checkoutDevicePermission"], [_enableCameraWithStreamDecs, 18, "enableCameraWithStream"], [_enableMicrophoneWithStreamDecs, 18, "enableMicrophoneWithStream"], [_decorator.bound, 2, "_handleCameraChanged"], [_decorator.bound, 2, "_handleMicrophoneChanged"], [_decorator.bound, 2, "_bindLocalAudioStream"], [_decorator.bound, 2, "_bindLocalVideoStream"], [_decorator.bound, 2, "_handleProcessEvent"], [_decorator.bound, 2, "updateStreams"], [
|
|
529
|
+
var _applyDecs$e = _applyDecs(_FcrDeviceStreamStore, [[_checkoutDevicePermissionDecs, 18, "checkoutDevicePermission"], [_enableCameraWithStreamDecs, 18, "enableCameraWithStream"], [_enableMicrophoneWithStreamDecs, 18, "enableMicrophoneWithStream"], [_decorator.bound, 2, "_handleCameraChanged"], [_decorator.bound, 2, "_handleMicrophoneChanged"], [_decorator.bound, 2, "_bindLocalAudioStream"], [_decorator.bound, 2, "_bindLocalVideoStream"], [_decorator.bound, 2, "_handleProcessEvent"], [_decorator.bound, 2, "updateStreams"], [_getInterpreterInfoDecs, 18, "_getInterpreterInfo"]], []).e;
|
|
576
530
|
var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
|
|
577
531
|
_initProto = _applyDecs$e2[0];
|
|
578
532
|
_applyDecs$e;
|
package/lib/common/room-store.js
CHANGED
|
@@ -344,14 +344,14 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
|
|
|
344
344
|
_context6.next = 5;
|
|
345
345
|
return control.join(roomJoinOptions);
|
|
346
346
|
case 5:
|
|
347
|
-
this.logger.info("interpreterLog-joinInterpreterRoom succeed");
|
|
347
|
+
this.logger.info("interpreterLog-joinInterpreterRoom succeed", param.language);
|
|
348
348
|
this._observable.notifyObservers('onJoinInterpretingRoomSuccess', param);
|
|
349
349
|
_context6.next = 13;
|
|
350
350
|
break;
|
|
351
351
|
case 9:
|
|
352
352
|
_context6.prev = 9;
|
|
353
353
|
_context6.t0 = _context6["catch"](1);
|
|
354
|
-
this.logger.info("interpreterLog-joinInterpreterRoom fail");
|
|
354
|
+
this.logger.info("interpreterLog-joinInterpreterRoom fail", param.language);
|
|
355
355
|
this._observable.notifyObservers('onJoinInterpretingRoomFailed', param);
|
|
356
356
|
case 13:
|
|
357
357
|
case "end":
|
|
@@ -378,14 +378,14 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
|
|
|
378
378
|
_context7.next = 5;
|
|
379
379
|
return control.leave();
|
|
380
380
|
case 5:
|
|
381
|
-
this.logger.info("interpreterLog-leaveInterpreterRoom succeed");
|
|
381
|
+
this.logger.info("interpreterLog-leaveInterpreterRoom succeed", param.language);
|
|
382
382
|
this._observable.notifyObservers('onLeaveInterpretingRoomSuccess', param);
|
|
383
383
|
_context7.next = 13;
|
|
384
384
|
break;
|
|
385
385
|
case 9:
|
|
386
386
|
_context7.prev = 9;
|
|
387
387
|
_context7.t0 = _context7["catch"](1);
|
|
388
|
-
this.logger.info("interpreterLog-leaveInterpreterRoom fail");
|
|
388
|
+
this.logger.info("interpreterLog-leaveInterpreterRoom fail", param.language);
|
|
389
389
|
this._observable.notifyObservers('onLeaveInterpretingRoomFailed', param);
|
|
390
390
|
case 13:
|
|
391
391
|
case "end":
|
|
@@ -2,33 +2,24 @@ import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'fcr-core'
|
|
|
2
2
|
import { FcrUserRole, FcrUserInfo, FcrLineType } from 'fcr-core/lib/type';
|
|
3
3
|
import { FcrUIEventStore } from './event-store';
|
|
4
4
|
import { FcrSharePermissionState } from 'fcr-core/lib/room-control/whiteboard-control/enums';
|
|
5
|
-
import {
|
|
6
|
-
import { FcrPermissionAction, FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload } from 'fcr-core/lib/room-control/privilege-control/type';
|
|
5
|
+
import { FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload } from 'fcr-core/lib/room-control/privilege-control/type';
|
|
7
6
|
import { FcrInterpreterControl } from 'fcr-core/lib/room-control/interpreter-control/types';
|
|
8
|
-
|
|
9
|
-
public: 0 | 1;
|
|
10
|
-
private: {
|
|
11
|
-
host: 0 | 1;
|
|
12
|
-
cohost: 0 | 1;
|
|
13
|
-
participant: 0 | 1;
|
|
14
|
-
};
|
|
15
|
-
};
|
|
7
|
+
import { FcrSecuritySendChatOriginalPayload } from './type';
|
|
16
8
|
export declare class FcrSecurityStore {
|
|
17
9
|
private _privilegeControl;
|
|
18
10
|
private _userControl;
|
|
19
11
|
private _streamControl;
|
|
20
|
-
private _roomSessionControl;
|
|
21
12
|
private _uiEventStore;
|
|
22
13
|
private _interpterControl?;
|
|
23
14
|
protected logger: import("agora-foundation/lib/logger").Logger;
|
|
24
15
|
private _disposers;
|
|
25
16
|
private _prevWaterMarkEnable;
|
|
26
17
|
accessor securityInfos: FcrSecurityInfo[];
|
|
27
|
-
accessor permissionInfos: FcrPermissionInfo[]
|
|
18
|
+
accessor permissionInfos: FcrPermissionInfo[];
|
|
28
19
|
accessor privilegeOperator: FcrUserInfo | undefined;
|
|
29
20
|
accessor boardOwnerUser: FcrUserInfo | undefined;
|
|
30
21
|
get hasSecurityPermission(): boolean;
|
|
31
|
-
constructor(_privilegeControl: FcrPrivilegeControl, _userControl: FcrUserControl, _streamControl: FcrStreamControl,
|
|
22
|
+
constructor(_privilegeControl: FcrPrivilegeControl, _userControl: FcrUserControl, _streamControl: FcrStreamControl, _uiEventStore: FcrUIEventStore, _interpterControl?: FcrInterpreterControl | undefined);
|
|
32
23
|
release(): void;
|
|
33
24
|
get localUser(): FcrUserInfo;
|
|
34
25
|
allowChangeSelfName: () => boolean;
|
|
@@ -118,11 +109,10 @@ export declare class FcrSecurityStore {
|
|
|
118
109
|
setAllowUnmuteSelfVideo: (enable: boolean) => void;
|
|
119
110
|
setAllowUnmuteSelfAudio: (enable: boolean) => void;
|
|
120
111
|
hasSendAllChatPermission: () => boolean;
|
|
121
|
-
_hasPermission
|
|
122
|
-
_hasPermissionWithParams
|
|
112
|
+
private _hasPermission;
|
|
113
|
+
private _hasPermissionWithParams;
|
|
123
114
|
private _handlePermissionUpdated;
|
|
124
115
|
private _handleSecurityUpdated;
|
|
125
|
-
private _handleUnmuteSessionReceived;
|
|
126
116
|
permitPrivateChat(userId: string): boolean;
|
|
127
117
|
private _printAllPermissions;
|
|
128
118
|
setAllowWaterMark(state: boolean, lineType?: FcrLineType): Promise<void>;
|
|
@@ -105,7 +105,7 @@ var _C = /*#__PURE__*/new WeakMap();
|
|
|
105
105
|
var _D = /*#__PURE__*/new WeakMap();
|
|
106
106
|
_ref = (_handlePermissionUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], _getInterpreterInfoDecs = [_mobx.action, _mobx.action.bound], "logger");
|
|
107
107
|
var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
108
|
-
function FcrSecurityStore(_privilegeControl, _userControl, _streamControl,
|
|
108
|
+
function FcrSecurityStore(_privilegeControl, _userControl, _streamControl, _uiEventStore, _interpterControl) {
|
|
109
109
|
var _this = this;
|
|
110
110
|
(0, _classCallCheck2["default"])(this, FcrSecurityStore);
|
|
111
111
|
(0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
|
|
@@ -497,13 +497,12 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
|
497
497
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
498
498
|
while (1) switch (_context2.prev = _context2.next) {
|
|
499
499
|
case 0:
|
|
500
|
-
_this.logger.info('setAllowWriteBoard', state);
|
|
501
500
|
enable = typeof state === 'boolean' ? state : state === _enums.FcrSharePermissionState.ON;
|
|
502
|
-
_context2.next =
|
|
501
|
+
_context2.next = 3;
|
|
503
502
|
return _this._privilegeControl.allowWriteBoard(enable, [_type4.FcrPrivilegeUserRole.PARTICIPANT]);
|
|
504
|
-
case
|
|
503
|
+
case 3:
|
|
505
504
|
return _context2.abrupt("return", _context2.sent);
|
|
506
|
-
case
|
|
505
|
+
case 4:
|
|
507
506
|
case "end":
|
|
508
507
|
return _context2.stop();
|
|
509
508
|
}
|
|
@@ -630,11 +629,9 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
|
630
629
|
});
|
|
631
630
|
return !!(info !== null && info !== void 0 && info.enable);
|
|
632
631
|
}));
|
|
633
|
-
(0, _defineProperty2["default"])(this, "_handleUnmuteSessionReceived", function () {});
|
|
634
632
|
this._privilegeControl = _privilegeControl;
|
|
635
633
|
this._userControl = _userControl;
|
|
636
634
|
this._streamControl = _streamControl;
|
|
637
|
-
this._roomSessionControl = _roomSessionControl;
|
|
638
635
|
this._uiEventStore = _uiEventStore;
|
|
639
636
|
this._interpterControl = _interpterControl;
|
|
640
637
|
this.securityInfos = this._privilegeControl.getAllSecurityInfo();
|
|
@@ -734,11 +731,13 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
|
734
731
|
this.privilegeOperator = event.operatorUser;
|
|
735
732
|
var securityInfo = event.securityInfo;
|
|
736
733
|
var enable = securityInfo.enable;
|
|
737
|
-
var
|
|
734
|
+
var isPersonalOperation = this.localUser.userId === ((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId);
|
|
735
|
+
var toastType = isPersonalOperation ? 'normal' : 'info';
|
|
736
|
+
var operator = isPersonalOperation ? (0, _i18n.transI18n)('fmt_settings_labels_you') : (((_event$operatorUser2 = event.operatorUser) === null || _event$operatorUser2 === void 0 ? void 0 : _event$operatorUser2.userRole) === _type.FcrUserRole.HOST ? (0, _i18n.transI18n)('fmt_role_host') : (0, _i18n.transI18n)('fmt_role_cohost')) + " ".concat((_this$privilegeOperat = this.privilegeOperator) === null || _this$privilegeOperat === void 0 ? void 0 : _this$privilegeOperat.userName, " ");
|
|
738
737
|
if (((_securityInfo$info = securityInfo.info) === null || _securityInfo$info === void 0 ? void 0 : _securityInfo$info.action) === _type4.FcrSecurityAction.JoinWithMuteAudio) {
|
|
739
738
|
if (enable) {
|
|
740
739
|
this._uiEventStore.showToast({
|
|
741
|
-
type:
|
|
740
|
+
type: toastType,
|
|
742
741
|
message: (0, _i18n.transI18n)('fmt_settings_tips_muteallwhilejoin', {
|
|
743
742
|
reason1: operator
|
|
744
743
|
})
|
|
@@ -752,7 +751,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
|
752
751
|
});
|
|
753
752
|
if (!this._getInterpreterInfo()) {
|
|
754
753
|
this._uiEventStore.showToast({
|
|
755
|
-
type:
|
|
754
|
+
type: toastType,
|
|
756
755
|
message: toastMessage
|
|
757
756
|
});
|
|
758
757
|
}
|
|
@@ -763,7 +762,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
|
763
762
|
reason1: operator
|
|
764
763
|
});
|
|
765
764
|
this._uiEventStore.showToast({
|
|
766
|
-
type:
|
|
765
|
+
type: toastType,
|
|
767
766
|
message: _toastMessage
|
|
768
767
|
});
|
|
769
768
|
} else if (((_securityInfo$info4 = securityInfo.info) === null || _securityInfo$info4 === void 0 ? void 0 : _securityInfo$info4.action) === _type4.FcrSecurityAction.ShareScreen) {
|
|
@@ -773,7 +772,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
|
773
772
|
reason1: operator
|
|
774
773
|
});
|
|
775
774
|
this._uiEventStore.showToast({
|
|
776
|
-
type:
|
|
775
|
+
type: toastType,
|
|
777
776
|
message: _toastMessage2
|
|
778
777
|
});
|
|
779
778
|
} else if (((_securityInfo$info5 = securityInfo.info) === null || _securityInfo$info5 === void 0 ? void 0 : _securityInfo$info5.action) === _type4.FcrSecurityAction.SendChat) {
|
|
@@ -783,7 +782,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
|
783
782
|
reason1: operator
|
|
784
783
|
});
|
|
785
784
|
this._uiEventStore.showToast({
|
|
786
|
-
type:
|
|
785
|
+
type: toastType,
|
|
787
786
|
message: _toastMessage3
|
|
788
787
|
});
|
|
789
788
|
} else if (((_securityInfo$info6 = securityInfo.info) === null || _securityInfo$info6 === void 0 ? void 0 : _securityInfo$info6.action) === _type4.FcrSecurityAction.Sharing && !enable) {
|
|
@@ -797,7 +796,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
|
797
796
|
}
|
|
798
797
|
if (((_this$boardOwnerUser2 = this.boardOwnerUser) === null || _this$boardOwnerUser2 === void 0 ? void 0 : _this$boardOwnerUser2.userId) !== this.localUser.userId) {
|
|
799
798
|
this._uiEventStore.showToast({
|
|
800
|
-
type:
|
|
799
|
+
type: toastType,
|
|
801
800
|
message: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_alreadyopend')
|
|
802
801
|
});
|
|
803
802
|
} else {
|
|
@@ -826,12 +825,12 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
|
826
825
|
if (!isSelf) {
|
|
827
826
|
if (enable) {
|
|
828
827
|
this._uiEventStore.showToast({
|
|
829
|
-
type:
|
|
828
|
+
type: toastType,
|
|
830
829
|
message: "".concat(userName).concat((0, _i18n.transI18n)('fmt_waitingroom_setting_tips_enable'))
|
|
831
830
|
});
|
|
832
831
|
} else {
|
|
833
832
|
this._uiEventStore.showToast({
|
|
834
|
-
type:
|
|
833
|
+
type: toastType,
|
|
835
834
|
message: "".concat(userName).concat((0, _i18n.transI18n)('fmt_waitingroom_mobile_setting_label_disable'))
|
|
836
835
|
});
|
|
837
836
|
}
|
|
@@ -857,7 +856,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
|
|
|
857
856
|
this._prevWaterMarkEnable = _enable;
|
|
858
857
|
if (toastText) {
|
|
859
858
|
this._uiEventStore.showToast({
|
|
860
|
-
type:
|
|
859
|
+
type: toastType,
|
|
861
860
|
message: toastText
|
|
862
861
|
});
|
|
863
862
|
}
|
package/lib/creator.js
CHANGED
|
@@ -22,9 +22,9 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
|
|
|
22
22
|
this.logger.info("[FcrUISceneCreator] creator config: ".concat(JSON.stringify(_config)));
|
|
23
23
|
this.settingConfig = {
|
|
24
24
|
media: {
|
|
25
|
-
autoConnectAudio:
|
|
26
|
-
microphoneExpectedOff:
|
|
27
|
-
cameraExpectedOff:
|
|
25
|
+
autoConnectAudio: true,
|
|
26
|
+
microphoneExpectedOff: true,
|
|
27
|
+
cameraExpectedOff: true
|
|
28
28
|
}
|
|
29
29
|
};
|
|
30
30
|
}
|
package/lib/electron/app.js
CHANGED
|
@@ -33,6 +33,12 @@ var hookApp = exports.hookApp = function hookApp(app) {
|
|
|
33
33
|
var isWindowDestroyed = function isWindowDestroyed(window) {
|
|
34
34
|
return window.isDestroyed();
|
|
35
35
|
};
|
|
36
|
+
var appUserModelId = process.argv.find(function (arg) {
|
|
37
|
+
return arg.startsWith('--app-user-model-id=');
|
|
38
|
+
});
|
|
39
|
+
if (appUserModelId) {
|
|
40
|
+
app.setAppUserModelId(appUserModelId.substring('--app-user-model-id='.length));
|
|
41
|
+
}
|
|
36
42
|
app.addListener('browser-window-created', function (_, window) {
|
|
37
43
|
var windowId = window.id;
|
|
38
44
|
window.addListener('close', function () {
|
|
@@ -145,19 +151,29 @@ var hookApp = exports.hookApp = function hookApp(app) {
|
|
|
145
151
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
146
152
|
while (1) switch (_context.prev = _context.next) {
|
|
147
153
|
case 0:
|
|
154
|
+
if (!(mediaType === 'sharing')) {
|
|
155
|
+
_context.next = 3;
|
|
156
|
+
break;
|
|
157
|
+
}
|
|
158
|
+
// below API call will trigger the system to add the permission for screen recording on macOS
|
|
159
|
+
_electron.desktopCapturer.getSources({
|
|
160
|
+
types: ['screen']
|
|
161
|
+
});
|
|
162
|
+
return _context.abrupt("return", true);
|
|
163
|
+
case 3:
|
|
148
164
|
accessStatus = _electron.systemPreferences.getMediaAccessStatus(mediaType);
|
|
149
165
|
if (!(accessStatus !== 'granted')) {
|
|
150
|
-
_context.next =
|
|
166
|
+
_context.next = 11;
|
|
151
167
|
break;
|
|
152
168
|
}
|
|
153
|
-
_context.next =
|
|
169
|
+
_context.next = 7;
|
|
154
170
|
return _electron.systemPreferences.askForMediaAccess(mediaType);
|
|
155
|
-
case
|
|
171
|
+
case 7:
|
|
156
172
|
res = _context.sent;
|
|
157
173
|
return _context.abrupt("return", res);
|
|
158
|
-
case
|
|
174
|
+
case 11:
|
|
159
175
|
return _context.abrupt("return", true);
|
|
160
|
-
case
|
|
176
|
+
case 12:
|
|
161
177
|
case "end":
|
|
162
178
|
return _context.stop();
|
|
163
179
|
}
|
|
@@ -32,8 +32,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
32
32
|
_electron.app.addListener('ready', function () {
|
|
33
33
|
var mainWindow = new _electron.BrowserWindow(_objectSpread(_objectSpread({}, _defaultOptions.defaultWindowOptions), {}, {
|
|
34
34
|
webPreferences: _objectSpread({}, _defaultOptions.defaultWebPreferences),
|
|
35
|
-
show: false
|
|
36
|
-
skipTaskbar: true
|
|
35
|
+
show: false
|
|
37
36
|
}));
|
|
38
37
|
_electron.Menu.setApplicationMenu(null);
|
|
39
38
|
(0, _2.hookWindow)(mainWindow);
|
|
@@ -21,7 +21,7 @@ export declare const captureScreen: (options?: {
|
|
|
21
21
|
hideWindow?: boolean;
|
|
22
22
|
}) => void;
|
|
23
23
|
export declare const openRendererWindow: (frameName: string, renderFn: (dom: Element, browserWindow: Electron.BrowserWindow, newRendererWindow: Window) => void, windowOptions: BrowserWindowConstructorOptions) => Promise<void>;
|
|
24
|
-
export declare const checkMediaPermission: (mediaType: "microphone" | "camera") => Promise<any>;
|
|
24
|
+
export declare const checkMediaPermission: (mediaType: "microphone" | "camera" | "sharing") => Promise<any>;
|
|
25
25
|
export declare const openSystemPreferences: (mediaType: "microphone" | "camera") => void;
|
|
26
26
|
export declare const closeRendererWindow: (frameName: string) => Promise<void>;
|
|
27
27
|
export declare const launch: (options: any) => Promise<any>;
|