fcr-ui-scene 3.7.8 → 3.8.0-alpha

package/lib/modules/setting/store.electron.js

@@ -1,38 +1,130 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+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");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.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.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.StoreContext = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.concat.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"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _store = require("./store.base");
 var _objectManager = require("../../object-manager");
+var _audioWhiteListManager = require("./audio-whiteList/audio-whiteList-manager");
+var _schedule = require("agora-foundation/lib/schedule");
+var _decorator = require("agora-foundation/lib/decorator");
+var _SettingStore;
+var _initProto;
 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)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+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; }
 var SettingStore = exports["default"] = /*#__PURE__*/function (_SettingStoreBase) {
   function SettingStore(args) {
     var _this;
     (0, _classCallCheck2["default"])(this, SettingStore);
     _this = _callSuper(this, SettingStore, [args]);
+    (0, _defineProperty2["default"])(_this, "_renderer", void _initProto(_this));
+    (0, _defineProperty2["default"])(_this, "_audioDeviceObserver", {
+      onMicrophoneChanged: _this._handleMicrophoneChanged,
+      onMicrophoneListUpdated: _this._handleMicrophoneListUpdated
+    });
     var objectManager = args.objectManager;
     _this._renderer = objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
     _this._windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
-    _this._syncSystemInfo();
+    var delegate = {
+      getCurrentSetting: function getCurrentSetting() {
+        return {
+          audioEchoCancellation: _this.sharedSettingDataSource.setting.audioEchoCancellation,
+          noiseReduce: _this.sharedSettingDataSource.setting.noiseReduce
+        };
+      },
+      getMicrophoneId: function getMicrophoneId() {
+        return _this.deviceProvider.microphoneId || '';
+      },
+      getMicrophoneList: function getMicrophoneList() {
+        return _this.deviceProvider.microphoneList;
+      },
+      enableAudioEchoCancellation: function enableAudioEchoCancellation(enable) {
+        return _this.deviceProvider.enableAudioEchoCancellation(enable);
+      },
+      toggleAgc: function toggleAgc(enable) {
+        return _this.deviceProvider.toggleAGC(enable);
+      },
+      setNoiseLevel: function setNoiseLevel(level) {
+        return _this.deviceProvider.setNoiseLevel(level);
+      },
+      updateSettings: function updateSettings(settings) {
+        return _this.sharedSettingDataSource.setSetting(settings);
+      }
+    };
+    _this._audioDeviceWhiteListManager = new _audioWhiteListManager.AudioDeviceWhiteListManager(delegate);
+    _this.deviceProvider.addObserver(_this._audioDeviceObserver);
+    _this._pollingTask = _schedule.AgoraScheduler.shared.addPollingTask(_this._syncSystemInfo, 5000, true);
     return _this;
   }
   (0, _inherits2["default"])(SettingStore, _SettingStoreBase);
   return (0, _createClass2["default"])(SettingStore, [{
+    key: "_handleMicrophoneChanged",
+    value: function _handleMicrophoneChanged(microphoneId, productId, vendorId) {
+      var _this$_audioDeviceWhi;
+      (_this$_audioDeviceWhi = this._audioDeviceWhiteListManager) === null || _this$_audioDeviceWhi === void 0 || _this$_audioDeviceWhi.handleMicrophoneChanged(microphoneId, productId, vendorId);
+    }
+  }, {
+    key: "_handleMicrophoneListUpdated",
+    value: function _handleMicrophoneListUpdated(microphoneList) {
+      var _this$_audioDeviceWhi2;
+      (_this$_audioDeviceWhi2 = this._audioDeviceWhiteListManager) === null || _this$_audioDeviceWhi2 === void 0 || _this$_audioDeviceWhi2.handleMicrophoneListUpdated(microphoneList);
+    }
+  }, {
     key: "getSystemInfo",
     value: function () {
       var _getSystemInfo = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -64,6 +156,23 @@ var SettingStore = exports["default"] = /*#__PURE__*/function (_SettingStoreBase
       }
       return getSystemInfo;
     }()
+  }, {
+    key: "_updateAudioDeviceWhitelistConfig",
+    value: function _updateAudioDeviceWhitelistConfig(config) {
+      var _this$_audioDeviceWhi3;
+      (_this$_audioDeviceWhi3 = this._audioDeviceWhiteListManager) === null || _this$_audioDeviceWhi3 === void 0 || _this$_audioDeviceWhi3.updateDeviceConfig(config);
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      var _this$_audioDeviceWhi4;
+      this._pollingTask.stop();
+      (_this$_audioDeviceWhi4 = this._audioDeviceWhiteListManager) === null || _this$_audioDeviceWhi4 === void 0 || _this$_audioDeviceWhi4.release();
+      this.deviceProvider.removeObserver(this._audioDeviceObserver);
+    }
   }]);
 }(_store.SettingStoreBase);
