fcr-ui-scene 3.3.1 → 3.4.0

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

@@ -1,17 +1,13 @@
 "use strict";
 
 require("core-js/modules/es.symbol.js");
-require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.for-each.js");
-require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.async-iterator.for-each.js");
-require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -19,34 +15,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/es.array.some.js");
+require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.async-iterator.map.js");
-require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.map.js");
-require("core-js/modules/esnext.iterator.some.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _select = require("agora-ui-foundation/lib/components/select");
-var _context = require("../../../../context");
+var _store = require("../../../../store");
 var _mobxReact = require("mobx-react");
-var _i18n = require("../../../../../../hooks/i18n");
+var _type = require("fcr-core/lib/type");
 var _avatar = require("agora-ui-foundation/lib/components/avatar");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _type2 = require("agora-rte-sdk/lib/core/scene/type");
+var _i18n = require("agora-ui-foundation/lib/i18n");
 require("./index.css");
-var _constant = require("../../../../constant");
 var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["randomKey"];
 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; }
 var OptionItem = (0, _mobxReact.observer)(function (props) {
   var model = props.model;
-  var getUserRole = (0, _i18n.useUserRoleI18n)();
-  var userRole = getUserRole(model.userRole);
+  var transI18n = (0, _i18n.useI18n)();
+  var userRole = (0, _react.useMemo)(function () {
+    if (_type.FcrUserRole.HOST === model.userRole) {
+      return transI18n('fmt_interpretation_interpreter_popup_special_co_host');
+    }
+    if (_type.FcrUserRole.COHOST === model.userRole) {
+      return transI18n('fmt_interpretation_interpreter_popup_special_host');
+    }
+    return null;
+  }, [model.userRole]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-simultaneous-interpretation__select-user-options-item",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -63,15 +71,15 @@ var OptionItem = (0, _mobxReact.observer)(function (props) {
         children: model.userName
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "fcr-simultaneous-interpretation__select-user-options-item-user-role",
-        children: "(".concat(userRole, ")")
+        children: userRole && "(".concat(userRole, ")")
       })]
     })]
   });
 });
 var PickUser = function PickUser(props) {
-  var _initUsers$find;
   var model = props.model;
-  var _useContext = (0, _react.useContext)(_context.StoreContext),
+  var transI18n = (0, _i18n.useI18n)();
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
     updateInterpreterUsers = _useContext.updateInterpreterUsers,
     interpreterState = _useContext.interpreterState,
     interpreterUsersEditState = _useContext.interpreterUsersEditState,
@@ -80,39 +88,67 @@ var PickUser = function PickUser(props) {
   var handleChange = function handleChange(data) {
     updateInterpreterUsers(_objectSpread(_objectSpread({}, model), data));
   };
-  var options = (0, _react.useMemo)(function () {
-    return initUsers.map(function (ele) {
-      var isExist = localInterpreterUsers.some(function (item) {
-        return item[_constant.InterpreterItemType.ID] === ele[_constant.InterpreterItemType.ID];
-      });
-      return {
-        text: ele[_constant.InterpreterItemType.INTERPRETER],
-        value: ele[_constant.InterpreterItemType.ID],
-        render: function render(option) {
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(OptionItem, {
-            model: ele
-          });
-        },
-        disabled: ele.isOffLine || isExist
-      };
+  var selectProps = (0, _react.useMemo)(function () {
+    var _usersOptions$find;
+    var selectedUserInfo = initUsers.find(function (user) {
+      return user.userId === model.userId;
     });
-  }, [initUsers, localInterpreterUsers]);
-  var value = model[_constant.InterpreterItemType.ID];
-  var isOffLine = (_initUsers$find = initUsers.find(function (ele) {
-    return ele[_constant.InterpreterItemType.ID] === value;
-  })) === null || _initUsers$find === void 0 ? void 0 : _initUsers$find.isOffLine;
+    var usersOptions = initUsers.filter(function (user) {
+      var notOffline = !user.isOffLine || user.isOffLine && model.userId === user.userId; //未离线 或者 离线且当前行选中状态
+      var usedUser = localInterpreterUsers.find(function (interpreter) {
+        return interpreter.userId === user.userId;
+      }); // 当前用户选项 是否被使用过
+      var unused = !usedUser || usedUser && (usedUser === null || usedUser === void 0 ? void 0 : usedUser.userId) === model.userId; /// 未使用过  或者 使用过且当前行选中状态
+
+      return notOffline && unused;
+    }); // 离线 没有被选中
+
+    if (!selectedUserInfo && model.userId) {
+      var randomKey = model.randomKey,
+        rest = (0, _objectWithoutProperties2["default"])(model, _excluded);
+      usersOptions.push(_objectSpread(_objectSpread({}, rest), {}, {
+        userRole: _type.FcrUserRole.PARTICIPANT,
+        connectorType: _type2.AgoraRteRoomConnectorType.NONE,
+        isOffLine: true
+      }));
+    }
+    var isOffLine = (_usersOptions$find = usersOptions.find(function (user) {
+      return user.userId === model.userId;
+    })) === null || _usersOptions$find === void 0 ? void 0 : _usersOptions$find.isOffLine;
+    return {
+      isOffLine: isOffLine,
+      options: usersOptions.map(function (user) {
+        return {
+          text: user.userName,
+          value: user.userId,
+          render: function render(option) {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(OptionItem, {
+              model: user
+            });
+          }
+        };
+      })
+    };
+  }, [initUsers, localInterpreterUsers, model]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_select.FcrSelect, {
     className: "fcr-simultaneous-interpretation__select-user",
     showSearch: true,
-    options: options,
-    value: value,
+    options: selectProps.options,
+    value: model.userId,
     onChange: function onChange(value) {
-      handleChange((0, _defineProperty2["default"])({}, _constant.InterpreterItemType.ID, value));
+      var _selectProps$options$;
+      var userName = (_selectProps$options$ = selectProps.options.find(function (option) {
+        return option.value === value;
+      })) === null || _selectProps$options$ === void 0 ? void 0 : _selectProps$options$.text;
+      handleChange({
+        userId: value,
+        userName: userName
+      });
     },
     disabled: !interpreterUsersEditState && interpreterState,
-    placeholder: '搜索名称',
+    placeholder: transI18n('fmt_interpretation_setting_popup_controller_labe_search_name'),
     styleType: "white",
-    tag: isOffLine ? '离会' : ''
+    tag: selectProps.isOffLine ? transI18n('fmt_interpretation_setting_popup_controller_label_departure') : ''
   });
 };
 var _default = exports["default"] = (0, _mobxReact.observer)(PickUser);

package/lib/modules/Interpreter/interpreter-list/interpreter-item/index.css

@@ -1,7 +1,7 @@
 .fcr-simultaneous-interpretation__interpreter-Item-container {
   height: 102px;
   margin-top: 10px;
-  padding: 16px 15px 20px;
+  padding: 19px 24px 20px 14px;
   background: var(--fcr_mobile_ui_scene_color_popup_block5);
   border-radius: 8px;
   display: flex;
@@ -22,13 +22,11 @@
   font-weight: 700;
   color: var(--fcr_ui_scene_icontext1);
 }
-/* .fcr-simultaneous-interpretation__interpreter-Item-container-top-icon {
-   
- }   */
+
 .fcr-simultaneous-interpretation__interpreter-Item-container-config {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-top: 22px;
+  margin-top: 19px;
   width: 100%;
 }

package/lib/modules/Interpreter/interpreter-list/interpreter-item/index.d.ts

@@ -1,5 +1,5 @@
-import './index.css';
 import { InitInterpreterItemModelType } from '../../constant';
+import './index.css';
 interface InterpreterItemProps {
     model: InitInterpreterItemModelType;
     index: number;

package/lib/modules/Interpreter/interpreter-list/interpreter-item/index.js

@@ -7,21 +7,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 require("core-js/modules/es.array.concat.js");
-var _icon = require("agora-ui-foundation/lib/components/icon");
-var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _pickUser = _interopRequireDefault(require("./components/pick-user"));
 var _pickLanguage = _interopRequireDefault(require("./components/pick-language"));
 var _react = require("react");
-var _context = require("../../context");
-var _classnames = _interopRequireDefault(require("classnames"));
+var _store = require("../../store");
 var _mobxReact = require("mobx-react");
-var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
-require("./index.css");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _deleteBtn = _interopRequireDefault(require("../../action/delete-btn"));
+require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 var InterpreterItem = function InterpreterItem(props) {
-  var _useContext = (0, _react.useContext)(_context.StoreContext),
-    deleteInterpreterUsers = _useContext.deleteInterpreterUsers,
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
     interpreterUsersEditState = _useContext.interpreterUsersEditState,
     localInterpreterUsers = _useContext.localInterpreterUsers,
     interpreterState = _useContext.interpreterState;
@@ -30,27 +26,14 @@ var InterpreterItem = function InterpreterItem(props) {
   var t = (0, _i18n.useI18n)();
   var isShow = localInterpreterUsers.length > 1 && (interpreterUsersEditState || !interpreterState);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: (0, _classnames["default"])('fcr-simultaneous-interpretation__interpreter-Item-container'),
+    className: "fcr-simultaneous-interpretation__interpreter-Item-container",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-simultaneous-interpretation__interpreter-Item-container-top",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "fcr-simultaneous-interpretation__interpreter-Item-container-top-title",
         children: "".concat(t('fmt_ai_transcriptions_setting_label_translator')).concat(index + 1)
-      }), isShow && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
-        mouseEnterDelay: 0,
-        trigger: "hover",
-        placement: "top",
-        content: "\u5220\u9664",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-            className: "fcr-simultaneous-interpretation__interpreter-Item-container-top-icon",
-            type: _type.FcrIconType.FCR_DELETE4,
-            onClick: function onClick() {
-              deleteInterpreterUsers(model);
-            },
-            size: 20
-          })
-        })
+      }), isShow && /*#__PURE__*/(0, _jsxRuntime.jsx)(_deleteBtn["default"], {
+        model: model
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-simultaneous-interpretation__interpreter-Item-container-config",

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

@@ -1,47 +1,53 @@
 import { FcrMainRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrInterpreterControl, FcrInterpreterState, FcrInterpreterUserInfo, FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUserJoinedEvent } from 'fcr-core/lib/room-control/user-control/type';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrDeviceStore } from '../../common/device-store';
 import { FcrRoomStore } from '../../common/room-store';
-import { initInterpreterItemModel, UpdateType, LanguageRoomType, ChangeInputLanguageParams, ChangeOutputLanguageParams } from './constant';
+import { initInterpreterItemModel, LanguageRoomType, ChangeInputLanguageParams, ChangeOutputLanguageParams, ToggleLanguageRoomParams, ChangeMainRoomStreamParams, closeAllLanguageRoomInputParams } from './constant';
 import { FcrDeviceStreamStore } from '../../common/device-stream-store';
+import { EventType } from '../action-bar/store';
+import { FcrSecurityStore } from '../../common/security-store';
 export default class InterpreterStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _deviceStreamStore;
-    private _currentDialogId;
     private _interpreterControl;
     private _uiEventStore;
     private _mainRoomControl;
     private _deviceStore;
     private _roomStore;
-    private _uiEvents;
-    accessor isScroll: boolean;
-    accessor _languageRoomList: LanguageRoomType[] | undefined;
+    private _securityStore;
+    private _streamControl;
+    private _userControl;
+    private _localUser;
+    private _indicateTimerId;
+    private _volumeTimerId;
+    private _disposers;
+    private _retryTask;
+    private _confirmDialogs;
+    private accessor _isSpeaking;
+    private accessor _languageRoomList;
     accessor localInterpreterUsers: Array<typeof initInterpreterItemModel>;
-    accessor storeLocalUser: FcrUserInfo;
+    accessor orgInterpreterUsers: Array<typeof initInterpreterItemModel>;
     accessor interpreterUsersEditState: boolean;
     accessor initUsers: Array<FcrUserInfo & {
         isOffLine: boolean;
     }>;
-    get interpreterState(): boolean;
+    accessor interpreterState: boolean;
+    accessor currentDialogId: string | null;
+    get hasEnableInterpreterPermission(): boolean;
     get interpreterUsersCheckPass(): boolean;
     get interpreterUsersAllOffLine(): boolean;
     get languageList(): FcrLanguage[];
-    constructor({ roomControl, interpreterControl, uiEventStore, deviceStore, roomStore, deviceStreamStore, }: {
+    constructor({ roomControl, interpreterControl, uiEventStore, deviceStore, roomStore, deviceStreamStore, securityStore, }: {
         roomControl: FcrMainRoomControl;
         interpreterControl: FcrInterpreterControl;
         uiEventStore: FcrUIEventStore;
         deviceStore: FcrDeviceStore;
         roomStore: FcrRoomStore;
         deviceStreamStore: FcrDeviceStreamStore;
+        securityStore: FcrSecurityStore;
     });
-    getInitUsers(): void;
-    updateUsers({ roomId, events }: {
-        roomId: string;
-        events: FcrUserJoinedEvent[];
-    }, type: UpdateType): void;
     openInterpreterState(): void;
     closeInterpreterState(): void;
     setInterpreterListEditState(): void;
@@ -50,33 +56,49 @@ export default class InterpreterStore {
     updateInterpreterUsers(data: typeof initInterpreterItemModel): void;
     queryInterpreterUsers(): void;
     updateInterpreterRoomStatus(executeRoomList: LanguageRoomType[]): Promise<void>;
-    restoreVolumeByMainRoom(roomId: string, intervalId: NodeJS.Timeout | null): void;
-    updateCancelRoomLstStatus(): Promise<void>;
-    changeMainRoomStream(closeOrgSound: boolean): Promise<void>;
-    clonseInterpreterRoomInput(executeRoomList: LanguageRoomType[]): Promise<void>;
-    updatedInterpreterRoomStatus(): Promise<void>;
+    changeMainRoomStream({ close, callback }: ChangeMainRoomStreamParams): Promise<void>;
+    toggleLanguageRoom({ languageRoomList, actionType, callback }: ToggleLanguageRoomParams): Promise<void>;
     updateLanguageRoomList(): Promise<void>;
-    onStreamVolumeIndicationUpdated(roomId: string, streamId: string, volume: number): void;
+    _updateUserProperties(language: string): Promise<void>;
     changeInputLanguage({ language, options, callback }: ChangeInputLanguageParams): Promise<void>;
+    closeAllLanguageRoomInput({ options, callback }: closeAllLanguageRoomInputParams): Promise<void>;
+    handleOutputLanguageRoom({ _languageRoomList, language, interpreterRoomList, event, }: {
+        _languageRoomList: LanguageRoomType[];
+        language: FcrLanguage;
+        interpreterRoomList: FcrLanguage[];
+        event: EventType;
+    }): Promise<void>;
     changeOutputLanguage({ language, orgLanguage, callback }: ChangeOutputLanguageParams): Promise<void>;
-    bindLocalMicrophoneId(room: LanguageRoomType): void;
-    joinInterpreterRoom(data: LanguageRoomType[], update?: boolean): Promise<void>;
-    leaveInterpreterRoom(data: LanguageRoomType[], update?: boolean): Promise<void>;
+    bindLocalMicrophoneId(room: LanguageRoomType, _microphoneId?: string): void;
+    joinInterpreterRoom(data: LanguageRoomType[], isToggleInterperterRemoteAudio?: boolean): Promise<void>;
+    leaveInterpreterRoom(data: LanguageRoomType[], isToggleInterperterRemoteAudio?: boolean): Promise<void>;
+    getInterpreterState(): boolean;
     openInterpreterDialog(): void;
     closeInterpreterDialog(): void;
-    setIsScroll(enable: boolean): void;
     getLocalUserByInterpreter(): {
         interpreter: FcrInterpreterUserInfo | undefined;
         localUser: FcrUserInfo;
     };
     checkIsSelfOperation(operatorUser: FcrUserInfo): boolean;
-    closeDialog(): void;
-    interpreterUsersUpdatedToast(roomId: string, users: FcrInterpreterUserInfo[] | null, operatorUser?: FcrUserInfo): void;
+    interpreterUsersUpdatedToast(roomId: string, users: FcrInterpreterUserInfo[] | null, operatorUser?: FcrUserInfo): Promise<void>;
     interpreterStateUpdatedToast(roomId: string, state: FcrInterpreterState, operatorUser: FcrUserInfo | undefined): void;
     openUpdateInterpreterStateToast(roomId: string, state: FcrInterpreterState, operatorUser: FcrUserInfo): void;
     updateInterpreterUsersToast(roomId: string, users: FcrInterpreterUserInfo[] | null, operatorUser: FcrUserInfo): void;
+    interpreterUsersJoinToast(): void;
+    _closeConfirmDialog(): void;
     openUpdateLanguageDialog(interpreter: FcrInterpreterUserInfo): void;
     openCreateInterpreterStatusToast(interpreter: FcrInterpreterUserInfo): void;
     openCancelInterpreterStatusToast(): void;
     release(): void;
+    private _getInitUsers;
+    private _updateUsers;
+    private _clearTimer;
+    private _clearRetryTaskTimer;
+    private _setMainRoomVolume;
+    private _restoreVolumeByMainRoom;
+    private _adjustMainRoomVolume;
+    private _setInterpreterRoomControlInfo;
+    private _onStreamVolumeIndicationUpdated;
+    private _uiEvents;
 }
+export declare const StoreContext: import("react").Context<InterpreterStore>;