fcr-ui-scene 3.6.4-rc.1 → 3.7.0

package/lib/modules/event-confirm/view.js

@@ -11,7 +11,6 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _store = require("./store");
@@ -22,41 +21,31 @@ require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 var View = exports.View = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
-    confirmList = _useContext.confirmList;
+    confirmList = _useContext.confirmList,
+    setMousePosition = _useContext.setMousePosition;
   var _ref = (0, _env.isElectron)() ? (0, _react.useContext)(_useElectron.DialogInstanceContext) : {},
     browserWindow = _ref.browserWindow;
-  var _useState = (0, _react.useState)(undefined),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    activeConfirm = _useState2[0],
-    setActiveConfirm = _useState2[1];
   (0, _react.useEffect)(function () {
-    // window.addEventListener('mousemove', setMousePosition);
+    window.addEventListener('mousemove', setMousePosition);
     if ((0, _toConsumableArray2["default"])(confirmList).length === 0) {
-      browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true);
+      browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
+        forward: true
+      });
       browserWindow === null || browserWindow === void 0 || browserWindow.blur();
     } else {
-      browserWindow === null || browserWindow === void 0 || browserWindow.focus();
+      // browserWindow?.setIgnoreMouseEvents(false);
       browserWindow === null || browserWindow === void 0 || browserWindow.setAlwaysOnTop(true, 'screen-saver');
     }
-    // return () => {
-    //   window.removeEventListener('mousemove', setMousePosition);
-    // };
+    return function () {
+      window.removeEventListener('mousemove', setMousePosition);
+    };
   }, [confirmList]);
-  var handleMouseEnter = function handleMouseEnter(title) {
-    setActiveConfirm(title);
-  };
-  var handleMouseLeave = function handleMouseLeave() {
-    setActiveConfirm(undefined);
-  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "confirm-wrapper",
       children: (0, _toConsumableArray2["default"])(confirmList).map(function (confirm) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_window.ConfirmWindow, {
-          confirm: confirm,
-          onMouseEnter: handleMouseEnter,
-          onMouseLeave: handleMouseLeave,
-          activeConfirm: activeConfirm
+          confirm: confirm
         }, confirm.title);
       })
     })

package/lib/modules/event-sound/index.d.ts

@@ -2,6 +2,7 @@ import { UIModule } from '../../base';
 import { FcrUIDeviceProvider } from '../../providers/device-provider';
 import { FcrUIConnectionProvider } from '../../providers/room-provider';
 import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
