fcr-ui-scene 3.7.5 → 3.7.7-rc.1

package/lib/translations/enUS.js

@@ -505,9 +505,7 @@ var enUs = exports.enUs = {
   fmt_screenshare_controlbar_security_list_participantManagement: 'Allow attendees',
   fmt_screenshare_button_chosecontent: 'Select shared content',
   fmt_screenshare_tips_newsharing: 'Initiate a new sharing',
-  fmt_screenshare_label_screenshare: 'Share Screen',
   fmt_screenshare_button_sharewhiteboard: 'Share Whiteboard',
-  fmt_screenshare_button_chosewhiteboard: 'Close whiteboard',
   fmt_screenshare_options_alreadyopend: 'Whiteboard (Already ON)',
   fmt_screenshare_options_allow: 'Allow attendees',
   fmt_screenshare_options_editable: 'Annotate and edit whiteboards',
@@ -805,8 +803,8 @@ var enUs = exports.enUs = {
   fmt_failure_popup_label_startup_fail: 'Startup Failure',
   fmt_failure_popup_label_startup_check: 'Please check startup parameters and network settings as a priority',
   fmt_failure_popup_button_i_know: 'I know',
-  fmt_failure_popup_label_crash: 'Exception occurred',
-  fmt_failure_popup_label_crash_tips: 'The app is error, please close the app and try again.',
+  fmt_failure_popup_label_crash: 'App crash',
+  fmt_failure_popup_label_crash_tips: 'The app is crashing, please close the app and try again.',
   fmt_failure_popup_button_close_app: 'Close the app',
   fmt_failure_popup_button_refresh: 'Refresh',
   fmt_qualitystatistics_label_video: 'Video',
@@ -859,7 +857,7 @@ var enUs = exports.enUs = {
   fmt_setting_option_3ahigh: 'High',
   fmt_setting_label_professional: 'Music and Professional Audio',
   fmt_setting_option_orinalvoise: 'Display the option in the meeting in case of you want to turn the original sound',
-  fmt_setting_tips_speaker: "Click on the test speaker to confirm that you can hear other people's voices",
+  fmt_setting_tips_speaker: 'Click to test the speaker',
   fmt_setting_tips_mic: 'Please speak into your microphone. If you cannot hear your own voice, please replace the microphone',
   fmt_setting_tips_speaker_unwork: 'If you cannot hear the test sound, please replace the speaker',
   fmt_setting_tips_mic_unwork: 'If you cannot hear the test sound, please replace the microphone',
@@ -1552,7 +1550,7 @@ var enUs = exports.enUs = {
   fmt_premeeting_setting_label_automatically_adjust_volume: 'Automatically adjust {reason1} volume',
   fmt_premeeting_setting_label_microphone: 'Microphone',
   fmt_premeeting_setting_button_test_microphone: 'Test Microphone',
-  fmt_premeeting_setting_label_speak_into_your_microphone: "Click 'Test Microphone' to ensure other participants can hear you clearly.",
+  fmt_premeeting_setting_label_speak_into_your_microphone: 'Click to test the microphone',
   fmt_premeeting_setting_button_recording: 'Recording',
   fmt_premeeting_setting_label_change_the_microphone: 'If you cannot hear the test sound, please change the microphone.',
   fmt_premeeting_setting_label_input_level: 'Input Level',

package/lib/translations/zhCN.d.ts

@@ -494,9 +494,7 @@ export declare const zhCn: {
     fmt_screenshare_controlbar_security_list_participantManagement: string;
     fmt_screenshare_button_chosecontent: string;
     fmt_screenshare_tips_newsharing: string;
-    fmt_screenshare_label_screenshare: string;
     fmt_screenshare_button_sharewhiteboard: string;
-    fmt_screenshare_button_chosewhiteboard: string;
     fmt_screenshare_options_alreadyopend: string;
     fmt_screenshare_options_allow: string;
     fmt_screenshare_options_editable: string;

package/lib/translations/zhCN.js

@@ -505,9 +505,7 @@ var zhCn = exports.zhCn = {
   fmt_screenshare_controlbar_security_list_participantManagement: '允许参会者',
   fmt_screenshare_button_chosecontent: '选择共享内容',
   fmt_screenshare_tips_newsharing: '发起新的屏幕共享',
-  fmt_screenshare_label_screenshare: '屏幕共享',
   fmt_screenshare_button_sharewhiteboard: '共享白板',
-  fmt_screenshare_button_chosewhiteboard: '关闭白板',
   fmt_screenshare_options_alreadyopend: '共享白板(其他人已开启)',
   fmt_screenshare_options_allow: '允许参会者',
   fmt_screenshare_options_editable: '可标注和编辑白板',
@@ -805,8 +803,8 @@ var zhCn = exports.zhCn = {
   fmt_failure_popup_label_startup_fail: '启动失败',
   fmt_failure_popup_label_startup_check: '请优先检查启动参数与网络设置',
   fmt_failure_popup_button_i_know: '我已知悉',
-  fmt_failure_popup_label_crash: '出现异常',
-  fmt_failure_popup_label_crash_tips: '应用出现异常，请关闭应用重试',
+  fmt_failure_popup_label_crash: '应用崩溃',
+  fmt_failure_popup_label_crash_tips: '应用遇到崩溃问题，请关闭应用重试',
   fmt_failure_popup_button_close_app: '关闭应用',
   fmt_failure_popup_button_refresh: '刷新',
   fmt_qualitystatistics_label_video: '视频',
@@ -859,7 +857,7 @@ var zhCn = exports.zhCn = {
   fmt_setting_option_3ahigh: '高',
   fmt_setting_label_professional: '音乐和专业音频',
   fmt_setting_option_orinalvoise: '显示会议中选项，以通过麦克风“打开原声”',
-  fmt_setting_tips_speaker: '点击测试扬声器，以确定你可以听到他人的声音',
+  fmt_setting_tips_speaker: '点击测试扬声器',
   fmt_setting_tips_mic: '请对着你的麦克风说话。如果你无法听到自己的声音，请更换麦克风',
   fmt_setting_tips_speaker_unwork: '如果你无法听到测试音，请更换扬声器',
   fmt_setting_tips_mic_unwork: '如果你无法听到测试音，请更换麦克风',
@@ -1552,7 +1550,7 @@ var zhCn = exports.zhCn = {
   fmt_premeeting_setting_label_automatically_adjust_volume: '自动调整{xxxxx}音量',
   fmt_premeeting_setting_label_microphone: '麦克风',
   fmt_premeeting_setting_button_test_microphone: '检测麦克风',
-  fmt_premeeting_setting_label_speak_into_your_microphone: '点击测试麦克风，确保其他参会人员可以听到您的声音',
+  fmt_premeeting_setting_label_speak_into_your_microphone: '点击测试麦克风',
   fmt_premeeting_setting_button_recording: '录制中',
   fmt_premeeting_setting_label_change_the_microphone: '如果你无法听到测试音，请更换麦克风',
   fmt_premeeting_setting_label_input_level: '输入级别',

package/lib/type.d.ts

@@ -175,6 +175,11 @@ export interface FcrUIDeviceObserver {
      * 音频已连接
      */
     onAudioConnected?(): void;
+    /**
+     * 系统选中设备变更
+     * @param device
+     */
+    onSystemSelectedDeviceChanged?(device: FcrDeviceInfo): void;
 }
 export declare enum FcrUIVideoEffectType {
     NONE = 0,

package/lib/ui-scene.d.ts

@@ -2,6 +2,7 @@ import { FcrUIDefaultSceneConstructorArgs, FcrUISceneFacadeInternal, FcrUISceneO
 import { FcrUIManager } from './ui-manager';
 export declare class FcrUIDefaultScene implements FcrUISceneFacadeInternal {
     private _joinAbortController;
+    private _widgetObserver;
     get uiManager(): FcrUIManager;
     constructor({ registeredWidgetConfigs, objectManager, providerInitializer, }: FcrUIDefaultSceneConstructorArgs);
     private _resetPreventClose;
@@ -12,6 +13,7 @@ export declare class FcrUIDefaultScene implements FcrUISceneFacadeInternal {
     private _removeLocalMeetingTimeKey;
     private _setLocalMeetingTimeKey;
     private _addObservers;
+    private _addWidgetObserver;
     private _joinRoom;
     private _renderSceneUI;
     private _release;
@@ -19,8 +21,4 @@ export declare class FcrUIDefaultScene implements FcrUISceneFacadeInternal {
     private _createWaitingScene;
     private _releaseCurrentScene;
     private _addLogObserver;
-    /**
-     * 统一管理provider和dataSource的创建/获取
-     */
-    private _createWidgetProvider;
 }

package/lib/ui-scene.js

@@ -67,12 +67,12 @@ var _type2 = require("fcr-core/lib/room-control/type");
 var _roomProvider = require("./providers/room-provider/room-provider");
 var _constant = require("./utilities/constant");
 var _leaveMeeting = _interopRequireDefault(require("../public/assets/leave-meeting.png"));
-var _widgetProvider = require("./providers/widget-provider");
 var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("fcr-core/lib/utilities/logger");
 var _logger2 = require("./utilities/logger");
 var _objectManager = require("./object-manager");
 var _env = require("agora-foundation/lib/utilities/env");
+var _platform = require("./utilities/platform");
 var _FcrUIDefaultScene;
 var _initProto;
 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)]; } }; }
@@ -108,10 +108,16 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
     // @internal
     (0, _defineProperty2["default"])(this, "_joinSuccess", false);
     (0, _defineProperty2["default"])(this, "_joinAbortController", null);
-    this._registeredWidgetConfigs = registeredWidgetConfigs;
+    (0, _defineProperty2["default"])(this, "_widgetObserver", {
+      onWidgetClicked: function onWidgetClicked(widgetId) {
+        _this._observable.notifyObservers('onWidgetClicked', widgetId);
+      }
+    });
     this._objectManager = objectManager;
     this._providerInitializer = providerInitializer;
     var sharedConfigDataSource = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIG_DATA_SOURCE);
+    var sharedWidgetDataSource = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE);
+    sharedWidgetDataSource.setRegisteredWidgetConfigs(registeredWidgetConfigs);
     this._config = sharedConfigDataSource.sceneConfig;
     this._creatorConfig = sharedConfigDataSource.creatorConfig;
     this._observable.addObserver({
@@ -181,9 +187,8 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       var eventProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_EVENT_PROVIDER);
       var messageProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
       this._uiManager = new _uiManager.FcrUIManager(this._config, this._dom, this._creatorConfig.parameters);
-      var roomProvider = new _roomProvider.FcrUIRoomProviderImpl(eventProvider, this._config, engine, messageProvider);
+      var roomProvider = new _roomProvider.FcrUIRoomProviderImpl(this._config, engine, messageProvider);
       this._objectManager.setObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER, roomProvider);
-      this._createWidgetProvider();
       var uiManager = this._uiManager;
       this._addObservers(uiManager);
 
@@ -239,7 +244,6 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       var roomProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
       var dialogProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
       var eventProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_EVENT_PROVIDER);
-      var widgetProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
       var roomObserver = {
         onLeaveMainRoom: function onLeaveMainRoom() {
           // 立即释放资源
@@ -278,7 +282,8 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
               onConfirm: function onConfirm() {
                 dialogProvider.closeDialog(_constant.FcrUIDialogKey.END_MEETING);
                 observable.notifyObservers('onExited', sceneConfig.roomId, _type.FcrUIExitReason.CLOSE_ROOM);
-              }
+              },
+              alwaysOnTop: (0, _platform.isWindows)()
             });
           }
         },
@@ -322,23 +327,26 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
         }
       };
       engine.addObserver(engineObserver);