+_SettingStore = SettingStore;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SettingStore, [[_decorator.bound, 2, "_handleMicrophoneChanged"], [_decorator.bound, 2, "_handleMicrophoneListUpdated"], [_decorator.bound, 2, "getSystemInfo"], [_decorator.trace, 2, "release"]], [], 0, void 0, _store.SettingStoreBase).e, 1);
+_initProto = _applyDecs$e[0];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/setting/type.d.ts

@@ -21,7 +21,8 @@ export declare enum DeviceSettingTab {
     GENERAL = "general",
     AUDIO = "audio",
     VIDEO = "video",
-    STATE = "state"
+    STATE = "state",
+    CAPTION_AND_TRANSCRIBING = "caption_and_transcribing"
 }
 export type VideoActiveTab = 'basic' | 'virtual-background' | 'beauty-filter';
 export interface DeviceSettingDialogConfig {

package/lib/modules/setting/type.js

@@ -17,6 +17,7 @@ var DeviceSettingTab = exports.DeviceSettingTab = /*#__PURE__*/function (DeviceS
   DeviceSettingTab["AUDIO"] = "audio";
   DeviceSettingTab["VIDEO"] = "video";
   DeviceSettingTab["STATE"] = "state";
+  DeviceSettingTab["CAPTION_AND_TRANSCRIBING"] = "caption_and_transcribing";
   return DeviceSettingTab;
 }({});
 var MeetingState = exports.MeetingState = /*#__PURE__*/function (MeetingState) {

package/lib/modules/setting/video-settings/video-settings-basic.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VideoSettingsBasic = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
@@ -33,10 +32,6 @@ var VideoSettingsBasic = exports.VideoSettingsBasic = (0, _mobxReact.observer)(f
     changeMediaSetting = _useContext.changeMediaSetting;
   var activeTab = dialogConfig.activeTab,
     highlightSelector = dialogConfig.highlightSelector;
-  var _useState = (0, _react.useState)(media.cameraExpectedOff),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    cameraExpectedOff = _useState2[0],
-    setCameraExpectedOff = _useState2[1];
   var ref = (0, _react.useRef)(null);
   var scrollToSection = function scrollToSection(previewId) {
     var _ref$current;
@@ -97,9 +92,8 @@ var VideoSettingsBasic = exports.VideoSettingsBasic = (0, _mobxReact.observer)(f
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
         size: "small",
         label: t('fmt_premeeting_setting_label_turn_on_camera'),
-        checked: !cameraExpectedOff,
+        checked: !media.cameraExpectedOff,
         onChange: function onChange(v) {
-          setCameraExpectedOff(!v);
           changeMediaSetting('cameraExpectedOff', !v);
         }
       })

package/lib/modules/setting/view.js

@@ -29,6 +29,7 @@ var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _type2 = require("./type");
 var _store = require("./store.base");
 var _useNamespace = require("../../utilities/useNamespace");
+var _caption_and_transcribing = _interopRequireDefault(require("./caption_and_transcribing"));
 var _jsxRuntime = require("react/jsx-runtime");
 // import StorageSettings from './storage-settings/storage-settings';
 // import TranslateSettings from './translate-settings/translate-settings';
@@ -39,7 +40,7 @@ var HelpQuestionIcon = exports.HelpQuestionIcon = function HelpQuestionIcon(_ref
     placement = _ref.placement;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
     mouseEnterDelay: 0,
-    trigger: "click",
+    trigger: "hover",
     content: content,
     placement: placement,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -61,7 +62,7 @@ var DeviceSettingsView = exports.DeviceSettingsView = (0, _mobxReact.observer)(f
     dialogConfig = _useContext.dialogConfig,
     setDialogConfig = _useContext.setDialogConfig,
     setSettingVideoOpened = _useContext.setSettingVideoOpened,
-    isHiddenStateTab = _useContext.isHiddenStateTab;
+    isHiddenMeetingTab = _useContext.isHiddenMeetingTab;
   var t = (0, _i18n.useI18n)();
   var ns = (0, _useNamespace.useNamespace)('device-settings');
   var getListItemCls = function getListItemCls(tabKey) {
@@ -84,7 +85,7 @@ var DeviceSettingsView = exports.DeviceSettingsView = (0, _mobxReact.observer)(f
     };
   }, []);
   var tabContent = (0, _react.useMemo)(function () {
-    var tabContents = (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _type2.DeviceSettingTab.GENERAL, /*#__PURE__*/(0, _jsxRuntime.jsx)(_generalSettings["default"], {})), _type2.DeviceSettingTab.AUDIO, /*#__PURE__*/(0, _jsxRuntime.jsx)(_audioSettings["default"], {})), _type2.DeviceSettingTab.VIDEO, /*#__PURE__*/(0, _jsxRuntime.jsx)(_videoSettings["default"], {})), _type2.DeviceSettingTab.STATE, /*#__PURE__*/(0, _jsxRuntime.jsx)(_state["default"], {}));
+    var tabContents = (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _type2.DeviceSettingTab.GENERAL, /*#__PURE__*/(0, _jsxRuntime.jsx)(_generalSettings["default"], {})), _type2.DeviceSettingTab.AUDIO, /*#__PURE__*/(0, _jsxRuntime.jsx)(_audioSettings["default"], {})), _type2.DeviceSettingTab.VIDEO, /*#__PURE__*/(0, _jsxRuntime.jsx)(_videoSettings["default"], {})), _type2.DeviceSettingTab.CAPTION_AND_TRANSCRIBING, /*#__PURE__*/(0, _jsxRuntime.jsx)(_caption_and_transcribing["default"], {})), _type2.DeviceSettingTab.STATE, /*#__PURE__*/(0, _jsxRuntime.jsx)(_state["default"], {}));
     return tabContents[dialogConfig.activeTab];
   }, [dialogConfig.activeTab]);
   var deviceSettingItems = [{
@@ -102,12 +103,18 @@ var DeviceSettingsView = exports.DeviceSettingsView = (0, _mobxReact.observer)(f
     color: 'purple',
     icon: _type.FcrIconType.FCR_CAMERA,
     label: t('fmt_setting_option_Video')
+  }, {
+    tab: _type2.DeviceSettingTab.CAPTION_AND_TRANSCRIBING,
+    color: 'storage',
+    icon: _type.FcrIconType.FCR_MOBILE_SUBTITIES_ON,
+    label: t('fmt_ai_subtitles_setting_label_caption_transcripts'),
+    isHidden: isHiddenMeetingTab
   }, {
     tab: _type2.DeviceSettingTab.STATE,
     color: 'blue',
     icon: _type.FcrIconType.FCR_COMPUTERDATA,
     label: t('fmt_modules_labels_qualitystatistics'),
-    isHidden: isHiddenStateTab
+    isHidden: isHiddenMeetingTab
   }];
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: ns.b(),

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("agora-foundation/lib/logger").Logger;
+    protected logger: import("fcr-core/lib/imports").Logger;
     protected dialogProvider: FcrUIDialogProvider;
     protected screenShareProvider: FcrUIScreenShareProvider;
     protected boardShareProvider: FcrUIBoardShareProvider;

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

@@ -73,7 +73,6 @@ var _type = require("./type");
 var _type2 = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _struct = require("../../providers/screen-share/struct");
-var _constant = require("../../utilities/constant");
 var _type3 = require("agora-ui-foundation/lib/components/icon/type");
 var _ShareScreenStoreBase;
 var _initProto, _init_isSharing, _init_displayList, _init_applicationList, _init_selectedShareItem, _init_isWhiteboardSelected, _init_isSharingWithAudio, _init_isSharingInSmoothMode, _loadSelectionListDecs, _setSelectedItemDecs, _ref;
@@ -132,6 +131,9 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
       onShareSourceReplaced: function onShareSourceReplaced() {
         _this.dialogProvider.setSharingDisplayBounds(_this.screenShareProvider.sharingDisplayBounds);
       },
+      onSelectionBoundsChanged: function onSelectionBoundsChanged() {
+        _this.dialogProvider.setSharingDisplayBounds(_this.screenShareProvider.sharingDisplayBounds);
+      },
       onScreenShareErrorOccurred: function onScreenShareErrorOccurred(code) {
         if (code === _struct.FcrUIScreenShareErrorCode.NETWORK_DISCONNECTED) {
           if (!_this.facilityProvider.isNetworkConnected) {
@@ -379,7 +381,6 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
                 captureType: captureType
               });
             case 6:
-              this.dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
               _context2.next = 8;
               break;
             case 7:

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

@@ -6,11 +6,12 @@ export default class ElectronShareScreenStore extends ShareScreenStoreBase {
     private _dialogProvider;
     private _multiDisplayProvider;
     private _sharedConfigDataSource;
+    private _renderer;
     private _isSharing;
     private _screenShareElectronObserver;
     get audioShareMode(): AudioProcessingChannel;
     constructor(args: ShareScreenStoreArgs);
-    handleSelectionOpen(): void;
+    handleSelectionOpen(): Promise<void>;
     setShareWithAudioState(withAudio: boolean): void;
     setShareInSmoothMode(enable: boolean): void;
     setShareAudioMode(mode: AudioProcessingChannel): void;
@@ -22,4 +23,5 @@ export default class ElectronShareScreenStore extends ShareScreenStoreBase {
     private _hideControlBar;
     private _handleSourceReplaced;
     private _checkAutoStartScreenSharing;
+    private _handleDisplayCountUpdated;
 }

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

@@ -16,7 +16,6 @@ require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.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.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.function.metadata.js");
@@ -43,8 +42,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-require("core-js/modules/es.date.to-json.js");
-require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.array.find.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");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -66,6 +67,8 @@ var _mobx = require("mobx");
 var _parameters = require("../../utilities/parameters");
 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 _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)); }
