fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib/scenes/main-scene.js

@@ -26,7 +26,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _i18n = require("agora-ui-foundation/lib/i18n");
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _mainScene = require("../modules/action-bar/main-scene");
 var _audioStream = require("../modules/audio-stream");
@@ -43,6 +42,8 @@ var _participant = require("../modules/dialog/dialogs/participant");
 var _systemPreference = require("../modules/dialog/dialogs/system-preference");
 var _whiteboard = require("../modules/dialog/dialogs/whiteboard");
 var _videoWindow = require("../modules/dialog/dialogs/video-window");
+var _annotationMask = require("../modules/dialog/dialogs/annotation-mask");
+var _annotationTool = require("../modules/dialog/dialogs/annotation-tool");
 var _interpreter2 = require("../modules/interpreter");
 var _invite2 = require("../modules/invite");
 var _layout = require("../modules/layout");
@@ -67,7 +68,7 @@ var _widget = require("../modules/dialog/dialogs/widget");
 var _widget2 = require("../modules/widget");
 var _rename = require("../modules/dialog/dialogs/rename");
 var _confirmLeaveMeeting = require("../modules/dialog/dialogs/confirm-leave-meeting");
-var _endMeeting = require("../modules/dialog/dialogs/end-meeting");
+var _endMeetingNotice = require("../modules/dialog/dialogs/end-meeting-notice");
 var _subWindow = require("../modules/dialog/dialogs/sub-window");
 var _secondaryWindow = require("../modules/secondary-window");
 var _objectManager = require("../object-manager");
@@ -78,9 +79,11 @@ var _muteAll = require("../modules/dialog/dialogs/mute-all");
 var _controlBarLeaveMeeting = require("../modules/dialog/dialogs/control-bar-leave-meeting");
 var _caption = require("../modules/caption");
 var _subtitlesHistory2 = require("../modules/dialog/dialogs/subtitles-history");
-var _platform = require("../utilities/platform");
 var _env = require("agora-foundation/lib/utilities/env");
 var _caption2 = require("../modules/dialog/dialogs/caption");
+var _annotation = require("../modules/annotation");
+var _type4 = require("../modules/toast-manager/type");
+var _toastManager = require("../modules/toast-manager");
 var _jsxRuntime = require("react/jsx-runtime");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -149,16 +152,16 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     _this._windowObserver = {
       onWindowCreated: function onWindowCreated(dialogKey, _, window) {
         if (dialogKey === _constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION) {
-          window.setAlwaysOnTop(true, (0, _platform.isMac)() ? 'floating' : 'normal');
-          if ((0, _platform.isMac)()) {
+          window.setAlwaysOnTop(true, (0, _env.isMac)() ? 'floating' : 'normal');
+          if ((0, _env.isMac)()) {
             window.setVisibleOnAllWorkspaces(true, {
               visibleOnFullScreen: true
             });
           }
         }
-        if (dialogKey === _constant.FcrUIDialogKey.LEAVE_MEETING) {
-          window.setAlwaysOnTop(true, (0, _platform.isMac)() ? 'floating' : 'normal');
-          if ((0, _platform.isMac)()) {
+        if (dialogKey === _constant.FcrUIDialogKey.CONFIRM_END_MEETING) {
+          window.setAlwaysOnTop(true, (0, _env.isMac)() ? 'floating' : 'normal');
+          if ((0, _env.isMac)()) {
             window.setVisibleOnAllWorkspaces(true, {
               visibleOnFullScreen: true
             });
@@ -185,6 +188,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       var whiteBoradUIModule = new _whiteboard2.FcrWhiteboardUIModule(this);
       var actionBarUIModule = new _mainScene.ActionBarMainSceneUIModule(this);
       var controlbarUIModule = new _controlBar.ControlBarUIModule(this);
+      var annotationUIModule = new _annotation.AnnotationUIModule(this);
       var layoutModule = new _layout.LayoutUIModule(this);
       var captionUIModule = new _caption.CaptionUIModule(this);
       var eventNotificationUIModule = new _notification.NotificationUIModule(this);
@@ -194,6 +198,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       var phoneAudioConnection = new _phoneAudioConnect.PhoneAudioConnectionUIModule(this);
       var webWidgetUIModule = new _widget2.WebWidgetUIModule(this);
       var displayDistributionModule = new _secondaryWindow.FcrUISecondaryWindowModule(this);
+      var toastManagerUIModule = new _toastManager.ToastManagerUIModule(this);
       var localVideoRenderProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER);
       var remoteVideoRenderProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_REMOTE_VIDEO_RENDER_PROVIDER);
       var dialogProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
@@ -218,6 +223,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       this.addSubNode(webWidgetUIModule);
       this.addSubNode(displayDistributionModule);
       this.addSubNode(captionUIModule);
+      this.addSubNode(annotationUIModule);
+      this.addSubNode(toastManagerUIModule);
       // add dialogs
       dialogProvider.addDialogs([{
         key: _constant.FcrUIDialogKey.INTERPRETER,
@@ -232,7 +239,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             children: interpreterUIModule.getComponent()
           }, dialogId);
         },
-        windowConfig: _interpreter.windowConfig
+        electronWindowConfig: _interpreter.electronWindowConfig,
+        webDialogConfig: _interpreter.webDialogConfig
       }, {
         key: _constant.FcrUIDialogKey.WIDGET,
         component: function component(_ref4) {
@@ -246,7 +254,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             children: webWidgetUIModule.getComponent(params)
           }, dialogId);
         },
-        windowConfig: _widget.windowConfig
+        electronWindowConfig: _widget.electronWindowConfig
       }, {
         key: _constant.FcrUIDialogKey.PARTICIPANT,
         component: function component(_ref5) {
@@ -262,7 +270,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             children: participantsModule.getComponent()
           }, dialogId);
         },
-        windowConfig: _participant.windowConfig
+        electronWindowConfig: _participant.electronWindowConfig,
+        webDialogConfig: _participant.webDialogConfig
       }, {
         key: _constant.FcrUIDialogKey.SUBTITLES_HISTORY,
         component: function component(_ref6) {
@@ -278,7 +287,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             children: subtitlesHistoryModule.getComponent()
           }, dialogId);
         },
