fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib/modules/share-screen/components/control-bar/index.js

@@ -9,91 +9,5 @@ var _mobxReact = require("mobx-react");
 require("./index.css");
 var FcrScreenShareControlBar = (0, _mobxReact.observer)(function (props) {
   return null;
-  // const { secondaryWindowProprs } = props;
-  // const {
-  //   screenShareWindowData,
-  //   zoomIn,
-  //   zoomOut,
-  //   fullContainer,
-  //   setOriginScalc,
-  //   toggleIsShowToolbar,
-  //   annotationHasStart,
-  //   isShowToolbar,
-  //   isZoomMaxmum,
-  //   isZoomMinimum,
-  //   isCurrentOriginal,
-  //   isAspectRatioPreserved,
-  //   isAnnotationSupported,
-  //   allowAnnotationSelfWriteState,
-  //   participantShareCanWeAnnotation,
-  // } = useContext(StoreContext);
-  // const transI18n = useI18n();
-
-  // const hasScreenSharing =
-  //   screenShareWindowData && screenShareWindowData.videoSourceType === FcrVideoSourceType.SCREEN;
-  // const hasLoopbackAudioStream =
-  //   hasScreenSharing &&
-  //   screenShareWindowData.hasLoopbackSharing &&
-  //   screenShareWindowData.hasMicrophoneAudioStream;
-
-  // const clickFn = useCallback(() => {
-  //   toggleIsShowToolbar();
-  // }, []);
-
-  // return (
-  //   <div className="fcr-screen-share-controlbar">
-  //     <div className="fcr-screen-share-controlbar-left">
-  //       {screenShareWindowData ? (
-  //         <>
-  //           <div className="fcr-screen-share-controlbar-username">
-  //             {screenShareWindowData.userName}
-  //             {transI18n('fmt_uimanager_labels_sharing')}
-  //           </div>
-  //           <FcrIcon
-  //             type={
-  //               !!hasLoopbackAudioStream
-  //                 ? FcrIconType.FCR_DEVICEAUDIOON
-  //                 : FcrIconType.FCR_DEVICEAUDIOOFF
-  //             }
-  //             size={22}
-  //             colors={{ iconPrimary: 'var(--fcr_ui_scene_ramp_green6)' }}
-  //             style={{ marginRight: '10px' }}
-  //           />
-  //         </>
-  //       ) : null}
-  //     </div>
-
-  //     <div className="fcr-screen-share-controlbar-center">
-  //       <FcrScreenShareZoomInBtn
-  //         isMinimum={secondaryWindowProprs?.isZoomMinimum ?? isZoomMinimum}
-  //         zoomIn={secondaryWindowProprs?.zoomIn || zoomIn}
-  //       />
-  //       <FcrScreenShareZoomOutBtn
-  //         isMaxmum={secondaryWindowProprs?.isZoomMaxmum ?? isZoomMaxmum}
-  //         zoomOut={secondaryWindowProprs?.zoomOut || zoomOut}
-  //       />
-  //       <FcrScreenShareFullContainerBtn
-  //         isAdaptived={secondaryWindowProprs?.isAspectRatioPreserved ?? isAspectRatioPreserved}
-  //         fullContainer={secondaryWindowProprs?.fullContainer || fullContainer}
-  //       />
-  //       <FcrScreenShareOrgSizeBtn
-  //         isOriginal={secondaryWindowProprs?.isCurrentOriginal ?? isCurrentOriginal}
-  //         setOriginScalc={secondaryWindowProprs?.setOriginScalc || setOriginScalc}
-  //       />
-  //     </div>
-  //     <div className="fcr-screen-share-controlbar-right">
-  //       {isAnnotationSupported && annotationHasStart && participantShareCanWeAnnotation() && (
-  //         <FcrScreenShareAnnotationBtn
-  //           visible={
-  //             secondaryWindowProprs ? secondaryWindowProprs.isShowToolbarToggle : annotationHasStart
-  //           }
-  //           disable={!allowAnnotationSelfWriteState}
-  //           isShowToolbar={isShowToolbar}
-  //           clickFn={clickFn}
-  //         />
-  //       )}
-  //     </div>
-  //   </div>
-  // );
 });
 var _default = exports["default"] = FcrScreenShareControlBar;

