fcr-ui-scene 3.8.0-alpha → 3.8.1-alpha

package/lib/modules/subtitles-history/index.css

@@ -1,129 +1,129 @@
-.fcr-subtitles-history__header {
-  display: flex;
-  align-items: center;
-  padding: 7px 12px;
-  font-size: 12px;
-  line-height: 16px;
-  color: var(--fcr_ui_scene_icontext1);
-  background-color: var(--fcr_web_ui_scene_fill4_popup);
-  border-radius: var(--fcr_cornerradius_s);
-}
-
-.fcr-no-data-subtitles-history {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-grow: 1;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-}
-
-.fcr-no-data-subtitles-history img {
-  width: 138px;
-  height: 100;
-  object-fit: contain;
-  margin-bottom: 20px;
-}
-
-.fcr-no-data-subtitles-history span {
-  font-weight: 400;
-  font-size: 13px;
-  line-height: 14px;
-  font-family: PingFang HK;
-  color: var(--fcr_ui_scene_icontext2);
-}
-
-.fcr-subtitles-history-wrapper {
-  padding: 5px 15px 0 15px;
-  height: 100%;
-}
-
-.fcr-dialog-container .fcr-subtitles-history-wrapper-electron {
-  height: calc(100% - 46px);
-}
-
-.fcr-subtitles-history-container {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-}
-
-.fcr-subtitles-history__content {
-  margin: 24px 0 12px 0;
-  flex-grow: 1;
-  overflow-y: auto;
-}
-
-.fcr-subtitles-history__waiting-input {
-  display: flex;
-  align-items: center;
-}
-
-.fcr-subtitles-history__list__item {
-  display: flex;
-  padding-bottom: 24px;
-}
-
-.fcr-subtitles-history__list__item__action {
-  margin: 0 auto;
-  width: 128px;
-  height: 30px;
-  color: var(--fcr_ui_scene_icontext1);
-  font-weight: 300;
-  font-size: 12px;
-  line-height: 30px;
-  text-align: center;
-  background: var(--fcr_chat_bg);
-  border-radius: var(--fcr_cornerradius_xxxxl);
-}
-
-.fcr-subtitles-history__list__item__head-icon {
-  margin-right: 12px;
-}
-
-.fcr-subtitles-history__list__item__info {
-  display: flex;
-  margin-bottom: 6px;
-  font-size: 12px;
-  line-height: 1;
-}
-.fcr-subtitles-history__list__item__info__name {
-  margin-right: 8px;
-  color: var(--fcr_ui_scene_icontext1);
-}
-.fcr-subtitles-history__list__item__info__time {
-  color: var(--fcr_ui_scene_icontext3);
-}
-
-.fcr-subtitles-history__list__item__text,
-.fcr-subtitles-history__list__item__text--translation {
-  font-size: 14px;
-  font-weight: 500;
-  line-height: 1.3;
-  color: var(--fcr_ui_scene_icontext1);
-}
-
-.fcr-subtitles-history__list__item__text--translation {
-  margin-top: 6px;
-  color: var(--fcr_ui_scene_icontext2);
-}
-
-.fcr-subtitles-history__footer {
-  display: flex;
-  justify-content: space-between;
-  padding: 10px 0;
-}
-
-.fcr-subtitles-history__footer__btn {
-  width: 100%;
-}
-
-.fcr-ui-subtitles-history-request-dialog .fcr-confirm-content-title {
-  text-align: center;
-}
-
-.fcr-ui-subtitles-history-request-dialog .fcr-button {
-  width: 50%;
-  flex-shrink: 1;
-}
+.fcr-subtitles-history__header {
+  display: flex;
+  align-items: center;
+  padding: 7px 12px;
+  font-size: 12px;
+  line-height: 16px;
+  color: var(--fcr_ui_scene_icontext1);
+  background-color: var(--fcr_web_ui_scene_fill4_popup);
+  border-radius: var(--fcr_cornerradius_s);
+}
+
+.fcr-no-data-subtitles-history {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-grow: 1;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+
+.fcr-no-data-subtitles-history img {
+  width: 138px;
+  height: 100;
+  object-fit: contain;
+  margin-bottom: 20px;
+}
+
+.fcr-no-data-subtitles-history span {
+  font-weight: 400;
+  font-size: 13px;
+  line-height: 14px;
+  font-family: PingFang HK;
+  color: var(--fcr_ui_scene_icontext2);
+}
+
+.fcr-subtitles-history-wrapper {
+  padding: 5px 15px 0 15px;
+  height: 100%;
+}
+
+.fcr-dialog-container .fcr-subtitles-history-wrapper-electron {
+  height: calc(100% - 46px);
+}
+
+.fcr-subtitles-history-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.fcr-subtitles-history__content {
+  margin: 24px 0 12px 0;
+  flex-grow: 1;
+  overflow-y: auto;
+}
+
+.fcr-subtitles-history__waiting-input {
+  display: flex;
+  align-items: center;
+}
+
+.fcr-subtitles-history__list__item {
+  display: flex;
+  padding-bottom: 24px;
+}
+
+.fcr-subtitles-history__list__item__action {
+  margin: 0 auto;
+  width: 128px;
+  height: 30px;
+  color: var(--fcr_ui_scene_icontext1);
+  font-weight: 300;
+  font-size: 12px;
+  line-height: 30px;
+  text-align: center;
+  background: var(--fcr_chat_bg);
+  border-radius: var(--fcr_cornerradius_xxxxl);
+}
+
+.fcr-subtitles-history__list__item__head-icon {
+  margin-right: 12px;
+}
+
+.fcr-subtitles-history__list__item__info {
+  display: flex;
+  margin-bottom: 6px;
+  font-size: 12px;
+  line-height: 1;
+}
+.fcr-subtitles-history__list__item__info__name {
+  margin-right: 8px;
+  color: var(--fcr_ui_scene_icontext1);
+}
+.fcr-subtitles-history__list__item__info__time {
+  color: var(--fcr_ui_scene_icontext3);
+}
+
+.fcr-subtitles-history__list__item__text,
+.fcr-subtitles-history__list__item__text--translation {
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 1.3;
+  color: var(--fcr_ui_scene_icontext1);
+}
+
+.fcr-subtitles-history__list__item__text--translation {
+  margin-top: 6px;
+  color: var(--fcr_ui_scene_icontext2);
+}
+
+.fcr-subtitles-history__footer {
+  display: flex;
+  justify-content: space-between;
+  padding: 10px 0;
+}
+
+.fcr-subtitles-history__footer__btn {
+  width: 100%;
+}
+
+.fcr-ui-subtitles-history-request-dialog .fcr-confirm-content-title {
+  text-align: center;
+}
+
+.fcr-ui-subtitles-history-request-dialog .fcr-button {
+  width: 50%;
+  flex-shrink: 1;
+}

package/lib/modules/subtitles-history/store.base.d.ts

@@ -10,7 +10,7 @@ export type Subtitle = {
     headIcon: string;
 };
 export default class SubtitlesHistoryStoreBase {
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("fcr-core/lib/imports").Logger;
     private _disposer;
     private _eventProvider;
     private _messageProvider;
@@ -26,6 +26,8 @@ export default class SubtitlesHistoryStoreBase {
     private _dialogObserver;
     private _requestDialogId;
     private _respondDialogId;
+    /** 主持人处理转写请求的时间 */
+    private _acceptOrRejectRequestTranscribingTime;
     /** 发起转写请求的用户 */
     private _requestTranscribingUser;
     /** 自己发起转写请求时的 sessionId */

package/lib/modules/subtitles-history/store.base.js

@@ -72,6 +72,7 @@ var _timer = require("./components/timer");
 var _type4 = require("../../type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _respondDialogContent = require("./components/respond-dialog-content");
+var _imports = require("fcr-core/lib/imports");
 var _jsxRuntime = require("react/jsx-runtime");
 var _SubtitlesHistoryStoreBase;
 var _initProto, _init_isLoading, _toggleOpenDecs, _ref;
@@ -103,6 +104,8 @@ var SubtitlesHistoryStoreBase = exports["default"] = /*#__PURE__*/function () {
     });
     (0, _defineProperty2["default"])(this, "_requestDialogId", null);
     (0, _defineProperty2["default"])(this, "_respondDialogId", null);
+    /** 主持人处理转写请求的时间 */
+    (0, _defineProperty2["default"])(this, "_acceptOrRejectRequestTranscribingTime", 0);
     /** 发起转写请求的用户 */
     (0, _defineProperty2["default"])(this, "_requestTranscribingUser", null);
     /** 自己发起转写请求时的 sessionId */
@@ -499,6 +502,7 @@ var SubtitlesHistoryStoreBase = exports["default"] = /*#__PURE__*/function () {
               case 0:
                 _this3._closeRespondDialog(id);
                 _context6.prev = 1;
+                _this3._acceptOrRejectRequestTranscribingTime = Date.now();
                 _context6.next = 2;
                 return _this3._sttProvider.rejectOpenTranscribing(session);
               case 2:
@@ -551,6 +555,7 @@ var SubtitlesHistoryStoreBase = exports["default"] = /*#__PURE__*/function () {
                   _this3._closeRespondDialog(id);
                   _context7.prev = 1;
                   _this3._setIsLoading(true);
+                  _this3._acceptOrRejectRequestTranscribingTime = Date.now();
                   _context7.next = 2;
                   return _this3._sttProvider.acceptOpenTranscribing(session);
                 case 2:
@@ -691,6 +696,11 @@ var SubtitlesHistoryStoreBase = exports["default"] = /*#__PURE__*/function () {
           this.logger.info('_onRoomSessionReceived: have set not to receive transcribing request, ignore this request');
           return;
         }
+        if (Date.now() - this._acceptOrRejectRequestTranscribingTime < _imports.Duration.second(3)) {
+          // 在刚处理完请求的 3 秒内, 忽略后续请求
+          this.logger.info('_onRoomSessionReceived: accept or reject a request in 3 second, ignore this request');
+          return;
+        }
         if (this._respondDialogId) {
           // 多人一起提交申请时, 只处理第一个请求, 在处理期间忽略后续请求
           this.logger.info('_onRoomSessionReceived: respond dialog is already opened, ignore this request');
@@ -715,7 +725,7 @@ var SubtitlesHistoryStoreBase = exports["default"] = /*#__PURE__*/function () {
         this._showRespondDialog(session);
       }
       if (session.sessionKey === _type2.FcrUISessionKey.REJECT_OPEN_TRANSCRIBING) {
-        var isSelfRequest = this._requestTranscribingTimeBySelf && Date.now() - this._requestTranscribingTimeBySelf < _type.FcrUiSttConstants.REQUEST_OPEN_TRANSCRIBING_DURATION;
+        var isSelfRequest = this._requestTranscribingTimeBySelf && Date.now() - this._requestTranscribingTimeBySelf < _type.FcrUISttConstants.REQUEST_OPEN_TRANSCRIBING_DURATION;
         if (!(isSelfRequest || [_type3.FcrUserRole.HOST, _type3.FcrUserRole.COHOST].includes(localUser.userRole))) {
           // 不是申请开启转写的用户，或者是主持人或联席主持人，无需处理该拒绝通知
           return;

package/lib/modules/video-window/components/members/index.css

@@ -1,51 +1,51 @@
-.fcr-video-window-members {
-  gap: 0;
-  user-select: none;
-  position: relative;
-  width: 100%;
-  min-height: 144px;
-  flex: 1;
-  display: none;
-  flex-direction: column;
-  align-items: center;
-  box-sizing: border-box;
-  padding: 0 1px;
-  border: 1px solid transparent;
-  border-top: none;
-  background-color: var(--fcr_web_ui_scene_fill5);
-  border-radius: 0 0 var(--fcr_cornerradius_m) var(--fcr_cornerradius_m);
-}
-.fcr-video-window-members .fcr-video-window-members-item {
-  width: 100%;
-  min-height: 144px;
-  overflow: hidden;
-  flex: 1;
-  box-sizing: border-box;
-}
-.fcr-video-window-members .fcr-video-window-members-item_last {
-  border-radius: 0 0 var(--fcr_cornerradius_s) var(--fcr_cornerradius_s);
-}
-.fcr-video-window-members .fcr-video-window-members-item_last .fcr-member-window-excitation {
-  border-radius: 0 0 var(--fcr_cornerradius_s) var(--fcr_cornerradius_s);
-}
-.fcr-video-window-members.fcr-video-window-members_mediapreview {
-  display: flex;
-  border: 1px solid var(--fcr_ui_scene_line1);
-  border-top: 0;
-}
-.fcr-video-window-members.fcr-video-window-members_mediapreviews {
-  border: 1px solid var(--fcr_ui_scene_line1);
-  border-top: 0;
-  display: flex;
-}
-.fcr-video-window-members-resize {
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  width: 100%;
-  display: none;
-  justify-content: space-between;
-}
-.fcr-video-window-members-resize_active {
-  display: flex;
-}
+.fcr-video-window-members {
+  gap: 0;
+  user-select: none;
+  position: relative;
+  width: 100%;
+  min-height: 144px;
+  flex: 1;
+  display: none;
+  flex-direction: column;
+  align-items: center;
+  box-sizing: border-box;
+  padding: 0 1px;
+  border: 1px solid transparent;
+  border-top: none;
+  background-color: var(--fcr_web_ui_scene_fill5);
+  border-radius: 0 0 var(--fcr_cornerradius_m) var(--fcr_cornerradius_m);
+}
+.fcr-video-window-members .fcr-video-window-members-item {
+  width: 100%;
+  min-height: 144px;
+  overflow: hidden;
+  flex: 1;
+  box-sizing: border-box;
+}
+.fcr-video-window-members .fcr-video-window-members-item_last {
+  border-radius: 0 0 var(--fcr_cornerradius_s) var(--fcr_cornerradius_s);
+}
+.fcr-video-window-members .fcr-video-window-members-item_last .fcr-member-window-excitation {
+  border-radius: 0 0 var(--fcr_cornerradius_s) var(--fcr_cornerradius_s);
+}
+.fcr-video-window-members.fcr-video-window-members_mediapreview {
+  display: flex;
+  border: 1px solid var(--fcr_ui_scene_line1);
+  border-top: 0;
+}
+.fcr-video-window-members.fcr-video-window-members_mediapreviews {
+  border: 1px solid var(--fcr_ui_scene_line1);
+  border-top: 0;
+  display: flex;
+}
+.fcr-video-window-members-resize {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  display: none;
+  justify-content: space-between;
+}
+.fcr-video-window-members-resize_active {
+  display: flex;
+}

package/lib/modules/video-window/components/speaking/index.css

@@ -1,86 +1,86 @@
-.fcr-video-window-speaking-wrapper {
-  width: 100%;
-  height: 50px;
-  box-sizing: border-box;
-  position: relative;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 1px;
-  border-radius: 0 0 var(--fcr_cornerradius_m) var(--fcr_cornerradius_m);
-  border: 1px solid transparent;
-}
-.fcr-video-window-speaking-wrapper_hover,
-.fcr-video-window-speaking-wrapper_mediapreview {
-  background-color: var(--fcr_web_ui_scene_fill5);
-  border-left: 1px solid var(--fcr_ui_scene_line1);
-  border-right: 1px solid var(--fcr_ui_scene_line1);
-}
-.fcr-video-window-speaking-wrapper.fcr-video-window-speaking-wrapper_mediapreview {
-  border-radius: var(--fcr_cornerradius_m) var(--fcr_cornerradius_m) 0 0;
-}
-.fcr-video-window-speaking-wrapper.fcr-video-window-speaking-wrapper_hover.fcr-video-window-speaking-wrapper_mediapreview {
-  border-radius: 0;
-}
-.fcr-video-window-speaking {
-  position: absolute;
-  inset: 0;
-  margin: 0 auto;
-  display: flex;
-  box-sizing: border-box;
-  width: calc(100% - 2px);
-  height: 48px;
-  align-items: center;
-  gap: 8px;
-  padding: 0 4px;
-  background-color: var(--fcr_mobile_ui_scene_color_popup_fill1);
-  border-radius: var(--fcr_cornerradius_m);
-}
-.fcr-video-window-speaking-wrapper_mediapreview .fcr-video-window-speaking {
-  border-radius: var(--fcr_cornerradius_m) var(--fcr_cornerradius_m) 0 0;
-}
-.fcr-video-window-speaking-icon {
-  flex-grow: 0;
-  flex-shrink: 0;
-  width: 40px;
-  height: 40px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: var(--fcr_mobile_ui_scene_guide);
-  border-radius: var(--fcr_cornerradius_m);
-  cursor: pointer;
-}
-.fcr-video-window-speaking-icon .device-control {
-  width: 40px;
-  height: 40px;
-  min-width: 40px;
-}
-.fcr-video-window-speaking-icon .device-control-inner {
-  justify-content: center;
-  height: 40px;
-  min-width: 40px;
-}
-.fcr-video-window-speaking-icon .device-control-item-wrapper:hover {
-  background: none;
-}
-.fcr-video-window-speaking-icon .device-control-extra {
-  display: none;
-}
-.fcr-video-window-control-speakers {
-  flex: 1 0 0;
-  height: 14px;
-  display: flex;
-  gap: 4px;
-  font-size: 12px;
-  color: var(--fcr_ui_scene_icontext1);
-}
-.fcr-video-window-control-speakers_names {
-  width: 0;
-  flex-grow: 1;
-  font-weight: 800;
-  color: var(--fcr_ui_scene_icontext1);
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
+.fcr-video-window-speaking-wrapper {
+  width: 100%;
+  height: 50px;
+  box-sizing: border-box;
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1px;
+  border-radius: 0 0 var(--fcr_cornerradius_m) var(--fcr_cornerradius_m);
+  border: 1px solid transparent;
+}
+.fcr-video-window-speaking-wrapper_hover,
+.fcr-video-window-speaking-wrapper_mediapreview {
+  background-color: var(--fcr_web_ui_scene_fill5);
+  border-left: 1px solid var(--fcr_ui_scene_line1);
+  border-right: 1px solid var(--fcr_ui_scene_line1);
+}
+.fcr-video-window-speaking-wrapper.fcr-video-window-speaking-wrapper_mediapreview {
+  border-radius: var(--fcr_cornerradius_m) var(--fcr_cornerradius_m) 0 0;
+}
+.fcr-video-window-speaking-wrapper.fcr-video-window-speaking-wrapper_hover.fcr-video-window-speaking-wrapper_mediapreview {
+  border-radius: 0;
+}
+.fcr-video-window-speaking {
+  position: absolute;
+  inset: 0;
+  margin: 0 auto;
+  display: flex;
+  box-sizing: border-box;
+  width: calc(100% - 2px);
+  height: 48px;
+  align-items: center;
+  gap: 8px;
+  padding: 0 4px;
+  background-color: var(--fcr_mobile_ui_scene_color_popup_fill1);
+  border-radius: var(--fcr_cornerradius_m);
+}
+.fcr-video-window-speaking-wrapper_mediapreview .fcr-video-window-speaking {
+  border-radius: var(--fcr_cornerradius_m) var(--fcr_cornerradius_m) 0 0;
+}
+.fcr-video-window-speaking-icon {
+  flex-grow: 0;
+  flex-shrink: 0;
+  width: 40px;
+  height: 40px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: var(--fcr_mobile_ui_scene_guide);
+  border-radius: var(--fcr_cornerradius_m);
+  cursor: pointer;
+}
+.fcr-video-window-speaking-icon .device-control {
+  width: 40px;
+  height: 40px;
+  min-width: 40px;
+}
+.fcr-video-window-speaking-icon .device-control-inner {
+  justify-content: center;
+  height: 40px;
+  min-width: 40px;
+}
+.fcr-video-window-speaking-icon .device-control-item-wrapper:hover {
+  background: none;
+}
+.fcr-video-window-speaking-icon .device-control-extra {
+  display: none;
+}
+.fcr-video-window-control-speakers {
+  flex: 1 0 0;
+  height: 14px;
+  display: flex;
+  gap: 4px;
+  font-size: 12px;
+  color: var(--fcr_ui_scene_icontext1);
+}
+.fcr-video-window-control-speakers_names {
+  width: 0;
+  flex-grow: 1;
+  font-weight: 800;
+  color: var(--fcr_ui_scene_icontext1);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}

package/lib/modules/video-window/components/topControl/index.css

@@ -1,35 +1,35 @@
-.fcr-video-window-topcontrol {
-  display: flex;
-  width: 100%;
-  gap: 3px;
-  height: 38px;
-  box-sizing: border-box;
-  overflow: hidden;
-  background-color: var(--fcr_web_ui_scene_fill5);
-  border-radius: var(--fcr_cornerradius_m) var(--fcr_cornerradius_m) 0 0;
-  padding: 4px 6px;
-  visibility: hidden;
-  border: 1px solid var(--fcr_ui_scene_line1);
-  border-bottom: none;
-  -webkit-app-region: drag;
-  user-select: none;
-  -webkit-user-select: none;
-}
-.fcr-video-window-topcontrol.fcr-video-window-topcontrol_hover {
-  visibility: visible;
-}
-.fcr-video-window-topcontrol-item {
-  width: 30px;
-  height: 30px;
-  display: flex;
-  justify-content: center;
-  flex-direction: column-reverse;
-  border-radius: var(--fcr_cornerradius_xs);
-  -webkit-app-region: no-drag;
-}
-.fcr-video-window-topcontrol-item:hover {
-  background: var(--fcr_web_ui_scene_hover);
-}
-.fcr-video-window-topcontrol-item:hover svg path {
-  fill: var(--fcr_ui_scene_ramp_brand6);
-}
+.fcr-video-window-topcontrol {
+  display: flex;
+  width: 100%;
+  gap: 3px;
+  height: 38px;
+  box-sizing: border-box;
+  overflow: hidden;
+  background-color: var(--fcr_web_ui_scene_fill5);
+  border-radius: var(--fcr_cornerradius_m) var(--fcr_cornerradius_m) 0 0;
+  padding: 4px 6px;
+  visibility: hidden;
+  border: 1px solid var(--fcr_ui_scene_line1);
+  border-bottom: none;
+  -webkit-app-region: drag;
+  user-select: none;
+  -webkit-user-select: none;
+}
+.fcr-video-window-topcontrol.fcr-video-window-topcontrol_hover {
+  visibility: visible;
+}
+.fcr-video-window-topcontrol-item {
+  width: 30px;
+  height: 30px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column-reverse;
+  border-radius: var(--fcr_cornerradius_xs);
+  -webkit-app-region: no-drag;
+}
+.fcr-video-window-topcontrol-item:hover {
+  background: var(--fcr_web_ui_scene_hover);
+}
+.fcr-video-window-topcontrol-item:hover svg path {
+  fill: var(--fcr_ui_scene_ramp_brand6);
+}