-        windowConfig: _subtitlesHistory2.windowConfig
+        electronWindowConfig: _subtitlesHistory2.electronWindowConfig,
+        webDialogConfig: _subtitlesHistory2.webDialogConfig
       }, {
         key: _constant.FcrUIDialogKey.CAPTION,
         component: function component(_ref7) {
@@ -295,7 +305,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             children: captionUIModule.getComponent()
           }, dialogId);
         },
-        windowConfig: _caption2.windowConfig
+        electronWindowConfig: _caption2.electronWindowConfig
       }, {
         key: _constant.FcrUIDialogKey.LIVE_STREAMING,
         component: function component(_ref8) {
@@ -309,7 +319,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             children: liveStreamingUIModule.getComponent()
           }, dialogId);
         },
-        windowConfig: _liveStreaming.windowConfig
+        electronWindowConfig: _liveStreaming.electronWindowConfig
       }, {
         key: _constant.FcrUIDialogKey.INVITE,
         component: function component(_ref9) {
@@ -325,7 +335,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             })
           }, dialogId);
         },
-        windowConfig: _invite.windowConfig
+        electronWindowConfig: _invite.electronWindowConfig
       }, {
         key: _constant.FcrUIDialogKey.CHAT,
         component: function component(_ref0) {
@@ -344,7 +354,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             })
           }, dialogId);
         },
-        windowConfig: _chat2.windowConfig
+        electronWindowConfig: _chat2.electronWindowConfig,
+        webDialogConfig: _chat2.webDialogConfig
       }, {
         key: _constant.FcrUIDialogKey.VIDEO_WINDOW,
         component: function component(_ref1) {
@@ -358,7 +369,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             children: videoWindowModule.getComponent()
           }, dialogId);
         },
-        windowConfig: _videoWindow.windowConfig
+        electronWindowConfig: _videoWindow.electronWindowConfig
       }, {
         key: _constant.FcrUIDialogKey.CONNECTION_GATEWAY,
         component: function component(_ref10) {
@@ -375,7 +386,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             })
           }, dialogId);
         },
