fcr-ui-scene 3.6.4 → 3.7.1

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

@@ -8,7 +8,6 @@ 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.date.to-primitive.js");
-require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.number.constructor.js");
@@ -46,6 +45,7 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.some.js");
 require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.function.bind.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");
@@ -64,23 +64,24 @@ var _base = require("../base");
 var _mobx = require("mobx");
 var _env = require("agora-foundation/lib/utilities/env");
 var _logger = require("../utilities/logger");
-var _type = require("agora-rte-sdk/lib/type");
+var _imports = require("fcr-core/lib/imports");
 var _decorator = require("agora-foundation/lib/decorator");
 var _types = require("fcr-core/lib/room-control/whiteboard-control/types");
+var _type = require("agora-rte-sdk/lib/core/rtc/type");
 var _rendererEvent = require("../utilities/renderer-event");
 var _tools = require("../utilities/tools");
-var _imports = require("fcr-core/lib/imports");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _constant = require("../utilities/constant");
 var _lodash = require("lodash");
+var _config = require("../modules/setting/config");
 var _FcrUIScreenShareProviderImpl;
-var _initProto, _handleScreenCaptureStateUpdatedDecs, _handleShareStopWithAudioDecs, _replaceScreenShareDecs, _handleStreamUpdateDecs, _handleStreamPublicDecs, _releaseDecs, _startShareScreenDecs, _handleShareStartWithAudioDecs, _ref;
+var _initProto, _zoomOutDecs, _zoomInDecs, _fullContainerDecs, _setOriginScalcDecs, _handleScreenCaptureStateUpdatedDecs, _handleShareStopWithAudioDecs, _replaceScreenShareDecs, _handleRemoteVideoStatsUpdatedDecs, _handleStreamUpdateDecs, _syncScreenShareStreamInfosDecs, _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], _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");
+_ref = (_zoomOutDecs = [_mobx.action, _mobx.action.bound], _zoomInDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound], _handleScreenCaptureStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleShareStopWithAudioDecs = [_mobx.action, _mobx.action.bound], _replaceScreenShareDecs = [_mobx.action, _mobx.action.bound], _handleRemoteVideoStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamUpdateDecs = [_mobx.action, _mobx.action.bound], _syncScreenShareStreamInfosDecs = [_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,
@@ -93,6 +94,11 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     })));
     (0, _defineProperty2["default"])(this, "shareLock", false);
     (0, _defineProperty2["default"])(this, "_previewDom", null);
+    (0, _defineProperty2["default"])(this, "_prevFullScalc", {
+      width: document.body.offsetWidth,
+      height: document.body.offsetHeight,
+      scalc: 1
+    });
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_streamObserver", {
       onStreamsAdded: function onStreamsAdded(_, events) {
@@ -103,12 +109,17 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       },
       onStreamsUpdated: function onStreamsUpdated(_, events) {
         return _this._handleStreamUpdate('update', events);
-      }
+      },
+      onRemoteVideoStatsUpdated: this._handleRemoteVideoStatsUpdated.bind(this)
     });
     (0, _defineProperty2["default"])(this, "_screenCaptureObserver", {
       onScreenCaptureStateUpdated: (0, _env.isElectron)() ? this._handleScreenCaptureStateUpdated : this._handleWebScreenCaptureStateUpdated
     });
+    (0, _defineProperty2["default"])(this, "_maxScalcValue", 4);
+    (0, _defineProperty2["default"])(this, "_minScalcValue", 1);
+    (0, _defineProperty2["default"])(this, "_diffScalcValue", 0.5);
     (0, _defineProperty2["default"])(this, "_hasStop", false);
+    (0, _defineProperty2["default"])(this, "_isReplaceScreen", false);
     this._deviceProvider = _deviceProvider;
     this._eventProvider = _eventProvider;
     this._roomProvider = _roomProvider;