-      var widgetObserver = {
-        onWidgetClicked: function onWidgetClicked(widgetId) {
-          _this3._observable.notifyObservers('onWidgetClicked', widgetId);
-        }
-      };
-      widgetProvider.addObserver(widgetObserver);
       this._disposers.push(function () {
         roomProvider.removeObserver(roomObserver);
         engine.removeObserver(engineObserver);
-        widgetProvider.removeObserver(widgetObserver);
+      });
+    }
+  }, {
+    key: "_addWidgetObserver",
+    value: function _addWidgetObserver() {
+      var _this4 = this;
+      var widgetProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
+      widgetProvider.addObserver(this._widgetObserver);
+      this._disposers.push(function () {
+        widgetProvider.removeObserver(_this4._widgetObserver);
       });
     }
   }, {
     key: "_joinRoom",
     value: function () {
       var _joinRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(engine, roomControl) {
-        var _this4 = this;
+        var _this5 = this;
         var abortController, p;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -376,13 +384,13 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                         }
                         throw new Error('join aborted');
                       case 5:
-                        if (_this4._isLaunched) {
+                        if (_this5._isLaunched) {
                           _context.next = 6;
                           break;
                         }
                         return _context.abrupt("return", reject());
                       case 6:
-                        _this4._joinSuccess = true;
+                        _this5._joinSuccess = true;
                         return _context.abrupt("return", resolve());
                       case 7:
                         _context.prev = 7;
@@ -391,7 +399,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                       case 8:
                         _context.prev = 8;
                         abortController.signal.removeEventListener('abort', onAbort);
-                        _this4._joinAbortController = null;
+                        _this5._joinAbortController = null;
                         return _context.finish(8);
                       case 9:
                       case "end":
@@ -404,15 +412,15 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                 };
               }());
               p.then(function () {
-                if (!_this4._isLaunched) return;
-                _this4._observable.notifyObservers('onLaunchSuccess', _this4._config.roomId);
+                if (!_this5._isLaunched) return;
+                _this5._observable.notifyObservers('onLaunchSuccess', _this5._config.roomId);
               })["catch"](function (e) {
-                if (!_this4._isLaunched) return;
+                if (!_this5._isLaunched) return;
                 if ((e === null || e === void 0 ? void 0 : e.message) === 'join aborted') {
-                  _this4.logger.info('join aborted');
+                  _this5.logger.info('join aborted');
                   return;
                 }
-                _this4._observable.notifyObservers('onLaunchFailure', _this4._config.roomId, e);
+                _this5._observable.notifyObservers('onLaunchFailure', _this5._config.roomId, e);
               });
               return _context2.abrupt("return", p);
             case 1:
@@ -445,6 +453,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
                   this._setLocalMeetingTimeKey();
                   mainScene = this._createMainScene();
                   this._providerInitializer.onMainSceneInitialize();
+                  this._addWidgetObserver();
                   mainScene.nodeWillActive();
                   uiManager.mountScene(mainScene);
                   this._observable.notifyObservers('onSceneMounted');
@@ -541,26 +550,6 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
     value: function _addLogObserver() {
       this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onExited', 'onLaunchSuccess', 'onLaunchCancel', 'onLaunchFailure']));
     }
-
-    /**
-     * 统一管理provider和dataSource的创建/获取
-     */
-  }, {
-    key: "_createWidgetProvider",
-    value: function _createWidgetProvider() {
-      if (this._objectManager.hasObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER)) {
-        return this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
-      }
-      var roomProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
-      var dialogProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
-      var widgetProvider = new _widgetProvider.FcrUIWidgetProviderImpl({
-        registeredWidgetConfigs: this._registeredWidgetConfigs,
-        roomProvider: roomProvider,
-        dialogProvider: dialogProvider
-      });
-      this._objectManager.setObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER, widgetProvider);
-      return widgetProvider;
-    }
   }]);
 }();
 _FcrUIDefaultScene = FcrUIDefaultScene;