-        windowConfig: _connectionGateway.windowConfig
+        electronWindowConfig: _connectionGateway.electronWindowConfig,
+        webDialogConfig: _connectionGateway.webDialogConfig
       }, {
         key: _constant.FcrUIDialogKey.WHITEBOARD,
         component: function component(_ref11) {
@@ -388,7 +400,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             params: params
           }, dialogId);
         },
-        windowConfig: {}
+        electronWindowConfig: {}
       }, {
         key: _constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION,
         component: function component(_ref12) {
@@ -402,7 +414,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             children: shareScreenModule.getSelectionComponent()
           }, dialogId);
         },
-        windowConfig: _shareScreenSelection.windowConfig
+        electronWindowConfig: _shareScreenSelection.electronWindowConfig
       }, {
         key: _constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR,
         component: function component(_ref13) {
@@ -416,116 +428,132 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             children: controlbarUIModule.getComponent()
           }, dialogId);
         },
-        windowConfig: _controlBar2.windowConfig
+        electronWindowConfig: _controlBar2.electronWindowConfig
       }, {
-        key: _constant.FcrUIDialogKey.SYSTEM_PREFERENCE,
+        key: _constant.FcrUIDialogKey.RENAME,
         component: function component(_ref14) {
           var dialogKey = _ref14.dialogKey,
             dialogId = _ref14.dialogId,
             params = _ref14.params;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_systemPreference.SystemPreferenceDialog, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_rename.RenameDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            params: params
+            params: params,
+            children: participantsModule.getRenameDialogContent()
           }, dialogId);
         },
-        windowConfig: {}
+        electronWindowConfig: _rename.electronWindowConfig
       }, {
-        key: _constant.FcrUIDialogKey.RENAME,
+        key: _constant.FcrUIDialogKey.CONFIRM_END_MEETING,
         component: function component(_ref15) {
           var dialogKey = _ref15.dialogKey,
             dialogId = _ref15.dialogId,
             params = _ref15.params;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_rename.RenameDialog, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirmLeaveMeeting.ConfirmEndMeetingDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
             params: params,
-            children: participantsModule.getRenameDialogContent()
+            children: actionBarUIModule.getConfirmEndMeetingComponent(dialogId)
           }, dialogId);
         },
-        windowConfig: _rename.windowConfig
+        electronWindowConfig: _confirmLeaveMeeting.electronWindowConfig
       }, {
-        key: _constant.FcrUIDialogKey.LEAVE_MEETING,
+        key: _constant.FcrUIDialogKey.EXIT_MEETING_NOTICE,
         component: function component(_ref16) {
           var dialogKey = _ref16.dialogKey,
             dialogId = _ref16.dialogId,
             params = _ref16.params;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirmLeaveMeeting.ConfirmLeaveMeetingDialog, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_endMeetingNotice.ExitMeetingNoticeDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            params: params,
-            children: actionBarUIModule.getConfirmLeaveMeetingComponent(dialogId)
+            params: params
           }, dialogId);
         },
-        windowConfig: _confirmLeaveMeeting.windowConfig
+        electronWindowConfig: _endMeetingNotice.electronWindowConfig
       }, {
-        key: _constant.FcrUIDialogKey.END_MEETING,
+        key: _constant.FcrUIDialogKey.SUB_WINDOW,
         component: function component(_ref17) {
           var dialogKey = _ref17.dialogKey,
             dialogId = _ref17.dialogId,
             params = _ref17.params;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_endMeeting.EndMeetingDialog, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_subWindow.SubWindowDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            params: params
+            params: params,
+            children: displayDistributionModule.component(shareScreenModule)
           }, dialogId);
         },
-        windowConfig: _endMeeting.windowConfig
+        electronWindowConfig: _subWindow.electronWindowConfig
       }, {
-        key: _constant.FcrUIDialogKey.SUB_WINDOW,
+        key: _constant.FcrUIDialogKey.REVOKE_HOST,
         component: function component(_ref18) {
           var dialogKey = _ref18.dialogKey,
             dialogId = _ref18.dialogId,
             params = _ref18.params;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_subWindow.SubWindowDialog, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_systemPreference.SystemPreferenceDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            params: params,
-            children: displayDistributionModule.component(shareScreenModule)
+            params: params
           }, dialogId);
         },