package/lib/modules/share-screen/components/selection/index.js

@@ -36,6 +36,7 @@ var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-
 require("./index.css");
 var _type = require("../../type");
 var _type2 = require("agora-ui-foundation/lib/components/icon/type");
+var _env = require("agora-foundation/lib/utilities/env");
 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; }
@@ -164,7 +165,8 @@ var ThumbnailRender = function ThumbnailRender(_ref3) {
     return (0, _tools.uint8ArrayToImageData)({
       buffer: image,
       width: width,
-      height: height
+      height: height,
+      isWindows: (0, _env.isWindows)()
     });
   }, [image]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {

package/lib/modules/share-screen/store.base.d.ts

@@ -7,7 +7,7 @@ import { FcrUIFacilityProvider } from '../../providers/facility/type';
 import { FcrUIMessageProvider } from '../../providers/message/type';
 import { FcrUIDialogProvider } from '../../providers/dialog/type';
 export default abstract class ShareScreenStoreBase implements FcrUIManagedObject {
-    protected logger: import("fcr-core/lib/imports").Logger;
+    protected logger: import("agora-foundation/lib/logger").Logger;
     protected dialogProvider: FcrUIDialogProvider;
     protected screenShareProvider: FcrUIScreenShareProvider;
     protected boardShareProvider: FcrUIBoardShareProvider;

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

@@ -74,6 +74,7 @@ var _type2 = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _struct = require("../../providers/screen-share/struct");
 var _type3 = require("agora-ui-foundation/lib/components/icon/type");
+var _type4 = require("../../modules/toast-manager/type");
 var _ShareScreenStoreBase;
 var _initProto, _init_isSharing, _init_displayList, _init_applicationList, _init_selectedShareItem, _init_isWhiteboardSelected, _init_isSharingWithAudio, _init_isSharingInSmoothMode, _loadSelectionListDecs, _setSelectedItemDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -121,9 +122,8 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
         });
         _this.dialogProvider.setSharingDisplayBounds(null);
         if (reason === _struct.FcrUIScreenShareStopReason.STOPPED_BY_OTHER) {
-          _this.messageProvider.showToast({
-            type: 'info',
-            message: (0, _i18n.transI18n)('fmt_share_tips_sharingdisabled')
+          _this.messageProvider.showToastByKey({
+            key: _type4.FcrUIToastKey.FMT_SHARE_TIPS_SHARINGDISABLED
           });
           _this._replaceShareConfirmDialog(operator);
         }
@@ -137,11 +137,9 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
       onScreenShareErrorOccurred: function onScreenShareErrorOccurred(code) {
         if (code === _struct.FcrUIScreenShareErrorCode.NETWORK_DISCONNECTED) {
           if (!_this.facilityProvider.isNetworkConnected) {
-            var params = {
-              message: (0, _i18n.transI18n)('fmt_screenshare_toast_network_error_unable_start_screen_share'),
-              type: 'error'
-            };
-            _this.messageProvider.showToast(params);
+            _this.messageProvider.showToastByKey({
+              key: _type4.FcrUIToastKey.FMT_SCREENTIPS_NETWORK_ERROR_UNABLE_START_SCREEN_SHARE
+            });
             return false;
           }
         }
@@ -320,7 +318,7 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
     key: "startShareScreen",
     value: function () {
       var _startShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var params, captureType, videoSourceId, _t;
+        var captureType, videoSourceId, _t;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -334,11 +332,9 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
                 _context2.next = 2;
                 break;
               }
-              params = {
-                message: (0, _i18n.transI18n)('fmt_screenshare_toast_network_error_unable_start_screen_share'),
-                type: 'error'
-              };
-              this.messageProvider.showToast(params);
+              this.messageProvider.showToastByKey({
+                key: _type4.FcrUIToastKey.FMT_SCREENTIPS_NETWORK_ERROR_UNABLE_START_SCREEN_SHARE
+              });
               return _context2.abrupt("return");
             case 2:
               _context2.prev = 2;

package/lib/modules/share-screen/store.electron.d.ts

@@ -8,6 +8,7 @@ export default class ElectronShareScreenStore extends ShareScreenStoreBase {
     private _sharedConfigDataSource;
     private _renderer;
     private _isSharing;
+    private _disposers;
     private _screenShareElectronObserver;
     get audioShareMode(): AudioProcessingChannel;
     constructor(args: ShareScreenStoreArgs);
@@ -20,7 +21,10 @@ export default class ElectronShareScreenStore extends ShareScreenStoreBase {
     private _ensureWindowsAreOpenAndPositioned;
     private _interceptDialogClose;
     private _showControlBar;
+    private _handleScreenShareStarted;
+    private _handleScreenShareEnded;
     private _hideControlBar;
+    private _addReactions;
     private _handleSourceReplaced;
     private _checkAutoStartScreenSharing;
     private _handleDisplayCountUpdated;

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

@@ -7,7 +7,6 @@ require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
@@ -42,10 +41,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+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.push.js");
 require("core-js/modules/es.object.to-string.js");
 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/web.dom-collections.for-each.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -69,6 +73,7 @@ var _type3 = require("fcr-core/lib/type");
 var _levelConfig = require("../dialog/level-config");
 var _imports = require("fcr-core/lib/imports");
 var _struct = require("../../providers/screen-share/struct");
+var _env = require("agora-foundation/lib/utilities/env");
 var _ElectronShareScreenStore;
 var _initProto, _handleSelectionOpenDecs, _setShareWithAudioStateDecs, _setShareInSmoothModeDecs, _ref;
 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)); }
@@ -87,10 +92,12 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
     _this = _callSuper(this, ElectronShareScreenStore, [args]);
     (0, _defineProperty2["default"])(_this, _ref, void _initProto(_this));
     (0, _defineProperty2["default"])(_this, "_isSharing", false);
+    (0, _defineProperty2["default"])(_this, "_disposers", []);
     (0, _defineProperty2["default"])(_this, "_screenShareElectronObserver", {
       onPrepreScreenCapture: _this._showControlBar,
-      onScreenShareErrorOccurred: _this._hideControlBar,
-      onScreenShareStopped: _this._hideControlBar,
+      onScreenShareStarted: _this._handleScreenShareStarted,
+      onScreenShareErrorOccurred: _this._handleScreenShareEnded,
+      onScreenShareStopped: _this._handleScreenShareEnded,
       onShareSourceReplaced: _this._handleSourceReplaced
     });
     _this._windowProvider = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
@@ -101,6 +108,7 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
     _this._renderer = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
     _this._renderer.addEventListener(_this._handleDisplayCountUpdated);
     _this.screenShareProvider.addObserver(_this._screenShareElectronObserver);
+    _this._addReactions();
     _this._checkAutoStartScreenSharing();
     return _this;
   }
@@ -181,6 +189,7 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
   }, {
     key: "release",
     value: function release() {
+      this._renderer.setMainWindowDisplaySupport(true);
       this._isSharing = false;
       this._dialogProvider.removeInterceptor(_type2.FcrDialogInterceptorEventName.ON_CLOSE, this._interceptDialogClose);
       this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR);
@@ -191,6 +200,10 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
       _superPropGet(ElectronShareScreenStore, "release", this, 3)([]);
       this.screenShareProvider.removeObserver(this._screenShareElectronObserver);
       this._renderer.removeEventListener(this._handleDisplayCountUpdated);
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this._disposers = [];
     }
   }, {
     key: "_ensureWindowsAreOpenAndPositioned",
@@ -240,7 +253,7 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
               isMultiDisplayActive = this._multiDisplayProvider.isActive;
               mainWindow = this._windowProvider.getCurrentWindow();
               if (isMultiDisplayActive) {
-                _context2.next = 1;
+                _context2.next = 2;
                 break;
               }
               if (!mainWindow.isFullScreen()) {
@@ -258,13 +271,14 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
                 videoWindow.show();
               }
               videoWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.VIDEO_WINDOW_LEVEL);
