fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib-es/ui-scene-switch.js

@@ -7,15 +7,21 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _FcrUISceneSwitch;
 var _initProto;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import "core-js/modules/es.symbol.js";
 import "core-js/modules/es.symbol.description.js";
+import "core-js/modules/es.symbol.iterator.js";
 import "core-js/modules/es.symbol.to-primitive.js";
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.error.to-string.js";
 import "core-js/modules/es.array.for-each.js";
+import "core-js/modules/es.array.from.js";
 import "core-js/modules/es.array.is-array.js";
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/es.array.slice.js";
 import "core-js/modules/es.date.to-primitive.js";
 import "core-js/modules/es.date.to-string.js";
 import "core-js/modules/es.function.bind.js";
@@ -28,6 +34,9 @@ import "core-js/modules/es.object.get-own-property-descriptor.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.promise.js";
 import "core-js/modules/es.promise.finally.js";
+import "core-js/modules/es.regexp.exec.js";
+import "core-js/modules/es.regexp.test.js";
+import "core-js/modules/es.regexp.to-string.js";
 import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/esnext.function.metadata.js";
 import "core-js/modules/esnext.iterator.constructor.js";
@@ -57,9 +66,9 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 import { FcrConnectionState } from 'fcr-core';
 import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
 import { getLanguage, transI18n } from 'agora-ui-foundation/lib/i18n';
-import { FcrUIExitReason, FcrUIGlobalNodeEventType } from './type';
+import { FcrUIExitReason, FcrUIGlobalNodeEventType, FcrUIMeetingExitReason } from './type';
 import { FcrUIManager } from './ui-manager';
-import { setLanguage } from './utilities/tools';
+import { setLanguage } from 'agora-foundation/lib/utilities/tools';
 import { FcrMainUIScene } from './scenes/main-scene';
 import { FcrWaitingUIScene } from './scenes/waiting-scene';
 import { isRobotPullingMode } from './utilities/parameters';
@@ -72,7 +81,7 @@ import { generateLogObserver } from 'fcr-core/lib/utilities/logger';
 import { createLogger } from './utilities/logger';
 import { FcrUIObjectKeys } from './object-manager';
 import { isElectron } from 'agora-foundation/lib/utilities/env';
