fcr-ui-scene 3.1.1 → 3.2.0

package/lib/common/device-stream-store.js

@@ -17,6 +17,22 @@ 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.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");
@@ -27,17 +43,20 @@ exports.FcrDeviceStreamStore = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.find.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"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _type = require("agora-edu-core/lib/type");
+var _agoraEduCore = require("agora-edu-core");
 var _decorator = require("agora-foundation/lib/decorator");
 var _mobx = require("mobx");
 var _toast = require("agora-ui-foundation/lib/components/toast");
-var _type2 = require("agora-rte-sdk/lib/core/scene/type");
-var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
+var _type = require("agora-rte-sdk/lib/core/scene/type");
+var _type2 = require("agora-rte-sdk/lib/core/rtc/type");
 var _logger = require("agora-foundation/lib/logger");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _rendererEvent = require("../utilities/renderer-event");
@@ -76,7 +95,7 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
       onStreamsAdded: function onStreamsAdded(_, e) {
         var _e$find;
         var localCameraStream = (_e$find = e.find(function (event) {
-          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type3.AgoraRtcVideoSourceType.CAMERA;
+          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type2.AgoraRtcVideoSourceType.CAMERA;
         })) === null || _e$find === void 0 ? void 0 : _e$find.modifiedStream;
         if (localCameraStream) {
           _this._bindLocalAudioStream();
@@ -86,10 +105,10 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
       onStreamsUpdated: function onStreamsUpdated(_, e) {
         var _e$find2;
         var localCameraStream = (_e$find2 = e.find(function (event) {
-          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type3.AgoraRtcVideoSourceType.CAMERA;
+          return event.modifiedStream.owner.userId === _this._localUser.userId && event.modifiedStream.videoSourceType === _type2.AgoraRtcVideoSourceType.CAMERA;
         })) === null || _e$find2 === void 0 ? void 0 : _e$find2.modifiedStream;
         if (localCameraStream) {
-          if (localCameraStream.streamType === _type2.AgoraRteMediaStreamType.AUDIO || localCameraStream.streamType === _type2.AgoraRteMediaStreamType.NONE) {
+          if (localCameraStream.streamType === _type.AgoraRteMediaStreamType.AUDIO || localCameraStream.streamType === _type.AgoraRteMediaStreamType.NONE) {
             if (_this._deviceStore.cameraEnabled) {
               _this._deviceStore.setCameraEnabled(false);
               _toast.FcrToastApi.open({
@@ -100,7 +119,7 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
               });
             }
           }
-          if (localCameraStream.streamType === _type2.AgoraRteMediaStreamType.VIDEO || localCameraStream.streamType === _type2.AgoraRteMediaStreamType.NONE) {
+          if (localCameraStream.streamType === _type.AgoraRteMediaStreamType.VIDEO || localCameraStream.streamType === _type.AgoraRteMediaStreamType.NONE) {
             if (_this._deviceStore.microphoneEnabled) {
               _this._deviceStore.setMicrophoneEnabled(false);
               _toast.FcrToastApi.open({
@@ -135,7 +154,7 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
     get: function get() {
       var localStreams = this._roomControl.getStreamControl().getStreamsByUserId(this._localUser.userId);
       return localStreams.find(function (stream) {
-        return stream.videoSourceType === _type3.AgoraRtcVideoSourceType.CAMERA;
+        return stream.videoSourceType === _type2.AgoraRtcVideoSourceType.CAMERA;
       });
     }
   }, {
@@ -143,23 +162,23 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
     get: function get() {
       var localStreams = this._roomControl.getStreamControl().getStreamsByUserId(this._localUser.userId);
       return localStreams.find(function (stream) {
-        return stream.audioSourceType === _type3.AgoraRtcAudioSourceType.LOOPBACK;
+        return stream.audioSourceType === _type2.AgoraRtcAudioSourceType.LOOPBACK;
       });
     }
   }, {
     key: "_canStartLocalVideo",
     get: function get() {
-      return this._securityStore.hasStartVideoPermission(_type.FcrPrivilegeUserRole.SELF);
+      return this._securityStore.hasStartVideoPermission(_agoraEduCore.FcrPrivilegeUserRole.SELF);
     }
   }, {
     key: "_canStartLocalAudio",
     get: function get() {
-      return this._securityStore.hasUnmutePermission(_type.FcrPrivilegeUserRole.SELF);
+      return this._securityStore.hasUnmutePermission(_agoraEduCore.FcrPrivilegeUserRole.SELF);
     }
   }, {
     key: "enableCameraWithStream",
     value: function () {
-      var _enableCameraWithStream = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(enable) {
+      var _enableCameraWithStream = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(enable) {
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -185,14 +204,14 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
                 _context.next = 9;
                 break;
               }
-              if (!(this._localCameraStream.streamType === _type.FcrStreamType.NONE || this._localCameraStream.streamType === _type.FcrStreamType.AUDIO)) {
+              if (!(this._localCameraStream.streamType === _agoraEduCore.FcrStreamType.NONE || this._localCameraStream.streamType === _agoraEduCore.FcrStreamType.AUDIO)) {
                 _context.next = 9;
                 break;
               }
               _context.next = 9;
               return this._roomControl.getStreamControl().updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, this._localCameraStream.streamId, {
-                videoPrivilege: _type.FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
-                audioPrivilege: _type.FcrStreamPrivilegeOperation.NOOPERATION
+                videoPrivilege: _agoraEduCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
+                audioPrivilege: _agoraEduCore.FcrStreamPrivilegeOperation.NOOPERATION
               }));
             case 9:
               this._deviceStore.setCameraEnabled(enable);
@@ -210,7 +229,7 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
   }, {
     key: "enableMicrophoneWithStream",
     value: function () {
-      var _enableMicrophoneWithStream = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(enable) {
+      var _enableMicrophoneWithStream = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(enable) {
         var _this2 = this;
         var confirmAudioShareWhileMicOff,
           dialogKey,
@@ -218,86 +237,89 @@ var FcrDeviceStreamStore = exports.FcrDeviceStreamStore = /*#__PURE__*/function
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              confirmAudioShareWhileMicOff = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : true;
-              if (this._deviceStore.microphoneId) {
-                _context2.next = 3;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 3:
-              if (!(enable && !this._canStartLocalAudio)) {
-                _context2.next = 6;
-                break;
-              }
-              _toast.FcrToastApi.open({
-                toastProps: {
-                  type: 'warn',
-                  content: (0, _i18n.transI18n)('fmt_uimanager_tips_norightsaudio')
-                }
-              });
-              return _context2.abrupt("return");
-            case 6:
-              if (!(confirmAudioShareWhileMicOff && !enable && this._localLoopbackStream)) {
-                _context2.next = 9;
-                break;
-              }
-              dialogKey = this._uiEventStore.openConfirmDialog({
+              confirmAudioShareWhileMicOff = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : false;
+              dialogKey = !enable && confirmAudioShareWhileMicOff && this._uiEventStore.openConfirmDialog({
                 title: (0, _i18n.transI18n)('fmt_screenshare_tips_share_audio_micon'),
-                content: (0, _i18n.transI18n)('fmt_screenshare_tips_sharing_audio_keep_on'),
-                cancelText: (0, _i18n.transI18n)('fmt_screenshare_tips_sharing_audio_cancel'),
-                okText: (0, _i18n.transI18n)('fmt_screenshare_tips_sharing_audio_confirm'),
-                closable: false,
-                cancelButtonProps: {
-                  type: 'primary',
-                  shape: 'rounded',
-                  styleType: 'danger'
-                },
-                okButtonProps: {
-                  type: 'primary',
-                  shape: 'rounded'
-                },
-                closeIcon: null,
+                content: (0, _i18n.transI18n)('fmt_screenshare_tips_share_audio_turnonmic'),
                 onOk: function onOk() {
-                  _this2._uiEventStore.closeDialog(dialogKey);
+                  _this2._setMicrophoneEnabled(true);
+                  dialogKey && _this2._uiEventStore.closeDialog(dialogKey);
                 },
                 onCancel: function onCancel() {
-                  _this2.enableMicrophoneWithStream(false, false);
+                  _this2._setMicrophoneEnabled(false);
                   (0, _rendererEvent.sendEvent)({
                     action: _constant.RendererEventAction.SET_SHARE_WITH_AUDIO_CONTROL_BAR,
                     payload: {
                       withAudio: false
                     }
                   });
-                  _this2._uiEventStore.closeDialog(dialogKey);
-                }
+                  dialogKey && _this2._uiEventStore.closeDialog(dialogKey);
+                },
+                okText: (0, _i18n.transI18n)('fmt_screenshare_button_confirm_shareaudio'),
+                cancelText: (0, _i18n.transI18n)('fmt_screenshare_button_giveup_shareaudio')
               });
+              if (!(!this._deviceStore.microphoneId || dialogKey)) {
+                _context2.next = 4;
+                break;
+              }
               return _context2.abrupt("return");
-            case 9:
+            case 4:
+              this._setMicrophoneEnabled(enable);
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function enableMicrophoneWithStream(_x2) {
+        return _enableMicrophoneWithStream.apply(this, arguments);
+      }
+      return enableMicrophoneWithStream;
+    }()
+  }, {
+    key: "_setMicrophoneEnabled",
+    value: function () {
+      var _setMicrophoneEnabled2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(enable) {
+        return _regenerator["default"].wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              if (!(enable && !this._canStartLocalAudio)) {
+                _context3.next = 3;
+                break;
+              }
+              _toast.FcrToastApi.open({
+                toastProps: {
+                  type: 'warn',
+                  content: (0, _i18n.transI18n)('fmt_uimanager_tips_norightsaudio')
+                }
+              });
+              return _context3.abrupt("return");
+            case 3:
               if (!(this._localCameraStream && enable)) {
-                _context2.next = 13;
+                _context3.next = 7;
                 break;
               }
-              if (!(this._localCameraStream.streamType === _type.FcrStreamType.NONE || this._localCameraStream.streamType === _type.FcrStreamType.VIDEO)) {
-                _context2.next = 13;
+              if (!(this._localCameraStream.streamType === _agoraEduCore.FcrStreamType.NONE || this._localCameraStream.streamType === _agoraEduCore.FcrStreamType.VIDEO)) {
+                _context3.next = 7;
                 break;
               }
-              _context2.next = 13;
+              _context3.next = 7;
               return this._roomControl.getStreamControl().updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, this._localCameraStream.streamId, {
-                videoPrivilege: _type.FcrStreamPrivilegeOperation.NOOPERATION,
-                audioPrivilege: _type.FcrStreamPrivilegeOperation.HAS_PRIVILEGE
+                videoPrivilege: _agoraEduCore.FcrStreamPrivilegeOperation.NOOPERATION,
+                audioPrivilege: _agoraEduCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE
               }));
-            case 13:
+            case 7:
               this._deviceStore.setMicrophoneEnabled(enable);
-            case 14:
+            case 8:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
-      function enableMicrophoneWithStream(_x2) {
-        return _enableMicrophoneWithStream.apply(this, arguments);
+      function _setMicrophoneEnabled(_x3) {
+        return _setMicrophoneEnabled2.apply(this, arguments);
       }
-      return enableMicrophoneWithStream;
+      return _setMicrophoneEnabled;
     }()
   }, {
     key: "release",

package/lib/common/event-store.d.ts

@@ -1,12 +1,12 @@
-/// <reference types="react" />
 import { DialogKey, UIAction } from '../utilities/constant';
-import { FcrChatRoomReceiveBaseMessage, FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrUserInfo } from 'agora-edu-core/lib/type';
 import { DeviceSettingDialogConfig, CustomSetting } from '../modules/setting/store';
 import { FcrUIExitReason } from '../type';
 import { ToastSize } from 'agora-ui-foundation/lib/components/toast';
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
 import { ButtonType } from 'agora-ui-foundation/lib/components/button';
 import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
+import { FcrChatRoomReceiveBaseMessage } from 'agora-edu-core/lib/room-control/chatroom-control/type';
 export interface FcrUIDialogParams {
     dialogKey: DialogKey;
     dialogId: string;
@@ -47,6 +47,7 @@ export interface FcrUINewChatMessagesParams {
 }
 export interface FcrUIToggleLayoutParams {
     layout: 'speaker' | 'gallery';
+    manual?: boolean;
 }
 export interface FcrUIToggleLayoutSizeParams {
     size: 16 | 25;

package/lib/common/event-store.js

@@ -10,6 +10,11 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {

package/lib/common/security-store.d.ts

@@ -1,9 +1,9 @@
 import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'agora-edu-core';
-import { FcrRoomSessionControl } from 'agora-edu-core/lib/room-control/room-session';
-import { FcrPermissionAction, FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload, FcrUserRole, FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrUserRole, FcrUserInfo } from 'agora-edu-core/lib/type';
 import { FcrUIEventStore } from './event-store';
 import { FcrSharePermissionState } from 'agora-edu-core/lib/room-control/whiteboard-control/enums';
-import { FcrSharePermissionProps } from 'agora-edu-core/lib/type';
+import { FcrRoomSessionControl } from 'agora-edu-core/lib/room-control/room-session/type';
+import { FcrPermissionAction, FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload, FcrSecuritySharePayload, FcrSecurityWriteBoardPayload } from 'agora-edu-core/lib/room-control/privilege-control/type';
 export type FcrSecuritySendChatOriginalPayload = {
     public: 0 | 1;
     private: {
@@ -21,7 +21,7 @@ export declare class FcrSecurityStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
     accessor securityInfos: FcrSecurityInfo[];
-    accessor permissionInfos: FcrPermissionInfo[];
+    accessor permissionInfos: FcrPermissionInfo[] | undefined;
     accessor privilegeOperator: FcrUserInfo | undefined;
     accessor boardOwnerUser: FcrUserInfo | undefined;
     constructor(_privilegeControl: FcrPrivilegeControl, _userControl: FcrUserControl, _streamControl: FcrStreamControl, _roomSessionControl: FcrRoomSessionControl, _uiEventStore: FcrUIEventStore);
@@ -85,18 +85,8 @@ export declare class FcrSecurityStore {
     hasDisallowWriteBoardPermission(): boolean;
     hasAllowScreenShareAndBoardPermission(): boolean;
     getAllowedOperations(targetUserRole: FcrUserRole, isSelf: boolean): string[];
-    allowShare(enable: FcrSharePermissionState, payload?: Pick<FcrSharePermissionProps, 'screen'>): Promise<{
-        msg: string;
-        data: Record<string, FcrSharePermissionProps>;
-        code: number;
-        ts: number;
-    }>;
-    setAllowWriteBoard(state: FcrSharePermissionState, payload?: Pick<FcrSharePermissionProps, 'board'>): Promise<{
-        msg: string;
-        data: Record<string, FcrSharePermissionProps>;
-        code: number;
-        ts: number;
-    }>;
+    allowShare(state: FcrSharePermissionState, payload: FcrSecuritySharePayload): Promise<void>;
+    setAllowWriteBoard(state: FcrSharePermissionState, payload: FcrSecurityWriteBoardPayload): Promise<void>;
     muteAll: () => void;
     unmuteAll: () => void;
     setLockRoomEnabled: (enable: boolean) => void;