+            case 2:
               this._ensureWindowsAreOpenAndPositioned(true, isMultiDisplayActive);
               if (isMultiDisplayActive) {
                 this._multiDisplayProvider.moveMainWindowToIndexLeastDisplay();
               } else {
                 mainWindow.hide();
               }
-            case 2:
+            case 3:
             case "end":
               return _context2.stop();
           }
@@ -275,6 +289,23 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
       }
       return _showControlBar;
     }()
+  }, {
+    key: "_handleScreenShareStarted",
+    value: function _handleScreenShareStarted() {
+      var isMultiDisplayActive = this._multiDisplayProvider.isActive;
+
+      // 单屏幕模式下，需要通知主进程屏幕共享已开启，不支持显示主窗口，避免主窗口和control bar 重复显示
+      if (!isMultiDisplayActive) {
+        this._renderer.setMainWindowDisplaySupport(false);
+      }
+    }
+  }, {
+    key: "_handleScreenShareEnded",
+    value: function _handleScreenShareEnded() {
+      // 通知主进程屏幕共享已关闭，支持显示主窗口
+      this._renderer.setMainWindowDisplaySupport(true);
+      this._hideControlBar();
+    }
   }, {
     key: "_hideControlBar",
     value: function _hideControlBar() {
@@ -284,6 +315,22 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
       var mainWindow = this._windowProvider.getCurrentWindow();
       mainWindow.show();
     }
+  }, {
+    key: "_addReactions",
+    value: function _addReactions() {
+      var _this3 = this;
+      // 监听多屏模式状态变化，当用户正在屏幕共享时同步更新主窗口显示支持
+      this._disposers.push((0, _mobx.reaction)(function () {
+        return _this3._multiDisplayProvider.isActive;
+      }, function (isActive) {
+        if (_this3.screenShareProvider.isLocalUserScreenSharing) {
+          // 单屏模式下（isActive = false），禁用主窗口显示支持
+          // 多屏模式下（isActive = true），启用主窗口显示支持
+          _this3._renderer.setMainWindowDisplaySupport(isActive);
+          _this3.logger.info("Multi-display mode changed to ".concat(isActive ? 'active' : 'inactive', ", setMainWindowDisplaySupport(").concat(isActive, ")"));
+        }
+      }));
+    }
   }, {
     key: "_handleSourceReplaced",
     value: function _handleSourceReplaced() {
@@ -336,7 +383,7 @@ 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, sharingTargetBounds, displayList, display, windowList, window, selectionBounds, _t;
+        var eventAction, _this$selectedShareIt, removedDisplay, _this$selectedShareIt2, x, y, _removedDisplay$bound, displayX, displayY, width, height, isPointInRemovedDisplay, _this$selectedShareIt3, type, id, sharingTargetBounds, displayList, display, windowList, window, selectionBounds, _t;
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -346,82 +393,109 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
               // ||
               // eventAction === FcrUIRendererEventAction.SCREEN_DISPLAY_METRICS_CHANGED
               )) {
-                _context4.next = 11;
+                _context4.next = 14;
                 break;
               }
               this.logger.info("action: ".concat(eventAction));