-import { isWindows } from './utilities/platform';
+import { isWindows } from 'agora-foundation/lib/utilities/env';
 export var FcrUISceneSwitch = /*#__PURE__*/function () {
   function FcrUISceneSwitch(_ref) {
     var _this = this;
@@ -249,11 +258,6 @@ export var FcrUISceneSwitch = /*#__PURE__*/function () {
       var roomProvider = this._objectManager.getObject(FcrUIObjectKeys.P_ROOM_PROVIDER);
       var dialogProvider = this._objectManager.getObject(FcrUIObjectKeys.P_DIALOG_PROVIDER);
       var eventProvider = this._objectManager.getObject(FcrUIObjectKeys.P_EVENT_PROVIDER);
-
-      /**
-       *  注意！！！ 请确保 FcrUISceneSwitch onExited 调用前 触发roomProvider  onExitRoom 通知UI重置状态
-       */
-
       var roomObserver = {
         onLeaveMainRoom: function onLeaveMainRoom() {
           // 立即释放资源
@@ -266,42 +270,78 @@ export var FcrUISceneSwitch = /*#__PURE__*/function () {
           _this3._releaseCurrentScene();
           uiManager.renderLoading(true);
         },
-        onLocalUserKickedOut: function onLocalUserKickedOut() {
-          uiManager.renderMeetingEnded(true);
-          dialogProvider.openDialog(FcrUIDialogKey.END_MEETING, {
-            title: transI18n('fmt_popup_button_leavemeeting'),
-            desc: transI18n('fmt_toolbar_tips_leave_confirm_dialog_kick_info'),
-            imgSrc: leaveMeetingPng,
-            btnTxt: transI18n('fmt_waitingroom_attendie_popup_button_gotit'),
-            onConfirm: function onConfirm() {
-              dialogProvider.closeDialog(FcrUIDialogKey.END_MEETING);
-              observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.KICKED_OUT);
-            }
-          });
-        },
-        onRoomClosed: function onRoomClosed() {
-          if (roomProvider.isSelfEndMeeting) {
-            observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.CLOSE_ROOM);
-          } else {
-            uiManager.renderMeetingEnded(true);
-            dialogProvider.openDialog(FcrUIDialogKey.END_MEETING, {
-              title: transI18n('fmt_toolbar_tips_leave_confirm_dialog_end_title'),
-              desc: transI18n('fmt_leave_tips_classover'),
-              imgSrc: leaveMeetingPng,
-              btnTxt: transI18n('fmt_waitingroom_attendie_popup_button_gotit'),
-              onConfirm: function onConfirm() {
-                dialogProvider.closeDialog(FcrUIDialogKey.END_MEETING);
-                observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.CLOSE_ROOM);
-              },
-              alwaysOnTop: isWindows()
-            });
+        onExitMeeting: function onExitMeeting(reason) {
+          /**
+           * 离开(结束)会议需满足的必要步骤
+           *  关键步骤1：触发 FcrUIRoomProvider.onMeetingExit，完成会议退出前置操作（如释放音视频资源、通知服务端）
+           *  关键步骤2：【必须在步骤1完成后执行】后触发 FcrUISceneSwitch.onExited，切换至非会议场景（如首页）
+           *  若步骤1未执行或执行失败，需阻断【步骤2的执行】，防止出现“场景已切换但会议未正常退出”的异常状态
+           */
+
+          switch (reason) {
+            case FcrUIMeetingExitReason.SYSTEM_NETWORK_ERROR:
+              //  engine.connectionState === FcrConnectionState.ABORTED
+              var dialogId = dialogProvider.openConfirmDialog({
+                title: transI18n('fmt_meetingroom_status_abnormal'),
+                content: transI18n('fmt_meetingroom_tips_disconnected'),
+                showCancel: false,
+                okButtonProps: {
+                  block: true
+                },
+                alignCenter: true,
+                closable: false,
+                onOk: function onOk() {
+                  dialogProvider.closeConfirmDialog(dialogId);
+                  observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.ABORTED);
+                }
+              });
+              break;
+            case FcrUIMeetingExitReason.ADMIN_KICKED:
+              // 被管理员/主持人踢出
+              uiManager.renderMeetingEnded(true);
+              dialogProvider.openDialog(FcrUIDialogKey.EXIT_MEETING_NOTICE, {
+                title: transI18n('fmt_popup_button_leavemeeting'),
+                desc: transI18n('fmt_toolbar_tips_leave_confirm_dialog_kick_info'),
+                imgSrc: leaveMeetingPng,
+                btnTxt: transI18n('fmt_waitingroom_attendie_popup_button_gotit'),
+                onConfirm: function onConfirm() {
+                  dialogProvider.closeDialog(FcrUIDialogKey.EXIT_MEETING_NOTICE);
+                  observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.KICKED_OUT);
+                }
+              });
+              break;
+            case FcrUIMeetingExitReason.SYSTEM_MEETING_ENDED:
+              // 主持人结束会议（全员退出）
+              uiManager.renderMeetingEnded(true);
+              dialogProvider.openDialog(FcrUIDialogKey.EXIT_MEETING_NOTICE, {
+                title: transI18n('fmt_toolbar_tips_leave_confirm_dialog_end_title'),
+                desc: transI18n('fmt_leave_tips_classover'),
+                imgSrc: leaveMeetingPng,
+                btnTxt: transI18n('fmt_waitingroom_attendie_popup_button_gotit'),
+                onConfirm: function onConfirm() {
+                  dialogProvider.closeDialog(FcrUIDialogKey.EXIT_MEETING_NOTICE);
+                  observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.CLOSE_ROOM);
+                },
+                alwaysOnTop: isWindows()
+              });
+              break;
+            case FcrUIMeetingExitReason.USER_INITIATED_END:
+              // 本地用户结束会议
+              observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.CLOSE_ROOM);
+              break;
+            case FcrUIMeetingExitReason.USER_INITIATED_LEAVE: //用户主动离开会议
+            case FcrUIMeetingExitReason.SYSTEM_JOIN_ROOM_FAILED:
+              // joinRoomError
+              observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.LEAVE_ROOM);
+              break;
+            default:
+              observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.LEAVE_ROOM);
+              break;
           }
         },
-        onExitRoom: function onExitRoom() {
-          observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.LEAVE_ROOM);
-        },
         onRoutingChanged: function onRoutingChanged(roomControl) {
           uiManager.renderLoading(false);
+          _this3._bindLocalStreams();
           _this3._renderSceneUI(roomControl, uiManager);
         }
       };
