fcr-ui-scene 3.9.0-alpha → 3.9.0

package/lib/creator/provider-initializer.browser.js

@@ -254,7 +254,8 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
         interpreterData: sharedInterpreterDataSource,
         deviceProvider: deviceProvider,
         screenShareProvider: screenShareProvider,
-        streamControl: streamControl
+        streamControl: streamControl,
+        volumeThreshold: 45
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER, userAudioVolumeProvider);
       var pinDataSource = new _pinData.FcrUISharedPinDataSourceImpl(messageProvider, videoWindowDataSource);

package/lib/creator/provider-initializer.electron.js

@@ -292,7 +292,8 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
         interpreterData: sharedInterpreterDataSource,
         deviceProvider: deviceProvider,
         screenShareProvider: screenShareProvider,
-        streamControl: streamControl
+        streamControl: streamControl,
+        volumeThreshold: 35
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER, userAudioVolumeProvider);
       var pinDataSource = new _pinData.FcrUISharedPinDataSourceImpl(messageProvider, sharedVideoWindowDataSource);

package/lib/fragments/annotation/style.css

@@ -4,5 +4,6 @@
 }
 
 body {
+  margin: 0;
   background: rgba(0, 0, 0, 0.01);
 }

package/lib/fragments/whiteboard/style.css