-        windowConfig: _subWindow.windowConfig
+        electronWindowConfig: _systemPreference.electronRevokeHostWindowConfig,
+        webDialogConfig: _systemPreference.webRevokeHostWindowConfig
       }, {
-        key: _constant.FcrUIDialogKey.REVOKE_HOST,
+        key: _constant.FcrUIDialogKey.MUTE_ALL,
         component: function component(_ref19) {
           var dialogKey = _ref19.dialogKey,
             dialogId = _ref19.dialogId,
             params = _ref19.params;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_systemPreference.SystemPreferenceDialog, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_muteAll.MuteAllDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            params: params
+            params: params,
+            children: participantsModule.getMuteAllDialogContent()
           }, dialogId);
         },
-        windowConfig: _systemPreference.revokeHostWindowConfig
+        electronWindowConfig: _muteAll.electronWindowConfig
       }, {
-        key: _constant.FcrUIDialogKey.MUTE_ALL,
+        key: _constant.FcrUIDialogKey.CONTROL_BAR_LEAVE_MEETING,
         component: function component(_ref20) {
           var dialogKey = _ref20.dialogKey,
             dialogId = _ref20.dialogId,
             params = _ref20.params;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_muteAll.MuteAllDialog, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBarLeaveMeeting.ControlBarLeaveMeetingDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
             params: params,
-            children: participantsModule.getMuteAllDialogContent()
+            children: controlbarUIModule.getLeaveMeetingComponent()
           }, dialogId);
         },
-        windowConfig: _muteAll.windowConfig
+        electronWindowConfig: _controlBarLeaveMeeting.electronWindowConfig
       }, {
-        key: _constant.FcrUIDialogKey.CONTROL_BAR_LEAVE_MEETING,
+        key: _constant.FcrUIDialogKey.ANNOTATION_MASK,
         component: function component(_ref21) {
           var dialogKey = _ref21.dialogKey,
             dialogId = _ref21.dialogId,
             params = _ref21.params;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBarLeaveMeeting.ControlBarLeaveMeetingDialog, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationMask.AnnotationMask, {
             dialogKey: dialogKey,
             dialogId: dialogId,
             params: params,
-            children: controlbarUIModule.getLeaveMeetingComponent()
+            children: annotationUIModule.getBoardComponent()
+          }, dialogId);
+        },
+        electronWindowConfig: _annotationMask.electronWindowConfig
+      }, {
+        key: _constant.FcrUIDialogKey.ANNOTATION_TOOLBAR,
+        component: function component(_ref22) {
+          var dialogKey = _ref22.dialogKey,
+            dialogId = _ref22.dialogId,
+            params = _ref22.params;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationTool.AnnotationTool, {
+            dialogKey: dialogKey,
+            dialogId: dialogId,
+            params: params,
+            children: annotationUIModule.getBoardToolComponent()
           }, dialogId);
         },
-        windowConfig: _controlBarLeaveMeeting.windowConfig
+        electronWindowConfig: _annotationTool.electronWindowConfig
       }]);
       var getView = function getView() {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_videoTrackRenderContext.FcrVideoTrackRenderContext.Provider, {
@@ -550,7 +578,8 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
               subtitles: captionUIModule.getDraggableComponent(),
               layers: _this2.renderLayers([eventNotificationUIModule.getComponent(), shareScreenModule.getComponent()]),
               whiteboard: whiteBoradUIModule.getComponent(),
-              screenShareControl: shareScreenModule.getControlComponent()
+              screenShareControl: shareScreenModule.getControlComponent(),
+              annotation: annotationUIModule.getComponent()
             })
           }), 'mainroom')
         });
@@ -563,7 +592,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       var dialogProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
 
       // add dialogs
