fcr-ui-scene 3.3.1 → 3.4.1

package/lib/modules/audio-stream/index.js

@@ -7,10 +7,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AudioStreamUIModule = void 0;
+require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.async-iterator.map.js");
@@ -18,7 +22,22 @@ require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -26,100 +45,280 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _base = require("../../base");
-var _agoraEduCore = require("agora-edu-core");
+var _fcrCore = require("fcr-core");
+var _constant = require("../../utilities/constant");
 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; })(); }
+var EventType = /*#__PURE__*/function (EventType) {
+  EventType["START"] = "start";
+  EventType["STOP"] = "stop";
+  return EventType;
+}(EventType || {});
 var AudioStreamUIModule = exports.AudioStreamUIModule = /*#__PURE__*/function (_UIModule) {
   function AudioStreamUIModule(_ref) {
     var _this;
-    var streamControl = _ref.streamControl,
+    var _streamControl = _ref.streamControl,
       userControl = _ref.userControl,
-      deviceStreamStore = _ref.deviceStreamStore;
+      deviceStreamStore = _ref.deviceStreamStore,
+      roomStore = _ref.roomStore,
+      uiEventStore = _ref.uiEventStore,
+      deviceStore = _ref.deviceStore;
     (0, _classCallCheck2["default"])(this, AudioStreamUIModule);
     _this = _callSuper(this, AudioStreamUIModule);
-    (0, _defineProperty2["default"])(_this, "_handleStreamsAdded", function (roomId, events) {
-      var streams = events.map(function (event) {
-        return event.modifiedStream;
-      });
-      _this._playRemoteAudio(streams);
+    (0, _defineProperty2["default"])(_this, "_isPstn", false);
+    (0, _defineProperty2["default"])(_this, "_disposers", []);
+    (0, _defineProperty2["default"])(_this, "_streamObserverMap", new Map());
+    (0, _defineProperty2["default"])(_this, "_turnOnMainRoomAudio", function () {
+      var streamControl = _this._streamControl;
+      var streamList = streamControl.getStreamList();
+      // 订阅主房间音频
+      _this._handleRemoteAudio(streamControl, streamList
+      //  'turnOnMainRoomAudio'
+      );
+      // 监听主房间音频
+      streamControl.addObserver(_this._streamObserver);
     });
-    (0, _defineProperty2["default"])(_this, "_handleStreamsUpdated", function (roomId, events) {
-      var streams = events.map(function (event) {
-        return event.modifiedStream;
-      });
-      _this._playRemoteAudio(streams);
+    (0, _defineProperty2["default"])(_this, "_turnOffMainRoomAudio", function () {
+      var streamControl = _this._streamControl;
+      var streamList = streamControl.getStreamList();
+      // 取消订阅主房间音频
+      _this._handleStopAudio(streamControl, streamList);
+      // 取消监听主房间音频
+      streamControl.removeObserver(_this._streamObserver);
     });
-    (0, _defineProperty2["default"])(_this, "_handleStreamsRemoved", function (roomId, events) {
-      events.forEach(function (event) {
-        if (event.modifiedStream.owner.userId === _this._userControl.getLocalUser().userId) {
-          return;
+    // 切换主房间音频
+    (0, _defineProperty2["default"])(_this, "_toggleMainRemoteAudio", function (event) {
+      // this._isMainRoomAudioOff = event !== EventType.START;
+      _this._deviceStore.setMainRoomAudioOff(event !== EventType.START);
+      if (_this._deviceStore.isAudioConnected) {
+        if (!_this._deviceStore.isMainRoomAudioOff) {
+          _this._turnOnMainRoomAudio();
+        } else {
+          _this._turnOffMainRoomAudio();
         }
-        _this.logger.info('stop play remote audio', event.modifiedStream.streamId);
-        _this._streamControl.stopPlayRemoteAudioStream(event.modifiedStream.streamId);
-      });
+      }
     });
-    (0, _defineProperty2["default"])(_this, "_playRemoteAudio", function (streams) {
-      var localStreams = _this._streamControl.getStreamsByUserId(_this._userControl.getLocalUser().userId);
-      if (_this._hasPstn(localStreams)) {
-        _this.logger.info('found local PSTN stream, close microphone');
-        // close microphone as audio input and output through mobile phone
-        _this._deviceStreamStore.enableMicrophoneWithStream(false);
-        _this.logger.info('found local PSTN stream, stop play all remote audio');
-        streams.forEach(function (stream) {
+    // 切换翻译官房间音频
+    (0, _defineProperty2["default"])(_this, "_toggleInterperterRemoteAudio", function (roomControl, event, key) {
+      var _ref2 = roomControl.getRoomInfo() || {},
+        roomId = _ref2.roomId;
+      var roomStreamControl = roomControl.getStreamControl();
+      if (roomId) {
+        if (event === EventType.START) {
+          _this.logger.info("".concat(roomId, "  addObserver ").concat(!_this._streamObserverMap.has(roomId) ? 'succeed' : 'fail', " "));
+          if (!_this._streamObserverMap.has(roomId)) {
+            var streamObserver = _this._createStreamObserver(roomStreamControl);
+            _this._streamObserverMap.set(roomId, streamObserver);
+            roomStreamControl.addObserver(streamObserver);
+          }
+          _this._handleRemoteAudio(roomStreamControl, roomStreamControl.getStreamList());
+        }
+        if (event === EventType.STOP) {
+          var _streamObserver = _this._streamObserverMap.get(roomId);
+          _this.logger.info("".concat(roomId, "  removeObserver ").concat(!!_streamObserver ? 'succeed' : 'fail', " "));
+          if (_streamObserver) {
+            roomStreamControl.removeObserver(_streamObserver);
+            _this._streamObserverMap["delete"](roomId);
+          }
+          _this._handleStopAudio(roomStreamControl, roomStreamControl.getStreamList());
+        }
+      }
+    });
+    (0, _defineProperty2["default"])(_this, "_handleRemoteAudio", function (streamControl, streams
+    // key: string,
+    ) {
+      if (_this._isPstn) {
+        streamControl.getStreamList().forEach(function (stream) {
           // stop playing all remote audio streams
-          if (stream.owner.userId !== _this._userControl.getLocalUser().userId) {
+          if (stream.owner.userId !== _this._localUser.userId) {
             _this.logger.info('stop play remote audio', stream.streamId);
-            _this._streamControl.stopPlayRemoteAudioStream(stream.streamId);
+            _this.logger.info("interpreterLog- stop subscribe remote audio execution scenario  by this._isPstn=".concat(_this._isPstn, " "), stream.streamId
+            // key,
+            );
+            streamControl.stopPlayRemoteAudioStream(stream.streamId);
           }
         });
       } else {
         streams.forEach(function (stream) {
-          if (stream.owner.userId !== _this._userControl.getLocalUser().userId) {
-            if ((stream.streamType === _agoraEduCore.FcrStreamType.AUDIO || stream.streamType === _agoraEduCore.FcrStreamType.BOTH) && stream.audioSourceState === _agoraEduCore.FcrMediaSourceState.STARTED) {
+          if (stream.owner.userId !== _this._localUser.userId) {
+            var isAudioPublished = stream.streamType === _fcrCore.FcrStreamType.AUDIO || stream.streamType === _fcrCore.FcrStreamType.BOTH;
+            var isAudioDeviceStarted = stream.audioSourceState === _fcrCore.FcrMediaSourceState.OPEN;
+            if (isAudioPublished && isAudioDeviceStarted) {
               _this.logger.info('start play remote audio', stream.streamId);
-              _this._streamControl.startPlayRemoteAudioStream(stream.streamId);
+              _this.logger.info("interpreterLog- start subscribe remote audio execution scenario  by this._isPstn=".concat(_this._isPstn, "%isAudioPublished && isAudioDeviceStarted=").concat(isAudioPublished && isAudioDeviceStarted), stream.streamId
+              // key,
+              );
+              streamControl.startPlayRemoteAudioStream(stream.streamId);
             } else {
               _this.logger.info('stop play remote audio', stream.streamId);
-              _this._streamControl.stopPlayRemoteAudioStream(stream.streamId);
+              _this.logger.info("interpreterLog- stop subscribe remote audio execution scenario  by this._isPstn=".concat(_this._isPstn, "%isAudioPublished && isAudioDeviceStarted=").concat(isAudioPublished && isAudioDeviceStarted), stream.streamId
+              // key,
+              );
+              streamControl.stopPlayRemoteAudioStream(stream.streamId);
             }
           }
         });
       }
     });
-    _this._streamControl = streamControl;
+    (0, _defineProperty2["default"])(_this, "_handleStopAudio", function (streamControl, streams) {
+      streams.forEach(function (stream) {
+        if (stream.owner.userId === _this._localUser.userId) return;
+        _this.logger.info("interpreterLog- stop subscribe remote audio execution scenario  by _handleStopAudio", stream.streamId);
+        streamControl.stopPlayRemoteAudioStream(stream.streamId);
+      });
+    });
+    (0, _defineProperty2["default"])(_this, "_hasLocalPstnStream", function (streams) {
+      var pstnStream = streams.find(function (stream) {
+        return stream.connectorType === _fcrCore.FcrRoomConnectorType.PSTN && stream.owner.userId === _this._localUser.userId;
+      });
+      return !!pstnStream;
+    });
+    (0, _defineProperty2["default"])(_this, "_handleUiEvent", function (action, payload) {
+      switch (action) {
+        case _constant.UIAction.CONNECT_AUDIO:
+          // this._isAudioConnected = true;
+          _this._deviceStore.setAudioConnected(true);
+          if (!_this._deviceStore.isMainRoomAudioOff) {
+            _this._turnOnMainRoomAudio();
+          }
+          break;
+        case _constant.UIAction.DISCONNECT_AUDIO:
+          // this._isAudioConnected = false;
+          _this._deviceStore.setAudioConnected(false);
+          if (!_this._deviceStore.isMainRoomAudioOff) {
+            _this._turnOffMainRoomAudio();
+          }
+          break;
+        // 切换语言房间订阅  ( 翻译官切换收听语言房间 为输出的语音房间时 单独出发订阅订阅 )
+        case _constant.UIAction.TOGGLE_INTERPRETER_REMOTE_AUDIO:
+          _this._toggleInterperterRemoteAudio(payload.roomControl, payload.event, 'UIAction.TOGGLE_INTERPRETER_REMOTE_AUDIO');
+          break;
+        //  切换收主房间(原声)订阅
+        case _constant.UIAction.TOGGLE_MAINROOM_REMOTE_AUDIO:
+          _this._toggleMainRemoteAudio(payload.event);
+          break;
+      }
+    });
+    (0, _defineProperty2["default"])(_this, "_handleJoinInterpretingRoomSuccess", function (param) {
+      if (param.isToggleInterperterRemoteAudio) {
+        _this._toggleInterperterRemoteAudio(param.control, EventType.START, '_handleJoinInterpretingRoomSuccess');
+      }
+    });
+    (0, _defineProperty2["default"])(_this, "_handleLeaveInterpretingRoom", function (param) {
+      if (param.isToggleInterperterRemoteAudio) {
+        _this._toggleInterperterRemoteAudio(param.control, EventType.STOP, '_handleLeaveInterpretingRoom');
+      }
+    });
+    (0, _defineProperty2["default"])(_this, "_createStreamObserver", function (streamControl) {
+      var onStreamsAdded = function onStreamsAdded(roomId, events) {
+        var streams = events.map(function (event) {
+          return event.modifiedStream;
+        });
+        if (!_this._isPstn && _this._hasLocalPstnStream(streams)) {
+          _this.logger.info("PSTN stream is created");
+          _this._isPstn = true;
+          _this.logger.info('found local PSTN stream, close microphone');
+          // close microphone as audio input and output through mobile phone
+          _this._deviceStreamStore.enableMicrophoneWithStream(false);
+          _this.logger.info('found local PSTN stream, stop play all remote audio');
+          _this._handleRemoteAudio(streamControl, streamControl.getStreamList()
+          // '_handleStreamsAdded1111',
+          );
+        } else {
+          _this._handleRemoteAudio(streamControl, streams
+          // '_handleStreamsAdded222'
+          );
+        }
+      };
+      var onStreamsUpdated = function onStreamsUpdated(roomId, events) {
+        var streams = events.map(function (event) {
+          return event.modifiedStream;
+        });
+        if (!_this._isPstn && _this._hasLocalPstnStream(streams)) {
+          _this.logger.info('PSTN stream is updated');
+          _this._isPstn = true;
+          _this.logger.info('found local PSTN stream, close microphone');
+          // close microphone as audio input and output through mobile phone
+          _this._deviceStreamStore.enableMicrophoneWithStream(false);
+          _this.logger.info('found local PSTN stream, stop play all remote audio');
+          _this._handleRemoteAudio(streamControl, streamControl.getStreamList()
+          // '_handleStreamsUpdated11111',
+          );
+        } else {
+          _this._handleRemoteAudio(streamControl, streams
+          // '_handleStreamsUpdated22222'
+          );
+        }
+      };
+      var onStreamsRemoved = function onStreamsRemoved(roomId, events) {
+        var streams = events.map(function (event) {
+          return event.modifiedStream;
+        });
+        if (_this._hasLocalPstnStream(streams)) {
+          _this.logger.info('PSTN stream is removed');
+          _this._isPstn = false;
+          _this._handleRemoteAudio(streamControl, streamControl.getStreamList()
+          // '_handleStreamsRemoved',
+          );
+        }
+        events.forEach(function (event) {
+          if (event.modifiedStream.owner.userId === _this._localUser.userId) {
+            return;
+          }
+          _this.logger.info('stop play remote audio', event.modifiedStream.streamId);
+          _this.logger.info("interpreterLog- stop subscribe remote audio execution scenario  by _handleStreamsRemoved", event.modifiedStream.streamId);
+          _this._streamControl.stopPlayRemoteAudioStream(event.modifiedStream.streamId);
+        });
+      };
+      return {
+        onStreamsAdded: onStreamsAdded,
+        onStreamsUpdated: onStreamsUpdated,
+        onStreamsRemoved: onStreamsRemoved
+      };
+    });
+    _this._streamControl = _streamControl;
     _this._userControl = userControl;
     _this._deviceStreamStore = deviceStreamStore;
-    _this.init();
-    streamControl.addObserver({
-      onStreamsAdded: _this._handleStreamsAdded,
-      onStreamsUpdated: _this._handleStreamsUpdated,
-      onStreamsRemoved: _this._handleStreamsRemoved
-    });
+    _this._roomStore = roomStore;
+    _this._uiEventStore = uiEventStore;
+    _this._deviceStore = deviceStore;
+    _this._streamObserver = _this._createStreamObserver(_this._streamControl);
+    _this._uiEventObserver = {
+      onEvent: _this._handleUiEvent
+    };
+    _this._roomObserver = {
+      onJoinInterpretingRoomSuccess: _this._handleJoinInterpretingRoomSuccess,
+      onLeaveInterpretingRoom: _this._handleLeaveInterpretingRoom
+    };
+    uiEventStore.addObserver(_this._uiEventObserver);
+    roomStore.addObserver(_this._roomObserver);
+    var _streams = _this._streamControl.getStreamList();
+    _this._isPstn = _this._hasLocalPstnStream(_streams);
+    if (!_this._deviceStore.isMainRoomAudioOff && _this._deviceStore.isAudioConnected) {
+      _this._turnOnMainRoomAudio();
+    }
     return _this;
   }
   (0, _inherits2["default"])(AudioStreamUIModule, _UIModule);
   return (0, _createClass2["default"])(AudioStreamUIModule, [{
-    key: "init",
-    value: function init() {
-      var streams = this._streamControl.getStreamList();
-      this._playRemoteAudio(streams);
+    key: "_localUser",
+    get: function get() {
+      return this._userControl.getLocalUser();
+    }
+  }, {
+    key: "onUnload",
+    value: function onUnload() {
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this._uiEventStore.removeObserver(this._uiEventObserver);
+      this._roomStore.removeObserver(this._roomObserver);
+      this._streamControl.removeObserver(this._streamObserver);
     }
   }, {
     key: "getComponent",
     value: function getComponent() {
       return null;
     }
-  }, {
-    key: "onUnload",
-    value: function onUnload() {}
-  }, {
-    key: "_hasPstn",
-    value: function _hasPstn(streams) {
-      var _this2 = this;
-      var pstnStream = streams.find(function (stream) {
-        return stream.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN && stream.owner.userId === _this2._userControl.getLocalUser().userId;
-      });
-      return !!pstnStream;
-    }
   }]);
 }(_base.UIModule);

package/lib/modules/chat/chat-bar/index.css

@@ -25,6 +25,8 @@
 
 .fcr-message-bar > span:first-child {
   margin-right: 4px;
+  font-size: 12px;
+  font-weight: 300;
 }
 
 .fcr-message-bar > .fcr-select-wrapper {
@@ -77,3 +79,7 @@
 .fcr-msg-bar-break-max-width {
   max-width: 75px;
 }
+
+.fcr-message-bar .fcr-text-bubble {
+  font-weight: 300;
+}

package/lib/modules/chat/chat-bar/index.d.ts

@@ -1,11 +1,11 @@
 import { CSSProperties } from 'react';
 import './index.css';
-import { FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrUserInfo } from 'fcr-core/lib/type';
 export interface MessageBarProps {
     styles?: CSSProperties;
     users?: FcrUserInfo[];
     onTargetChange?: (target: FcrUserInfo) => void;
-    selectedUserId?: string;
+    selectedUser?: FcrUserInfo;
     title?: React.ReactNode;
 }
-export declare const MessageBar: ({ styles, users, selectedUserId, onTargetChange, title, }: React.PropsWithChildren<MessageBarProps>) => import("react/jsx-runtime").JSX.Element;
+export declare const MessageBar: ({ styles, users, selectedUser, onTargetChange, title, }: React.PropsWithChildren<MessageBarProps>) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/chat/chat-bar/index.js

@@ -1,7 +1,6 @@
 "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");
@@ -9,9 +8,7 @@ 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,11 +16,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MessageBar = void 0;
-require("core-js/modules/es.array.find.js");
+require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.find.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.filter.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _type = require("agora-ui-foundation/lib/components/icon/type");
@@ -36,18 +33,16 @@ require("./index.css");
 var _chatSelect = require("../chat-select");
 var _store = require("../store");
 var _mobxReact = require("mobx-react");
-var _contex = require("../contex");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 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 MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
-  var _users$find$userName, _users$find;
+  var _users$filter, _selectedUser$userId, _selectedUser$userNam;
   var styles = _ref.styles,
     _ref$users = _ref.users,
     users = _ref$users === void 0 ? [] : _ref$users,
-    _ref$selectedUserId = _ref.selectedUserId,
-    selectedUserId = _ref$selectedUserId === void 0 ? _store.USER_ALL : _ref$selectedUserId,
+    selectedUser = _ref.selectedUser,
     onTargetChange = _ref.onTargetChange,
     title = _ref.title;
   var t = (0, _i18n.useI18n)();
@@ -61,9 +56,16 @@ var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     popoverOpened = _useState4[0],
     setPopoverOpened = _useState4[1];
+  var hasParticipant = users === null || users === void 0 || (_users$filter = users.filter(function (user) {
+    return user.userId !== _store.USER_ALL;
+  })) === null || _users$filter === void 0 ? void 0 : _users$filter.length;
   var onPopoverChanged = function onPopoverChanged(visible) {
+    if (!hasParticipant) {
+      return;
+    }
     setPopoverOpened(visible);
   };
+  var selectedUserId = (_selectedUser$userId = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.userId) !== null && _selectedUser$userId !== void 0 ? _selectedUser$userId : _store.USER_ALL;
   var handleSelected = function handleSelected(user) {
     setPopoverOpened(false);
     onTargetChange && onTargetChange(user);
@@ -71,9 +73,10 @@ var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
   (0, _react.useEffect)(function () {
     setTips(selectedUserId === _store.USER_ALL ? t('fmt_chat_labels_sendto') : t('fmt_chats_label_privatechat'));
   }, [selectedUserId]);
-  var _useContext = (0, _react.useContext)(_contex.StoreContext),
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
     chatRoomStores = _useContext.chatRoomStores,
-    activeTabIndex = _useContext.activeTabIndex;
+    activeTabIndex = _useContext.activeTabIndex,
+    roomType = _useContext.roomType;
   var _ref2 = chatRoomStores[activeTabIndex],
     chatLevel = _ref2.chatLevel,
     privateTargetUser = _ref2.privateTargetUser,
@@ -103,12 +106,6 @@ var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
         onSelect: handleSelected
       }),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        onClick: function onClick() {
-          if ((users === null || users === void 0 ? void 0 : users.length) <= 1) {
-            return;
-          }
-          setPopoverOpened(!popoverOpened);
-        },
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_textBubble.TextBubble, {
           styles: {
             padding: '4px 1px 4px 4px',
@@ -122,17 +119,20 @@ var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
             }
             // TODO: 当选中的 uid 为 None 时，需要提示选择管理员
             ,
-            txt: privateTargetUser.userId === _store.USER_NONE && !localIsManager ? t('fmt_chat_tips_selecthost') : (_users$find$userName = (_users$find = users.find(function (user) {
-              return user.userId === selectedUserId;
-            })) === null || _users$find === void 0 ? void 0 : _users$find.userName) !== null && _users$find$userName !== void 0 ? _users$find$userName : _store.USER_ALL,
+            txt: privateTargetUser.userId === _store.USER_NONE && !localIsManager ? t('fmt_chat_tips_selecthost') : (_selectedUser$userNam = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.userName) !== null && _selectedUser$userNam !== void 0 ? _selectedUser$userNam : _store.USER_ALL,
             icon: _type.FcrIconType.FCR_DROPDOWN,
             colors: {
-              iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
+              iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)',
+              fontSize: '12px'
             },
+            fontSize: "medium",
             iconTransform: popoverOpened,
             enable: true,
-            isHideIcon: (users === null || users === void 0 ? void 0 : users.length) <= 1,
+            isHideIcon: !hasParticipant,
             onClick: function onClick() {
+              if (!hasParticipant) {
+                return;
+              }
               setPopoverOpened(!popoverOpened);
             },
             iconReverse: true

package/lib/modules/chat/chat-select/index.css

@@ -57,6 +57,7 @@
   align-items: center;
   cursor: pointer;
   width: 215px !important;
+  border-radius: var(--fcr_cornerradius_l);
 }
 
 .candidate-container-selected {
@@ -72,20 +73,20 @@
 }
 
 .candidate-avatar {
-  width: 26px;
-  height: 26px;
+  width: 32px;
+  height: 32px;
   border-radius: var(--fcr_cornerradius_s);
   background: var(--for_head5);
   display: flex;
   justify-content: center;
   align-items: center;
-  margin: 0 5px;
   /* text */
   color: var(--fcr_ui_scene_white10);
   font-family: Verdana;
   font-size: 14px;
   font-weight: 700;
   line-height: 14px;
+  margin-right: 5px;
 }
 .candidate-avatar .fcr-avatar {
   border-radius: var(--fcr_cornerradius_m);
@@ -93,6 +94,8 @@
 
 .candidate-avatar-all {
   background: var(--for_head1);
+  width: 32px;
+  height: 32px;
 }
 
 .candidate {
@@ -162,6 +165,13 @@
   flex-direction: column;
 }
 
+.fcr-no-data img {
+  margin-top: 20px;
+  width: 50%;
+  object-fit: contain;
+  margin-bottom: 20px;
+}
+
 .fcr-no-data span {
   font-weight: 400;
   font-size: 13px;

package/lib/modules/chat/chat-select/index.d.ts

@@ -1,5 +1,5 @@
 import './index.css';
-import { FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrUserInfo } from 'fcr-core/lib/type';
 interface ChatSelectProps {
     type: 'assign-host' | 'private-chat';
     title?: React.ReactNode;

package/lib/modules/chat/chat-select/index.js

@@ -1,11 +1,21 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.for-each.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.for-each.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");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ChatSelect = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.includes.js");
@@ -28,7 +38,7 @@ var _mobxReact = require("mobx-react");
 var _react = require("react");
 require("./index.css");
 var _reactVirtualized = require("react-virtualized");
-var _type2 = require("agora-edu-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _store = require("../store");
 var _textBubble = require("agora-ui-foundation/lib/components/text-bubble");
@@ -36,6 +46,8 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _fcr_defaultpage = _interopRequireDefault(require("../../../../public/assets/fcr_defaultpage.png"));
 var _helper = require("agora-ui-foundation/lib/components/avatar/helper");
 var _jsxRuntime = require("react/jsx-runtime");
+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 highlightMatches(str, matchStr) {
   var result = [];
   var matchLen = matchStr.length;
@@ -104,7 +116,9 @@ var ChatSelect = exports.ChatSelect = (0, _mobxReact.observer)(function (_ref) {
     }
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: selectedUid === users[index].userId ? 'candidate-container-selected' : 'candidate-container',
-      style: style,
+      style: _objectSpread(_objectSpread({}, style), {}, {
+        pointerEvents: 'all'
+      }),
       onClick: function onClick(_) {
         var user = filterUsers[index];
         onSelect(user);
@@ -142,11 +156,11 @@ var ChatSelect = exports.ChatSelect = (0, _mobxReact.observer)(function (_ref) {
             style: {
               color: (0, _helper.getNameColor)(datum.userName)
             },
-            children: highlightMatches(datum.userName, filterKey).map(function (value) {
+            children: highlightMatches(datum.userName, filterKey).map(function (value, i) {
               return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
                 className: value !== null && value !== void 0 && value.isHighlight ? 'candidate-highlight' : '',
                 children: value.data
-              });
+              }, "".concat(i));
             })
           }), datum.userId !== _store.USER_ALL && (datum.userRole === _type2.FcrUserRole.COHOST || datum.userRole === _type2.FcrUserRole.HOST) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_textBubble.TextBubble, {
             txt: t(datum.userRole === _type2.FcrUserRole.HOST ? 'fmt_role_host' : 'fmt_role_cohost'),