@@ -95,6 +98,8 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
     _this._multiDisplayProvider = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MULTI_DISPLAY_PROVIDER);
     _this._sharedConfigDataSource = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE);
     _this._dialogProvider.addInterceptor(_type2.FcrDialogInterceptorEventName.ON_CLOSE, _this._interceptDialogClose);
+    _this._renderer = args.objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
+    _this._renderer.addEventListener(_this._handleDisplayCountUpdated);
     _this.screenShareProvider.addObserver(_this._screenShareElectronObserver);
     _this._checkAutoStartScreenSharing();
     return _this;
@@ -107,11 +112,44 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
     }
   }, {
     key: "handleSelectionOpen",
-    value: function handleSelectionOpen() {
-      this.isSharingInSmoothMode = false;
-      this.isSharingWithAudio = false;
-      this.loadSelectionList();
-    }
+    value: function () {
+      var _handleSelectionOpen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var _this2 = this;
+        var selectedId, existItem;
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              this.isSharingInSmoothMode = false;
+              this.isSharingWithAudio = false;
+              _context.next = 1;
+              return this.loadSelectionList();
+            case 1:
+              // 检查之前选择的共享窗口是否还存在, 不存在则重置选择状态
+              // 仅在未开始共享时检查, 在共享过程中, 窗口可能会被隐藏. ps: 在共享过程中隐藏窗口, 不会停止共享.
+              if (this.selectedShareItem !== null && !this.screenShareProvider.isLocalUserScreenSharing) {
+                selectedId = this.selectedShareItem.id;
+                existItem = this.applicationList.find(function (item) {
+                  return item.id === selectedId;
+                });
+                if (!existItem) {
+                  (0, _mobx.runInAction)(function () {
+                    _this2.selectedShareItem = null;
+                    _this2.screenShareProvider.setSelectionBounds(null);
+                    _this2.screenShareProvider.setSelectionIdAndType(null);
+                  });
+                }
+              }
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function handleSelectionOpen() {
+        return _handleSelectionOpen.apply(this, arguments);
+      }
+      return handleSelectionOpen;
+    }()
   }, {
     key: "setShareWithAudioState",
     value: function setShareWithAudioState(withAudio) {
@@ -139,6 +177,10 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
       var isDisplay = selected.type === _type.FcrUIShareType.DISPLAY;
       if (isWindow || isDisplay) {
         this.screenShareProvider.setSelectionBounds(selected.bounds);
+        this.screenShareProvider.setSelectionIdAndType({
+          id: selected.id,
+          type: isWindow ? _type3.FcrScreenCaptureType.WINDOW : _type3.FcrScreenCaptureType.SCREEN
+        });
       }
     }
   }, {
@@ -153,6 +195,7 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
       mainWindow.show();
       _superPropGet(ElectronShareScreenStore, "release", this, 3)([]);
       this.screenShareProvider.removeObserver(this._screenShareElectronObserver);
+      this._renderer.removeEventListener(this._handleDisplayCountUpdated);
     }
   }, {
     key: "_ensureWindowsAreOpenAndPositioned",
@@ -191,28 +234,52 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
     }
   }, {
     key: "_showControlBar",
-    value: function _showControlBar() {
-      this._isSharing = true;
-      this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
-      var videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-      try {
-        if (!videoWindow.isVisible()) {
-          videoWindow.show();
-        }
-      } catch (e) {
-        this.logger.warn('share_screen _showControlBar error', JSON.stringify(e));
-      }
-      videoWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.VIDEO_WINDOW_LEVEL);
-      var isMultiDisplayActive = this._multiDisplayProvider.isActive;
-      this._ensureWindowsAreOpenAndPositioned(true, isMultiDisplayActive);
-      if (isMultiDisplayActive) {
-        this._multiDisplayProvider.moveMainWindowToIndexLeastDisplay();
-      } else {
-        var mainWindow = this._windowProvider.getCurrentWindow();
-        mainWindow.setFullScreen(false);
-        mainWindow.hide();
+    value: function () {
+      var _showControlBar2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+        var isMultiDisplayActive, mainWindow, videoWindow;
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              this._isSharing = true;
+              this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
+              isMultiDisplayActive = this._multiDisplayProvider.isActive;
+              mainWindow = this._windowProvider.getCurrentWindow();
+              if (isMultiDisplayActive) {
+                _context2.next = 1;
+                break;
+              }
+              if (!mainWindow.isFullScreen()) {
+                _context2.next = 1;
+                break;
+              }
+              mainWindow.setFullScreen(false);
+
+              // 需要等待窗口退出全屏完成
+              _context2.next = 1;
+              return (0, _imports.sleep)(1000);
+            case 1:
+              videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+              if (!videoWindow.isVisible()) {
+                videoWindow.show();
+              }
+              videoWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.VIDEO_WINDOW_LEVEL);
+              this._ensureWindowsAreOpenAndPositioned(true, isMultiDisplayActive);
+              if (isMultiDisplayActive) {
+                this._multiDisplayProvider.moveMainWindowToIndexLeastDisplay();
+              } else {
+                mainWindow.hide();
+              }
+            case 2:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function _showControlBar() {
+        return _showControlBar2.apply(this, arguments);
       }
-    }
+      return _showControlBar;
+    }()
   }, {
     key: "_hideControlBar",
     value: function _hideControlBar() {
@@ -235,25 +302,29 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
   }, {
     key: "_checkAutoStartScreenSharing",
     value: function () {
-      var _checkAutoStartScreenSharing2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _checkAutoStartScreenSharing2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
         var needStartShare, displayList, _displayList$, bounds, id;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator["default"].wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               needStartShare = (0, _parameters.getStartScreenSharing)(this._sharedConfigDataSource.creatorConfig.parameters);
               if (!needStartShare) {
-                _context.next = 2;
+                _context3.next = 2;
                 break;
               }
-              _context.next = 1;
+              _context3.next = 1;
               return this.screenShareProvider.getDisplayList();
             case 1:
-              displayList = _context.sent;
+              displayList = _context3.sent;
               if (displayList.length === 0) {
                 this.logger.error('cannot start auto screen sharing, no display found');
               } else {
                 _displayList$ = displayList[0], bounds = _displayList$.bounds, id = _displayList$.id;
                 this.screenShareProvider.setSelectionBounds(bounds);
+                this.screenShareProvider.setSelectionIdAndType({
+                  id: id,
+                  type: _type3.FcrScreenCaptureType.SCREEN
+                });
                 this.screenShareProvider.startShare({
                   videoSourceId: id,
                   captureType: _type3.FcrScreenCaptureType.SCREEN
@@ -261,17 +332,76 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
               }
             case 2:
             case "end":
-              return _context.stop();
+              return _context3.stop();
           }
-        }, _callee, this);
+        }, _callee3, this);
       }));
       function _checkAutoStartScreenSharing() {
         return _checkAutoStartScreenSharing2.apply(this, arguments);
       }
       return _checkAutoStartScreenSharing;
     }()