@@ -309,24 +349,6 @@ export var FcrUISceneSwitch = /*#__PURE__*/function () {
       roomProvider.addObserver(roomObserver);
       var engineObserver = {
         onConnectionStateUpdated: function onConnectionStateUpdated(state) {
-          if (state === FcrConnectionState.ABORTED) {
-            var dialogId = dialogProvider.openConfirmDialog({
-              title: transI18n('fmt_meetingroom_status_abnormal'),
-              content: transI18n('fmt_meetingroom_tips_disconnected'),
-              showCancel: false,
-              okButtonProps: {
-                block: true
-              },
-              alignCenter: true,
-              closable: false,
-              onOk: function onOk() {
-                dialogProvider.closeConfirmDialog(dialogId);
-                roomProvider.removeObserver(roomObserver);
-                roomProvider.exitRoom();
-                observable.notifyObservers('onExited', sceneConfig.roomId, FcrUIExitReason.ABORTED);
-              }
-            });
-          }
           if (state === FcrConnectionState.CONNECTED && _this3._joinSuccess) {
             uiManager.renderLoading(false);
             eventProvider.sendEvent(FcrUIAction.ENGINE_RECONNECTED);
@@ -355,22 +377,111 @@ export var FcrUISceneSwitch = /*#__PURE__*/function () {
         widgetProvider.removeObserver(_this4._widgetObserver);
       });
     }
+  }, {
+    key: "_bindLocalStreams",
+    value: function () {
+      var _bindLocalStreams2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var roomProvider, currentRoomControl, streamControl, localUser, localStreams, _iterator, _step, stream, bindConfig, _t, _t2;
+        return _regeneratorRuntime.wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              roomProvider = this._objectManager.getObject(FcrUIObjectKeys.P_ROOM_PROVIDER);
+              if (roomProvider instanceof FcrUIRoomProviderImpl) {
+                _context.next = 1;
+                break;
+              }
+              this.logger.warn('roomProvider is not FcrUIRoomProviderImpl, skipping bindLocalStreams');
+              return _context.abrupt("return");
+            case 1:
+              if (!roomProvider.currentRoomControl) {
+                _context.next = 11;
+                break;
+              }
+              currentRoomControl = roomProvider.currentRoomControl;
+              streamControl = currentRoomControl.getStreamControl();
+              localUser = currentRoomControl.getUserControl().getLocalUser();
+              localStreams = streamControl.getStreamsByUserId(localUser.userId);
+              if (!(localStreams.length > 0)) {
+                _context.next = 9;
+                break;
+              }
+              this.logger.info("Binding local streams, count: ".concat(localStreams.length));
+              _iterator = _createForOfIteratorHelper(localStreams);
+              _context.prev = 2;
+              _iterator.s();
+            case 3:
+              if ((_step = _iterator.n()).done) {
+                _context.next = 5;
+                break;
+              }
+              stream = _step.value;
+              bindConfig = {
+                streamId: stream.streamId,
+                videoSourceId: stream.videoSourceId,
+                audioSourceId: stream.audioSourceId
+              };
+              _context.next = 4;
+              return streamControl.bindLocalStreams([bindConfig]);
+            case 4:
+              _context.next = 3;
+              break;
+            case 5:
+              _context.next = 7;
+              break;
+            case 6:
+              _context.prev = 6;
+              _t = _context["catch"](2);
+              _iterator.e(_t);
+            case 7:
+              _context.prev = 7;
+              _iterator.f();
+              return _context.finish(7);
+            case 8:
+              this.logger.info('Successfully bound all local streams');
+              _context.next = 10;
+              break;
+            case 9:
+              this.logger.info('No local streams found to bind');
+            case 10:
+              _context.next = 12;
+              break;
+            case 11:
+              this.logger.warn('currentRoomControl is not available yet, skipping bindLocalStreams');
+            case 12:
+              _context.next = 14;
+              break;
+            case 13:
+              _context.prev = 13;
+              _t2 = _context["catch"](0);
+              this.logger.error('Failed to bind local streams', _t2);
+            case 14:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[0, 13], [2, 6, 7, 8]]);
+      }));
+      function _bindLocalStreams() {
+        return _bindLocalStreams2.apply(this, arguments);
+      }
+      return _bindLocalStreams;
+    }()
   }, {
     key: "_joinRoom",
     value: function () {
-      var _joinRoom2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(engine, roomControl) {
+      var _joinRoom2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(engine, roomControl) {
         var _this5 = this;
         var abortController, p;
-        return _regeneratorRuntime.wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime.wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               abortController = new AbortController();
               this._joinAbortController = abortController;
               p = new Promise(/*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(resolve, reject) {
-                  var onAbort, _t;
-                  return _regeneratorRuntime.wrap(function (_context) {
-                    while (1) switch (_context.prev = _context.next) {
+                var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
+                  var onAbort, _t3;
+                  return _regeneratorRuntime.wrap(function (_context2) {
+                    while (1) switch (_context2.prev = _context2.next) {
                       case 0:
                         onAbort = function onAbort() {
                           return reject(new Error('join aborted'));
@@ -378,47 +489,47 @@ export var FcrUISceneSwitch = /*#__PURE__*/function () {
                         abortController.signal.addEventListener('abort', onAbort, {
                           once: true
                         });
-                        _context.prev = 1;
-                        _context.next = 2;
+                        _context2.prev = 1;
+                        _context2.next = 2;
                         return engine.login();
                       case 2:
                         if (!abortController.signal.aborted) {
-                          _context.next = 3;
+                          _context2.next = 3;
                           break;
                         }
                         throw new Error('join aborted');
                       case 3:
-                        _context.next = 4;
+                        _context2.next = 4;
                         return roomControl.handleJoinRoom();
                       case 4:
                         if (!abortController.signal.aborted) {
-                          _context.next = 5;
+                          _context2.next = 5;
                           break;
                         }
                         throw new Error('join aborted');
                       case 5:
                         if (_this5._isLaunched) {
-                          _context.next = 6;
+                          _context2.next = 6;
                           break;
                         }
-                        return _context.abrupt("return", reject());
+                        return _context2.abrupt("return", reject());
                       case 6:
                         _this5._joinSuccess = true;
-                        return _context.abrupt("return", resolve());
+                        return _context2.abrupt("return", resolve());
                       case 7:
-                        _context.prev = 7;
-                        _t = _context["catch"](1);
-                        return _context.abrupt("return", reject(_t));
+                        _context2.prev = 7;
+                        _t3 = _context2["catch"](1);
+                        return _context2.abrupt("return", reject(_t3));
                       case 8:
-                        _context.prev = 8;
+                        _context2.prev = 8;
                         abortController.signal.removeEventListener('abort', onAbort);
                         _this5._joinAbortController = null;
-                        return _context.finish(8);
+                        return _context2.finish(8);
                       case 9:
                       case "end":
-                        return _context.stop();
+                        return _context2.stop();
                     }
-                  }, _callee, null, [[1, 7, 8, 9]]);
+                  }, _callee2, null, [[1, 7, 8, 9]]);
                 }));
                 return function (_x3, _x4) {
                   return _ref2.apply(this, arguments);
@@ -435,12 +546,12 @@ export var FcrUISceneSwitch = /*#__PURE__*/function () {
                 }
                 _this5._observable.notifyObservers('onLaunchFailure', _this5._config.roomId, e);
               });