+              if (!(eventAction === _constant.FcrUIRendererEventAction.SCREEN_DISPLAY_REMOVED)) {
+                _context4.next = 3;
+                break;
+              }
+              removedDisplay = event.display;
+              if (!(
+              // macOS: some versions do not emit screen track callbacks when a display is unplugged.
+              (0, _env.isMac)() && removedDisplay && this.screenShareProvider.isLocalUserScreenSharing && ((_this$selectedShareIt = this.selectedShareItem) === null || _this$selectedShareIt === void 0 ? void 0 : _this$selectedShareIt.type) === _type.FcrUIShareType.DISPLAY && this.selectedShareItem.bounds)) {
+                _context4.next = 3;
+                break;
+              }
+              _this$selectedShareIt2 = this.selectedShareItem.bounds, x = _this$selectedShareIt2.x, y = _this$selectedShareIt2.y;
+              _removedDisplay$bound = removedDisplay.bounds, displayX = _removedDisplay$bound.x, displayY = _removedDisplay$bound.y, width = _removedDisplay$bound.width, height = _removedDisplay$bound.height;
+              isPointInRemovedDisplay = x >= displayX && x < displayX + width && y >= displayY && y < displayY + height;
+              if (isPointInRemovedDisplay) {
+                _context4.next = 1;
+                break;
+              }
+              this.logger.info("removed display ".concat(removedDisplay.id, " does not match shared display, skip stop"));
+              return _context4.abrupt("return");
+            case 1:
+              this.logger.info("shared display removed (".concat(removedDisplay.id, "), stop screen sharing"));
+              _context4.next = 2;
+              return this.screenShareProvider.stopShare();
+            case 2:
+              return _context4.abrupt("return");
+            case 3:
               if (!this.screenShareProvider.isLocalUserScreenSharing) {
-                _context4.next = 11;
+                _context4.next = 14;
                 break;
               }
               if (this.selectedShareItem) {
-                _context4.next = 1;
+                _context4.next = 4;
                 break;
               }
               this.logger.warn('no selected share item, supposed to be non-null');
               return _context4.abrupt("return");