+  }, {
+    key: "_handleDisplayCountUpdated",
+    value: function () {
+      var _handleDisplayCountUpdated2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(event) {
+        var eventAction, _this$selectedShareIt, type, id, windowList, sharingTarget;
+        return _regenerator["default"].wrap(function (_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              eventAction = event.action;
+              if (!(eventAction === _constant.FcrUIRendererEventAction.SCREEN_DISPLAY_REMOVED
+              // ||
+              // eventAction === FcrUIRendererEventAction.SCREEN_DISPLAY_METRICS_CHANGED
+              )) {
+                _context4.next = 4;
+                break;
+              }
+              this.logger.info("action: ".concat(eventAction));
+              if (!this.screenShareProvider.isLocalUserScreenSharing) {
+                _context4.next = 4;
+                break;
+              }
+              if (this.selectedShareItem) {
+                _context4.next = 1;
+                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;
+              if (!(type === _type.FcrUIShareType.WINDOW)) {
+                _context4.next = 4;
+                break;
+              }
+              _context4.next = 2;
+              return this.screenShareProvider.getWindowList();
+            case 2:
+              windowList = _context4.sent;
+              sharingTarget = windowList.find(function (item) {
+                return item.id === id;
+              });
+              if (sharingTarget) {
+                _context4.next = 3;
+                break;
+              }
+              this.logger.warn('sharing target is missing when display changed');
+              return _context4.abrupt("return");
+            case 3:
+              this.screenShareProvider.changeSelectionBounds(sharingTarget.bounds, _struct.FcrUISelectionBoundsChangeReason.DISPLAY_CHANGE);
+            case 4:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function _handleDisplayCountUpdated(_x) {
+        return _handleDisplayCountUpdated2.apply(this, arguments);
+      }
+      return _handleDisplayCountUpdated;
+    }()
   }]);
 }(_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"]], [], 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, "_hideControlBar"], [_decorator.bound, 2, "_handleSourceReplaced"], [_decorator.bound, 2, "_handleDisplayCountUpdated"]], [], 0, void 0, _store["default"]).e, 1);
 _initProto = _applyDecs$e[0];