@@ -1,3 +1,7 @@
+body {
+  margin: 0;
+}
+
 .fcr-fragment-whiteboard-view {
   width: 100vw;
   height: 100vh;

package/lib/modules/chat/chat-room-store.js

@@ -976,8 +976,10 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
     }
   }, {
     key: "_handleConnectionUpdated",
-    value: function _handleConnectionUpdated(_, state) {
-      this.chatRoomState = state;
+    value: function _handleConnectionUpdated(_, state, roomType) {
+      if (roomType === this._type) {
+        this.chatRoomState = state;
+      }
     }
   }, {
     key: "_initChatRoomConnectionState",

package/lib/modules/control-bar/store.d.ts

@@ -70,12 +70,13 @@ export default class ControlBarStore implements FcrUIManagedObject {
     get isMuteAudio(): boolean;
     get isRoomDetailSupported(): boolean;
     get isRecordingSupported(): boolean;
+    get isAnnotationSupported(): boolean;
     get meetingTimeKey(): string;
     get roomId(): string;
     get checkedStateMap(): FcrSecurityCheckedStateType;
     get isWriteAnnotationAllowed(): boolean;
     get hasPermissionAllowWriteAnnotation(): boolean;
-    get hasAnnotationStartPermission(): boolean;
+    get hasAnnotationWritePermission(): boolean;
     get liveStreamingButtonVisible(): boolean;
     get recordingButtonVisible(): boolean;
     get draggableArea(): FcrUI.FcrUIRectangle;

package/lib/modules/control-bar/store.js

@@ -491,6 +491,11 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._abilityProvider.isRecordingSupported();
     }
+  }, {
+    key: "isAnnotationSupported",
+    get: function get() {
+      return this._abilityProvider.isAnnotationSupported();
+    }
   }, {
     key: "meetingTimeKey",
     get: function get() {
@@ -517,9 +522,9 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       return this._privilegeProvider.hasAnnotationAllowWritePermission();
     }
   }, {
-    key: "hasAnnotationStartPermission",
+    key: "hasAnnotationWritePermission",
     get: function get() {
-      return this._privilegeProvider.hasAnnotationStartPermission();
+      return this._privilegeProvider.hasAnnotationWritePermission();
     }
   }, {
     key: "liveStreamingButtonVisible",

package/lib/modules/control-bar/view.js

@@ -534,7 +534,8 @@ var AnnotationSection = (0, _mobxReact.observer)(function () {
     clearAnnotation = _useContext11.clearAnnotation,
     isWriteAnnotationAllowed = _useContext11.isWriteAnnotationAllowed,
     hasPermissionAllowWriteAnnotation = _useContext11.hasPermissionAllowWriteAnnotation,
-    hasAnnotationStartPermission = _useContext11.hasAnnotationStartPermission;
+    isAnnotationSupported = _useContext11.isAnnotationSupported,
+    hasAnnotationWritePermission = _useContext11.hasAnnotationWritePermission;
   var _useContext12 = (0, _react.useContext)(_context.ControlBarCalculationContext),
     isShareActionNavHidden = _useContext12.isShareActionNavHidden;
   var _useState11 = (0, _react.useState)(false),
@@ -546,6 +547,16 @@ var AnnotationSection = (0, _mobxReact.observer)(function () {
       setVisible(false);
     }
   }, [isShareActionNavHidden]);
+
+  // 不支持标注的能力, 不显示按钮
+  if (!isAnnotationSupported) {
+    return null;
+  }
+
+  // 没有标注写权限, 不显示按钮
+  if (!hasAnnotationWritePermission) {
+    return null;
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationButton.AnnotationButton, {
     onAllowWriteClick: allowWriteAnnotation,
     onCleanAnnotationClick: clearAnnotation,

package/lib/providers/user-audio-volume-provider.d.ts

@@ -14,11 +14,17 @@ type FcrUIUserAudioVolumeProviderParams = {
     deviceProvider: FcrUIDeviceProvider;
     screenShareProvider: FcrUIScreenShareProvider;
     streamControl: FcrStreamControl;
+    /** 触发语音激励的音量阈值
+     * @browser 45
+     * @electron 35
+     */
+    volumeThreshold: number;
 };
 export interface FcrUIUserAudioVolumeProvider {
     userIdToAudioStreamIdMap: Map<string, string>;
 }
 export declare class FcrUIUserAudioVolumeProviderImpl implements FcrUIUserAudioVolumeProvider, FcrUIManagedObject {
+    private readonly _volumeThreshold;
     private _audioVolumeData;
     private _videoWindowData;
     private _settingData;

package/lib/providers/user-audio-volume-provider.js

@@ -99,7 +99,7 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 _ref = (_updateAudioVolumesDecs = (0, _decorator.throttled)(16, {
   leading: false,
   trailing: true
-}), "_audioVolumeData");
+}), "_volumeThreshold");
 var FcrUIUserAudioVolumeProviderImpl = exports.FcrUIUserAudioVolumeProviderImpl = /*#__PURE__*/function () {
   function FcrUIUserAudioVolumeProviderImpl(params) {
     var _this = this;
@@ -122,6 +122,7 @@ var FcrUIUserAudioVolumeProviderImpl = exports.FcrUIUserAudioVolumeProviderImpl
     this._deviceProvider = params.deviceProvider;
     this._screenShareProvider = params.screenShareProvider;
     this._streamControl = params.streamControl;
+    this._volumeThreshold = params.volumeThreshold;
     this._streamControl.addObserver(this._streamControlObserver);
     this._deviceProvider.setMicrophoneVolumeLevelDelegate(this._handleMicrophoneVolumeUpdated);
     this._disposers.push((0, _mobx.reaction)(function () {
@@ -237,7 +238,7 @@ var FcrUIUserAudioVolumeProviderImpl = exports.FcrUIUserAudioVolumeProviderImpl
             streamId = _step$value[0],
             volume = _step$value[1];
           // 参照以前的逻辑, 找到第一个达到阈值的流后,就返回该流 id
-          if (volume > 45) {
+          if (volume > this._volumeThreshold) {
             // 过滤掉自己的流
             if (streamId === '0') {
               continue;

package/lib-es/creator/provider-initializer.browser.js

@@ -246,7 +246,8 @@ export var FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
         interpreterData: sharedInterpreterDataSource,
         deviceProvider: deviceProvider,
         screenShareProvider: screenShareProvider,
-        streamControl: streamControl
+        streamControl: streamControl,
+        volumeThreshold: 45
       });
       objectManager.setObject(FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER, userAudioVolumeProvider);
       var pinDataSource = new FcrUISharedPinDataSourceImpl(messageProvider, videoWindowDataSource);

package/lib-es/creator/provider-initializer.electron.js

@@ -284,7 +284,8 @@ export var FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
         interpreterData: sharedInterpreterDataSource,
         deviceProvider: deviceProvider,
         screenShareProvider: screenShareProvider,
-        streamControl: streamControl
+        streamControl: streamControl,
+        volumeThreshold: 35
       });
       objectManager.setObject(FcrUIObjectKeys.P_USER_AUDIO_VOLUME_PROVIDER, userAudioVolumeProvider);
       var pinDataSource = new FcrUISharedPinDataSourceImpl(messageProvider, sharedVideoWindowDataSource);

package/lib-es/fragments/annotation/style.css

@@ -4,5 +4,6 @@
 }
 
 body {
+  margin: 0;
   background: rgba(0, 0, 0, 0.01);
 }

package/lib-es/fragments/whiteboard/style.css

@@ -1,3 +1,7 @@
+body {
+  margin: 0;
+}
+
 .fcr-fragment-whiteboard-view {
   width: 100vw;
   height: 100vh;

package/lib-es/modules/chat/chat-room-store.js

@@ -969,8 +969,10 @@ export var ChatRoomStore = /*#__PURE__*/function () {
     }
   }, {
     key: "_handleConnectionUpdated",
-    value: function _handleConnectionUpdated(_, state) {
-      this.chatRoomState = state;
+    value: function _handleConnectionUpdated(_, state, roomType) {
+      if (roomType === this._type) {
+        this.chatRoomState = state;
+      }
     }
   }, {
     key: "_initChatRoomConnectionState",

package/lib-es/modules/control-bar/store.js

@@ -485,6 +485,11 @@ var ControlBarStore = /*#__PURE__*/function () {
     get: function get() {
       return this._abilityProvider.isRecordingSupported();
     }
+  }, {
+    key: "isAnnotationSupported",
+    get: function get() {
+      return this._abilityProvider.isAnnotationSupported();
+    }
   }, {
     key: "meetingTimeKey",
     get: function get() {
@@ -511,9 +516,9 @@ var ControlBarStore = /*#__PURE__*/function () {
       return this._privilegeProvider.hasAnnotationAllowWritePermission();
     }
   }, {
-    key: "hasAnnotationStartPermission",
+    key: "hasAnnotationWritePermission",
     get: function get() {
-      return this._privilegeProvider.hasAnnotationStartPermission();
+      return this._privilegeProvider.hasAnnotationWritePermission();
     }
   }, {
     key: "liveStreamingButtonVisible",

package/lib-es/modules/control-bar/view.js

@@ -519,7 +519,8 @@ var AnnotationSection = observer(function () {
     clearAnnotation = _useContext11.clearAnnotation,
     isWriteAnnotationAllowed = _useContext11.isWriteAnnotationAllowed,
     hasPermissionAllowWriteAnnotation = _useContext11.hasPermissionAllowWriteAnnotation,
-    hasAnnotationStartPermission = _useContext11.hasAnnotationStartPermission;
+    isAnnotationSupported = _useContext11.isAnnotationSupported,
+    hasAnnotationWritePermission = _useContext11.hasAnnotationWritePermission;
   var _useContext12 = useContext(ControlBarCalculationContext),
     isShareActionNavHidden = _useContext12.isShareActionNavHidden;
   var _useState11 = useState(false),
@@ -531,6 +532,16 @@ var AnnotationSection = observer(function () {
       setVisible(false);
     }
   }, [isShareActionNavHidden]);
+
+  // 不支持标注的能力, 不显示按钮
+  if (!isAnnotationSupported) {
+    return null;
+  }
+
+  // 没有标注写权限, 不显示按钮
+  if (!hasAnnotationWritePermission) {
+    return null;
+  }
   return /*#__PURE__*/_jsx(AnnotationButton, {
     onAllowWriteClick: allowWriteAnnotation,
     onCleanAnnotationClick: clearAnnotation,

package/lib-es/providers/user-audio-volume-provider.js

@@ -92,7 +92,7 @@ import { FcrUIWindowType } from '../type';
 _ref = (_updateAudioVolumesDecs = throttled(16, {
   leading: false,
   trailing: true
-}), "_audioVolumeData");
+}), "_volumeThreshold");
 export var FcrUIUserAudioVolumeProviderImpl = /*#__PURE__*/function () {
   function FcrUIUserAudioVolumeProviderImpl(params) {
     var _this = this;
@@ -115,6 +115,7 @@ export var FcrUIUserAudioVolumeProviderImpl = /*#__PURE__*/function () {
     this._deviceProvider = params.deviceProvider;
     this._screenShareProvider = params.screenShareProvider;
     this._streamControl = params.streamControl;
+    this._volumeThreshold = params.volumeThreshold;
     this._streamControl.addObserver(this._streamControlObserver);
     this._deviceProvider.setMicrophoneVolumeLevelDelegate(this._handleMicrophoneVolumeUpdated);
     this._disposers.push(reaction(function () {
@@ -230,7 +231,7 @@ export var FcrUIUserAudioVolumeProviderImpl = /*#__PURE__*/function () {
             streamId = _step$value[0],
             volume = _step$value[1];
           // 参照以前的逻辑, 找到第一个达到阈值的流后,就返回该流 id
-          if (volume > 45) {
+          if (volume > this._volumeThreshold) {
             // 过滤掉自己的流
             if (streamId === '0') {
               continue;

package/package.json

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