-            case 1:
-              _this$selectedShareIt = this.selectedShareItem, type = _this$selectedShareIt.type, id = _this$selectedShareIt.id;
+            case 4:
+              _this$selectedShareIt3 = this.selectedShareItem, type = _this$selectedShareIt3.type, id = _this$selectedShareIt3.id;
               if (!(type === _type.FcrUIShareType.DISPLAY)) {
-                _context4.next = 5;
+                _context4.next = 8;
                 break;
               }
-              _context4.next = 2;
+              _context4.next = 5;
               return this.screenShareProvider.getDisplayList();
-            case 2:
+            case 5:
               displayList = _context4.sent;
               display = displayList.find(function (item) {
                 return item.id === id;
               });
               if (!display) {
-                _context4.next = 3;
+                _context4.next = 6;
                 break;
               }
               sharingTargetBounds = display.bounds;
-              _context4.next = 4;
+              _context4.next = 7;
               break;
-            case 3:
+            case 6:
               this.logger.warn("can not find display info for shared screen id: ".concat(id));
               return _context4.abrupt("return");
-            case 4:
-              _context4.next = 10;
+            case 7:
+              _context4.next = 13;
               break;
-            case 5:
-              _context4.next = 6;
+            case 8:
+              _context4.next = 9;
               return this.screenShareProvider.getWindowList();
-            case 6:
+            case 9:
               windowList = _context4.sent;
               window = windowList.find(function (item) {
                 return item.id === id;
               });
               if (!window) {
-                _context4.next = 7;
+                _context4.next = 10;
                 break;
               }
               sharingTargetBounds = window.bounds;
-              _context4.next = 10;
+              _context4.next = 13;
               break;
-            case 7:
+            case 10:
               this.logger.warn("can not find window info for shared window id: ".concat(id));
 
               // 共享的窗口被隐藏时，尝试使用 selectionBounds 作为位置依据
-              _context4.prev = 8;
+              _context4.prev = 11;
               selectionBounds = this.screenShareProvider.selectionBounds;
               sharingTargetBounds = this._renderer.getDisplayMatching(selectionBounds).bounds;
-              _context4.next = 10;
+              _context4.next = 13;
               break;
-            case 9:
-              _context4.prev = 9;
-              _t = _context4["catch"](8);
+            case 12:
+              _context4.prev = 12;
+              _t = _context4["catch"](11);
               this.logger.warn("get selection bounds error, can not set video window position: ".concat(_t));
               return _context4.abrupt("return");
-            case 10:
+            case 13:
               this.screenShareProvider.changeSelectionBounds(sharingTargetBounds, _struct.FcrUISelectionBoundsChangeReason.DISPLAY_CHANGE);