-              return _context2.abrupt("return", p);
+              return _context3.abrupt("return", p);
             case 1:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function _joinRoom(_x, _x2) {
         return _joinRoom2.apply(this, arguments);
@@ -450,11 +561,11 @@ export var FcrUISceneSwitch = /*#__PURE__*/function () {
   }, {
     key: "_renderSceneUI",
     value: function () {
-      var _renderSceneUI2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(roomControl, uiManager) {
+      var _renderSceneUI2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(roomControl, uiManager) {
         var _roomControl$getRoomI;
         var type, mainScene, waitingScene;
-        return _regeneratorRuntime.wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime.wrap(function (_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               type = (_roomControl$getRoomI = roomControl.getRoomInfo()) === null || _roomControl$getRoomI === void 0 ? void 0 : _roomControl$getRoomI.roomType;
               if (type === FcrRoomType.Mainroom) {
@@ -488,9 +599,9 @@ export var FcrUISceneSwitch = /*#__PURE__*/function () {
               }
             case 1:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
       function _renderSceneUI(_x5, _x6) {
         return _renderSceneUI2.apply(this, arguments);

package/lib-es/utilities/browser-api.js

@@ -1,43 +1,3 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-export function copyText(_x) {
-  return _copyText.apply(this, arguments);
-}
-function _copyText() {
-  _copyText = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(text) {
-    var textarea, _t;
-    return _regeneratorRuntime.wrap(function (_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          if (!('clipboard' in navigator)) {
-            _context.next = 4;
-            break;
-          }
-          _context.prev = 1;
-          _context.next = 2;
-          return navigator.clipboard.writeText(text);
-        case 2:
-          return _context.abrupt("return");
-        case 3:
-          _context.prev = 3;
-          _t = _context["catch"](1);
-          console.error('navigator.clipboard.writeText catch error:', _t);
-        case 4:
-          textarea = document.createElement('textarea');
-          textarea.setAttribute('readonly', 'readonly');
-          textarea.value = text;
-          document.body.appendChild(textarea);
-          textarea.select();
-          document.execCommand('copy');
-          document.body.removeChild(textarea);
-        case 5:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[1, 3]]);
-  }));
-  return _copyText.apply(this, arguments);
-}
 export var isFullScreen = function isFullScreen() {
   return !!(document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement);
 };

package/lib-es/utilities/constant.js

@@ -149,13 +149,12 @@ export var FcrUIDialogKey = /*#__PURE__*/function (FcrUIDialogKey) {
   FcrUIDialogKey["WAITING_ROOM_OPERATION"] = "operation-waiting-room";
   FcrUIDialogKey["WIDGET"] = "widget";
   FcrUIDialogKey["RENAME"] = "rename";
-  FcrUIDialogKey["ANNOTATION_TOOL"] = "annotation-tool";
-  FcrUIDialogKey["LEAVE_MEETING"] = "leave-meeting";
-  FcrUIDialogKey["END_MEETING"] = "end-meeting";
+  FcrUIDialogKey["CONFIRM_END_MEETING"] = "confirm-end-meeting";
+  FcrUIDialogKey["EXIT_MEETING_NOTICE"] = "exit\u2014meeting\u2014notice";
   FcrUIDialogKey["SUB_WINDOW"] = "sub-window";
   FcrUIDialogKey["MUTE_ALL"] = "mute-all";
-  // fragments
-  FcrUIDialogKey["ANNOTATION"] = "annotation";
+  FcrUIDialogKey["ANNOTATION_TOOLBAR"] = "annotation-toolbar";
+  FcrUIDialogKey["ANNOTATION_MASK"] = "annotation-mask";
   FcrUIDialogKey["REVOKE_HOST"] = "revoke-host";
   FcrUIDialogKey["CONTROL_BAR_LEAVE_MEETING"] = "control-bar-leave-meeting";
   // debug

package/lib-es/utilities/default-config.js

@@ -1,52 +1,13 @@
 import "core-js/modules/es.object.assign.js";
 import { FcrCloudRecordingAudioProfile } from 'fcr-core/lib/type';
+import { FcrVideoEncoderConfig } from 'fcr-core';
 import merge from 'lodash/merge';
-export var cameraVideoHighStreamEncoderConfig = {
-  dimensions: {
-    width: 1280,
-    height: 720
-  },
-  frameRate: 30,
-  bitrate: 1500,
-  isMirror: false
-};
-export var cameraVideoLowStreamEncoderConfig = {
-  dimensions: {
-    width: 480,
-    height: 270
-  },
-  frameRate: 15,
-  bitrate: 350,
-  isMirror: false
-};
-export var screenCaptureHighStreamEncoderConfig = {
-  dimensions: {
-    width: 1920,
-    height: 1080
-  },
-  frameRate: 15,
-  bitrate: 1500,
-  isMirror: false
-};
-export var screenCaptureClearityConfig = screenCaptureHighStreamEncoderConfig;
-export var screenCaptureSmoothConfig = {
-  dimensions: {
-    width: 1920,
-    height: 1080
-  },
-  frameRate: 30,
-  bitrate: 1500,
-  isMirror: false
-};
-export var hdCameraVideoEncoderConfig = {
-  dimensions: {
-    width: 1920,
-    height: 1080
-  },
-  frameRate: 20,
-  bitrate: 2500,
-  isMirror: false
-};
+export var cameraVideoHighStreamEncoderConfig = FcrVideoEncoderConfig.createDefaultHighCameraConfig();
+export var cameraVideoLowStreamEncoderConfig = FcrVideoEncoderConfig.createDefaultLowCameraConfig();
+export var screenCaptureHighStreamEncoderConfig = FcrVideoEncoderConfig.createDefaultClarityScreenConfig();
+export var screenCaptureClearityConfig = FcrVideoEncoderConfig.createDefaultClarityScreenConfig();
+export var screenCaptureSmoothConfig = FcrVideoEncoderConfig.createDefaultSmoothScreenConfig();
+export var hdCameraVideoEncoderConfig = FcrVideoEncoderConfig.createDefaultFullHighCameraConfig();
 export var enableCameraDualStreamMode = true;
 export var enableScreenDualStreamMode = false;
 export var cloudRecordingConfig = {
@@ -57,8 +18,7 @@ export var cloudRecordingConfig = {
       height: 720
     },
     bitrate: 1200,
-    frameRate: 15,
-    isMirror: false
+    frameRate: 15
   },
   retryTimeout: 60
 };

package/lib-es/utilities/dialog-utils.js

@@ -8,7 +8,7 @@ import "core-js/modules/web.dom-collections.for-each.js";
 import "core-js/modules/web.timers.js";
 import { isElectron } from 'agora-foundation/lib/utilities/env';
 import { FcrUIDialogKey } from './constant';
-import { isMac } from './platform';
+import { isMac } from 'agora-foundation/lib/utilities/env';
 import { getLogger } from './logger';
 
 // 修复 windows 无法响应 hover 的问题

package/lib-es/utilities/focus-helper.js

@@ -1,5 +1,5 @@
 import "core-js/modules/web.timers.js";
-import { isWindows } from './platform';
+import { isWindows } from 'agora-foundation/lib/utilities/env';
 export var focusWindow = function focusWindow(window) {
   // Windows 需要此操作来确保窗口在最前，Mac不需要
   if (isWindows()) {

package/lib-es/utilities/logger.js

@@ -1,45 +1,17 @@
-import "core-js/modules/es.array.concat.js";
-import "core-js/modules/es.array.for-each.js";
 import "core-js/modules/es.date.to-json.js";
+import "core-js/modules/es.function.bind.js";
 import "core-js/modules/es.json.stringify.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.for-each.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-import { getLogger as _getLogger, createLogger as _createLogger } from 'agora-foundation/lib/logger';
-import { randomString } from 'agora-foundation/lib/utilities/misc';
-import { serializeArgs } from 'agora-foundation/lib/decorator/log/log-serializer';
-export var getLogger = function getLogger() {
-  return _getLogger({
-    label: 'fcr-ui-scene'
-  });
-};
-export var createLogger = function createLogger(opts) {
-  return _createLogger({
-    label: 'fcr-ui-scene',
-    prefix: "".concat(opts.prefix, "@").concat(randomString(5)),
-    database: opts.database
-  });
-};
-export var createFragmentLogger = function createFragmentLogger(opts) {
-  return _createLogger({
-    label: 'fcr-ui-scene-fragments',
-    prefix: "".concat(opts.prefix, "@").concat(randomString(5)),
-    database: opts.database
-  });
-};
-export var generateLogObserver = function generateLogObserver(logger, callbackMethods) {
-  var observer = {};
-  callbackMethods.forEach(function (method) {
-    observer[method] = function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      logger.info("[API Callback] ".concat(method, " [parameters: ").concat(serializeArgs(args), "]"));
-    };
-  });
-  return observer;
-};
+import { LoggerManager } from 'agora-foundation/lib/utilities/logger';
+var loggerManager = new LoggerManager({
+  label: 'fcr-ui-scene'
+});
+export var getLogger = loggerManager.getLogger.bind(loggerManager);
+export var createLogger = loggerManager.createLogger.bind(loggerManager);
+export var generateLogObserver = loggerManager.generateLogObserver.bind(loggerManager);
+var fragmentLoggerManager = new LoggerManager({
+  label: 'fcr-ui-scene-fragments'
+});
+export var createFragmentLogger = fragmentLoggerManager.createLogger.bind(fragmentLoggerManager);
 window.addEventListener('error', function (e) {
   getLogger().error('window error event:', JSON.stringify(e), e.error, e.message, e.lineno, e.colno, e.filename);
 });

package/lib-es/utilities/package-info.js

@@ -1,7 +1,6 @@
+import "core-js/modules/es.function.bind.js";
 import packageInfo from '../../package.json';
-export var getVersion = function getVersion() {
-  return packageInfo.version;
-};
-export var getDependenciesInfo = function getDependenciesInfo(packageName) {
-  return packageInfo.dependencies[packageName];
-};
+import { PackageInfo } from 'agora-foundation/lib/utilities/package-info';
+var packageInfoObj = new PackageInfo(packageInfo);
+export var getVersion = packageInfoObj.getVersion.bind(packageInfoObj);
+export var getDependenciesInfo = packageInfoObj.getDependenciesInfo.bind(packageInfoObj);