fcr-ui-scene 3.8.0-alpha → 3.8.0

package/lib/modules/share-screen/store.electron.js

@@ -135,7 +135,6 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
                   (0, _mobx.runInAction)(function () {
                     _this2.selectedShareItem = null;
                     _this2.screenShareProvider.setSelectionBounds(null);
-                    _this2.screenShareProvider.setSelectionIdAndType(null);
                   });
                 }
               }
@@ -177,10 +176,6 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
       var isDisplay = selected.type === _type.FcrUIShareType.DISPLAY;
       if (isWindow || isDisplay) {
         this.screenShareProvider.setSelectionBounds(selected.bounds);
-        this.screenShareProvider.setSelectionIdAndType({
-          id: selected.id,
-          type: isWindow ? _type3.FcrScreenCaptureType.WINDOW : _type3.FcrScreenCaptureType.SCREEN
-        });
       }
     }
   }, {
@@ -321,10 +316,6 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
               } else {
                 _displayList$ = displayList[0], bounds = _displayList$.bounds, id = _displayList$.id;
                 this.screenShareProvider.setSelectionBounds(bounds);
-                this.screenShareProvider.setSelectionIdAndType({
-                  id: id,
-                  type: _type3.FcrScreenCaptureType.SCREEN
-                });
                 this.screenShareProvider.startShare({
                   videoSourceId: id,
                   captureType: _type3.FcrScreenCaptureType.SCREEN
@@ -345,21 +336,22 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
     key: "_handleDisplayCountUpdated",
     value: function () {
       var _handleDisplayCountUpdated2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(event) {
-        var eventAction, _this$selectedShareIt, type, id, windowList, sharingTarget;
+        var eventAction, _this$selectedShareIt, type, id, sharingTargetBounds, displayList, display, windowList, window, selectionBounds, _t;
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               eventAction = event.action;
-              if (!(eventAction === _constant.FcrUIRendererEventAction.SCREEN_DISPLAY_REMOVED
+              if (!(eventAction === _constant.FcrUIRendererEventAction.SCREEN_DISPLAY_REMOVED || eventAction === _constant.FcrUIRendererEventAction.SCREEN_DISPLAY_ADDED
+
               // ||
               // eventAction === FcrUIRendererEventAction.SCREEN_DISPLAY_METRICS_CHANGED
               )) {
-                _context4.next = 4;
+                _context4.next = 11;
                 break;
               }
               this.logger.info("action: ".concat(eventAction));
               if (!this.screenShareProvider.isLocalUserScreenSharing) {
-                _context4.next = 4;
+                _context4.next = 11;
                 break;
               }
               if (this.selectedShareItem) {
@@ -370,30 +362,66 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
               return _context4.abrupt("return");
             case 1:
               _this$selectedShareIt = this.selectedShareItem, type = _this$selectedShareIt.type, id = _this$selectedShareIt.id;
-              if (!(type === _type.FcrUIShareType.WINDOW)) {
-                _context4.next = 4;
+              if (!(type === _type.FcrUIShareType.DISPLAY)) {
+                _context4.next = 5;
                 break;
               }
               _context4.next = 2;
-              return this.screenShareProvider.getWindowList();
+              return this.screenShareProvider.getDisplayList();
             case 2:
-              windowList = _context4.sent;
-              sharingTarget = windowList.find(function (item) {
+              displayList = _context4.sent;
+              display = displayList.find(function (item) {
                 return item.id === id;
               });
-              if (sharingTarget) {
+              if (!display) {
                 _context4.next = 3;
                 break;
               }
-              this.logger.warn('sharing target is missing when display changed');
-              return _context4.abrupt("return");
+              sharingTargetBounds = display.bounds;
+              _context4.next = 4;
+              break;
             case 3:
-              this.screenShareProvider.changeSelectionBounds(sharingTarget.bounds, _struct.FcrUISelectionBoundsChangeReason.DISPLAY_CHANGE);
+              this.logger.warn("can not find display info for shared screen id: ".concat(id));
+              return _context4.abrupt("return");
             case 4:
+              _context4.next = 10;
+              break;
+            case 5:
+              _context4.next = 6;
+              return this.screenShareProvider.getWindowList();
+            case 6:
+              windowList = _context4.sent;
+              window = windowList.find(function (item) {
+                return item.id === id;
+              });
+              if (!window) {
+                _context4.next = 7;
+                break;
+              }
+              sharingTargetBounds = window.bounds;
+              _context4.next = 10;
+              break;
+            case 7:
+              this.logger.warn("can not find window info for shared window id: ".concat(id));
+
+              // 共享的窗口被隐藏时，尝试使用 selectionBounds 作为位置依据
+              _context4.prev = 8;
+              selectionBounds = this.screenShareProvider.selectionBounds;
+              sharingTargetBounds = this._renderer.getDisplayMatching(selectionBounds).bounds;
+              _context4.next = 10;
+              break;
+            case 9:
+              _context4.prev = 9;
+              _t = _context4["catch"](8);
+              this.logger.warn("get selection bounds error, can not set video window position: ".concat(_t));
+              return _context4.abrupt("return");
+            case 10:
+              this.screenShareProvider.changeSelectionBounds(sharingTargetBounds, _struct.FcrUISelectionBoundsChangeReason.DISPLAY_CHANGE);
+            case 11:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this);
+        }, _callee4, this, [[8, 9]]);
       }));
       function _handleDisplayCountUpdated(_x) {
         return _handleDisplayCountUpdated2.apply(this, arguments);

package/lib/modules/subtitles-history/components/list-item.js

@@ -22,15 +22,12 @@ var getDateText = function getDateText(time) {
   var mm = minute < 10 ? '0' + minute : minute;
   var now = new Date();
   if (year === now.getFullYear()) {
-    if (month === now.getMonth() + 1) {
-      if (day === now.getDate()) {
-        return "".concat(hh, ":").concat(mm);
-      }
-      return "".concat(day, " ").concat(hh, ":").concat(mm);
+    if (month === now.getMonth() + 1 && day === now.getDate()) {
+      return "".concat(hh, ":").concat(mm);
     }
-    return "".concat(month, "-").concat(day, " ").concat(hh, ":").concat(mm);
+    return "".concat(month, "/").concat(day, " ").concat(hh, ":").concat(mm);
   }
-  return "".concat(year, "-").concat(month, "-").concat(day, " ").concat(hh, ":").concat(mm);
+  return "".concat(year, "/").concat(month, "/").concat(day, " ").concat(hh, ":").concat(mm);
 };
 var renderSentence = function renderSentence(item, showTwoLine, isTranslateLanguageOpened) {
   /** 没有开启双语显示但是开启了翻译时, 首行要显示的翻译语言 */

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/providers/screen-share/provider.base.d.ts

@@ -1,6 +1,6 @@
 import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
 import { FcrDesktopMediaControl, FcrStreamControl, FcrStreamObserver } from 'fcr-core';
-import { FcrScreenCaptureType, FcrSharingControl, FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrSharingControl, FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrUIManagedObject, FcrUIObjectManager } from '../../object-manager';
 import { FcrUISharedScreenShareDataSource } from '../../shared-data/screen-share/type';
 import { FcrUIFacilityProvider } from '../facility/type';
@@ -48,15 +48,12 @@ export declare abstract class FcrUIScreenShareProviderBase implements FcrUIManag
     protected _windowList: FcrUIScreenShareWindowInfo[];
     protected _displayList: FcrUIScreenShareDisplayInfo[];
     protected _localUserId: string;
-    protected _selectionIdAndType: {
-        id: string;
-        type: FcrScreenCaptureType;
-    } | null;
     protected _selectionBounds: FcrUI.FcrUIRectangle | null;
     protected _sharingDisplayBounds: FcrUI.FcrUIRectangle | null;
     protected _closeByOther: boolean;
     protected _closeOperator: FcrUserInfo | null;
     protected _localUser: FcrUserInfo;
+    protected _abortController: AbortController | null;
     protected accessor _isLocalUserScreenSharing: boolean;
     protected accessor _isRemoteUserScreenSharing: boolean;
     protected accessor _isSharingWithAudio: boolean;
@@ -65,10 +62,6 @@ export declare abstract class FcrUIScreenShareProviderBase implements FcrUIManag
     protected accessor _shareStreamId: string | null;
     protected accessor _sharingUser: FcrUserInfo | null;
     get selectionBounds(): FcrUI.FcrUIRectangle;
-    get selectionIdAndType(): {
-        id: string;
-        type: FcrScreenCaptureType;
-    };
     get sharingDisplayBounds(): FcrUI.FcrUIRectangle;
     get isSharingWithAudio(): boolean;
     get isSharingInSmoothMode(): boolean;
@@ -83,10 +76,6 @@ export declare abstract class FcrUIScreenShareProviderBase implements FcrUIManag
     abstract replaceShare(params: FcrUIScreenShareReplaceParams): Promise<void>;
     addObserver(observer: FcrUIScreenShareObserver): void;
     removeObserver(observer: FcrUIScreenShareObserver): void;
-    setSelectionIdAndType(idAndType: {
-        id: string;
-        type: FcrScreenCaptureType;
-    } | null): void;
     setSelectionBounds(bounds: FcrUI.FcrUIRectangle | null): void;
     changeSelectionBounds(bounds: FcrUI.FcrUIRectangle, reason: FcrUISelectionBoundsChangeReason): void;
     enableScreenShareAudio(): Promise<void>;

package/lib/providers/screen-share/provider.base.js

@@ -122,11 +122,11 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
     (0, _defineProperty2["default"])(this, "_isScreenShareStarted", false);
     (0, _defineProperty2["default"])(this, "_windowList", []);
     (0, _defineProperty2["default"])(this, "_displayList", []);
-    (0, _defineProperty2["default"])(this, "_selectionIdAndType", null);
     (0, _defineProperty2["default"])(this, "_selectionBounds", null);
     (0, _defineProperty2["default"])(this, "_sharingDisplayBounds", null);
     (0, _defineProperty2["default"])(this, "_closeByOther", false);
     (0, _defineProperty2["default"])(this, "_closeOperator", null);
+    (0, _defineProperty2["default"])(this, "_abortController", null);
     _classPrivateFieldInitSpec(this, _A, _init__isLocalUserScreenSharing(this, false));
     _classPrivateFieldInitSpec(this, _B, _init__isRemoteUserScreenSharing(this, false));
     _classPrivateFieldInitSpec(this, _C, _init__isSharingWithAudio(this, false));
@@ -246,14 +246,6 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
       }
       throw new Error('cannot get selection bounds while no selection made');
     }
-  }, {
-    key: "selectionIdAndType",
-    get: function get() {
-      if (this._selectionIdAndType) {
-        return this._selectionIdAndType;
-      }
-      throw new Error('can not get selection id and type while no selection made');
-    }
   }, {
     key: "sharingDisplayBounds",
     get: function get() {
@@ -313,9 +305,6 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
     value: function removeObserver(observer) {
       this.observable.removeObserver(observer);
     }
-  }, {
-    key: "setSelectionIdAndType",
-    value: function setSelectionIdAndType(idAndType) {}
   }, {
     key: "setSelectionBounds",
     value: function setSelectionBounds(bounds) {}
@@ -457,6 +446,10 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
   }, {
     key: "_stopDeviceCapture",
     value: function _stopDeviceCapture() {
+      if (this._abortController) {
+        this._abortController.abort();
+        this._abortController = null;
+      }
       this.strategy.stopScreenCapture();
       this.strategy.stopLoopbackCapture();
     }

package/lib/providers/screen-share/provider.electron.d.ts

@@ -1,4 +1,3 @@
-import { FcrScreenCaptureType } from 'fcr-core/lib/type';
 import { FcrUIObjectManager } from '../../object-manager';
 import { FcrUIScreenShareProviderBase } from './provider.base';
 import { FcrUIScreenShareStrategy } from './strategy/type';
@@ -15,10 +14,6 @@ export declare class FcrUIScreenShareProviderImpl extends FcrUIScreenShareProvid
     replaceShare({ videoSourceId, captureType }: FcrUIScreenShareReplaceParams): Promise<void>;
     findSharingDisplayBounds(): Electron.Rectangle;
     createStrategy(): FcrUIScreenShareStrategy;
-    setSelectionIdAndType(idAndType: {
-        id: string;
-        type: FcrScreenCaptureType;
-    } | null): void;
     setSelectionBounds(bounds: FcrUI.FcrUIRectangle | null): void;
     changeSelectionBounds(bounds: FcrUI.FcrUIRectangle, reason: FcrUISelectionBoundsChangeReason): void;
     private _getExcludeWindows;

package/lib/providers/screen-share/provider.electron.js

@@ -169,7 +169,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "startShare",
     value: function () {
       var _startShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref) {
-        var videoSourceId, _ref$captureType, captureType, createConfig, screenTrack, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, encoderConfig, excludeWindows, dimensions, frameRate, bitrate, _t, _t2;
+        var videoSourceId, _ref$captureType, captureType, createConfig, screenTrack, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, encoderConfig, aborted, abortController, excludeWindows, dimensions, frameRate, bitrate, _t, _t2;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -217,7 +217,15 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               }
               this._sharingDisplayBounds = this.findSharingDisplayBounds();
               this.observable.notifyObservers('onPrepreScreenCapture');
-              encoderConfig = this._getEncoderConfig(); // create screen stream
+              encoderConfig = this._getEncoderConfig();
+              aborted = false;
+              abortController = new AbortController();
+              this._abortController = abortController;
+              abortController.signal.addEventListener('abort', function () {
+                aborted = true;
+              });
+
+              // create screen stream
               _context3.prev = 5;
               _context3.next = 6;
               return this._screenStreamSync.startScreenStream(createConfig, encoderConfig);
@@ -236,7 +244,13 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
             case 9:
               excludeWindows = _context3.sent;
               dimensions = encoderConfig.dimensions, frameRate = encoderConfig.frameRate, bitrate = encoderConfig.bitrate;
-              _context3.next = 10;
+              if (!aborted) {
+                _context3.next = 10;
+                break;
+              }
+              throw new Error(_constant2.ERROR_MESSAGE_ABORTED);
+            case 10:
+              _context3.next = 11;
               return this.strategy.startScreenCapture({
                 sourceId: videoSourceId,
                 captureType: captureType,
@@ -245,11 +259,11 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
                 frameRate: frameRate,
                 bitrate: bitrate
               });
-            case 10:
-              _context3.next = 12;
-              break;
             case 11:
-              _context3.prev = 11;
+              _context3.next = 13;
+              break;
+            case 12:
+              _context3.prev = 12;
               _t2 = _context3["catch"](8);
               if (_t2 instanceof Error && _t2.message === _constant2.ERROR_MESSAGE_ABORTED) {
                 this.observable.notifyObservers('onScreenShareErrorOccurred', _struct.FcrUIScreenShareErrorCode.ABORT_START_SCREEN_CAPTURE);
@@ -257,18 +271,18 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
                 this.observable.notifyObservers('onScreenShareErrorOccurred', _struct.FcrUIScreenShareErrorCode.CANNOT_START_SCREEN_CAPTURE);
               }
               throw new Error("cannot start screen capture, error: ".concat(_t2));
-            case 12:
+            case 13:
               if (!this._isSharingWithAudio) {
-                _context3.next = 13;
+                _context3.next = 14;
                 break;
               }
-              _context3.next = 13;
+              _context3.next = 14;
               return this.strategy.startLoopbackCapture({});
-            case 13:
+            case 14:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[5, 7], [8, 11]]);
+        }, _callee3, this, [[5, 7], [8, 12]]);
       }));
       function startShare(_x) {
         return _startShare.apply(this, arguments);
@@ -282,6 +296,10 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              if (this._abortController) {
+                this._abortController.abort();
+                this._abortController = null;
+              }
               this.strategy.stopScreenCapture();
               this.strategy.stopLoopbackCapture();
               _context4.next = 1;
@@ -383,11 +401,6 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     value: function createStrategy() {
       return new _electron.FcrUIElectronScreenShareStrategy(this.objectManager);
     }
-  }, {
-    key: "setSelectionIdAndType",
-    value: function setSelectionIdAndType(idAndType) {
-      this._selectionIdAndType = idAndType;
-    }
   }, {
     key: "setSelectionBounds",
     value: function setSelectionBounds(bounds) {
@@ -474,7 +487,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }]);
 }(_provider.FcrUIScreenShareProviderBase);
 _FcrUIScreenShareProviderImpl = FcrUIScreenShareProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIScreenShareProviderImpl, [[_decorator.trace, 2, "getDisplayList"], [_decorator.trace, 2, "getWindowList"], [_decorator.trace, 2, "startShare"], [_decorator.trace, 2, "stopShare"], [_decorator.trace, 2, "replaceShare"], [_decorator.trace, 2, "setSelectionIdAndType"], [[_decorator.trace, _mobx.action], 2, "setSelectionBounds"], [[_decorator.trace, _mobx.action], 2, "changeSelectionBounds"]], [], 0, void 0, _provider.FcrUIScreenShareProviderBase).e;