-            case 11:
+            case 14:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[8, 9]]);
+        }, _callee4, this, [[11, 12]]);
       }));
       function _handleDisplayCountUpdated(_x) {
         return _handleDisplayCountUpdated2.apply(this, arguments);
@@ -431,5 +505,5 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
   }]);
 }(_store["default"]);
 _ElectronShareScreenStore = ElectronShareScreenStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ElectronShareScreenStore, [[_handleSelectionOpenDecs, 18, "handleSelectionOpen"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_setShareInSmoothModeDecs, 18, "setShareInSmoothMode"], [_decorator.bound, 2, "setShareAudioMode"], [_decorator.bound, 2, "setSelectedItem"], [[_decorator.bound, _decorator.trace], 2, "release"], [_decorator.bound, 2, "_interceptDialogClose"], [_decorator.bound, 2, "_showControlBar"], [_decorator.bound, 2, "_hideControlBar"], [_decorator.bound, 2, "_handleSourceReplaced"], [_decorator.bound, 2, "_handleDisplayCountUpdated"]], [], 0, void 0, _store["default"]).e, 1);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ElectronShareScreenStore, [[_handleSelectionOpenDecs, 18, "handleSelectionOpen"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_setShareInSmoothModeDecs, 18, "setShareInSmoothMode"], [_decorator.bound, 2, "setShareAudioMode"], [_decorator.bound, 2, "setSelectedItem"], [[_decorator.bound, _decorator.trace], 2, "release"], [_decorator.bound, 2, "_interceptDialogClose"], [_decorator.bound, 2, "_showControlBar"], [_decorator.bound, 2, "_handleScreenShareStarted"], [_decorator.bound, 2, "_handleScreenShareEnded"], [_decorator.bound, 2, "_hideControlBar"], [_decorator.bound, 2, "_handleSourceReplaced"], [_decorator.bound, 2, "_handleDisplayCountUpdated"]], [], 0, void 0, _store["default"]).e, 1);
 _initProto = _applyDecs$e[0];

package/lib/modules/state-bar/layout-config.js

@@ -13,7 +13,7 @@ require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobxReact = require("mobx-react");
-var _useNamespace = require("../../utilities/useNamespace");
+var _useNamespace = require("agora-ui-foundation/lib/utilities/use-namespace");
 require("./index.css");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");

package/lib/modules/state-bar/live-streaming-state.js

@@ -18,10 +18,11 @@ var _dropMenu = require("agora-ui-foundation/lib/components/drop-menu");
 var _react = require("react");
 var _store = require("./main-scene/store.base");
 var _liveStreaming = _interopRequireDefault(require("./assets/live-streaming.gif"));
-var _useNamespace = require("../../utilities/useNamespace");
+var _useNamespace = require("agora-ui-foundation/lib/utilities/use-namespace");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _browserApi = require("../../utilities/browser-api");
+var _copyText = require("agora-ui-foundation/lib/utilities/copy-text");
 var _constant = require("../../utilities/constant");
+var _type2 = require("../../modules/toast-manager/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var LiveStreamingState = exports.LiveStreamingState = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
@@ -81,15 +82,13 @@ var LiveStreamingState = exports.LiveStreamingState = (0, _mobxReact.observer)(f
     onButtonClick: function onButtonClick() {
       setVisible(false);
       toggleLayoutBarLock(false);
-      (0, _browserApi.copyText)(liveStreamingPlayUrl).then(function () {
+      (0, _copyText.copyText)(liveStreamingPlayUrl).then(function () {
         showToast({
-          type: 'info',
-          message: transI18n('fmt_statusbar_status_coppied')
+          key: _type2.FcrUIToastKey.FMT_STATUSBAR_STATUS_COPPIED
         });
       })["catch"](function () {
         showToast({
-          type: 'error',
-          message: transI18n('fmt_statusbar_tips_copyfailed')
+          key: _type2.FcrUIToastKey.FMT_STATUSBAR_TIPS_COPYFAILED
         });
       });
     }

package/lib/modules/state-bar/main-scene/store.browser.js

@@ -77,7 +77,7 @@ var StateBarBrowserStore = exports["default"] = /*#__PURE__*/function (_StateBar
     get: function get() {
       // 浏览器环境中，如果正在共享屏幕则禁用布局切换
       // 复用 state-bar/store.browser.ts 中的逻辑
-      return this.isSharingScreen || this.isLiveStreaming;
+      return this.isSharingScreen;
     }
   }]);
 }(_store.StateBarMainSceneStoreBase);

package/lib/modules/state-bar/main-scene/store.electron.js

@@ -104,7 +104,7 @@ var StateBarElectronStore = exports["default"] = /*#__PURE__*/function (_StateBa
       }
 
       // 如果正在共享屏幕，则禁用布局切换
-      return this.isSharingScreen || this.isLiveStreaming;
+      return this.isSharingScreen;
     }
   }]);
 }(_store.StateBarMainSceneStoreBase);

