fcr-ui-scene 3.6.2 → 3.6.4

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

@@ -40,6 +40,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrUIScreenShareProviderImpl = 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.includes.js");
 require("core-js/modules/es.array.push.js");
@@ -48,10 +49,7 @@ require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
-require("core-js/modules/es.promise.finally.js");
 require("core-js/modules/es.string.includes.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.some.js");
@@ -76,13 +74,13 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _constant = require("../utilities/constant");
 var _lodash = require("lodash");
 var _FcrUIScreenShareProviderImpl;
-var _initProto, _handleScreenCaptureStateUpdatedDecs, _handleShareStopWithAudioDecs, _handleStreamUpdateDecs, _handleStreamPublicDecs, _releaseDecs, _startShareScreenDecs, _handleShareStartWithAudioDecs, _ref;
+var _initProto, _handleScreenCaptureStateUpdatedDecs, _handleShareStopWithAudioDecs, _replaceScreenShareDecs, _handleStreamUpdateDecs, _handleStreamPublicDecs, _releaseDecs, _startShareScreenDecs, _handleShareStartWithAudioDecs, _ref;
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
-_ref = (_handleScreenCaptureStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleShareStopWithAudioDecs = [_mobx.action, _mobx.action.bound], _handleStreamUpdateDecs = [_mobx.action, _mobx.action.bound], _handleStreamPublicDecs = [_mobx.action, _mobx.action.bound], _releaseDecs = [_mobx.action, _mobx.action.bound], _startShareScreenDecs = [_mobx.action, _mobx.action.bound], _handleShareStartWithAudioDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_handleScreenCaptureStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleShareStopWithAudioDecs = [_mobx.action, _mobx.action.bound], _replaceScreenShareDecs = [_mobx.action, _mobx.action.bound], _handleStreamUpdateDecs = [_mobx.action, _mobx.action.bound], _handleStreamPublicDecs = [_mobx.action, _mobx.action.bound], _releaseDecs = [_mobx.action, _mobx.action.bound], _startShareScreenDecs = [_mobx.action, _mobx.action.bound], _handleShareStartWithAudioDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__PURE__*/function () {
   function FcrUIScreenShareProviderImpl(_deviceProvider, _eventProvider, _roomProvider, _sharingProvider, _sharedScreenShareSharedDataSource, _sharedMemberDataSource) {
     var _this = this,
@@ -110,6 +108,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     (0, _defineProperty2["default"])(this, "_screenCaptureObserver", {
       onScreenCaptureStateUpdated: (0, _env.isElectron)() ? this._handleScreenCaptureStateUpdated : this._handleWebScreenCaptureStateUpdated
     });
+    (0, _defineProperty2["default"])(this, "_hasStop", false);
     this._deviceProvider = _deviceProvider;
     this._eventProvider = _eventProvider;
     this._roomProvider = _roomProvider;
@@ -149,11 +148,15 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "stop",
     value: function stop() {
-      this._observable.notifyObservers('onScreenCaptureStopped');
+      if (!this._hasStop) {
+        this._observable.notifyObservers('onScreenCaptureStopped');
+        this._hasStop = true;
+      }
     }
   }, {
     key: "bootstrap",
     value: function bootstrap() {
+      this._hasStop = false;
       this._observable.notifyObservers('onScreenCaptureStarted');
     }
   }, {
@@ -161,33 +164,32 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     value: function () {
       var _handleWebScreenCaptureStateUpdated2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(sourceId, state) {
         var streamId, _this$screenTrack;
-        return _regenerator["default"].wrap(function _callee$(_context) {
+        return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this._sharedScreenShareSharedDataSource.setScreenSharingState(state);
               if (!(state === _fcrCore.FcrMediaSourceState.OPEN)) {
-                _context.next = 7;
+                _context.next = 2;
                 break;
               }
-              this.setShareLock(true);
-              _context.next = 5;
+              _context.next = 1;
               return this.createScreenShareWithSelectionId(this.currentShareId, this.currentSelectionBounds);
-            case 5:
+            case 1:
               streamId = _context.sent;
               if (streamId) {
                 this._sharedScreenShareSharedDataSource.setCurrentShareStreamId(streamId);
               }
-            case 7:
+            case 2:
               if (state === _fcrCore.FcrMediaSourceState.CLOSE) {
-                this.setShareLock(false);
                 (_this$screenTrack = this.screenTrack) === null || _this$screenTrack === void 0 || _this$screenTrack.removeObserver(this._screenCaptureObserver);
                 this.isReplaceScreen ? this._screenTrackStop() : this.stop();
+                this.logger.info("[Annotation][web]: _handleScreenCaptureStateUpdated: CLOSE, set replaceScreen to: ".concat(this.isReplaceScreen));
               }
               if (state === _fcrCore.FcrMediaSourceState.ERROR) {
                 this.setShareLock(false);
                 this._setIsReplaceScreen(false);
               }
-            case 9:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -201,13 +203,14 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "_handleScreenCaptureStateUpdated",
     value: function _handleScreenCaptureStateUpdated(sourceId, state) {
-      this.logger.info('screen-share-provider _handleScreenCaptureStateUpdated: ', sourceId, ' ==== ', state);
+      this.logger.info("[handleScreenCaptureStateUpdated]: ".concat(sourceId, " ==== ").concat(state));
       if (state === _fcrCore.FcrMediaSourceState.CLOSE) {
         var _this$screenTrack2;
         this.stopRenderSharePreview(this.screenTrack);
         (_this$screenTrack2 = this.screenTrack) === null || _this$screenTrack2 === void 0 || _this$screenTrack2.removeObserver(this._screenCaptureObserver);
         this.isReplaceScreen ? this._screenTrackStop() : this.stop();
-        this._setIsReplaceScreen(false);
+        // this._setIsReplaceScreen(false); // 如果是替换的逻辑，暂时不把是否是替换屏幕的值设置为false，改为在结束屏幕共享时重置
+        this.logger.info("[Annotation][electron]: _handleScreenCaptureStateUpdated: CLOSE, set replaceScreen to: ".concat(this.isReplaceScreen));
       }
       if (state === _fcrCore.FcrMediaSourceState.ERROR) {
         this.stop();
@@ -231,27 +234,28 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "replaceScreenShare",
     value: function replaceScreenShare(id, type, withAudio, bounds) {
       var _this2 = this;
+      this.logger.info('screen-share-provider: replaceScreenShare start');
       var shareWithAudio = (0, _lodash.isBoolean)(withAudio) ? withAudio : this._sharedScreenShareSharedDataSource.shareWithAudio;
       this.toggleScreenshareWithAudio(shareWithAudio);
       this._sharedScreenShareSharedDataSource.setIsReplaceScreen(true);
       if (this.screenTrack) {
-        var _this$screenTrack3;
+        this.screenTrack.removeObserver(this._screenCaptureObserver);
         var _observer = {
           onScreenCaptureStateUpdated: function () {
             var _onScreenCaptureStateUpdated = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(sourceId, state) {
               var _this2$screenTrack;
-              return _regenerator["default"].wrap(function _callee2$(_context2) {
+              return _regenerator["default"].wrap(function (_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
                     if (!(state === _fcrCore.FcrMediaSourceState.CLOSE)) {
-                      _context2.next = 7;
+                      _context2.next = 2;
                       break;
                     }
                     _this2._observable.notifyObservers('onScreenShareReplaceBegin', id, type, bounds);
                     (_this2$screenTrack = _this2.screenTrack) === null || _this2$screenTrack === void 0 || _this2$screenTrack.removeObserver(_observer);
-                    _context2.next = 5;
+                    _context2.next = 1;
                     return _this2.startShareScreen(id, type, withAudio, true);
-                  case 5:
+                  case 1:
                     _this2._sharedScreenShareSharedDataSource.setCurrentShareIdInfos(id, type, bounds);
                     if (_this2.currentShareStreamId && _this2._streamControl) {
                       _this2._streamControl.bindLocalStreams([{
@@ -260,7 +264,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
                         videoSourceId: id
                       }]);
                     }
-                  case 7:
+                  case 2:
                   case "end":
                     return _context2.stop();
                 }
@@ -272,7 +276,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
             return onScreenCaptureStateUpdated;
           }()
         };
-        (_this$screenTrack3 = this.screenTrack) === null || _this$screenTrack3 === void 0 || _this$screenTrack3.addObserver(_observer);
+        this.screenTrack.addObserver(_observer);
         this._screenTrackStop();
         this.stopRenderSharePreview(this.screenTrack);
       }
@@ -331,32 +335,28 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "createScreenShareWithSelectionId",
     value: function () {
       var _createScreenShareWithSelectionId = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(videoSourceId, bounds) {
-        var _this3 = this;
         var audioSourceId, _this$_sharingControl, streamId;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
+        return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              this.logger.info('screen-share-provider: createScreenShareWithSelectionId: ', videoSourceId);
-              this.setShareLock(true);
+              this.logger.info("screen-share-provider: createScreenShareWithSelectionId: ".concat(videoSourceId, ", annotation-use-bounds-width: ").concat(bounds.width, ", annotation-use-bounds-height: ").concat(bounds.height));
               audioSourceId = this.loopbackAudioSourceId;
               if (!this._sharingControl) {
-                _context3.next = 10;
+                _context3.next = 2;
                 break;
               }
-              _context3.next = 6;
+              _context3.next = 1;
               return (_this$_sharingControl = this._sharingControl) === null || _this$_sharingControl === void 0 ? void 0 : _this$_sharingControl.startScreenSharing({
                 streamType: _imports.AgoraRteMediaStreamType.BOTH,
                 videoSourceId: videoSourceId,
                 audioSourceId: audioSourceId
-              }, bounds)["finally"](function () {
-                _this3.setShareLock(false);
-              });
-            case 6:
+              }, bounds);
+            case 1:
               streamId = _context3.sent;
               return _context3.abrupt("return", Promise.resolve(streamId));
-            case 10:
+            case 2:
               return _context3.abrupt("return", Promise.reject());
-            case 11:
+            case 3:
             case "end":
               return _context3.stop();
           }
@@ -370,10 +370,10 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "_isStoppedFor",
     value: function _isStoppedFor(events, reason) {
-      var _this4 = this;
+      var _this3 = this;
       return events && events.find(function (event) {
         var _event$cause;
-        return ((_event$cause = event.cause) === null || _event$cause === void 0 || (_event$cause = _event$cause.data) === null || _event$cause === void 0 ? void 0 : _event$cause.reason) === reason && event.modifiedStream.owner.userId === _this4.localUserId;
+        return ((_event$cause = event.cause) === null || _event$cause === void 0 || (_event$cause = _event$cause.data) === null || _event$cause === void 0 ? void 0 : _event$cause.reason) === reason && event.modifiedStream.owner.userId === _this3.localUserId;
       });
     }
   }, {
@@ -390,9 +390,9 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "_syncShareStreamState",
     value: function _syncShareStreamState() {
       var _this$_streamControl3,
-        _this5 = this;
+        _this4 = this;
       var currentShareStreamId = this.currentShareStreamId || ((_this$_streamControl3 = this._streamControl) === null || _this$_streamControl3 === void 0 || (_this$_streamControl3 = _this$_streamControl3.getStreamList().find(function (stream) {
-        return stream.videoSourceType === _type.AgoraRteVideoSourceType.SCREEN && stream.owner.userId === _this5.localUserId;
+        return stream.videoSourceType === _type.AgoraRteVideoSourceType.SCREEN && stream.owner.userId === _this4.localUserId;
       })) === null || _this$_streamControl3 === void 0 ? void 0 : _this$_streamControl3.streamId);
       if (this._sharedScreenShareSharedDataSource.screenSharingState !== _fcrCore.FcrMediaSourceState.OPEN && currentShareStreamId) {
         this.stop();
@@ -401,7 +401,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "_handleStreamUpdate",
     value: function _handleStreamUpdate(process, events) {
-      var _this6 = this;
+      var _this5 = this;
       this._handleStreamPublic();
       var isClosedByOther = this._isStoppedFor(events, _types.FcrBoardInactiveReason.CLOSE);
       var isSeizedByOther = this._isStoppedFor(events, _types.FcrBoardInactiveReason.SEIZE);
@@ -418,11 +418,13 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       });
       switch (process) {
         case 'add':
-          var newsStreamsHaveScreenShare = events.some(function (event) {
-            return event.modifiedStream.videoSourceType === _type.AgoraRteVideoSourceType.SCREEN;
-          });
-          var isSeizeStreamAdd = newsStreamsHaveScreenShare && this._sharedScreenShareSharedDataSource.isSharingScreen;
-          this._sharedScreenShareSharedDataSource.setIsSeizeStream(isSeizeStreamAdd);
+          // 抢占流添加时，不设置抢占流状态，因为抢占发生时，会触发 remove 事件，此时判断 reason===seize 的结果设置抢占流状态
+          // const newsStreamsHaveScreenShare = events.some(
+          //   (event) => event.modifiedStream.videoSourceType === AgoraRteVideoSourceType.SCREEN,
+          // );
+          // const isSeizeStreamAdd =
+          //   newsStreamsHaveScreenShare && this._sharedScreenShareSharedDataSource.isSharingScreen;
+          // this._sharedScreenShareSharedDataSource.setIsSeizeStream(isSeizeStreamAdd);
           break;
         case 'remove':
           var isSeizeStreamRemove = events.some(function (event) {
@@ -430,14 +432,15 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
             return event.modifiedStream.videoSourceType === _type.AgoraRteVideoSourceType.SCREEN && ((_event$cause2 = event.cause) === null || _event$cause2 === void 0 || (_event$cause2 = _event$cause2.data) === null || _event$cause2 === void 0 ? void 0 : _event$cause2.reason) === _types.FcrBoardInactiveReason.SEIZE && ((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId) !== event.modifiedStream.owner.userId;
           });
           this._sharedScreenShareSharedDataSource.setIsSeizeStream(isSeizeStreamRemove);
-          this.logger.info('screen-share-provider: stream update remove', isSeizeStreamRemove);
+          this.logger.info('stream update remove', isSeizeStreamRemove);
           if (events.some(function (event) {
-            return event.modifiedStream.videoSourceType === _type.AgoraRteVideoSourceType.SCREEN && event.modifiedStream.owner.userId === _this6.localUserId;
+            return event.modifiedStream.videoSourceType === _type.AgoraRteVideoSourceType.SCREEN && event.modifiedStream.owner.userId === _this5.localUserId;
           })) {
             if (!(0, _env.isElectron)() && this.isReplaceScreen) {
+              // web下的替换流不需要停止采集
               this._setIsReplaceScreen(false);
               return;
-            } // web 下如果是替换的逻辑，不需要关闭分享
+            }
             this.logger.info('screen-share-provider: current user stream remove');
             this._screenTrackStop();
           }
@@ -517,70 +520,71 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "startShareScreen",
     value: function () {
       var _startShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(id, type, withAudio, isReplace) {
-        var _this$screenTrack4, _this$screenTrack5, streamId, screenTrack;
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
+        var _this$screenTrack3, _this$screenTrack4, streamId, screenTrack, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8;
+        return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.prev = 0;
+              this.setShareLock(true);
+              _context4.prev = 1;
               this.logger.info('screen-share-provider: enter startShareScreen');
               if (!((0, _env.isElectron)() && !isReplace)) {
-                _context4.next = 7;
+                _context4.next = 3;
                 break;
               }
-              _context4.next = 5;
+              _context4.next = 2;
               return this.createScreenShareWithSelectionId(id, this.currentSelectionBounds);
-            case 5:
+            case 2:
               streamId = _context4.sent;
               if (streamId) {
                 this._sharedScreenShareSharedDataSource.setCurrentShareStreamId(streamId);
               }
-            case 7:
+            case 3:
               this._sharedScreenShareSharedDataSource.setShareWithAudio(withAudio);
               this.toggleScreenshareWithAudio(withAudio);
               screenTrack = this._deviceProvider.getScreenTrack(id);
               this.setScreenTrack(screenTrack);
               this.logger.info('screen-share-provider: start share screen with track start');
-              (_this$screenTrack4 = this.screenTrack) === null || _this$screenTrack4 === void 0 || _this$screenTrack4.addObserver(this._screenCaptureObserver);
-              _context4.t0 = (_this$screenTrack5 = this.screenTrack) === null || _this$screenTrack5 === void 0;
-              if (_context4.t0) {
-                _context4.next = 28;
+              (_this$screenTrack3 = this.screenTrack) === null || _this$screenTrack3 === void 0 || _this$screenTrack3.addObserver(this._screenCaptureObserver);
+              _t = (_this$screenTrack4 = this.screenTrack) === null || _this$screenTrack4 === void 0;
+              if (_t) {
+                _context4.next = 7;
                 break;
               }
-              _context4.t1 = _this$screenTrack5;
-              _context4.t2 = type;
-              _context4.t3 = withAudio;
+              _t2 = _this$screenTrack4;
+              _t3 = type;
+              _t4 = withAudio;
               if (!(0, _env.isElectron)()) {
-                _context4.next = 24;
+                _context4.next = 5;
                 break;
               }
-              _context4.next = 21;
+              _context4.next = 4;
               return this._getExcludeWindows();
-            case 21:
-              _context4.t4 = _context4.sent;
-              _context4.next = 25;
+            case 4:
+              _t5 = _context4.sent;
+              _context4.next = 6;
               break;
-            case 24:
-              _context4.t4 = undefined;
-            case 25:
-              _context4.t5 = _context4.t4;
-              _context4.t6 = {
-                withAudio: _context4.t3,
-                excludeWindows: _context4.t5
+            case 5:
+              _t5 = undefined;
+            case 6:
+              _t6 = _t5;
+              _t7 = {
+                withAudio: _t4,
+                excludeWindows: _t6
               };
-              _context4.t1.start.call(_context4.t1, _context4.t2, _context4.t6);
-            case 28:
+              _t2.start.call(_t2, _t3, _t7);
+            case 7:
               return _context4.abrupt("return", Promise.resolve(this.screenTrack));
-            case 31:
-              _context4.prev = 31;
-              _context4.t7 = _context4["catch"](0);
-              return _context4.abrupt("return", Promise.reject(_context4.t7));
-            case 34:
+            case 8:
+              _context4.prev = 8;
+              _t8 = _context4["catch"](1);
+              return _context4.abrupt("return", Promise.reject(_t8));
+            case 9:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[0, 31]]);
+        }, _callee4, this, [[1, 8]]);
       }));
-      function startShareScreen(_x7, _x8, _x9, _x10) {
+      function startShareScreen(_x7, _x8, _x9, _x0) {
         return _startShareScreen.apply(this, arguments);
       }
       return startShareScreen;
@@ -590,16 +594,9 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     value: function stopShareScreen(targetScreenTrack) {
       this.logger.info('screen-share-provider: stopShareScreen');
       var screenTrack = targetScreenTrack !== null && targetScreenTrack !== void 0 ? targetScreenTrack : this.screenTrack;
-      this.setShareLock(false);
       this.stopRenderSharePreview(screenTrack);
-      if ((0, _env.isElectron)()) {
-        this._screenTrackStop();
-        this.removeScreenStream();
-      } else {
-        this.removeScreenStream();
-        this._screenTrackStop();
-      }
-      this._sharedScreenShareSharedDataSource.setCurrentShareId('');
+      this.removeScreenStream();
+      this._screenTrackStop();
     }
   }, {
     key: "_handleShareStartWithAudio",
@@ -631,11 +628,11 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     value: function () {
       var _getExcludeWindows2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
         var excludeWindows;
-        return _regenerator["default"].wrap(function _callee5$(_context5) {
+        return _regenerator["default"].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               excludeWindows = [];
-              _context5.next = 3;
+              _context5.next = 1;
               return (0, _tools.waitUntil)(function () {
                 var _getControlBarMediaSo, _getVideoWindowMediaS, _getAnnotationMediaSo, _getAnnotationMediaSo2;
                 var windowId = (_getControlBarMediaSo = (0, _rendererEvent.getControlBarMediaSourceId)()) !== null && _getControlBarMediaSo !== void 0 ? _getControlBarMediaSo : '';
@@ -668,10 +665,10 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
                 }
                 return !!videoWindowId && !!controlBarWindowId;
               }, 'control bar is open');
-            case 3:
+            case 1:
               this.logger.info('exclude win:', JSON.stringify(excludeWindows));
               return _context5.abrupt("return", excludeWindows);
-            case 5:
+            case 2:
             case "end":
               return _context5.stop();
           }
@@ -685,10 +682,6 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "removeScreenStream",
     value: function removeScreenStream() {
-      var streamId = this.currentShareStreamId;
-      if (!streamId) {
-        return false;
-      }
       try {
         var _this$_streamControl5;
         this.logger.info('screen-share-provider: remove screen streams');
@@ -703,13 +696,14 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "_screenTrackStop",
     value: function _screenTrackStop() {
-      var _this$screenTrack6;
+      var _this$screenTrack5;
       this.logger.info('screen-share-provider: current screen track stop');
-      (_this$screenTrack6 = this.screenTrack) === null || _this$screenTrack6 === void 0 || _this$screenTrack6.stop();
+      (_this$screenTrack5 = this.screenTrack) === null || _this$screenTrack5 === void 0 || _this$screenTrack5.stop();
+      this.setShareLock(false);
     }
   }]);
 }();
 _FcrUIScreenShareProviderImpl = FcrUIScreenShareProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareProviderImpl, [[_decorator.bound, 2, "getCurrentScreenSharingOwner"], [_decorator.bound, 2, "stop"], [_decorator.bound, 2, "bootstrap"], [_decorator.bound, 2, "_handleWebScreenCaptureStateUpdated"], [_handleScreenCaptureStateUpdatedDecs, 18, "_handleScreenCaptureStateUpdated"], [_handleShareStopWithAudioDecs, 18, "_handleShareStopWithAudio"], [_decorator.bound, 2, "_syncShareStreamState"], [_handleStreamUpdateDecs, 18, "_handleStreamUpdate"], [_decorator.bound, 2, "startRenderSharePreview"], [_decorator.bound, 2, "stopRenderSharePreview"], [_handleStreamPublicDecs, 18, "_handleStreamPublic"], [_releaseDecs, 18, "release"], [_startShareScreenDecs, 18, "startShareScreen"], [_handleShareStartWithAudioDecs, 18, "_handleShareStartWithAudio"], [_decorator.bound, 2, "_getExcludeWindows"], [_decorator.bound, 2, "_screenTrackStop"]], []).e, 1);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareProviderImpl, [[_decorator.bound, 2, "getCurrentScreenSharingOwner"], [_decorator.bound, 2, "stop"], [_decorator.bound, 2, "bootstrap"], [_decorator.bound, 2, "_handleWebScreenCaptureStateUpdated"], [_handleScreenCaptureStateUpdatedDecs, 18, "_handleScreenCaptureStateUpdated"], [_handleShareStopWithAudioDecs, 18, "_handleShareStopWithAudio"], [_replaceScreenShareDecs, 18, "replaceScreenShare"], [_decorator.bound, 2, "_syncShareStreamState"], [_handleStreamUpdateDecs, 18, "_handleStreamUpdate"], [_decorator.bound, 2, "startRenderSharePreview"], [_decorator.bound, 2, "stopRenderSharePreview"], [_handleStreamPublicDecs, 18, "_handleStreamPublic"], [_releaseDecs, 18, "release"], [_startShareScreenDecs, 18, "startShareScreen"], [_handleShareStartWithAudioDecs, 18, "_handleShareStartWithAudio"], [_decorator.bound, 2, "_getExcludeWindows"], [_decorator.bound, 2, "_screenTrackStop"]], []).e, 1);
 _initProto = _applyDecs$e[0];
 (0, _base.registerDependency)('screenShareProvider');

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

@@ -1,5 +1,6 @@
 import { FcrScreenSharingState, FcrSharingControl, FcrWhiteboardState } from 'fcr-core/lib/room-control/sharing-control/type';
 import { FcrScreenStreamCreateConfig } from 'fcr-core/lib/room-control/stream-control/type';
+import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
 export interface FcrUISharingProvider {
     get screenSharingOwnerId(): string;
     get whiteboardOwnerId(): string;
@@ -15,13 +16,16 @@ export interface FcrUISharingProvider {
 }
 export declare class FcrUISharingProviderImpl implements FcrUISharingProvider {
     private _sharingControl;
+    private _sharedScreenShareSharedDataSource;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observer;
     accessor screenSharingOwnerId: string;
     accessor whiteboardOwnerId: string;
     accessor screenSharingState: FcrScreenSharingState;
     accessor whiteboardState: FcrWhiteboardState;
-    constructor(_sharingControl: FcrSharingControl);
+    get isReplaceScreen(): boolean;
+    get isSeizeStream(): boolean;
+    constructor(_sharingControl: FcrSharingControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource);
     startScreenSharing(config: FcrScreenStreamCreateConfig): void;
     startWhiteboard(): void;
     updateScreenSharing(enableAnnotation: boolean): void;

package/lib/providers/sharing-provider.js

@@ -53,6 +53,7 @@ var _type = require("fcr-core/lib/room-control/sharing-control/type");
 var _mobx = require("mobx");
 var _base = require("../base");
 var _logger = require("../utilities/logger");
+var _env = require("agora-foundation/lib/utilities/env");
 var _FcrUISharingProviderImpl;
 var _initProto, _init_screenSharingOwnerId, _init_whiteboardOwnerId, _init_screenSharingState, _init_whiteboardState;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -70,7 +71,7 @@ var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/function () {
-  function FcrUISharingProviderImpl(_sharingControl) {
+  function FcrUISharingProviderImpl(_sharingControl, _sharedScreenShareSharedDataSource) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUISharingProviderImpl);
     (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
@@ -80,6 +81,10 @@ var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/f
       onScreenSharingUpdated: function onScreenSharingUpdated(ownerId, state) {
         _this.screenSharingOwnerId = ownerId;
         _this.screenSharingState = state;
+        if (state === _type.FcrScreenSharingState.END && (0, _env.isElectron)()) {
+          _this.isReplaceScreen && _this._sharedScreenShareSharedDataSource.setIsReplaceScreen(false);
+          _this.isSeizeStream && _this._sharedScreenShareSharedDataSource.setIsSeizeStream(false);
+        }
       },
       onWhiteboardStarted: function onWhiteboardStarted(ownerId, operatorUser) {
         _this.whiteboardOwnerId = ownerId;
@@ -94,6 +99,7 @@ var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/f
     _classPrivateFieldInitSpec(this, _C, _init_screenSharingState(this, _type.FcrScreenSharingState.END));
     _classPrivateFieldInitSpec(this, _D, _init_whiteboardState(this, _type.FcrWhiteboardState.END));
     this._sharingControl = _sharingControl;
+    this._sharedScreenShareSharedDataSource = _sharedScreenShareSharedDataSource;
     // @ts-ignore
     // this._sharingControl.getToken();
     this._sharingControl.addObserver(this._observer);
@@ -130,6 +136,16 @@ var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/f
     set: function set(v) {
       _classPrivateFieldSet(_D, this, v);
     }
+  }, {
+    key: "isReplaceScreen",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isReplaceScreen;
+    }
+  }, {
+    key: "isSeizeStream",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isSeizeStream;
+    }
   }, {
     key: "startScreenSharing",
     value: function startScreenSharing(config) {

package/lib/providers/user-setting-storage-provider.d.ts

@@ -0,0 +1,20 @@
+import { FcrUISettingConfig } from '../type';
+export interface FcrUIUserSettingStorageProvider {
+    /**
+     * 写入本地存储
+     * @param key
+     * @param value
+     */
+    write(value: Partial<FcrUISettingConfig>): number;
+    /**
+     * 从本地存储读取
+     * @param key
+     */
+    read(): FcrUISettingConfig | null;
+}
+export declare class FcrUIUserSettingStorageProviderImpl implements FcrUIUserSettingStorageProvider {
+    private _isElectron;
+    constructor();
+    write(value: Partial<FcrUISettingConfig>): number;
+    read(): any;
+}

package/lib/providers/user-setting-storage-provider.js

@@ -0,0 +1,72 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.define-properties.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.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");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUIUserSettingStorageProviderImpl = void 0;
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/esnext.json.parse.js");
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _base = require("../base");
+var _env = require("agora-foundation/lib/utilities/env");
+var _settingConfigStorage = require("../utilities/setting-config-storage");
+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 FcrUIUserSettingStorageProviderImpl = exports.FcrUIUserSettingStorageProviderImpl = /*#__PURE__*/function () {
+  function FcrUIUserSettingStorageProviderImpl() {
+    (0, _classCallCheck2["default"])(this, FcrUIUserSettingStorageProviderImpl);
+    (0, _defineProperty2["default"])(this, "_isElectron", false);
+    this._isElectron = (0, _env.isElectron)();
+  }
+  return (0, _createClass2["default"])(FcrUIUserSettingStorageProviderImpl, [{
+    key: "write",
+    value: function write(value) {
+      var userSetting = this.read();
+      if (userSetting) {
+        value = _objectSpread(_objectSpread({}, userSetting), value);
+      }
+      if (this._isElectron) {
+        window.runtime.setUserSettingData(value);
+      } else {
+        localStorage.setItem(_settingConfigStorage.settingConfigStorageKey, JSON.stringify(value));
+      }
+      return 1;
+    }
+  }, {
+    key: "read",
+    value: function read() {
+      if (this._isElectron) {
+        return window.runtime.getUserSettingData();
+      } else {
+        var getItem = localStorage.getItem(_settingConfigStorage.settingConfigStorageKey);
+        return getItem ? JSON.parse(getItem) : null;
+      }
+    }
+
+    // remove(key: string) {
+    //   localStorage.removeItem(key);
+    // }
+  }]);
+}(); // export enum FcrLocalStorageSettingKey {
+//   SpotlightEnabled = 'spotlightEnabled',
+//   ShouldHideNonVideoParticipants = 'shouldHideNonVideoParticipants',
+// }
+(0, _base.registerDependency)('userSettingStorageProvider');