package/lib/utilities/constant.d.ts

@@ -147,7 +147,8 @@ export declare enum FcrUIDialogKey {
     MUTE_ALL = "mute-all",
     ANNOTATION = "annotation",
     REVOKE_HOST = "revoke-host",
-    CONTROL_BAR_LEAVE_MEETING = "control-bar-leave-meeting"
+    CONTROL_BAR_LEAVE_MEETING = "control-bar-leave-meeting",
+    MOUSE_DETECT_DEBUG = "mouse-detect-debug"
 }
 export declare enum FcrUIHighlightElement {
     VIDEO_BASIC = "fcr_VIDEO_BASIC_highlighter",
@@ -171,3 +172,4 @@ export declare const ErrorCode: {
     FAILED_TO_UPDATE_USER_ROLE_DUE_TO_PRIVILEGE: number;
     FAILED_TO_UPDATE_USER_ROLE_DUE_TO_LIMIT_REACHED: number;
 };
+export declare const ExcludeWIndows: string[];

package/lib/utilities/constant.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SETTING_CONFIG_STORAGE_KEY = exports.SESSION_DURATION = exports.GALLERY_MIN_SIZE = exports.FcrUIVideoWindowPinType = exports.FcrUIRoomControlType = exports.FcrUIRendererEventAction = exports.FcrUIParticipantType = exports.FcrUIHighlightElement = exports.FcrUIDialogKey = exports.FcrUIAction = exports.ErrorCode = void 0;
+exports.SETTING_CONFIG_STORAGE_KEY = exports.SESSION_DURATION = exports.GALLERY_MIN_SIZE = exports.FcrUIVideoWindowPinType = exports.FcrUIRoomControlType = exports.FcrUIRendererEventAction = exports.FcrUIParticipantType = exports.FcrUIHighlightElement = exports.FcrUIDialogKey = exports.FcrUIAction = exports.ExcludeWIndows = exports.ErrorCode = void 0;
 var FcrUIRendererEventAction = exports.FcrUIRendererEventAction = /*#__PURE__*/function (FcrUIRendererEventAction) {
   /**
    * Indicates that the fragment has been loaded.
@@ -163,6 +163,8 @@ var FcrUIDialogKey = exports.FcrUIDialogKey = /*#__PURE__*/function (FcrUIDialog
   FcrUIDialogKey["ANNOTATION"] = "annotation";
   FcrUIDialogKey["REVOKE_HOST"] = "revoke-host";
   FcrUIDialogKey["CONTROL_BAR_LEAVE_MEETING"] = "control-bar-leave-meeting";
+  // debug
+  FcrUIDialogKey["MOUSE_DETECT_DEBUG"] = "mouse-detect-debug";
   return FcrUIDialogKey;
 }({});
 var FcrUIHighlightElement = exports.FcrUIHighlightElement = /*#__PURE__*/function (FcrUIHighlightElement) {
@@ -187,4 +189,5 @@ var ErrorCode = exports.ErrorCode = {
   FAILED_TO_MOVE_USER_TO_WAITING_ROOM: 732403470,
   FAILED_TO_UPDATE_USER_ROLE_DUE_TO_PRIVILEGE: 700000403,
   FAILED_TO_UPDATE_USER_ROLE_DUE_TO_LIMIT_REACHED: 720403001
-};
+};
+var ExcludeWIndows = exports.ExcludeWIndows = ['AgoraHighLighter', 'Toast', 'Confirm', 'Annotation tool bar', 'Annotation', 'Video Window', 'Control Bar', '灵动会议'];

package/lib/utilities/default-config.d.ts

@@ -35,6 +35,24 @@ export declare const screenCaptureLowStreamEncoderConfig: {
     bitrate: number;
     isMirror: boolean;
 };
+export declare const screenCaptureClearityConfig: {
+    dimensions: {
+        width: number;
+        height: number;
+    };
+    frameRate: number;
+    bitrate: number;
+    isMirror: boolean;
+};
+export declare const screenCaptureSmoothConfig: {
+    dimensions: {
+        width: number;
+        height: number;
+    };
+    frameRate: number;
+    bitrate: number;
+    isMirror: boolean;
+};
 export declare let enableCameraDualStreamMode: boolean;
 export declare let enableScreenDualStreamMode: boolean;
 export declare const cloudRecordingConfig: {

package/lib/utilities/default-config.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.screenCaptureLowStreamEncoderConfig = exports.screenCaptureHighStreamEncoderConfig = exports.mergeDefaultDualStreamConfig = exports.isScreenDualStreamModeEnabled = exports.isCameraDualStreamModeEnabled = exports.enableScreenDualStreamMode = exports.enableCameraDualStreamMode = exports.cloudRecordingConfig = exports.cameraVideoLowStreamEncoderConfig = exports.cameraVideoHighStreamEncoderConfig = void 0;
+exports.screenCaptureSmoothConfig = exports.screenCaptureLowStreamEncoderConfig = exports.screenCaptureHighStreamEncoderConfig = exports.screenCaptureClearityConfig = exports.mergeDefaultDualStreamConfig = exports.isScreenDualStreamModeEnabled = exports.isCameraDualStreamModeEnabled = exports.enableScreenDualStreamMode = exports.enableCameraDualStreamMode = exports.cloudRecordingConfig = exports.cameraVideoLowStreamEncoderConfig = exports.cameraVideoHighStreamEncoderConfig = void 0;
 require("core-js/modules/es.object.assign.js");
 var _type = require("fcr-core/lib/type");
 var _merge = _interopRequireDefault(require("lodash/merge"));
@@ -45,6 +45,24 @@ var screenCaptureLowStreamEncoderConfig = exports.screenCaptureLowStreamEncoderC
   bitrate: 400,
   isMirror: false
 };
+var screenCaptureClearityConfig = exports.screenCaptureClearityConfig = {
+  dimensions: {
+    width: 1920,
+    height: 1080
+  },
+  frameRate: 15,
+  bitrate: 1800,
+  isMirror: false
+};
+var screenCaptureSmoothConfig = exports.screenCaptureSmoothConfig = {
+  dimensions: {
+    width: 1920,
+    height: 1080
+  },
+  frameRate: 30,
+  bitrate: 1500,
+  isMirror: false
+};
 var enableCameraDualStreamMode = exports.enableCameraDualStreamMode = true;
 var enableScreenDualStreamMode = exports.enableScreenDualStreamMode = false;
 var cloudRecordingConfig = exports.cloudRecordingConfig = {

package/lib/utilities/focus-helper.js

@@ -11,9 +11,16 @@ var focusWindow = exports.focusWindow = function focusWindow(window) {
   // Windows 需要此操作来确保窗口在最前，Mac不需要
   if ((0, _platform.isWindows)()) {
     window.show();
-    window.setAlwaysOnTop(true);
+    window.focus();
+    window.moveTop();
     setTimeout(function () {
-      window.setAlwaysOnTop(false);
-    });
+      window.moveTop();
+      window.focus();
+    }, 100);
+    // window.setAlwaysOnTop(true);
+
+    // setTimeout(() => {
+    //   window.setAlwaysOnTop(false);
+    // });
   }
 };

package/lib/utilities/logger.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.getLogger = exports.generateLogObserver = exports.createLogger = exports.createFragmentLogger = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
+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/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -46,7 +48,7 @@ var generateLogObserver = exports.generateLogObserver = function generateLogObse
   return observer;
 };
 window.addEventListener('error', function (e) {
-  getLogger().error('window error event:', e);
+  getLogger().error('window error event:', JSON.stringify(e));
 });
 window.addEventListener('unhandledrejection', function (e) {
   getLogger().error('window unhandledrejection event:', e.reason);

package/lib/utilities/renderer.d.ts

@@ -61,6 +61,7 @@ export declare class FcrUIRendererWrapper implements FcrUIManagedObject {
     openDirectory(): Promise<string | undefined>;
     showItemInFolder(path: string): void;
     openRendererWindow(frameName: string, callback: (dom: HTMLElement, windowId: string, newRendererWindow: Window) => void, windowOptions: Electron.BrowserWindowConstructorOptions): void;
+    getBaseUrl(): string;
     getWindowInfoList(): never[];
     getNetworkType(): Promise<import("../runtime").NetworkType>;
     getSystemCpuInfo(): import("../runtime").CpuInfo[];

package/lib/utilities/renderer.js

@@ -358,6 +358,12 @@ var FcrUIRendererWrapper = exports.FcrUIRendererWrapper = /*#__PURE__*/function
       this._checkRuntime();
       return runtime.openRendererWindow(frameName, callback, windowOptions);
     }
+  }, {
+    key: "getBaseUrl",
+    value: function getBaseUrl() {
+      this._checkRuntime();
+      return runtime.getBaseUrl();
+    }
   }, {
     key: "getWindowInfoList",
     value: function getWindowInfoList() {
@@ -417,7 +423,7 @@ var FcrUIRendererWrapper = exports.FcrUIRendererWrapper = /*#__PURE__*/function
   }]);
 }();
 _FcrUIRendererWrapper = FcrUIRendererWrapper;