+var _applyDecs$e = _applyDecs(_FcrUIScreenShareProviderImpl, [[_decorator.trace, 2, "getDisplayList"], [_decorator.trace, 2, "getWindowList"], [_decorator.trace, 2, "startShare"], [_decorator.trace, 2, "stopShare"], [_decorator.trace, 2, "replaceShare"], [[_decorator.trace, _mobx.action], 2, "setSelectionBounds"], [[_decorator.trace, _mobx.action], 2, "changeSelectionBounds"]], [], 0, void 0, _provider.FcrUIScreenShareProviderBase).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/providers/screen-share/type.d.ts

@@ -80,14 +80,6 @@ export interface FcrUIScreenShareProvider {
      * @returns 当前选中的共享区域的位置和尺寸信息
      */
     get selectionBounds(): FcrUI.FcrUIRectangle;
-    /**
-     * 获取当前选中的共享源的 id 和 类型
-     * @returns 选中的共享源的 id 和 类型
-     */
-    get selectionIdAndType(): {
-        id: string;
-        type: FcrScreenCaptureType;
-    };
     /**
      * 当前共享源所在的窗口边界信息
      * 例如：
@@ -169,14 +161,6 @@ export interface FcrUIScreenShareProvider {
      * 获取可共享的窗口列表
      */
     getWindowList(): Promise<FcrUIScreenShareWindowInfo[]>;
-    /**
-     *设置选中的共享源的 id 和 类型
-     * @param source
-     */
-    setSelectionIdAndType(idAndType: {
-        id: string;
-        type: FcrScreenCaptureType;
-    } | null): void;
     /**
      * 设置选中的共享源边界信息
      * @param source

package/lib/providers/stt-provider/stt-provider.d.ts

@@ -22,6 +22,7 @@ export declare class FcrUISttProviderImpl implements FcrUISttProvider, FcrUIMana
     private _sentenceMap;
     private _privilegeControl;
     private _interpreterDataSource;
+    private _effectiveTranslateLanguage;
     private _localUserId;
     private _privilegeObserver;
     private _roomControlObserver;
@@ -35,7 +36,6 @@ export declare class FcrUISttProviderImpl implements FcrUISttProvider, FcrUIMana
     private accessor _translateLanguage;
     private accessor _transcribingList;
     private accessor _captionSentence;
-    private accessor _preCaptionSentence;
     private accessor _isCaptionOpening;
     get captionState(): boolean;
     get transcribingState(): boolean;
@@ -49,7 +49,6 @@ export declare class FcrUISttProviderImpl implements FcrUISttProvider, FcrUIMana
     get isCaptionOpening(): boolean;
     get transcribingList(): FcrUISttTranscribingItem[];
     get captionSentence(): FcrUISttSentence | null;
-    get preCaptionSentence(): FcrUISttSentence | null;
     constructor({ sttControl, roomSessionControl, roomControl, localUserId, messageProvider, dialogProvider, sharedSecurityDataSource, privilegeProvider, sharedInterpreterDataSource, }: {
         sttControl: FcrSttControl;
         roomSessionControl: FcrRoomSessionControl;
@@ -64,7 +63,7 @@ export declare class FcrUISttProviderImpl implements FcrUISttProvider, FcrUIMana
     release(): void;
     requestOpenTranscribing(): Promise<string>;
     acceptOpenTranscribing(session: FcrRoomSession): Promise<[void, void]>;
-    rejectOpenTranscribing(session: FcrRoomSession): Promise<[void, string]>;
+    rejectOpenTranscribing(session: FcrRoomSession): Promise<[string]>;
     startCaption(): Promise<void>;
     stopCaption(isCallbackTriggered?: boolean): Promise<void>;
     startTranscribing(): Promise<void>;
@@ -72,12 +71,12 @@ export declare class FcrUISttProviderImpl implements FcrUISttProvider, FcrUIMana
     updateSourceLanguage(language: FcrLanguage): Promise<void>;
     subscribeTranslateLanguage(language: FcrLanguage | null): Promise<void>;
     clearCaptionSentence(): void;
-    clearPreCaptionSentence(): void;
     allowStartTranscribe(enable: boolean): void;
     allowStartCaption(enable: boolean): void;
     allowSetSourceLanguage(enable: boolean): void;
     addObserver(observer: FcrUISttObserver): void;
     removeObserver(observer: FcrUISttObserver): void;
+    private _updateSourceLanguage;
     private _getTranslation;
     private _handleSttEventReceived;
     private _handleSourceLanguageUpdated;