+import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
 export declare enum SoundEffectType {
     INCOMMING_MESSAGE = "incomming_message",
     INCOMMING_PRIVATE_MESSAGE = "incomming_private_message",
@@ -27,6 +28,7 @@ export declare class SoundEffectUIModule extends UIModule {
     private _duration;
     private _soundEffectTimer;
     private _soundEffectPlayerMap;
+    sharedConfigDataSource: FcrUISharedConfigDataSource | undefined;
     private _engineObserver;
     private _chatRoomObserver;
     private _roomObserver;

package/lib/modules/event-sound/index.js

@@ -67,6 +67,8 @@ var _fcrCore = require("fcr-core");
 var _type = require("fcr-core/lib/type");
 var _decorator = require("agora-foundation/lib/decorator");
 var _soundEffectPlayer = require("./sound-effect-player");
+var _parameters = require("../../utilities/parameters");
+var _imports = require("fcr-core/lib/imports");
 var _SoundEffectUIModule;
 var _initProto;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -99,7 +101,7 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
     }
     _this = _callSuper(this, SoundEffectUIModule, [].concat(args));
     (0, _defineProperty2["default"])(_this, "currentRoomControlProvider", void _initProto(_this));
-    (0, _defineProperty2["default"])(_this, "_duration", 60000);
+    (0, _defineProperty2["default"])(_this, "_duration", _imports.Duration.minute(2));
     (0, _defineProperty2["default"])(_this, "_soundEffectTimer", new Map());
     (0, _defineProperty2["default"])(_this, "_soundEffectPlayerMap", new Map());
     (0, _defineProperty2["default"])(_this, "_engineObserver", {
@@ -124,10 +126,15 @@ var SoundEffectUIModule = exports.SoundEffectUIModule = /*#__PURE__*/function (_
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
       var _this$currentRoomCont,
+        _this$sharedConfigDat,
         _this2 = this;
       if (!((_this$currentRoomCont = this.currentRoomControlProvider) !== null && _this$currentRoomCont !== void 0 && _this$currentRoomCont.currentRoomControl)) {
         return;
       }
+      var eventSoundInterval = (0, _parameters.getEventSoundInterval)((_this$sharedConfigDat = this.sharedConfigDataSource) === null || _this$sharedConfigDat === void 0 ? void 0 : _this$sharedConfigDat.creatorConfig.parameters);
+      if (eventSoundInterval && 1 <= eventSoundInterval && eventSoundInterval <= 600) {
+        this._duration = eventSoundInterval * _imports.Duration.second(1);
+      }
       this._chatRoomControl = this.currentRoomControlProvider.currentRoomControl.getChatRoomControl();
       this._streamControl = this.currentRoomControlProvider.currentRoomControl.getStreamControl();
       this._roomControl = this.currentRoomControlProvider.currentRoomControl;

package/lib/modules/event-toast/index.css

@@ -9,6 +9,16 @@
   margin-top: 10%;
   overflow: hidden;
 }
+.toast-wrapper.toast-wrapper-web {
+  position: absolute;
+  height: 100%;
+  top: 0;
+  left: 0;
+  margin: 0;
+  padding-top: 5%;
+  box-sizing: border-box;
+  pointer-events: none;
+}
 
 .toast-wrapper .fcr-toast-container {
   margin-bottom: 10px;

package/lib/modules/event-toast/store.d.ts

@@ -10,9 +10,9 @@ type ToastProps = {
 export default class ToastStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
-    private _toastEventObserver;
     private _uiEventProvider;
     private _messageProvider;
+    private _toastEventObserver;
     accessor toasts: Map<string, () => void>;
     get toastsList(): any[];
     constructor({ uiEventStore, messageProvider, }: {

package/lib/modules/event-toast/store.js

@@ -64,9 +64,10 @@ var _mobx = require("mobx");
 var _constant = require("../../utilities/constant");
 var _toast = require("agora-ui-foundation/lib/components/toast");
 var _react = require("react");
-var _env = require("agora-foundation/lib/utilities/env");
 var _logger = require("../../utilities/logger");
-var _tools = require("../../utilities/tools");
+var _dialogUtils = require("../../utilities/dialog-utils");
+var _store = require("../dialog/store");
+var _platform = require("../../utilities/platform");
 var _ToastStore;
 var _initProto, _init_toasts, _addToastDecs, _handleToastEventDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -165,27 +166,28 @@ var ToastStore = exports["default"] = /*#__PURE__*/function () {
         });
       }
       if (action === _constant.FcrUIAction.OPEN_DIALOG && params.dialogKey === _constant.FcrUIDialogKey.SHOW_TOAST) {
-        (0, _tools.followCorrectDisplay)({
+        var _dialogWindows$get;
+        (0, _dialogUtils.followCorrectDisplay)({
           dialogKey: _constant.FcrUIDialogKey.SHOW_TOAST,
           alwaysFollowScreen: true
         });
+        (0, _platform.isWindows)() && ((_dialogWindows$get = _store.dialogWindows.get(_constant.FcrUIDialogKey.SHOW_TOAST)) === null || _dialogWindows$get === void 0 ? void 0 : _dialogWindows$get.setAlwaysOnTop(true, 'screen-saver'));
         var _params$params = params.params,
           _params$params$type = _params$params.type,
           type = _params$params$type === void 0 ? 'info' : _params$params$type,
           content = _params$params.message,
           duration = _params$params.duration;
-        if (!(0, _env.isElectron)()) {
-          var _params$duration2;
-          return _toast.FcrToastApi.open({
-            id: params === null || params === void 0 ? void 0 : params.id,
-            toastProps: {
-              type: type,
-              content: content
-            },
-            customRootClass: params === null || params === void 0 ? void 0 : params.customRootClass,
-            duration: (_params$duration2 = params.duration) !== null && _params$duration2 !== void 0 ? _params$duration2 : 3000
-          });
-        }
+        // if (!isElectron()) {
+        //   return FcrToastApi.open({
+        //     id: Date.now().toString(),
+        //     toastProps: {
+        //       type,
+        //       content,
+        //     },
+        //     customRootClass: params?.customRootClass,
+        //     duration: 30000, // params.duration ?? 3000,
+        //   });
+        // }
         this.addToast({
           type: type,
           content: content,

package/lib/modules/event-toast/view.js

@@ -17,6 +17,7 @@ var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _store = require("./store");
 require("./index.css");
+var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
 var View = exports.View = (0, _mobxReact.observer)(function (props) {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
@@ -24,7 +25,7 @@ var View = exports.View = (0, _mobxReact.observer)(function (props) {
   var type = props.type;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: type === 'global' ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "toast-wrapper",
+      className: "toast-wrapper ".concat((0, _env.isElectron)() ? '' : 'toast-wrapper-web'),
       children: (0, _toConsumableArray2["default"])(toastsList).map(function (toast, idx) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_toast.FcrToastTransitionGroup, {
           type: toast.type,

package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-user/index.js

@@ -65,7 +65,8 @@ var PickUser = function PickUser(props) {
     });
     if (!selectedUserInfo) {
       var userId = model.userId,
-        userName = model.userName;
+        userName = model.userName,
+        avatar = model.avatar;
       if (userId && userName) {
         usersOptions.push({
           userId: userId,
@@ -73,7 +74,8 @@ var PickUser = function PickUser(props) {
           userRole: _type.FcrUserRole.PARTICIPANT,
           connectorType: _type2.AgoraRteRoomConnectorType.NONE,
           isOffLine: true,
-          platform: _type.FcrPlatform.WEB_DESKTOP
+          platform: _type.FcrPlatform.WEB_DESKTOP,
+          avatar: avatar || ''
         });
       }
     }

package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-user/option-Item.js

@@ -35,7 +35,8 @@ var OptionItem = (0, _mobxReact.observer)(function (props) {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_avatar.FcrAvatar, {
         size: 24,
         nickName: model.userName,
-        textSize: 13
+        textSize: 13,
+        avatarImage: model.avatar
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-simultaneous-interpretation__select-user-options-item-user",

package/lib/modules/interpreter/store.d.ts

@@ -48,6 +48,7 @@ export default class InterpreterStore {
     closeInterpreterDialog(): void;
     private _handleUiEvents;
     private _updatePublishAudioPrivilegeOfStreams;
+    initInterpreterStatus(): void;
     release(): void;
 }
 export declare const StoreContext: import("react").Context<InterpreterStore>;

package/lib/modules/interpreter/store.js

@@ -111,7 +111,7 @@ var _type5 = require("agora-rte-sdk/lib/type");
 var _logger = require("../../utilities/logger");
 var _excluded = ["randomKey"];
 var _InterpreterStore;
-var _initProto, _init_localInterpreterUsers, _init_interpreterUsersEditState, _init_initUsers, _init_currentDialogId, _openInterpreterStateDecs, _closeInterpreterStateDecs, _setInterpreterListEditStateDecs, _addInterpreterUsersDecs, _deleteInterpreterUsersDecs, _updateInterpreterUsersDecs, _queryInterpreterUsersDecs, _getInterpreterStateDecs, _openUpdateInterpreterStateToastDecs, _updateInterpreterUsersToastDecs, _interpreterUsersJoinToastDecs, _closeConfirmDialogDecs, _openInofDialogDecs, _getInitUsersDecs, _updateUsersDecs, _closeInterpreterDialogDecs, _handleUiEventsDecs, _ref;
+var _initProto, _init_localInterpreterUsers, _init_interpreterUsersEditState, _init_initUsers, _init_currentDialogId, _openInterpreterStateDecs, _closeInterpreterStateDecs, _setInterpreterListEditStateDecs, _addInterpreterUsersDecs, _deleteInterpreterUsersDecs, _updateInterpreterUsersDecs, _queryInterpreterUsersDecs, _getInterpreterStateDecs, _openUpdateInterpreterStateToastDecs, _updateInterpreterUsersToastDecs, _interpreterUsersJoinToastDecs, _closeConfirmDialogDecs, _openInofDialogDecs, _getInitUsersDecs, _updateUsersDecs, _closeInterpreterDialogDecs, _handleUiEventsDecs, _initInterpreterStatusDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -128,7 +128,7 @@ var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
-_ref = (_openInterpreterStateDecs = [_mobx.action, _mobx.action.bound], _closeInterpreterStateDecs = [_mobx.action, _mobx.action.bound], _setInterpreterListEditStateDecs = [_mobx.action, _mobx.action.bound], _addInterpreterUsersDecs = [_mobx.action, _mobx.action.bound], _deleteInterpreterUsersDecs = [_mobx.action, _mobx.action.bound], _updateInterpreterUsersDecs = [_mobx.action, _mobx.action.bound], _queryInterpreterUsersDecs = [_mobx.action, _mobx.action.bound], _getInterpreterStateDecs = [_mobx.action, _mobx.action.bound], _openUpdateInterpreterStateToastDecs = [_mobx.action, _mobx.action.bound], _updateInterpreterUsersToastDecs = [_mobx.action, _mobx.action.bound], _interpreterUsersJoinToastDecs = [_mobx.action, _mobx.action.bound], _closeConfirmDialogDecs = [_mobx.action, _mobx.action.bound], _openInofDialogDecs = [_mobx.action, _mobx.action.bound], _getInitUsersDecs = [_mobx.action, _mobx.action.bound], _updateUsersDecs = [_mobx.action, _mobx.action.bound], _closeInterpreterDialogDecs = [_mobx.action, _mobx.action.bound], _handleUiEventsDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_openInterpreterStateDecs = [_mobx.action, _mobx.action.bound], _closeInterpreterStateDecs = [_mobx.action, _mobx.action.bound], _setInterpreterListEditStateDecs = [_mobx.action, _mobx.action.bound], _addInterpreterUsersDecs = [_mobx.action, _mobx.action.bound], _deleteInterpreterUsersDecs = [_mobx.action, _mobx.action.bound], _updateInterpreterUsersDecs = [_mobx.action, _mobx.action.bound], _queryInterpreterUsersDecs = [_mobx.action, _mobx.action.bound], _getInterpreterStateDecs = [_mobx.action, _mobx.action.bound], _openUpdateInterpreterStateToastDecs = [_mobx.action, _mobx.action.bound], _updateInterpreterUsersToastDecs = [_mobx.action, _mobx.action.bound], _interpreterUsersJoinToastDecs = [_mobx.action, _mobx.action.bound], _closeConfirmDialogDecs = [_mobx.action, _mobx.action.bound], _openInofDialogDecs = [_mobx.action, _mobx.action.bound], _getInitUsersDecs = [_mobx.action, _mobx.action.bound], _updateUsersDecs = [_mobx.action, _mobx.action.bound], _closeInterpreterDialogDecs = [_mobx.action, _mobx.action.bound], _handleUiEventsDecs = [_mobx.action, _mobx.action.bound], _initInterpreterStatusDecs = [_mobx.action, _mobx.action.bound], "logger");
 var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
   function InterpreterStore(_ref2) {
     var _this = this;
@@ -504,8 +504,7 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
         closable: false,
         showCancel: false,
         okText: (0, _i18n.transI18n)('fmt_interpretation_interpreter_popup_button_i_know'),
-        width: 321,
-        height: 234
+        width: 321
       });
       this._confirmDialogs.add(dialogId);
     }
@@ -622,6 +621,14 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
       }
       return _updatePublishAudioPrivilegeOfStreams;
     }()
+  }, {
+    key: "initInterpreterStatus",
+    value: function initInterpreterStatus() {
+      this.queryInterpreterUsers();
+      if (this.interpreterUsersEditState) {
+        this.setInterpreterListEditState();
+      }
+    }
   }, {
     key: "release",
     value: function release() {
@@ -632,7 +639,7 @@ var InterpreterStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }(); // #endregion
 _InterpreterStore = InterpreterStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_InterpreterStore, [[_mobx.observable, 1, "localInterpreterUsers"], [_mobx.observable, 1, "interpreterUsersEditState"], [_mobx.observable, 1, "initUsers"], [_mobx.observable, 1, "currentDialogId"], [_mobx.computed, 3, "hasEnableInterpreterPermission"], [_mobx.computed, 3, "isFormValidationPassed"], [_mobx.computed, 3, "isAllInterpreterUsersOffline"], [_mobx.computed, 3, "languageList"], [_openInterpreterStateDecs, 18, "openInterpreterState"], [_closeInterpreterStateDecs, 18, "closeInterpreterState"], [_setInterpreterListEditStateDecs, 18, "setInterpreterListEditState"], [_addInterpreterUsersDecs, 18, "addInterpreterUsers"], [_deleteInterpreterUsersDecs, 18, "deleteInterpreterUsers"], [_updateInterpreterUsersDecs, 18, "updateInterpreterUsers"], [_queryInterpreterUsersDecs, 18, "queryInterpreterUsers"], [_getInterpreterStateDecs, 18, "getInterpreterState"], [_openUpdateInterpreterStateToastDecs, 18, "_openUpdateInterpreterStateToast"], [_updateInterpreterUsersToastDecs, 18, "_updateInterpreterUsersToast"], [_interpreterUsersJoinToastDecs, 18, "_interpreterUsersJoinToast"], [_closeConfirmDialogDecs, 18, "_closeConfirmDialog"], [_openInofDialogDecs, 18, "_openInofDialog"], [_getInitUsersDecs, 18, "_getInitUsers"], [_updateUsersDecs, 18, "_updateUsers"], [_closeInterpreterDialogDecs, 18, "closeInterpreterDialog"], [_handleUiEventsDecs, 18, "_handleUiEvents"]], []).e, 5);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_InterpreterStore, [[_mobx.observable, 1, "localInterpreterUsers"], [_mobx.observable, 1, "interpreterUsersEditState"], [_mobx.observable, 1, "initUsers"], [_mobx.observable, 1, "currentDialogId"], [_mobx.computed, 3, "hasEnableInterpreterPermission"], [_mobx.computed, 3, "isFormValidationPassed"], [_mobx.computed, 3, "isAllInterpreterUsersOffline"], [_mobx.computed, 3, "languageList"], [_openInterpreterStateDecs, 18, "openInterpreterState"], [_closeInterpreterStateDecs, 18, "closeInterpreterState"], [_setInterpreterListEditStateDecs, 18, "setInterpreterListEditState"], [_addInterpreterUsersDecs, 18, "addInterpreterUsers"], [_deleteInterpreterUsersDecs, 18, "deleteInterpreterUsers"], [_updateInterpreterUsersDecs, 18, "updateInterpreterUsers"], [_queryInterpreterUsersDecs, 18, "queryInterpreterUsers"], [_getInterpreterStateDecs, 18, "getInterpreterState"], [_openUpdateInterpreterStateToastDecs, 18, "_openUpdateInterpreterStateToast"], [_updateInterpreterUsersToastDecs, 18, "_updateInterpreterUsersToast"], [_interpreterUsersJoinToastDecs, 18, "_interpreterUsersJoinToast"], [_closeConfirmDialogDecs, 18, "_closeConfirmDialog"], [_openInofDialogDecs, 18, "_openInofDialog"], [_getInitUsersDecs, 18, "_getInitUsers"], [_updateUsersDecs, 18, "_updateUsers"], [_closeInterpreterDialogDecs, 18, "closeInterpreterDialog"], [_handleUiEventsDecs, 18, "_handleUiEvents"], [_initInterpreterStatusDecs, 18, "initInterpreterStatus"]], []).e, 5);
 _init_localInterpreterUsers = _applyDecs$e[0];
 _init_interpreterUsersEditState = _applyDecs$e[1];
 _init_initUsers = _applyDecs$e[2];

package/lib/modules/interpreter/view.js

@@ -43,11 +43,17 @@ var InterpreterView = exports.InterpreterView = (0, _mobxReact.observer)(functio
     currentDialogId = _useContext.currentDialogId,
     hasEnableInterpreterPermission = _useContext.hasEnableInterpreterPermission,
     interpreterUsersEditState = _useContext.interpreterUsersEditState,
-    isInterpreterEnabled = _useContext.isInterpreterEnabled;
+    isInterpreterEnabled = _useContext.isInterpreterEnabled,
+    initInterpreterStatus = _useContext.initInterpreterStatus;
   var _useScroll = useScroll(),
     refDom = _useScroll.refDom,
     isScroll = _useScroll.isScroll;
   var isEditState = interpreterUsersEditState || !isInterpreterEnabled;
+  (0, _react.useEffect)(function () {
+    return function () {
+      initInterpreterStatus();
+    };
+  }, []);
   (0, _react.useEffect)(function () {
     if (!hasEnableInterpreterPermission && currentDialogId) {
       closeInterpreterDialog();

package/lib/modules/layout/components/Aside.js

@@ -106,6 +106,8 @@ var Aside = exports.Aside = (0, _mobxReact.observer)(function (_ref) {
           onClose: closeParticipantFromAside,
           otherActionsAfter: /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
             mouseEnterDelay: 0,
+            verticalOffset: -4,
+            isArrowAndTargetCenter: true,
             content: transI18n('fmt_uimanager_button_close'),
             trigger: "hover",
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -136,6 +138,8 @@ var Aside = exports.Aside = (0, _mobxReact.observer)(function (_ref) {
           otherActions: chatAction,
           otherActionsAfter: /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
             mouseEnterDelay: 0,
+            verticalOffset: -4,
+            isArrowAndTargetCenter: true,
             content: transI18n('fmt_uimanager_button_close'),
             trigger: "hover",
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/modules/layout/components/Carousel.js

@@ -152,7 +152,9 @@ var Carousel = exports.Carousel = (0, _mobxReact.observer)(function () {
             data: carouselListData,
             dimensions: dimensions,
             layoutType: _type2.FcrUILayoutType.CAROUSEL,
-            onPageChange: setPage
+            onPageChange: setPage,
+            isMainWindow: false,
+            isMainWindowInScreenSharing: false
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
           className: "fcr-layout-content-carousel-arrow",

package/lib/modules/layout/components/CommonVideoRenderer.d.ts

@@ -8,6 +8,8 @@ interface CommonVideoRendererProps {
     };
     onPageChange?: React.Dispatch<React.SetStateAction<number>>;
     cols?: number;
+    isMainWindow?: boolean;
+    isMainWindowInScreenSharing?: boolean;
 }
-declare const CommonVideoRenderer: ({ onPageChange, dimensions, data, layoutType, cols }: CommonVideoRendererProps) => import("react/jsx-runtime").JSX.Element;
+declare const CommonVideoRenderer: ({ onPageChange, dimensions, data, layoutType, cols, isMainWindow, isMainWindowInScreenSharing, }: CommonVideoRendererProps) => import("react/jsx-runtime").JSX.Element;
 export { CommonVideoRenderer };

package/lib/modules/layout/components/CommonVideoRenderer.js

@@ -97,7 +97,9 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
     dimensions = _ref.dimensions,
     data = _ref.data,
     layoutType = _ref.layoutType,
-    cols = _ref.cols;
+    cols = _ref.cols,
+    isMainWindow = _ref.isMainWindow,
+    isMainWindowInScreenSharing = _ref.isMainWindowInScreenSharing;
   var _useContext3 = (0, _react.useContext)(_store.StoreContext),
     addPin = _useContext3.addPin,
     openPrivateChat = _useContext3.openPrivateChat,
@@ -114,8 +116,8 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
     openRenameDialog = _useContext3.openRenameDialog,
     isVideoSuspended = _useContext3.isVideoSuspended,
     scalcValue = _useContext3.scalcValue,
-    annotationHasStart = _useContext3.annotationHasStart,
-    annotationControl = _useContext3.annotationControl,
+    setScaleValue = _useContext3.setScaleValue,
+    screenShareControl = _useContext3.screenShareControl,
     annotation = _useContext3.annotation;
   var getFormatWindowData = useFormatWindowData();
   var commonProps = useCommonProps(layoutType);
@@ -194,8 +196,6 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
       /**
        * 在只有一个用户时，无法开启网格布局，所以可以通过 data.length 和 layoutType 判断是否是主窗口。
        */
-      var isMainWindow = data.length === 1 && layoutType === _type.FcrUILayoutType.GALLERY;
-      var isShowScreenSharingInMainWindow = isScreenSharing && isMainWindow;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: commonProps.className,
         style: {
@@ -207,12 +207,12 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
             width: dimensions.width,
             height: dimensions.height
           },
-          children: [isShowScreenSharingInMainWindow && annotationControl, /*#__PURE__*/(0, _jsxRuntime.jsx)(_memberWindow.MemberWindow, {
+          children: [isMainWindowInScreenSharing && screenShareControl, /*#__PURE__*/(0, _jsxRuntime.jsx)(_memberWindow.MemberWindow, {
             memberWindowPreviewType: commonProps.memberWindowPreviewType,
             canShowSpeakerSpotlight: commonProps.canShowSpeakerSpotlight,
             width: dimensions.width,
             height: dimensions.height,
-            slot: !isShowScreenSharingInMainWindow && renderMemberWindowActions(windowData, false),
+            slot: !isMainWindowInScreenSharing && renderMemberWindowActions(windowData, false),
             videoRenderMode: _imports.AgoraRtcRenderMode.FIT,
             videoStreamType: commonProps.videoStreamType,
             windowData: windowData,
@@ -222,8 +222,12 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
               return handleDoubleClick(windowId, isScreenSharing, isPin);
             },
             isVideoSuspended: isVideoSuspended,
-            scalcValue: isMainWindow ? scalcValue : 1,
-            annotation: annotation
+            scalcValue: isMainWindow ? scalcValue : 1
+            // annotation={annotation}
+            ,
+            annotation: isMainWindow ? annotation : null,
+            onScaleChange: setScaleValue,
+            enableZoom: isMainWindow
           }, windowId)]
         })
       }, windowId);

package/lib/modules/layout/components/Gallery.js

@@ -86,7 +86,7 @@ var ReturnBar = (0, _mobxReact.observer)(function () {
     if (currentShareData) toggleMainStream(currentShareData === null || currentShareData === void 0 ? void 0 : currentShareData.windowId);
   };
   var transI18n = (0, _i18n.useI18n)();
-  var haveShare = isMainWindowInScreenSharing || isCurrentUserInBoardSharing;
+  var haveShare = !isMainWindowInScreenSharing || isCurrentUserInBoardSharing;
   return currentShareData && haveShare && layout === _type2.FcrUIVideoWindowLayoutType.Gallery ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-layout-content-gallery-return-bar",
     children: [currentShareData.isMySelf ? transI18n('fmt_settings_labels_you') : currentShareData.userName, transI18n('fmt_uimanager_labels_sharing'), currentShareData.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN ? transI18n('fmt_uimanager_labels_screen') : transI18n('fmt_uimanager_labels_whiteboard'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
@@ -103,7 +103,10 @@ var Gallery = exports.Gallery = (0, _mobxReact.observer)(function () {
     layout = _useContext2.layout,
     galleryMaxSize = _useContext2.galleryMaxSize,
     galleryList = _useContext2.galleryList,
-    participantCount = _useContext2.participantCount;
+    participantCount = _useContext2.participantCount,
+    isMainWindow = _useContext2.isMainWindow,
+    isMainWindowInScreenSharing = _useContext2.isMainWindowInScreenSharing,
+    setScreenShareSpeakerViewSize = _useContext2.setScreenShareSpeakerViewSize;
   var _useDelayedMeasure = (0, _hooks.useDelayedMeasure)(),
     _useDelayedMeasure2 = (0, _slicedToArray2["default"])(_useDelayedMeasure, 2),
     ref = _useDelayedMeasure2[0],
@@ -183,6 +186,9 @@ var Gallery = exports.Gallery = (0, _mobxReact.observer)(function () {
       height: bounds.height - paddingY + (participantCount > 1 ? 20 : 26)
     } : videoSize;
   }, [layout, bounds.width, bounds.height, grid, galleryList, participantCount]);
+  if (isMainWindowInScreenSharing) {
+    setScreenShareSpeakerViewSize(size.width, size.height);
+  }
   var arrow = /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
     className: "fcr-layout-content-gallery-arrow-content",
     children: [page + 1, "/", maxPages]
@@ -203,7 +209,9 @@ var Gallery = exports.Gallery = (0, _mobxReact.observer)(function () {
           data: cells,
           dimensions: size,
           layoutType: _type2.FcrUILayoutType.GALLERY,
-          cols: grid === null || grid === void 0 ? void 0 : grid.cols
+          cols: grid === null || grid === void 0 ? void 0 : grid.cols,
+          isMainWindow: isMainWindow,
+          isMainWindowInScreenSharing: isMainWindowInScreenSharing
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "fcr-layout-content-gallery-arrows",

package/lib/modules/layout/index.css

@@ -32,6 +32,7 @@
   align-items: center;
   justify-content: center;
   flex-direction: column;
+  padding: 20px;
 }
 
 .login-confirm-dialog-content img {

package/lib/modules/layout/index.d.ts

@@ -17,6 +17,7 @@ import { FcrUISharedPinDataSource } from '../../shared-data-source/pin-data';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 import { FcrUIInterpreterProvider } from '../../providers/interpreter-provider';
+import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
 export declare class LayoutUIModule extends UIModule {
     private _store?;
     eventProvider?: FcrUIEventProvider;
@@ -35,6 +36,7 @@ export declare class LayoutUIModule extends UIModule {
     sharedPinDataSource?: FcrUISharedPinDataSource;
     annotationProvider?: FcrUIAnnotationProvider;
     sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
+    sharedAnnotationDataSource?: FcrUISharedAnnotationSource;
     interpreterProvider?: FcrUIInterpreterProvider;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;

package/lib/modules/layout/index.js

@@ -23,8 +23,8 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _base = require("../../base");
-var _confirm = require("../dialog/components/confirm");
-var _toast = _interopRequireDefault(require("../dialog/components/toast"));
+var _confirm = require("../dialog/dialogs/confirm");
+var _toast = _interopRequireDefault(require("../dialog/dialogs/toast"));
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -58,7 +58,8 @@ var LayoutUIModule = exports.LayoutUIModule = /*#__PURE__*/function (_UIModule)
         sharedPinDataSource: this.sharedPinDataSource,
         annotationProvider: this.annotationProvider,
         sharedScreenShareDataSource: this.sharedScreenShareSharedDataSource,
-        interpreterProvider: this.interpreterProvider
+        interpreterProvider: this.interpreterProvider,
+        sharedAnnotationDataSource: this.sharedAnnotationDataSource
       });
     }
   }, {

package/lib/modules/layout/store.d.ts

@@ -22,6 +22,7 @@ import { FcrUISharedPinDataSource } from '../../shared-data-source/pin-data';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 import { FcrUIInterpreterProvider } from '../../providers/interpreter-provider';
+import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
 export interface FcrLayoutSlots {
     participant: React.ReactNode;
     chat: React.ReactNode;
@@ -31,7 +32,7 @@ export interface FcrLayoutSlots {
     layers: React.ReactNode;
     whiteboard: React.ReactNode;
     annotation: React.ReactNode;
-    annotationControl: React.ReactNode;
+    screenShareControl: React.ReactNode;
 }
 export interface FcrUILayoutAsideContent {
     participant: boolean;
@@ -55,6 +56,7 @@ export interface LayoutStoreParams {
     annotationProvider: FcrUIAnnotationProvider;
     sharedScreenShareDataSource: FcrUIScreenShareSharedDataSource;
     interpreterProvider: FcrUIInterpreterProvider;
+    sharedAnnotationDataSource: FcrUISharedAnnotationSource;
 }
 export default class LayoutStore implements FcrLayoutSlots, FcrUIEventObserver {
     private readonly logger;
@@ -73,7 +75,6 @@ export default class LayoutStore implements FcrLayoutSlots, FcrUIEventObserver {
     private _barLockTimer;
     private _liveStreamState;
     private _sharedInterpreterDataSource;
-    private _managerRoleUpdateForToast;
     private _sharedLayoutDataSource;
     private _sharedSettingDataSource;
     private _sharedMemberDataSource;
@@ -83,6 +84,7 @@ export default class LayoutStore implements FcrLayoutSlots, FcrUIEventObserver {
     private _annotationProvider;
     private _sharedScreenShareDataSource;
     private _interpreterProvider;
+    private _sharedAnnotationDataSource;
     accessor participant: React.ReactNode;
     accessor chat: React.ReactNode;
     accessor chatAction: React.ReactNode;
@@ -91,7 +93,7 @@ export default class LayoutStore implements FcrLayoutSlots, FcrUIEventObserver {
     accessor layers: React.ReactNode;
     accessor whiteboard: React.ReactNode;
     accessor annotation: React.ReactNode;
-    accessor annotationControl: React.ReactNode;
+    accessor screenShareControl: React.ReactNode;
     accessor collapsed: boolean;
     accessor aside: boolean;
     accessor barHovering: boolean;
@@ -148,8 +150,8 @@ export default class LayoutStore implements FcrLayoutSlots, FcrUIEventObserver {
     get participantCount(): number;
     get isVideoSuspended(): boolean;
     get asideContent(): import("../../type").FcrUIUpdateAsideParams;
-    get participantsRenderAt(): "dialog" | "aside";
-    get chatRenderAt(): "dialog" | "aside";
+    get participantsRenderAt(): "aside" | "dialog";
+    get chatRenderAt(): "aside" | "dialog";
     getWaterMarkContent(): string;
     hasMutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
     hasUnmutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
@@ -186,12 +188,14 @@ export default class LayoutStore implements FcrLayoutSlots, FcrUIEventObserver {
     resetLockTimer(): void;
     setHoveringHandler(): void;
     setHoveringLeaveHandler(): false | void;
+    setScreenShareSpeakerViewSize(width: number, height: number): void;
     handleLiveLayoutChange(modifiedUser: FcrUserInfo): void;
     release(): void;
     onUserInfoUpdated(roomId: string, event: FcrUserUpdatedEvent): void;
     stopLocalPreview(view: HTMLDivElement): void;
     startLocalPreview(div: HTMLDivElement | null): void;
     setAllowChatWithPayload(type: 'public' | 'private_to_manager'): void;
+    setScaleValue(scale: number): void;
     muteAudio(mute: boolean, userId: string): void;
     sendParticipantEvent(payload: unknown): void;
     onEvent(action: FcrUIAction.SET_MAIN_SPEAKER, payload: FcrUISetMainSpeakerParams): void;