@@ -118,6 +129,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     this._sharingControl = (_this$_roomProvider$c = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c === void 0 ? void 0 : _this$_roomProvider$c.getSharingControl();
     this._streamControl = (_this$_roomProvider$c2 = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c2 === void 0 ? void 0 : _this$_roomProvider$c2.getStreamControl();
     (_this$_streamControl = this._streamControl) === null || _this$_streamControl === void 0 || _this$_streamControl.addObserver(this._streamObserver);
+    this._syncScreenShareStreamInfos();
     this._addEventListeners();
     this._syncShareStreamState();
   }
@@ -132,8 +144,80 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       return this._deviceProvider.speakerId;
     }
   }, {
-    key: "getCurrentScreenSharingOwner",
-    value: function getCurrentScreenSharingOwner() {
+    key: "screenShareScalcValue",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.screenShareScalcValue;
+    }
+  }, {
+    key: "screenShareVideoRatio",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.screenShareVideoRatio;
+    }
+  }, {
+    key: "screenShareSpeakerViewSize",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.screenShareSpeakerViewSize;
+    }
+  }, {
+    key: "screenShareScenarioType",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.screenShareScenarioType;
+    }
+  }, {
+    key: "setSharingInReplace",
+    value: function setSharingInReplace(isInReplace) {
+      this._sharedScreenShareSharedDataSource.setSharingInReplace(isInReplace);
+    }
+  }, {
+    key: "zoomOut",
+    value: function zoomOut() {
+      if (this.screenShareScalcValue < this._maxScalcValue) {
+        this._sharedScreenShareSharedDataSource.setScreenShareScalcValue(this.screenShareScalcValue + this._diffScalcValue);
+      }
+    }
+  }, {
+    key: "zoomIn",
+    value: function zoomIn() {
+      if (this.screenShareScalcValue > this._minScalcValue) {
+        this._sharedScreenShareSharedDataSource.setScreenShareScalcValue(this.screenShareScalcValue - this._diffScalcValue);
+      }
+    }
+  }, {
+    key: "fullContainer",
+    value: function fullContainer() {
+      // = 外层容器的宽/(外层容器的高 * 屏幕共享的宽高比)
+      var _this$screenShareSpea = this.screenShareSpeakerViewSize,
+        width = _this$screenShareSpea.width,
+        height = _this$screenShareSpea.height;
+      var scalc = width / (height * this.screenShareVideoRatio);
+      this._prevFullScalc = {
+        width: width,
+        height: height,
+        scalc: scalc
+      };
+      this._sharedScreenShareSharedDataSource.setScreenShareScalcValue(scalc);
+    }
+  }, {
+    key: "isAspectRatioPreserved",
+    get: function get() {
+      var _this$screenShareSpea2 = this.screenShareSpeakerViewSize,
+        width = _this$screenShareSpea2.width,
+        height = _this$screenShareSpea2.height;
+      var _this$_prevFullScalc = this._prevFullScalc,
+        prevWidth = _this$_prevFullScalc.width,
+        prevHeight = _this$_prevFullScalc.height,
+        prevScalc = _this$_prevFullScalc.scalc;
+      var isAspectRatio = width === prevWidth && height === prevHeight && this.screenShareScalcValue == prevScalc;
+      return isAspectRatio;
+    }
+  }, {
+    key: "setOriginScalc",
+    value: function setOriginScalc() {
+      this._sharedScreenShareSharedDataSource.setScreenShareScalcValue(this._minScalcValue);
+    }
+  }, {
+    key: "currentScreenSharingOwner",
+    get: function get() {
       var _this$_streamControl2;
       var allStreams = (_this$_streamControl2 = this._streamControl) === null || _this$_streamControl2 === void 0 ? void 0 : _this$_streamControl2.getStreamList();
       var screenShareStream = allStreams === null || allStreams === void 0 ? void 0 : allStreams.find(function (stream) {
@@ -145,12 +229,18 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
         return null;
       }
     }
+  }, {
+    key: "currentScreenSharingOwnerIsMySelf",
+    get: function get() {
+      var _this$currentScreenSh;
+      return ((_this$currentScreenSh = this.currentScreenSharingOwner) === null || _this$currentScreenSh === void 0 ? void 0 : _this$currentScreenSh.userId) === this._sharedMemberDataSource.localUserId;
+    }
   }, {
     key: "stop",
     value: function stop() {
       if (!this._hasStop) {
-        this._observable.notifyObservers('onScreenCaptureStopped');
         this._hasStop = true;
+        this._observable.notifyObservers('onScreenCaptureStopped');
       }
     }
   }, {
@@ -167,7 +257,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              this._sharedScreenShareSharedDataSource.setScreenSharingState(state);
+              this._sharedScreenShareSharedDataSource.setLocalUserScreenSharingState(state);
               if (!(state === _fcrCore.FcrMediaSourceState.OPEN)) {
                 _context.next = 2;
                 break;
@@ -182,12 +272,13 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
             case 2:
               if (state === _fcrCore.FcrMediaSourceState.CLOSE) {
                 (_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));
+                this._isReplaceScreen ? this._stopScreenTrack() : this.stop();
+                this.logger.info("[Annotation][web]: _handleScreenCaptureStateUpdated: CLOSE, set replaceScreen to: ".concat(this._isReplaceScreen));
               }
               if (state === _fcrCore.FcrMediaSourceState.ERROR) {
+                this.stop();
                 this.setShareLock(false);
-                this._setIsReplaceScreen(false);
+                this._isReplaceScreen = false;
               }
             case 3:
             case "end":
@@ -207,18 +298,19 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       if (state === _fcrCore.FcrMediaSourceState.CLOSE) {
         var _this$screenTrack2;
         this.stopRenderSharePreview(this.screenTrack);
+        if (!this._isReplaceScreen) {
+          this.stop();
+        }
         (_this$screenTrack2 = this.screenTrack) === null || _this$screenTrack2 === void 0 || _this$screenTrack2.removeObserver(this._screenCaptureObserver);
-        this.isReplaceScreen ? this._screenTrackStop() : this.stop();
-        // this._setIsReplaceScreen(false); // 如果是替换的逻辑，暂时不把是否是替换屏幕的值设置为false，改为在结束屏幕共享时重置
-        this.logger.info("[Annotation][electron]: _handleScreenCaptureStateUpdated: CLOSE, set replaceScreen to: ".concat(this.isReplaceScreen));
+        this.logger.info("[Annotation][electron]: _handleScreenCaptureStateUpdated: CLOSE, set replaceScreen to: ".concat(this._isReplaceScreen));
       }
       if (state === _fcrCore.FcrMediaSourceState.ERROR) {
         this.stop();
-        this._sharedScreenShareSharedDataSource.setScreenSharingState(_fcrCore.FcrMediaSourceState.CLOSE);
-        this._setIsReplaceScreen(false);
+        this._sharedScreenShareSharedDataSource.setLocalUserScreenSharingState(_fcrCore.FcrMediaSourceState.CLOSE);
+        this._isReplaceScreen = false;
         return;
       }
-      this._sharedScreenShareSharedDataSource.setScreenSharingState(state);
+      this._sharedScreenShareSharedDataSource.setLocalUserScreenSharingState(state);
     }
   }, {
     key: "_handleShareStopWithAudio",
@@ -227,6 +319,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
         return;
       }
       if (this._deviceProvider.isCapabilitySupported(_fcrCore.FcrCapability.LOOPBACK_CAPTURE)) {
+        this.logger.info('[screen-share-provider][handleShareStopWithAudio] shareAudioTrack.stop');
         this.shareAudioTrack.stop();
       }
     }
