fcr-ui-scene 3.8.0-alpha → 3.8.1-alpha

package/lib/modules/setting/audio-settings/index.css

@@ -1,195 +1,195 @@
-.fcr-device-settings-audio {
-  padding-top: 15px;
-}
-
-.fcr-device-settings-audio__section {
-  margin-top: 10px;
-  border-radius: var(--fcr_cornerradius_s);
-  width: 100%;
-  background: var(--fcr_mobile_ui_scene_color_popup_block5);
-}
-.fcr-device-settings-audio__section:first-child {
-  margin-top: 0;
-}
-
-.fcr-device-settings-audio__section:last-child {
-  margin-bottom: 10px;
-}
-
-.fcr-device-settings-audio__section:nth-child(2) {
-  margin-top: 15px;
-}
-
-.fcr-device-settings-audio__section-title {
-  padding: 0 10px 0 12px;
-  font-size: 13px;
-  line-height: 32px;
-  font-weight: 700;
-  color: var(--fcr_ui_scene_icontext1);
-}
-.fcr-device-settings-audio__switch-wrapper {
-  padding: 0 10px 0 12px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.fcr-device-settings-audio__switch-wrapper-switch {
-  flex-shrink: 0;
-}
-
-.fcr-device-settings-audio__switch-wrapper-orinalvoise-tip {
-  font-size: 12px;
-}
-
-.fcr-device-settings-audio__switch-title {
-  padding: 0 10px 0 12px;
-  font-size: 12px;
-  line-height: 18px;
-  color: var(--fcr_ui_scene_icontext1);
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.fcr-device-settings-audio__checkbox-item {
-  gap: 8px;
-  font-size: 12px;
-  line-height: 32px;
-  color: var(--fcr_ui_scene_icontext1);
-  display: flex;
-  align-items: center;
-}
-
-.fcr-device-settings-audio__options-section {
-  background-color: var(--fcr_mobile_ui_scene_color_popup_fill2);
-  border-radius: var(--fcr_cornerradius_s);
-  padding: 10px 12px;
-  margin: 10px;
-}
-/* .fcr-device-settings-audio__options {
-  padding-left: 28px;
-} */
-
-.fcr-device-settings-audio__section .fcr-radio {
-  min-width: 100px;
-  padding: 6px 10px;
-  align-items: start;
-}
-.fcr-device-settings-audio__section .fcr-radio .fcr-radio-label {
-  padding-left: 6px;
-  line-height: 20px;
-}
-.fcr-device-settings-audio__section-title + .fcr-radio {
-  margin-top: 4px;
-}
-
-.fcr-device-settings-audio__radio-label-addition {
-  font-size: 12px;
-  line-height: 1;
-  color: var(--fcr_ui_scene_icontext2);
-}
-
-.fcr-device-settings-audio__form-item {
-  height: 32px;
-  padding: 0 10px;
-  display: flex;
-  align-items: center;
-  column-gap: 22px;
-}
-.fcr-device-settings-audio__form-item .fcr-slider.is-disabled {
-  border: none;
-}
-
-.fcr-device-settings-audio__form-label {
-  font-size: 12px;
-  line-height: 16px;
-  font-weight: 300;
-  color: var(--fcr_ui_scene_icontext1);
-}
-
-.fcr-device-settings-audio__form-item .fcr-volume-indicator {
-  flex-grow: 1;
-}
-
-.fcr-device-settings-audio__form-item .fcr-slider {
-  flex-grow: 1;
-}
-
-.fcr-device-settings-audio__checkbox-wrapper--bordered {
-  margin-top: 5px;
-  border-top: 1px solid var(--fcr_ui_scene_line2);
-  /* height: 46px; */
-  padding: 8px 8px;
-  display: flex;
-  /* align-items: center; */
-  /* gap: 10px; */
-  flex-direction: column;
-}
-.fcr-device-settings-audio__checkbox-wrapper--bordered .fcr-checkbox {
-  /* height: 32px; */
-  align-items: start;
-  margin: 6px 0;
-}
-
-.fcr-device-settings-audio__checkbox-wrapper--bordered .fcr-checkbox-label {
-  font-size: 14px;
-  font-weight: 400;
-  color: var(--fcr_ui_scene_icontext1);
-  line-height: 20px;
-}
-
-.fcr-device-settings-audio__section-reduce-noise {
-  padding-bottom: 10px;
-}
-
-.fcr-device-settings-audio__section-reduce-noise .fcr-radio-label {
-  white-space: pre-wrap;
-  line-height: 16px;
-}
-
-.fcr-device-settings-audio__section-pro-audio {
-  padding-bottom: 10px;
-}
-
-.fcr-device-settings-audio__section-pro-audio .fcr-checkbox {
-  margin-top: 4px;
-  height: 32px;
-  padding: 0 8px;
-}
-
-.fcr-device-settings-audio .fcr-device-settings-advance-link {
-  margin-top: 10px;
-}
-
-.fcr-speaker-detection,
-.fcr-microphone-detection {
-  height: 32px;
-  padding: 0 10px;
-  display: flex;
-  align-items: center;
-  column-gap: 8px;
-}
-
-.fcr-speaker-detection .fcr-select-wrapper,
-.fcr-microphone-detection .fcr-select-wrapper {
-  flex-grow: 1;
-  min-width: 0;
-}
-
-.fcr-speaker-detection .fcr-button,
-.fcr-microphone-detection .fcr-button {
-  flex-shrink: 0;
-  border-radius: var(--fcr_cornerradius_xs);
-  padding: 0 4px;
-}
-.fcr-speaker-detection .fcr-button > div,
-.fcr-microphone-detection .fcr-button > div {
-  width: 100px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.fcr-device-settings-audio__detection-wrapper {
-  margin-bottom: 8px;
-}
+.fcr-device-settings-audio {
+  padding-top: 15px;
+}
+
+.fcr-device-settings-audio__section {
+  margin-top: 10px;
+  border-radius: var(--fcr_cornerradius_s);
+  width: 100%;
+  background: var(--fcr_mobile_ui_scene_color_popup_block5);
+}
+.fcr-device-settings-audio__section:first-child {
+  margin-top: 0;
+}
+
+.fcr-device-settings-audio__section:last-child {
+  margin-bottom: 10px;
+}
+
+.fcr-device-settings-audio__section:nth-child(2) {
+  margin-top: 15px;
+}
+
+.fcr-device-settings-audio__section-title {
+  padding: 0 10px 0 12px;
+  font-size: 13px;
+  line-height: 32px;
+  font-weight: 700;
+  color: var(--fcr_ui_scene_icontext1);
+}
+.fcr-device-settings-audio__switch-wrapper {
+  padding: 0 10px 0 12px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.fcr-device-settings-audio__switch-wrapper-switch {
+  flex-shrink: 0;
+}
+
+.fcr-device-settings-audio__switch-wrapper-orinalvoise-tip {
+  font-size: 12px;
+}
+
+.fcr-device-settings-audio__switch-title {
+  padding: 0 10px 0 12px;
+  font-size: 12px;
+  line-height: 18px;
+  color: var(--fcr_ui_scene_icontext1);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.fcr-device-settings-audio__checkbox-item {
+  gap: 8px;
+  font-size: 12px;
+  line-height: 32px;
+  color: var(--fcr_ui_scene_icontext1);
+  display: flex;
+  align-items: center;
+}
+
+.fcr-device-settings-audio__options-section {
+  background-color: var(--fcr_mobile_ui_scene_color_popup_fill2);
+  border-radius: var(--fcr_cornerradius_s);
+  padding: 10px 12px;
+  margin: 10px;
+}
+/* .fcr-device-settings-audio__options {
+  padding-left: 28px;
+} */
+
+.fcr-device-settings-audio__section .fcr-radio {
+  min-width: 100px;
+  padding: 6px 10px;
+  align-items: start;
+}
+.fcr-device-settings-audio__section .fcr-radio .fcr-radio-label {
+  padding-left: 6px;
+  line-height: 20px;
+}
+.fcr-device-settings-audio__section-title + .fcr-radio {
+  margin-top: 4px;
+}
+
+.fcr-device-settings-audio__radio-label-addition {
+  font-size: 12px;
+  line-height: 1;
+  color: var(--fcr_ui_scene_icontext2);
+}
+
+.fcr-device-settings-audio__form-item {
+  height: 32px;
+  padding: 0 10px;
+  display: flex;
+  align-items: center;
+  column-gap: 22px;
+}
+.fcr-device-settings-audio__form-item .fcr-slider.is-disabled {
+  border: none;
+}
+
+.fcr-device-settings-audio__form-label {
+  font-size: 12px;
+  line-height: 16px;
+  font-weight: 300;
+  color: var(--fcr_ui_scene_icontext1);
+}
+
+.fcr-device-settings-audio__form-item .fcr-volume-indicator {
+  flex-grow: 1;
+}
+
+.fcr-device-settings-audio__form-item .fcr-slider {
+  flex-grow: 1;
+}
+
+.fcr-device-settings-audio__checkbox-wrapper--bordered {
+  margin-top: 5px;
+  border-top: 1px solid var(--fcr_ui_scene_line2);
+  /* height: 46px; */
+  padding: 8px 8px;
+  display: flex;
+  /* align-items: center; */
+  /* gap: 10px; */
+  flex-direction: column;
+}
+.fcr-device-settings-audio__checkbox-wrapper--bordered .fcr-checkbox {
+  /* height: 32px; */
+  align-items: start;
+  margin: 6px 0;
+}
+
+.fcr-device-settings-audio__checkbox-wrapper--bordered .fcr-checkbox-label {
+  font-size: 14px;
+  font-weight: 400;
+  color: var(--fcr_ui_scene_icontext1);
+  line-height: 20px;
+}
+
+.fcr-device-settings-audio__section-reduce-noise {
+  padding-bottom: 10px;
+}
+
+.fcr-device-settings-audio__section-reduce-noise .fcr-radio-label {
+  white-space: pre-wrap;
+  line-height: 16px;
+}
+
+.fcr-device-settings-audio__section-pro-audio {
+  padding-bottom: 10px;
+}
+
+.fcr-device-settings-audio__section-pro-audio .fcr-checkbox {
+  margin-top: 4px;
+  height: 32px;
+  padding: 0 8px;
+}
+
+.fcr-device-settings-audio .fcr-device-settings-advance-link {
+  margin-top: 10px;
+}
+
+.fcr-speaker-detection,
+.fcr-microphone-detection {
+  height: 32px;
+  padding: 0 10px;
+  display: flex;
+  align-items: center;
+  column-gap: 8px;
+}
+
+.fcr-speaker-detection .fcr-select-wrapper,
+.fcr-microphone-detection .fcr-select-wrapper {
+  flex-grow: 1;
+  min-width: 0;
+}
+
+.fcr-speaker-detection .fcr-button,
+.fcr-microphone-detection .fcr-button {
+  flex-shrink: 0;
+  border-radius: var(--fcr_cornerradius_xs);
+  padding: 0 4px;
+}
+.fcr-speaker-detection .fcr-button > div,
+.fcr-microphone-detection .fcr-button > div {
+  width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.fcr-device-settings-audio__detection-wrapper {
+  margin-bottom: 8px;
+}

package/lib/modules/setting/audio-whiteList/audio-device-adaptation.d.ts

@@ -1,3 +1,4 @@
+import { FcrUIAiDenoiseLevel } from '../../../type';
 export interface AudioDeviceAdaptationConfig {
     /**
      * WhiteList device ID list
@@ -16,3 +17,30 @@ export interface AudioDeviceAdaptationConfig {
  * Audio device whiteList configuration
  */
 export declare const AUDIO_DEVICE_WHITE_LIST_CONFIG: AudioDeviceAdaptationConfig;
+/**
+ * Audio device configuration for individual device
+ */
+export interface AudioDeviceConfig {
+    audioEchoCancellation: boolean;
+    audioAgc: boolean;
+    noiseReduce: FcrUIAiDenoiseLevel;
+}
+/**
+ * Device profile with name and audio configuration
+ */
+export interface DeviceProfile {
+    deviceName: string;
+    config: AudioDeviceConfig;
+}
+/**
+ * Device-specific audio configurations
+ * Key: deviceId (format: "vendorId:productId")
+ * Value: device profile with name and config
+ */
+export declare const DEVICE_SPECIFIC_CONFIGS: Record<string, DeviceProfile>;
+/**
+ * Get audio configuration for a specific device
+ * @param deviceId Device ID in format "vendorId:productId"
+ * @returns AudioDeviceConfig if device has specific config, undefined otherwise
+ */
+export declare function getDeviceSpecificConfig(deviceId: string): AudioDeviceConfig | undefined;

package/lib/modules/setting/audio-whiteList/audio-device-adaptation.js

@@ -4,9 +4,11 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AUDIO_DEVICE_WHITE_LIST_CONFIG = void 0;
-/**
- * Audio device whiteList configuration
+exports.DEVICE_SPECIFIC_CONFIGS = exports.AUDIO_DEVICE_WHITE_LIST_CONFIG = void 0;
+exports.getDeviceSpecificConfig = getDeviceSpecificConfig;
+var _type = require("../../../type");
+/**
+ * Audio device whiteList configuration
  */
 var AUDIO_DEVICE_WHITE_LIST_CONFIG = exports.AUDIO_DEVICE_WHITE_LIST_CONFIG = {
   whiteListDeviceIds: [
@@ -23,12 +25,46 @@ var AUDIO_DEVICE_WHITE_LIST_CONFIG = exports.AUDIO_DEVICE_WHITE_LIST_CONFIG = {
   // Huawei-MIC100 Mic 100会议音箱
   '12D1:2308', //Hamedal Speak A20
   "1FC9:826B", //Hamedal A21T TEA
-  "2A5F:2005",
-  //HD Audio
-  '33F1:1016'],
+  "2A5F:2005", //HD Audio VA400
+  "33F1:1016"],
   whiteListConfig: {
     audioEchoCancellation: false,
     audioAgc: false,
     noiseReduce: 4
   }
-};
+};
+
+/**
+ * Audio device configuration for individual device
+ */
+
+/**
+ * Device profile with name and audio configuration
+ */
+
+/**
+ * Device-specific audio configurations
+ * Key: deviceId (format: "vendorId:productId")
+ * Value: device profile with name and config
+ */
+var DEVICE_SPECIFIC_CONFIGS = exports.DEVICE_SPECIFIC_CONFIGS = {
+  // INNOTRIK I-90
+  '2F9D:0091': {
+    deviceName: 'INNOTRIK I-90',
+    config: {
+      audioEchoCancellation: true,
+      audioAgc: true,
+      noiseReduce: _type.FcrUIAiDenoiseLevel.LOW
+    }
+  }
+};
+
+/**
+ * Get audio configuration for a specific device
+ * @param deviceId Device ID in format "vendorId:productId"
+ * @returns AudioDeviceConfig if device has specific config, undefined otherwise
+ */
+function getDeviceSpecificConfig(deviceId) {
+  var _DEVICE_SPECIFIC_CONF;
+  return (_DEVICE_SPECIFIC_CONF = DEVICE_SPECIFIC_CONFIGS[deviceId]) === null || _DEVICE_SPECIFIC_CONF === void 0 ? void 0 : _DEVICE_SPECIFIC_CONF.config;
+}

package/lib/modules/setting/audio-whiteList/audio-whiteList-manager.d.ts

@@ -1,26 +1,14 @@
 import { FcrUIAiDenoiseLevel } from '../../../type';
+import { AudioDeviceConfig } from './audio-device-adaptation';
 import { FcrDeviceInfo } from 'fcr-core/lib/type';
-/**
- * Audio device configuration
- * Includes audio echo cancellation, automatic gain control, noise reduction and other audio processing parameters
- */
-export interface AudioDeviceConfig {
-    audioEchoCancellation: boolean;
-    audioAgc: boolean;
-    noiseReduce: FcrUIAiDenoiseLevel;
-}
 /**
  * The manager delegates device operations and settings management to the implementing class
  */
 export interface AudioDeviceWhiteListDelegate {
-    getCurrentSetting: () => {
-        audioEchoCancellation: boolean;
-        noiseReduce: FcrUIAiDenoiseLevel;
-    };
     getMicrophoneId: () => string;
     getMicrophoneList: () => FcrDeviceInfo[];
     enableAudioEchoCancellation: (enable: boolean) => void;
-    toggleAgc: (enable: boolean) => void;
+    enableAudioGainControl: (enable: boolean) => void;
     setNoiseLevel: (level: FcrUIAiDenoiseLevel) => void;
     updateSettings: (settings: {
         audioEchoCancellation?: boolean;
@@ -40,6 +28,7 @@ export declare class AudioDeviceWhiteListManager {
     handleMicrophoneListUpdated(microphoneList: FcrDeviceInfo[]): void;
     handleMicrophoneChanged(microphoneId: string, productId: string | null, vendorId: string | null): void;
     private _handleDeviceChanged;
+    private _createDeviceConfig;
     /**
      * Get device 3A configuration (use current settings if not exists)
      */