-var _applyDecs$e = _applyDecs(_FcrUIRendererWrapper, [[_decorator.trace, 2, "addEventListener"], [_decorator.trace, 2, "removeEventListener"], [_decorator.trace, 2, "removeAllEventListener"], [_decorator.trace, 2, "sendEvent"], [_decorator.trace, 2, "openLinkInDefaultBrowser"], [_decorator.trace, 2, "getMediaSourcesIdByTitle"], [_decorator.trace, 2, "open"], [_decorator.trace, 2, "close"], [_decorator.trace, 2, "handleWillClose"], [_decorator.trace, 2, "setInMeetingState"], [_decorator.trace, 2, "release"], [_decorator.trace, 2, "initialize"], [_decorator.trace, 2, "restartApp"], [_decorator.trace, 2, "quitApp"], [_decorator.trace, 2, "getDisplayMatching"], [_decorator.trace, 2, "setUserSettingData"], [_decorator.trace, 2, "getUserSettingData"], [_decorator.trace, 2, "getAllDisplays"], [_decorator.trace, 2, "checkMediaPermission"], [_decorator.trace, 2, "openSystemPreferences"], [_decorator.trace, 2, "captureScreen"], [_decorator.trace, 2, "getDisplayNearestPoint"], [_decorator.trace, 2, "fileToBlob"], [_decorator.trace, 2, "getResourceByFileType"], [_decorator.trace, 2, "loadBuiltinResources"], [_decorator.trace, 2, "openDirectory"], [_decorator.trace, 2, "showItemInFolder"], [_decorator.trace, 2, "openRendererWindow"], [_decorator.trace, 2, "getWindowInfoList"], [_decorator.trace, 2, "getNetworkType"], [_decorator.trace, 2, "getSystemCpuInfo"], [_decorator.trace, 2, "getSystemMemorySize"], [_decorator.trace, 2, "setFragmentOptions"], [_decorator.trace, 2, "getCurrentBrowserWindow"], [_decorator.trace, 2, "createWindowProxy"], [_decorator.trace, 2, "getBrowserWindowById"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrUIRendererWrapper, [[_decorator.trace, 2, "addEventListener"], [_decorator.trace, 2, "removeEventListener"], [_decorator.trace, 2, "removeAllEventListener"], [_decorator.trace, 2, "sendEvent"], [_decorator.trace, 2, "openLinkInDefaultBrowser"], [_decorator.trace, 2, "getMediaSourcesIdByTitle"], [_decorator.trace, 2, "open"], [_decorator.trace, 2, "close"], [_decorator.trace, 2, "handleWillClose"], [_decorator.trace, 2, "setInMeetingState"], [_decorator.trace, 2, "release"], [_decorator.trace, 2, "initialize"], [_decorator.trace, 2, "restartApp"], [_decorator.trace, 2, "quitApp"], [_decorator.trace, 2, "getDisplayMatching"], [_decorator.trace, 2, "setUserSettingData"], [_decorator.trace, 2, "getUserSettingData"], [_decorator.trace, 2, "getAllDisplays"], [_decorator.trace, 2, "checkMediaPermission"], [_decorator.trace, 2, "openSystemPreferences"], [_decorator.trace, 2, "captureScreen"], [_decorator.trace, 2, "getDisplayNearestPoint"], [_decorator.trace, 2, "fileToBlob"], [_decorator.trace, 2, "getResourceByFileType"], [_decorator.trace, 2, "loadBuiltinResources"], [_decorator.trace, 2, "openDirectory"], [_decorator.trace, 2, "showItemInFolder"], [_decorator.trace, 2, "openRendererWindow"], [_decorator.trace, 2, "getBaseUrl"], [_decorator.trace, 2, "getWindowInfoList"], [_decorator.trace, 2, "getNetworkType"], [_decorator.trace, 2, "getSystemCpuInfo"], [_decorator.trace, 2, "getSystemMemorySize"], [_decorator.trace, 2, "setFragmentOptions"], [_decorator.trace, 2, "getCurrentBrowserWindow"], [_decorator.trace, 2, "createWindowProxy"], [_decorator.trace, 2, "getBrowserWindowById"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.7.5",
+  "version": "3.7.7-rc.1",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -22,13 +22,13 @@
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
     "agora-electron-sdk": "4.3.2-build.156-rc.1",
-    "agora-foundation": "~3.7.5",
-    "agora-ui-foundation": "~3.7.5",
+    "agora-foundation": "~3.7.7-rc.1",
+    "agora-ui-foundation": "~3.7.7-rc.1",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "~3.7.5",
+    "fcr-core": "~3.7.7-rc.1",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -59,7 +59,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "~3.7.5",
+    "agora-toolchain": "~3.7.7-rc.1",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",

package/public/index.html

@@ -179,6 +179,8 @@
 
     (async () => {
       let creator;
+      let uiScene;
+      let sendExitedEventFlag = true;
       window.cppSdkHelper.onCreatorInit = (config) => {
         if (creator) {
           creator.release();
@@ -205,13 +207,36 @@
       };
 
       window.cppSdkHelper.onLaunchMeeting = (launchOptions) => {
+        try {
+          if (uiScene) {
+            console.log('the previous sequence ui scene exists, exit it');
+            uiScene.exit();
+            sendExitedEventFlag = false;
+          }
+        } catch (error) {
+          // 这里可能会有报错，但是不影响后续的流程
+          console.error(
+            ' the previous sequence ui scene exists, exit it,but exit  has error',
+            JSON.stringify(error),
+          );
+        }
         setFullScreenFailureComp(false);
         setLoading(true);
-        document.querySelector('#fcr-launch-failure-confirm-btn').addEventListener('click', () => {
+
+        // 定义事件处理函数，以便可以正确移除
+        const handleConfirmClick = () => {
           setFullScreenFailureComp(false);
-          console.log('windows_release ui scene closed callback');
+          console.log('windows_release error button clicked');
           window.runtime.getCurrentBrowserWindow().hide();
-        });
+        };
+
+        document
+          .querySelector('#fcr-launch-failure-confirm-btn')
+          .removeEventListener('click', handleConfirmClick);
+        document
+          .querySelector('#fcr-launch-failure-confirm-btn')
+          .addEventListener('click', handleConfirmClick);
+
         const { widgets, ...others } = launchOptions;
 
         if (widgets && widgets instanceof Array) {
@@ -219,7 +244,7 @@
             creator.registerWidget(w);
           });
         }
-        const uiScene = creator.launch(
+        uiScene = creator.launch(
           others,
           () => {
             console.log('windows_release ui scene closed callback');
@@ -241,6 +266,7 @@
         uiScene.addObserver({
           onLaunchSuccess: () => {
             setLoading(false);
+            sendExitedEventFlag = true;
             const roomProvider = uiScene._objectManager.getObject('roomProvider');
             if (!roomProvider) {
               throw new Error('roomProvider not found in uiScene');
@@ -279,7 +305,12 @@
           },
 
           onExited: (roomId, reason) => {
+            if (!sendExitedEventFlag) {
+              return;
+            }
+            console.log('the previous sequence ui scene : ui scene exited');
             window.cppSdkHelper.exitedMeeting(roomId, reason);
+            uiScene = null;
             setTimeout(() => {
               console.log('windows_release ui scene exited callback');
               window.runtime.getCurrentBrowserWindow().hide();

package/lib/modules/action-bar/index.d.ts

@@ -1,17 +0,0 @@
-import { UIModule } from '../../base';
-import './index.css';
-import { LeaveMeetingStoreBase } from '../components/leave-meeting/store.base';
-import { DeviceControlStoreBase } from '../components/device-control/store.base';
-import SecurityMenuStore from '../components/security-menu/store';
-export declare const actionBarClassName = "fcr-action-bar";
-export declare abstract class FcrActionBarUIModule extends UIModule {
-    protected _securityMenuStore: SecurityMenuStore | null;
-    protected _deviceControlStore: DeviceControlStoreBase | null;
-    protected _leaveMeetingStore: LeaveMeetingStoreBase | null;
-    get deviceControlStore(): DeviceControlStoreBase;
-    get leaveMeetingStore(): LeaveMeetingStoreBase;
-    get securityMenuStore(): SecurityMenuStore;
-    abstract onNodeWillActive(): void;
-    abstract onNodeWillInactive(): void;
-    abstract getComponent(): React.ReactNode;
-}