package/lib/modules/state-bar/meeting-details.js

@@ -19,7 +19,8 @@ var _react = require("react");
 var _store = require("./main-scene/store.base");
 require("./meeting-detail.css");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _browserApi = require("../../utilities/browser-api");
+var _copyText = require("agora-ui-foundation/lib/utilities/copy-text");
+var _type2 = require("../../modules/toast-manager/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var CopyState = /*#__PURE__*/function (CopyState) {
   CopyState[CopyState["COPYINIT"] = 1] = "COPYINIT";
@@ -56,41 +57,35 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
   function handleCopyMeetingId(copyContent) {
     if (!copyContent) return;
     var content = meetingId ? copyContent : copyContent.replace(/\s+/g, '');
-    (0, _browserApi.copyText)(content).then(function () {
+    (0, _copyText.copyText)(content).then(function () {
       showToast({
-        type: 'info',
-        message: t('fmt_statusbar_status_coppied')
+        key: _type2.FcrUIToastKey.FMT_STATUSBAR_STATUS_COPPIED
       });
     })["catch"](function () {
       showToast({
-        type: 'warn',
-        message: t('fmt_information_tips_numbercopyfailed')
+        key: _type2.FcrUIToastKey.FMT_INFORMATION_TIPS_NUMBERCOPYFAILED
       });
     });
   }
   function handleCopyMeetingPassword(password) {
-    (0, _browserApi.copyText)(password).then(function () {
+    (0, _copyText.copyText)(password).then(function () {
       showToast({
-        type: 'info',
-        message: t('fmt_uimanager_tips_passwordcopied')
+        key: _type2.FcrUIToastKey.FMT_UIMANAGER_TIPS_PASSWORDCOPIED
       });
     })["catch"](function () {
       showToast({
-        type: 'warn',
-        message: t('fmt_settings_tips_passwordcopyfailed')
+        key: _type2.FcrUIToastKey.FMT_SETTINGS_TIPS_PASSWORDCOPYFAILED
       });
     });
   }
   function handlerCopyMeetingShareLink(shareLink) {
-    (0, _browserApi.copyText)(shareLink).then(function () {
+    (0, _copyText.copyText)(shareLink).then(function () {
       showToast({
-        type: 'info',
-        message: t('fmt_additional_tips_invitation')
+        key: _type2.FcrUIToastKey.FMT_ADDITIONAL_TIPS_INVITATION
       });
     })["catch"](function () {
       showToast({
-        type: 'warn',
-        message: t('fmt_additional_tips_invitationfailed')
+        key: _type2.FcrUIToastKey.FMT_ADDITIONAL_TIPS_INVITATIONFAILED
       });
     });
   }
@@ -103,20 +98,18 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
       copyIcon: _type.FcrIconType.FCR_RESET,
       copyText: t('fmt_meeting_call_voice_call_button_copy_info')
     });
-    (0, _browserApi.copyText)(roomDetailCopyText).then(function () {
+    (0, _copyText.copyText)(roomDetailCopyText).then(function () {
       setCopyInfoState({
         copyState: CopyState.COPIED,
         copyIcon: _type.FcrIconType.FCR_CHOOSEIT,
         copyText: t('fmt_statusbar_status_coppied')
       });
       showToast({
-        type: 'info',
-        message: t('fmt_meeting_mainwindow_topbar_left_popup_toast_copy_done')
+        key: _type2.FcrUIToastKey.FMT_MEETING_MAINWINDOW_TOPBAR_LEFT_POPUP_TOAST_COPY_DONE
       });
     })["catch"](function () {
       showToast({
-        type: 'warn',
-        message: t('fmt_sharing_tips_copyfull_failed')
+        key: _type2.FcrUIToastKey.FMT_SHARING_TIPS_COPYFULL_FAILED
       });
     });
   }