-      dialogProvider.removeDialogs([_constant.FcrUIDialogKey.INTERPRETER, _constant.FcrUIDialogKey.WIDGET, _constant.FcrUIDialogKey.PARTICIPANT, _constant.FcrUIDialogKey.LIVE_STREAMING, _constant.FcrUIDialogKey.INVITE, _constant.FcrUIDialogKey.CHAT, _constant.FcrUIDialogKey.VIDEO_WINDOW, _constant.FcrUIDialogKey.CONNECTION_GATEWAY, _constant.FcrUIDialogKey.WHITEBOARD, _constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION, _constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR, _constant.FcrUIDialogKey.SYSTEM_PREFERENCE, _constant.FcrUIDialogKey.RENAME, _constant.FcrUIDialogKey.LEAVE_MEETING, _constant.FcrUIDialogKey.END_MEETING, _constant.FcrUIDialogKey.SUB_WINDOW, _constant.FcrUIDialogKey.SUBTITLES_HISTORY, _constant.FcrUIDialogKey.CAPTION]);
+      dialogProvider.removeDialogs([_constant.FcrUIDialogKey.INTERPRETER, _constant.FcrUIDialogKey.WIDGET, _constant.FcrUIDialogKey.PARTICIPANT, _constant.FcrUIDialogKey.LIVE_STREAMING, _constant.FcrUIDialogKey.INVITE, _constant.FcrUIDialogKey.CHAT, _constant.FcrUIDialogKey.VIDEO_WINDOW, _constant.FcrUIDialogKey.CONNECTION_GATEWAY, _constant.FcrUIDialogKey.WHITEBOARD, _constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION, _constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR, _constant.FcrUIDialogKey.RENAME, _constant.FcrUIDialogKey.CONFIRM_END_MEETING, _constant.FcrUIDialogKey.EXIT_MEETING_NOTICE, _constant.FcrUIDialogKey.SUB_WINDOW, _constant.FcrUIDialogKey.SUBTITLES_HISTORY, _constant.FcrUIDialogKey.CAPTION, _constant.FcrUIDialogKey.ANNOTATION_MASK, _constant.FcrUIDialogKey.ANNOTATION_TOOLBAR]);
       _reactDom["default"].unmountComponentAtNode(dom);
     }
   }, {
@@ -611,10 +640,9 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
                 media: media,
                 setting: setting
               }));
-              showToast = function showToast(content) {
-                messageProvider.showToast({
-                  type: 'error',
-                  message: content
+              showToast = function showToast(key) {
+                messageProvider.showToastByKey({
+                  key: key
                 });
               };
               allowJoinWithCloseVideo = privilegeProvider.isJoinWithMutedVideoEnabled();
@@ -625,13 +653,13 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
               if (deviceProvider.ifNeedExecuteOpenCamera()) {
                 isJoinWithCloseVideo = allowJoinWithCloseVideo && !hasOpenCameraPrivilege;
                 if (isJoinWithCloseVideo) {
-                  showToast((0, _i18n.transI18n)('fmt_attendies_toast_host_turned_off_video'));
+                  showToast(_type4.FcrUIToastKey.FMT_ATTENDIES_TOAST_HOST_TURNED_OFF_VIDEO);
                 }
                 deviceProvider.setCameraEnabled(hasOpenCameraPrivilege);
               } else {
                 if (deviceProvider.cameraEnabled) {
                   if (allowJoinWithCloseVideo) {
-                    showToast((0, _i18n.transI18n)('fmt_attendies_toast_host_turned_off_video'));
+                    showToast(_type4.FcrUIToastKey.FMT_ATTENDIES_TOAST_HOST_TURNED_OFF_VIDEO);
                     deviceProvider.setCameraEnabled(hasOpenCameraPrivilege);
                   }
                 }
@@ -644,13 +672,13 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
               if (deviceProvider.ifNeedExecuteAutoConnectAudio()) {
                 isJoinWithMuteAudio = allowJoinWithMuteAudio && !hasOpenMicrophonePrivilege && deviceProvider.shouldEnableMicBeforeSession;
                 if (isJoinWithMuteAudio) {
-                  showToast((0, _i18n.transI18n)('fmt_attendies_toast_host_enabled_mute'));
+                  showToast(_type4.FcrUIToastKey.FMT_ATTENDIES_TOAST_HOST_ENABLED_MUTE);
                 }
                 deviceProvider.connectAudio(hasOpenMicrophonePrivilege);
               } else {
                 if (deviceProvider.microphoneEnabled) {
                   if (allowJoinWithMuteAudio) {
-                    showToast((0, _i18n.transI18n)('fmt_attendies_toast_host_enabled_mute'));
+                    showToast(_type4.FcrUIToastKey.FMT_ATTENDIES_TOAST_HOST_ENABLED_MUTE);
                     deviceProvider.setMicrophoneEnabled(hasOpenMicrophonePrivilege);
                   }
                 }
@@ -689,15 +717,16 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONNECTION_GATEWAY);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR);
-      dialogProvider.closeDialog(_constant.FcrUIDialogKey.SYSTEM_PREFERENCE);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.RENAME);
-      dialogProvider.closeDialog(_constant.FcrUIDialogKey.LEAVE_MEETING);
-      dialogProvider.closeDialog(_constant.FcrUIDialogKey.END_MEETING);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONFIRM_END_MEETING);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.EXIT_MEETING_NOTICE);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.REVOKE_HOST);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.MUTE_ALL);
       dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONTROL_BAR_LEAVE_MEETING);
