fcr-ui-scene 3.6.2 → 3.6.4

package/lib/providers/annotation-provider.js

@@ -40,11 +40,11 @@ exports.FcrUIAnnotationProviderImpl = exports.FcrAnnotationState = void 0;
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.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/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.find.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.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -106,24 +106,11 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     (0, _defineProperty2["default"])(this, "_shareScreenOwnerId", '');
     (0, _defineProperty2["default"])(this, "_maxScalcValue", 4);
     (0, _defineProperty2["default"])(this, "_minScalcValue", 1);
-    _classPrivateFieldInitSpec(this, _A, _init_scalcValue(this, 1));
-    _classPrivateFieldInitSpec(this, _B, _init_annotationState(this, FcrAnnotationState.END));
-    _classPrivateFieldInitSpec(this, _C, _init_annotating(this, false));
-    _classPrivateFieldInitSpec(this, _D, _init_currentShareInfo(this, {
-      id: '',
-      type: _type.AgoraRtcScreenCaptureType.SCREEN,
-      bounds: {
-        x: 0,
-        y: 0,
-        width: 0,
-        height: 0
-      }
-    }));
     (0, _defineProperty2["default"])(this, "_annotationObserver", {
       onConnectionStateUpdated: function () {
         var _onConnectionStateUpdated = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(state) {
           var _this$_annotationCont, mainWindow;
-          return _regenerator["default"].wrap(function _callee$(_context) {
+          return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (state === _fcrCore.FcrConnectionState.CONNECTED) {
@@ -155,12 +142,27 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
         }
       }
     });
+    _classPrivateFieldInitSpec(this, _A, _init_scalcValue(this, 1));
+    _classPrivateFieldInitSpec(this, _B, _init_annotationState(this, FcrAnnotationState.END));
+    _classPrivateFieldInitSpec(this, _C, _init_annotating(this, false));
+    _classPrivateFieldInitSpec(this, _D, _init_currentShareInfo(this, {
+      id: '',
+      type: _type.AgoraRtcScreenCaptureType.SCREEN,
+      bounds: {
+        x: 0,
+        y: 0,
+        width: 0,
+        height: 0
+      }
+    }));
     this._dialogProvider = _dialogProvider;
     this._sharingProvider = _sharingProvider;
     this._memberDataSource = _memberDataSource;
     this._videoWindowDataSource = _videoWindowDataSource;
     this._screenShareProvider = _screenShareProvider;
     this._deviceProvider = _deviceProvider;
+    //@ts-ignore
+    window._annotationProvider = this;
     this._sharingProvider.getSharingControl().addObserver(this._observer);
     setTimeout(function () {
       return _this.openAnnotationWindow();
@@ -171,6 +173,17 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     }
   }
   return (0, _createClass2["default"])(FcrUIAnnotationProviderImpl, [{
+    key: "_currentScreenShareOwnerCanStartAnnotation",
+    value: function _currentScreenShareOwnerCanStartAnnotation() {
+      var owner = this._screenShareProvider.getCurrentScreenSharingOwner();
+      return owner && owner.platform !== _type4.FcrPlatform.IOS;
+    }
+  }, {
+    key: "_localUser",
+    get: function get() {
+      return this._memberDataSource.localUser;
+    }
+  }, {
     key: "scalcValue",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
@@ -202,23 +215,6 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     set: function set(v) {
       _classPrivateFieldSet(_D, this, v);
     }
-  }, {
-    key: "_currentScreenShareOwnerCanStartAnnotation",
-    value: function _currentScreenShareOwnerCanStartAnnotation() {
-      var owner = this._screenShareProvider.getCurrentScreenSharingOwner();
-      return owner && owner.platform !== _type4.FcrPlatform.IOS;
-    }
-  }, {
-    key: "_initAnnotationTransaction",
-    value: function _initAnnotationTransaction(screenShareOwnerId) {
-      this._annotationControl = this.getAnnotationControl();
-      if (this._localUser.userId !== screenShareOwnerId) {
-        if (this._annotationControl) {
-          this._annotationControl.addObserver(this._annotationObserver);
-          this._annotationControl.open();
-        }
-      }
-    }
   }, {
     key: "screenShareWindowData",
     get: function get() {
@@ -239,13 +235,7 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
   }, {
     key: "annotationHasStart",
     get: function get() {
-      //return this.annotationState === FcrAnnotationState.START;
-      return false;
-    }
-  }, {
-    key: "_localUser",
-    get: function get() {
-      return this._memberDataSource.localUser;
+      return this.annotationState === FcrAnnotationState.START;
     }
   }, {
     key: "zoomIn",
@@ -275,7 +265,7 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     key: "toggleAnnotation",
     value: function () {
       var _toggleAnnotation = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
+        return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (this.annotating) {
@@ -285,6 +275,7 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
                   payload: true
                 });
                 this._closeToolbar();
+                this.logger.info('[Annotation] toggleAnnotation close toolbar, ignore mouse event true');
               } else {
                 this.annotating = true;
                 (0, _rendererEvent.sendEvent)({
@@ -292,6 +283,7 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
                   payload: false
                 });
                 this._openToolbar();
+                this.logger.info('[Annotation] toggleAnnotation open toolbar, ignore mouse event false');
               }
             case 1:
             case "end":
@@ -313,12 +305,12 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
     key: "openAnnotationWindow",
     value: function openAnnotationWindow() {
       this._annotationDialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.ANNOTATION);
-      this.logger.info('openedAnnotationWindow');
+      this.logger.info('[Annotation] openedAnnotationWindow');
     }
   }, {
     key: "hideAnnotationWindow",
     value: function hideAnnotationWindow() {
-      this.logger.info('hideAnnotationWindow');
+      this.logger.info('[Annotation] hideAnnotationWindow');
       this.annotating = false;
       (0, _rendererEvent.sendEvent)({
         action: _type3.ToolbarEvents.CLEAN,
@@ -341,7 +333,7 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
       var _setBoundsToAnnotationWindow = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(info) {
         var _this2 = this;
         var targetBounds, _ref2, bounds, _getCurrentSharingWor, width, height, x, y, windows, win;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
+        return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               targetBounds = null;
@@ -364,12 +356,17 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
                 if (win) {
                   targetBounds = win.getBounds();
                 }
+                // 当 mac 是分享的全屏应用的时候，通过 id 无法获取到正确的 bounds，因为本身全屏幕应用的尺寸就是屏幕的尺寸，所以可以直接取 info 的 bounds
+                if (!targetBounds) {
+                  targetBounds = (info === null || info === void 0 ? void 0 : info.bounds) || this.currentShareInfo.bounds || null;
+                }
               }
+              this.logger.info("[Annotation][setBoundsToAnnotationWindow]: targetBounds: ".concat(JSON.stringify(targetBounds)));
               (0, _rendererEvent.sendEvent)({
                 action: _constant.FcrUIRendererEventAction.SET_CURRENT_SHARE_SCREEN_BOUNDS,
                 payload: targetBounds
               });
-            case 3:
+            case 1:
             case "end":
               return _context3.stop();
           }
@@ -399,10 +396,19 @@ var FcrUIAnnotationProviderImpl = exports.FcrUIAnnotationProviderImpl = /*#__PUR
       this._dialogProvider.closeDialog(this._annotationToolDialogId);
       this._annotationToolDialogId = '';
     }
+  }, {
+    key: "_initAnnotationTransaction",
+    value: function _initAnnotationTransaction(screenShareOwnerId) {
+      this._annotationControl = this.getAnnotationControl();
+      if (this._annotationControl) {
+        this._annotationControl.addObserver(this._annotationObserver);
+        this._annotationControl.open();
+      }
+    }
   }]);
 }();
 _FcrUIAnnotationProviderImpl = FcrUIAnnotationProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIAnnotationProviderImpl, [[_mobx.observable, 1, "scalcValue"], [_mobx.observable, 1, "annotationState"], [_mobx.observable, 1, "annotating"], [_mobx.observable, 1, "currentShareInfo"], [_mobx.computed, 3, "screenShareWindowData"], [_zoomInDecs, 18, "zoomIn"], [_zoomOutDecs, 18, "zoomOut"], [_fullContainerDecs, 18, "fullContainer"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_toggleAnnotationDecs, 18, "toggleAnnotation"], [_imports.bound, 2, "getAnnotationControl"], [_openAnnotationWindowDecs, 18, "openAnnotationWindow"], [_hideAnnotationWindowDecs, 18, "hideAnnotationWindow"], [_setCurrentShareInfoDecs, 18, "setCurrentShareInfo"], [_imports.bound, 2, "setBoundsToAnnotationWindow"], [_imports.bound, 2, "release"], [_openToolbarDecs, 18, "_openToolbar"], [_closeToolbarDecs, 18, "_closeToolbar"]], []).e, 5);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIAnnotationProviderImpl, [[_mobx.observable, 1, "scalcValue"], [_mobx.observable, 1, "annotationState"], [_mobx.observable, 1, "annotating"], [_mobx.observable, 1, "currentShareInfo"], [_mobx.computed, 3, "screenShareWindowData"], [_zoomInDecs, 18, "zoomIn"], [_zoomOutDecs, 18, "zoomOut"], [_fullContainerDecs, 18, "fullContainer"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_toggleAnnotationDecs, 18, "toggleAnnotation"], [_imports.bound, 2, "getAnnotationControl"], [_openAnnotationWindowDecs, 18, "openAnnotationWindow"], [_hideAnnotationWindowDecs, 18, "hideAnnotationWindow"], [_setCurrentShareInfoDecs, 18, "setCurrentShareInfo"], [_imports.bound, 2, "setBoundsToAnnotationWindow"], [_imports.bound, 2, "release"], [_openToolbarDecs, 18, "_openToolbar"], [_closeToolbarDecs, 18, "_closeToolbar"], [_imports.bound, 2, "_initAnnotationTransaction"]], []).e, 5);
 _init_scalcValue = _applyDecs$e[0];
 _init_annotationState = _applyDecs$e[1];
 _init_annotating = _applyDecs$e[2];

package/lib/providers/device-privilege-provider.js

@@ -10,8 +10,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.find.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.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -47,12 +45,12 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
     this._privilegeObserver = {
       onLocalUserPermissionInfoAdded: function () {
         var _onLocalUserPermissionInfoAdded = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(roomId, event) {
-          var hasVideoPermission, localStream, hasVideo, hasAudioPermission, _localStream, hasAudio;
-          return _regenerator["default"].wrap(function _callee$(_context) {
+          var hasVideoPermission, localStream, hasVideo, hasAudioPermission, _localStream, hasAudio, _t, _t2;
+          return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (!_this._autoUpdateVideoStreamPrivilege) {
-                  _context.next = 13;
+                  _context.next = 4;
                   break;
                 }
                 hasVideoPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(event.permissionInfo, _fcrCore.FcrPermissionAction.StreamStartVideo, _type.FcrPrivilegeUserRole.SELF);
@@ -61,28 +59,28 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
                 });
                 hasVideo = (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.VIDEO || (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.BOTH;
                 if (!hasVideoPermission) {
-                  _context.next = 13;
+                  _context.next = 4;
                   break;
                 }
                 if (!(!hasVideo && localStream)) {
-                  _context.next = 13;
+                  _context.next = 4;
                   break;
                 }
-                _context.prev = 6;
-                _context.next = 9;
+                _context.prev = 1;
+                _context.next = 2;
                 return _this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, localStream.streamId, {
                   videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
                   audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION
                 }));
-              case 9:
-                _context.next = 13;
+              case 2:
+                _context.next = 4;
                 break;
-              case 11:
-                _context.prev = 11;
-                _context.t0 = _context["catch"](6);
-              case 13:
+              case 3:
+                _context.prev = 3;
+                _t = _context["catch"](1);
+              case 4:
                 if (!_this._autoUpdateAudioStreamPrivilege) {
-                  _context.next = 26;
+                  _context.next = 8;
                   break;
                 }
                 hasAudioPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(event.permissionInfo, _fcrCore.FcrPermissionAction.StreamStartAudio, _type.FcrPrivilegeUserRole.SELF);
@@ -91,30 +89,30 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
                 });
                 hasAudio = (_localStream === null || _localStream === void 0 ? void 0 : _localStream.streamType) === _fcrCore.FcrStreamType.AUDIO || (_localStream === null || _localStream === void 0 ? void 0 : _localStream.streamType) === _fcrCore.FcrStreamType.BOTH;
                 if (!hasAudioPermission) {
-                  _context.next = 26;
+                  _context.next = 8;
                   break;
                 }
                 if (!(!hasAudio && _localStream)) {
-                  _context.next = 26;
+                  _context.next = 8;
                   break;
                 }
-                _context.prev = 19;
-                _context.next = 22;
+                _context.prev = 5;
+                _context.next = 6;
                 return _this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, _localStream.streamId, {
                   videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION,
                   audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE
                 }));
-              case 22:
-                _context.next = 26;
+              case 6:
+                _context.next = 8;
                 break;
-              case 24:
-                _context.prev = 24;
-                _context.t1 = _context["catch"](19);
-              case 26:
+              case 7:
+                _context.prev = 7;
+                _t2 = _context["catch"](5);
+              case 8:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[6, 11], [19, 24]]);
+          }, _callee, null, [[1, 3], [5, 7]]);
         }));
         function onLocalUserPermissionInfoAdded(_x, _x2) {
           return _onLocalUserPermissionInfoAdded.apply(this, arguments);
@@ -126,7 +124,7 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
       onStreamsUpdated: function () {
         var _onStreamsUpdated = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(roomId, events) {
           var hasVideoPermission, hasAudioPermission;
-          return _regenerator["default"].wrap(function _callee2$(_context2) {
+          return _regenerator["default"].wrap(function (_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
                 hasVideoPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(_this._privilegeControl.getAllLocalUserPermissionInfo(), _fcrCore.FcrPermissionAction.StreamStartVideo, _type.FcrPrivilegeUserRole.SELF);
@@ -194,7 +192,7 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
                     }
                   }
                 });
-              case 3:
+              case 1:
               case "end":
                 return _context2.stop();
             }
@@ -238,16 +236,16 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
     key: "hasOpenCameraPrivilege",
     value: function () {
       var _hasOpenCameraPrivilege = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-        var permissionInfo, hasVideoPermission, localUserId, localStream, hasVideo;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
+        var permissionInfo, hasVideoPermission, localUserId, localStream, hasVideo, _t3;
+        return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if (!this._alwaysHasCameraPrivilege) {
-                _context3.next = 2;
+                _context3.next = 1;
                 break;
               }
               return _context3.abrupt("return", true);
-            case 2:
+            case 1:
               permissionInfo = this._privilegeControl.getLocalUserPermissionInfo(_fcrCore.FcrPermissionAction.StreamStartVideo);
               hasVideoPermission = (0, _privilege.isPermissionWithTargetRoleEnabled)(permissionInfo, _type.FcrPrivilegeUserRole.SELF);
               localUserId = this._userControl.getLocalUser().userId;
@@ -256,60 +254,60 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
               });
               hasVideo = (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.VIDEO || (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.BOTH;
               if (!this._firstGetCameraPrivilege) {
-                _context3.next = 16;
+                _context3.next = 4;
                 break;
               }
               this._firstGetCameraPrivilege = false;
               if (!hasVideo) {
-                _context3.next = 13;
+                _context3.next = 2;
                 break;
               }
               return _context3.abrupt("return", true);
-            case 13:
+            case 2:
               return _context3.abrupt("return", false);
-            case 14:
-              _context3.next = 34;
+            case 3:
+              _context3.next = 12;
               break;
-            case 16:
+            case 4:
               if (!hasVideoPermission) {
-                _context3.next = 33;
+                _context3.next = 11;
                 break;
               }
               if (!hasVideo) {
-                _context3.next = 21;
+                _context3.next = 5;
                 break;
               }
               return _context3.abrupt("return", true);
-            case 21:
+            case 5:
               if (!localStream) {
-                _context3.next = 30;
+                _context3.next = 9;
                 break;
               }
-              _context3.prev = 22;
-              _context3.next = 25;
+              _context3.prev = 6;
+              _context3.next = 7;
               return this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, localStream.streamId, {
                 videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
                 audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION
               }));
-            case 25:
-              _context3.next = 30;
+            case 7:
+              _context3.next = 9;
               break;
-            case 27:
-              _context3.prev = 27;
-              _context3.t0 = _context3["catch"](22);
+            case 8:
+              _context3.prev = 8;
+              _t3 = _context3["catch"](6);
               return _context3.abrupt("return", false);
-            case 30:
+            case 9:
               return _context3.abrupt("return", true);
-            case 31:
-              _context3.next = 34;
+            case 10:
+              _context3.next = 12;
               break;
-            case 33:
+            case 11:
               return _context3.abrupt("return", false);
-            case 34:
+            case 12:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[22, 27]]);
+        }, _callee3, this, [[6, 8]]);
       }));
       function hasOpenCameraPrivilege() {
         return _hasOpenCameraPrivilege.apply(this, arguments);
@@ -320,16 +318,16 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
     key: "hasOpenMicrophonePrivilege",
     value: function () {
       var _hasOpenMicrophonePrivilege = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var permissionInfo, hasAudioPermission, localUserId, localStream, hasAudio;
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
+        var permissionInfo, hasAudioPermission, localUserId, localStream, hasAudio, _t4;
+        return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (!this._alwaysHasMicrophonePrivilege) {
-                _context4.next = 2;
+                _context4.next = 1;
                 break;
               }
               return _context4.abrupt("return", true);
-            case 2:
+            case 1:
               permissionInfo = this._privilegeControl.getLocalUserPermissionInfo(_fcrCore.FcrPermissionAction.StreamStartAudio);
               hasAudioPermission = (0, _privilege.isPermissionWithTargetRoleEnabled)(permissionInfo, _type.FcrPrivilegeUserRole.SELF);
               localUserId = this._userControl.getLocalUser().userId;
@@ -338,60 +336,60 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
               });
               hasAudio = (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.AUDIO || (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.BOTH;
               if (!this._firstGetMicrophonePrivilege) {
-                _context4.next = 16;
+                _context4.next = 4;
                 break;
               }
               this._firstGetMicrophonePrivilege = false;
               if (!hasAudio) {
-                _context4.next = 13;
+                _context4.next = 2;
                 break;
               }
               return _context4.abrupt("return", true);
-            case 13:
+            case 2:
               return _context4.abrupt("return", false);
-            case 14:
-              _context4.next = 34;
+            case 3:
+              _context4.next = 12;
               break;
-            case 16:
+            case 4:
               if (!hasAudioPermission) {
-                _context4.next = 33;
+                _context4.next = 11;
                 break;
               }
               if (!hasAudio) {
-                _context4.next = 21;
+                _context4.next = 5;
                 break;
               }
               return _context4.abrupt("return", true);
-            case 21:
+            case 5:
               if (!localStream) {
-                _context4.next = 30;
+                _context4.next = 9;
                 break;
               }
-              _context4.prev = 22;
-              _context4.next = 25;
+              _context4.prev = 6;
+              _context4.next = 7;
               return this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, localStream.streamId, {
                 videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION,
                 audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE
               }));
-            case 25:
-              _context4.next = 30;
+            case 7:
+              _context4.next = 9;
               break;
-            case 27:
-              _context4.prev = 27;
-              _context4.t0 = _context4["catch"](22);
+            case 8:
+              _context4.prev = 8;
+              _t4 = _context4["catch"](6);
               return _context4.abrupt("return", false);
-            case 30:
+            case 9:
               return _context4.abrupt("return", true);
-            case 31:
-              _context4.next = 34;
+            case 10:
+              _context4.next = 12;
               break;
-            case 33:
+            case 11:
               return _context4.abrupt("return", false);
-            case 34:
+            case 12:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[22, 27]]);
+        }, _callee4, this, [[6, 8]]);
       }));
       function hasOpenMicrophonePrivilege() {
         return _hasOpenMicrophonePrivilege.apply(this, arguments);

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

@@ -6,7 +6,7 @@ import { VirtualBackground } from '../modules/device-pretest/assets/virtual-back
 import { FcrUIVideoEffectType, FcrUIBeautyKey, FcrUIConnectType, FcrUIResource, FcrUIDeviceObserver, FcrUIMediaConfig, FcrUIAiDenoiseLevel, FcrUiResourceType } from '../type';
 import { FcrUIEventProvider } from './event-provider';
 import { BeautyKey } from '../modules/setting/store';
-import { FcrUILocalStorageProviderImpl } from './local-storage-provider';
+import { FcrUIUserSettingStorageProviderImpl } from './user-setting-storage-provider';
 export declare const DEFAULT_DEVICE_ID = "default";
 export interface FcrUIDeviceProvider {
     /**
@@ -273,7 +273,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     private _eventProvider;
     private _mediaControl;
     private _mediaConfig;
-    private _localStorageProvider;
+    private _userSettingStorageProvider;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _listeners;
@@ -339,7 +339,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider {
     };
     get isAudioConnected(): boolean;
     get shouldEnableMicBeforeSession(): boolean;
-    constructor(_eventProvider: FcrUIEventProvider, _mediaControl: FcrDesktopMediaControl, _mediaConfig: FcrUIMediaConfig, _localStorageProvider: FcrUILocalStorageProviderImpl);
+    constructor(_eventProvider: FcrUIEventProvider, _mediaControl: FcrDesktopMediaControl, _mediaConfig: FcrUIMediaConfig, _userSettingStorageProvider: FcrUIUserSettingStorageProviderImpl);
     getScreenTrack(id: string): FcrScreenTrack;
     getLoopbackTrack(id: string): FcrLoopbackTrack;
     checkLoopbackDevice(): Promise<number>;