@@ -237,7 +330,8 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       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);
+      this._isReplaceScreen = true;
+      this.setSharingInReplace(true);
       if (this.screenTrack) {
         this.screenTrack.removeObserver(this._screenCaptureObserver);
         var _observer = {
@@ -277,19 +371,26 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
           }()
         };
         this.screenTrack.addObserver(_observer);
-        this._screenTrackStop();
+        this._stopScreenTrack();
         this.stopRenderSharePreview(this.screenTrack);
       }
     }
   }, {
-    key: "_setIsReplaceScreen",
-    value: function _setIsReplaceScreen(isReplace) {
-      this._sharedScreenShareSharedDataSource.setIsReplaceScreen(isReplace);
-    }
-  }, {
-    key: "isReplaceScreen",
-    get: function get() {
-      return this._sharedScreenShareSharedDataSource.isReplaceScreen;
+    key: "_handleRemoteVideoStatsUpdated",
+    value: function _handleRemoteVideoStatsUpdated(roomId, streamId, videoStats) {
+      var _this$_streamControl3;
+      var stream = (_this$_streamControl3 = this._streamControl) === null || _this$_streamControl3 === void 0 ? void 0 : _this$_streamControl3.getStreamByStreamId(streamId);
+      if ((stream === null || stream === void 0 ? void 0 : stream.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN) {
+        var _videoStats$dimension = videoStats.dimensions,
+          width = _videoStats$dimension.width,
+          height = _videoStats$dimension.height;
+        if (width !== 0 && height !== 0) {
+          var shareScreenVideoRatio = width / height;
+          var shareScreenVideoSize = videoStats.dimensions;
+          this._sharedScreenShareSharedDataSource.setScreenShareVideoRatio(shareScreenVideoRatio);
+          this._sharedScreenShareSharedDataSource.setScreenShareVideoSize(shareScreenVideoSize);
+        }
+      }
     }
   }, {
     key: "localUserId",
@@ -335,16 +436,18 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "createScreenShareWithSelectionId",
     value: function () {
       var _createScreenShareWithSelectionId = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(videoSourceId, bounds) {
-        var audioSourceId, _this$_sharingControl, streamId;
+        var audioSourceId, _this$_sharingControl, targetEncoderConfig, streamId;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               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) {
+              if (!(this._sharingControl && this._streamControl)) {
                 _context3.next = 2;
                 break;
               }
+              targetEncoderConfig = this.screenShareScenarioType === _imports.FcrScreenScenarioType.CLEARITY ? _config.clearityEncoderConfig : _config.smoothEncoderConfig;
+              this._streamControl.setScreenScenario(this.screenShareScenarioType);
               _context3.next = 1;
               return (_this$_sharingControl = this._sharingControl) === null || _this$_sharingControl === void 0 ? void 0 : _this$_sharingControl.startScreenSharing({
                 streamType: _imports.AgoraRteMediaStreamType.BOTH,
@@ -353,6 +456,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               }, bounds);
             case 1:
               streamId = _context3.sent;
+              this._streamControl.setVideoEncoderConfig(streamId, targetEncoderConfig, _type.AgoraRtcVideoStreamType.HIGH_STREAM);
               return _context3.abrupt("return", Promise.resolve(streamId));
             case 2:
               return _context3.abrupt("return", Promise.reject());
@@ -389,33 +493,35 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "_syncShareStreamState",
     value: function _syncShareStreamState() {
-      var _this$_streamControl3,
-        _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 === _this4.localUserId;
-      })) === null || _this$_streamControl3 === void 0 ? void 0 : _this$_streamControl3.streamId);
-      if (this._sharedScreenShareSharedDataSource.screenSharingState !== _fcrCore.FcrMediaSourceState.OPEN && currentShareStreamId) {
+      if (this._sharedScreenShareSharedDataSource.localUserScreenSharingState !== _fcrCore.FcrMediaSourceState.OPEN) {
+        this._hasStop = false;
         this.stop();
       }
     }
   }, {
     key: "_handleStreamUpdate",
     value: function _handleStreamUpdate(process, events) {
-      var _this5 = this;
-      this._handleStreamPublic();
+      var _seizeStream$operator,
+        _this4 = this;
+      this._syncScreenShareStreamInfos();
       var isClosedByOther = this._isStoppedFor(events, _types.FcrBoardInactiveReason.CLOSE);
       var isSeizedByOther = this._isStoppedFor(events, _types.FcrBoardInactiveReason.SEIZE);
       var operatorUser = (isSeizedByOther === null || isSeizedByOther === void 0 ? void 0 : isSeizedByOther.operatorUser) || (isClosedByOther === null || isClosedByOther === void 0 ? void 0 : isClosedByOther.operatorUser);
       var ownerUser = (isSeizedByOther === null || isSeizedByOther === void 0 ? void 0 : isSeizedByOther.modifiedStream.owner) || (isClosedByOther === null || isClosedByOther === void 0 ? void 0 : isClosedByOther.modifiedStream.owner);
       var selfOperated = (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) === this.localUserId;
       var isMyOwnShare = this.localUserId === (ownerUser === null || ownerUser === void 0 ? void 0 : ownerUser.userId);
-      if ((isSeizedByOther || isClosedByOther) && !selfOperated) {
-        this._screenTrackStop();
-      }
       isClosedByOther && !selfOperated && isMyOwnShare && this._eventProvider.sendEvent(_constant.FcrUIAction.SHOW_TOAST, {
         type: 'info',
         message: (0, _i18n.transI18n)('fmt_share_tips_sharingdisabled')
       });
+      if ((isSeizedByOther || isClosedByOther) && !selfOperated) {
+        if ((0, _env.isElectron)()) {
+          this.stop();
+        } else {
+          this._stopScreenTrack();
+        }
+        return;
+      }
       switch (process) {
         case 'add':
           // 抢占流添加时，不设置抢占流状态，因为抢占发生时，会触发 remove 事件，此时判断 reason===seize 的结果设置抢占流状态
@@ -427,22 +533,26 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
           // this._sharedScreenShareSharedDataSource.setIsSeizeStream(isSeizeStreamAdd);
           break;
         case 'remove':
-          var isSeizeStreamRemove = events.some(function (event) {
+          var seizeStream = events.find(function (event) {
             var _event$cause2, _event$operatorUser;
-            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;
+            return event.modifiedStream.videoSourceType === _imports.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('stream update remove', isSeizeStreamRemove);
-          if (events.some(function (event) {
-            return event.modifiedStream.videoSourceType === _type.AgoraRteVideoSourceType.SCREEN && event.modifiedStream.owner.userId === _this5.localUserId;
-          })) {
-            if (!(0, _env.isElectron)() && this.isReplaceScreen) {
+          if ((seizeStream === null || seizeStream === void 0 || (_seizeStream$operator = seizeStream.operatorUser) === null || _seizeStream$operator === void 0 ? void 0 : _seizeStream$operator.userId) !== this.localUserId && (seizeStream === null || seizeStream === void 0 ? void 0 : seizeStream.modifiedStream.owner.userId) === this.localUserId) {
+            this._observable.notifyObservers('onScreenShareSeize');
+            this._sharedScreenShareSharedDataSource.setIsSeizeStream(true);
+          }
+          var mySharingScreenRemoved = events.some(function (event) {
+            return event.modifiedStream.videoSourceType === _imports.AgoraRteVideoSourceType.SCREEN && event.modifiedStream.owner.userId === _this4.localUserId;
+          });
+          if (mySharingScreenRemoved) {
+            this.setSharingInReplace(false);
+            if (!(0, _env.isElectron)() && this._isReplaceScreen) {
               // web下的替换流不需要停止采集
-              this._setIsReplaceScreen(false);
+              this._isReplaceScreen = false;
               return;
             }
             this.logger.info('screen-share-provider: current user stream remove');
-            this._screenTrackStop();
+            this._stopScreenTrack();
           }
           break;
       }
@@ -469,16 +579,16 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       this._previewDom && (screenTrack === null || screenTrack === void 0 ? void 0 : screenTrack.stopPreview(this._previewDom));
     }
   }, {
-    key: "_handleStreamPublic",
-    value: function _handleStreamPublic() {
+    key: "_syncScreenShareStreamInfos",
+    value: function _syncScreenShareStreamInfos() {
       var _this$_roomProvider$c3, _streams$find;
       var streams = (_this$_roomProvider$c3 = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c3 === void 0 ? void 0 : _this$_roomProvider$c3.getStreamControl().getStreamList();
       var isSharingScreen = streams === null || streams === void 0 ? void 0 : streams.some(function (stream) {
-        return stream.videoSourceType === _type.AgoraRteVideoSourceType.SCREEN;
+        return stream.videoSourceType === _imports.AgoraRteVideoSourceType.SCREEN;
       });
       this._sharedScreenShareSharedDataSource.setIsSharingScreen(!!isSharingScreen);
       var screenSharingOwner = streams === null || streams === void 0 || (_streams$find = streams.find(function (stream) {
-        return stream.videoSourceType === _type.AgoraRteVideoSourceType.SCREEN;
+        return stream.videoSourceType === _imports.AgoraRteVideoSourceType.SCREEN;
       })) === null || _streams$find === void 0 ? void 0 : _streams$find.owner;
       this._sharedScreenShareSharedDataSource.setScreenSharingOwner(screenSharingOwner);
     }
@@ -503,16 +613,13 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       var _this$_sharingProvide;
       (_this$_sharingProvide = this._sharingProvider) === null || _this$_sharingProvide === void 0 || _this$_sharingProvide.startWhiteboard();
     }
-  }, {
-    key: "stopShareWhiteboard",
-    value: function stopShareWhiteboard() {
-      var _this$_sharingProvide2;
-      (_this$_sharingProvide2 = this._sharingProvider) === null || _this$_sharingProvide2 === void 0 || _this$_sharingProvide2.stop();
-    }
   }, {
     key: "release",
     value: function release() {
       var _this$_streamControl4;
+      this.logger.info('[screen-share-provider] in release');
+      this._hasStop = false;
+      this.stop();
       (_this$_streamControl4 = this._streamControl) === null || _this$_streamControl4 === void 0 || _this$_streamControl4.removeObserver(this._streamObserver);
       this._removeEventListeners();
     }
@@ -520,69 +627,65 @@ 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$screenTrack3, _this$screenTrack4, streamId, screenTrack, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8;
+        var _this$screenTrack3, _this$screenTrack4, frameRate, excludeWindows, streamId, screenTrack, _t, _t2;
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               this.setShareLock(true);
               _context4.prev = 1;
               this.logger.info('screen-share-provider: enter startShareScreen');
-              if (!((0, _env.isElectron)() && !isReplace)) {
+              frameRate = this._sharedScreenShareSharedDataSource.screenShareScenarioType === _imports.FcrScreenScenarioType.SMOOTH ? 25 : 15;
+              if (!(0, _env.isElectron)()) {
                 _context4.next = 3;
                 break;
               }
               _context4.next = 2;
-              return this.createScreenShareWithSelectionId(id, this.currentSelectionBounds);
+              return this._getExcludeWindows();
             case 2:
+              _t = _context4.sent;
+              _context4.next = 4;
+              break;
+            case 3:
+              _t = undefined;
+            case 4:
+              excludeWindows = _t;
+              if (!((0, _env.isElectron)() && !isReplace)) {
+                _context4.next = 6;
+                break;
+              }
+              _context4.next = 5;
+              return this.createScreenShareWithSelectionId(id, this.currentSelectionBounds);
+            case 5:
               streamId = _context4.sent;
               if (streamId) {
                 this._sharedScreenShareSharedDataSource.setCurrentShareStreamId(streamId);
               }
-            case 3:
+            case 6:
               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$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;
-              }
-              _t2 = _this$screenTrack4;
-              _t3 = type;
-              _t4 = withAudio;
-              if (!(0, _env.isElectron)()) {
-                _context4.next = 5;
-                break;
-              }
-              _context4.next = 4;
-              return this._getExcludeWindows();
-            case 4:
-              _t5 = _context4.sent;
-              _context4.next = 6;
+              (_this$screenTrack4 = this.screenTrack) === null || _this$screenTrack4 === void 0 || _this$screenTrack4.start(type, {
+                withAudio: withAudio,
+                excludeWindows: excludeWindows,
+                frameRate: frameRate
+              });
+              _context4.next = 8;
               break;
-            case 5:
-              _t5 = undefined;
-            case 6:
-              _t6 = _t5;
-              _t7 = {
-                withAudio: _t4,
-                excludeWindows: _t6
-              };
-              _t2.start.call(_t2, _t3, _t7);
             case 7:
-              return _context4.abrupt("return", Promise.resolve(this.screenTrack));
+              _context4.prev = 7;
+              _t2 = _context4["catch"](1);
+              return _context4.abrupt("return", null);
             case 8:
               _context4.prev = 8;
-              _t8 = _context4["catch"](1);
-              return _context4.abrupt("return", Promise.reject(_t8));
+              return _context4.abrupt("return", this.screenTrack);
             case 9:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[1, 8]]);
+        }, _callee4, this, [[1, 7, 8, 9]]);
       }));
       function startShareScreen(_x7, _x8, _x9, _x0) {
         return _startShareScreen.apply(this, arguments);
@@ -594,9 +697,20 @@ 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._handleShareStopWithAudio();
+      this._cleanShareWithAudioDataSource();
       this.stopRenderSharePreview(screenTrack);
       this.removeScreenStream();
-      this._screenTrackStop();
+      this._stopScreenTrack();
+    }
+  }, {
+    key: "stopShareScreenByExitRoom",
+    value: function stopShareScreenByExitRoom(targetScreenTrack) {
+      this.logger.info('screen-share-provider: stopShareScreenByExitRoom');
+      var screenTrack = targetScreenTrack !== null && targetScreenTrack !== void 0 ? targetScreenTrack : this.screenTrack;
+      this.stopRenderSharePreview(screenTrack);
+      this._stopScreenTrack();
+      this._cleanShareWithAudioDataSource();
     }
   }, {
     key: "_handleShareStartWithAudio",
@@ -611,6 +725,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "toggleScreenshareWithAudio",
     value: function toggleScreenshareWithAudio(withAudio) {
       this._sharedScreenShareSharedDataSource.setShareWithAudio(withAudio);
+      this.logger.info("[screen-share-provider] current-share with audio: ".concat(withAudio));
       if (this.currentShareStreamId && this._streamControl) {
         this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, this.currentShareStreamId, {
           audioPrivilege: withAudio ? _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE : _fcrCore.FcrStreamPrivilegeOperation.NOPRIVILEGE,
@@ -694,16 +809,23 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       }
     }
   }, {
-    key: "_screenTrackStop",
-    value: function _screenTrackStop() {
+    key: "_stopScreenTrack",
+    value: function _stopScreenTrack() {
       var _this$screenTrack5;
       this.logger.info('screen-share-provider: current screen track stop');
       (_this$screenTrack5 = this.screenTrack) === null || _this$screenTrack5 === void 0 || _this$screenTrack5.stop();
       this.setShareLock(false);
     }
+  }, {
+    key: "_cleanShareWithAudioDataSource",
+    value: function _cleanShareWithAudioDataSource() {
+      this.logger.info('[screen-share-provider][cleanShareWithAudioDataSource] reset done !');
+      this._sharedScreenShareSharedDataSource.setShareWithAudioTrack(null);
+      this._sharedScreenShareSharedDataSource.setShareWithAudio(!(0, _env.isElectron)());
+    }
   }]);
 }();
 _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"], [_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);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareProviderImpl, [[_decorator.bound, 2, "setSharingInReplace"], [_zoomOutDecs, 18, "zoomOut"], [_zoomInDecs, 18, "zoomIn"], [_fullContainerDecs, 18, "fullContainer"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_decorator.bound, 2, "stop"], [_decorator.bound, 2, "bootstrap"], [_decorator.bound, 2, "_handleWebScreenCaptureStateUpdated"], [_handleScreenCaptureStateUpdatedDecs, 18, "_handleScreenCaptureStateUpdated"], [_handleShareStopWithAudioDecs, 18, "_handleShareStopWithAudio"], [_replaceScreenShareDecs, 18, "replaceScreenShare"], [_handleRemoteVideoStatsUpdatedDecs, 18, "_handleRemoteVideoStatsUpdated"], [_decorator.bound, 2, "_syncShareStreamState"], [_handleStreamUpdateDecs, 18, "_handleStreamUpdate"], [_decorator.bound, 2, "startRenderSharePreview"], [_decorator.bound, 2, "stopRenderSharePreview"], [_syncScreenShareStreamInfosDecs, 18, "_syncScreenShareStreamInfos"], [_releaseDecs, 18, "release"], [_startShareScreenDecs, 18, "startShareScreen"], [_decorator.bound, 2, "stopShareScreen"], [_decorator.bound, 2, "stopShareScreenByExitRoom"], [_handleShareStartWithAudioDecs, 18, "_handleShareStartWithAudio"], [_decorator.bound, 2, "toggleScreenshareWithAudio"], [_decorator.bound, 2, "_getExcludeWindows"], [_decorator.bound, 2, "removeScreenStream"], [_decorator.bound, 2, "_stopScreenTrack"], [_decorator.bound, 2, "_cleanShareWithAudioDataSource"]], []).e, 1);
 _initProto = _applyDecs$e[0];
 (0, _base.registerDependency)('screenShareProvider');

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

@@ -23,7 +23,6 @@ export declare class FcrUISharingProviderImpl implements FcrUISharingProvider {
     accessor whiteboardOwnerId: string;
     accessor screenSharingState: FcrScreenSharingState;
     accessor whiteboardState: FcrWhiteboardState;
-    get isReplaceScreen(): boolean;
     get isSeizeStream(): boolean;
     constructor(_sharingControl: FcrSharingControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource);
     startScreenSharing(config: FcrScreenStreamCreateConfig): void;