-      dialogProvider.closeDialog(_constant.FcrUIDialogKey.END_MEETING);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.EXIT_MEETING_NOTICE);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.ANNOTATION_MASK);
+      dialogProvider.closeDialog(_constant.FcrUIDialogKey.ANNOTATION_TOOLBAR);
       dialogProvider.closeAllConfirms();
     }
   }]);

package/lib/scenes/waiting-scene.js

@@ -25,7 +25,7 @@ var _constant = require("../utilities/constant");
 var _base = require("../base");
 var _waitingScene2 = require("../modules/pc-audio-connect/waiting-scene");
 var _misc = require("agora-foundation/lib/utilities/misc");
-var _endMeeting = require("../modules/dialog/dialogs/end-meeting");
+var _endMeetingNotice = require("../modules/dialog/dialogs/end-meeting-notice");
 var _objectManager = require("../object-manager");
 var _logger = require("../utilities/logger");
 var _waitingScene3 = require("../modules/state-bar/waiting-scene");
@@ -73,14 +73,14 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
             children: pcAudioConnectionModule.getComponent()
           }, dialogId);
         },
-        windowConfig: _connectionGateway.windowConfig
+        electronWindowConfig: _connectionGateway.electronWindowConfig
       }, {
-        key: _constant.FcrUIDialogKey.END_MEETING,
+        key: _constant.FcrUIDialogKey.EXIT_MEETING_NOTICE,
         component: function component(_ref2) {
           var dialogKey = _ref2.dialogKey,
             dialogId = _ref2.dialogId,
             params = _ref2.params;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_endMeeting.EndMeetingDialog, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_endMeetingNotice.ExitMeetingNoticeDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
             params: params

package/lib/shared-data/member-data.d.ts

@@ -58,12 +58,6 @@ export interface FcrUISharedMemberDataSource {
      * @returns 主房间参与者列表，元素类型为 FcrUserInfo。
      */
     get memberUserInfoList(): FcrUserInfo[];
-    /**
-     * 获取音频音量映射。
-     * 键为用户 ID，值为对应的音频音量。
-     * @returns 音频音量映射，类型为 Map<string, number>。
-     */
-    get audioVolumeMap(): Map<string, number>;
     /**
      * 获取共享屏幕视频的宽高。
      * @returns 共享屏幕视频的宽高，类型为 FcrRemoteVideoStats['dimensions'] | null。
@@ -84,7 +78,6 @@ export declare class FcrUISharedMemberDataSourceImpl implements FcrUISharedMembe
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _dataSource;
     private _disposers;
-    private accessor _audioVolumeMap;
     private accessor _isLocalUserInPstn;
     private accessor _interpreterInputLanguageList;
     private accessor _localUser;
@@ -99,7 +92,6 @@ export declare class FcrUISharedMemberDataSourceImpl implements FcrUISharedMembe
         userId: string;
         language: FcrLanguage;
     }[];
-    get audioVolumeMap(): Map<string, number>;
     get localUser(): FcrUserInfo;
     get localUserRole(): FcrUserRole;
     get localUserRoleString(): "participant" | "host" | "cohost" | "audience" | "observer" | "robot";
@@ -117,7 +109,6 @@ export declare class FcrUISharedMemberDataSourceImpl implements FcrUISharedMembe
     private _initUserList;
     private _handleUserInfoUpdated;
     private _syncParticipants;
-    private _onAudioVolumeUpdated;
     private _handleRemoteUserJoined;
     private _handleRemoteUserLeft;
     private _handleStreamsAdded;