Browse Source

Revert "fix(azure_speech): 恢复音频数据回调并注释ASR相关代码"

This reverts commit 09b0dc3d23.
newdev_shunjiawei
lxm 1 year ago
parent
commit
7e8a881cf5
  1. 25
      lib/modules/meeting/controllers/meeting_record_controller.dart
  2. 7
      local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureAsrHelper.kt

25
lib/modules/meeting/controllers/meeting_record_controller.dart

@ -90,7 +90,7 @@ class MeetingRecordController extends GetxController
Future<void> _reinitializeAsrService() async { Future<void> _reinitializeAsrService() async {
try { try {
// 重新初始化ASR服务 // 重新初始化ASR服务
// await _asrService.initialize(); await _asrService.initialize();
Logger.info('ASR服务重新初始化成功'); Logger.info('ASR服务重新初始化成功');
} catch (e) { } catch (e) {
@ -163,7 +163,7 @@ class MeetingRecordController extends GetxController
_bleManager.closeCodec(); _bleManager.closeCodec();
} }
_asrService.stopRecord(true); _asrService.stopRecord(true);
//_asrService.stopContinuousRecognition(); _asrService.stopContinuousRecognition();
isRecording.value = false; isRecording.value = false;
} }
@ -196,12 +196,12 @@ class MeetingRecordController extends GetxController
/// Toggles visibility of transcribed text content /// Toggles visibility of transcribed text content
Future<void> toggleTextDisplay() async { Future<void> toggleTextDisplay() async {
// final recognitionStream = await _asrService.recognizeCallback(); final recognitionStream = await _asrService.recognizeCallback();
// _recognitionSubscription?.cancel(); _recognitionSubscription?.cancel();
// _recognitionSubscription = _recognitionSubscription =
// recognitionStream.listen(_handleRecognitionEvent); recognitionStream.listen(_handleRecognitionEvent);
//await _asrService.startContinuousRecognition(_audioSourceType); await _asrService.startContinuousRecognition(_audioSourceType);
showTextContent.toggle(); showTextContent.toggle();
} }
@ -242,8 +242,8 @@ class MeetingRecordController extends GetxController
/// Starts recording session /// Starts recording session
Future<void> _startRecording() async { Future<void> _startRecording() async {
// Initialize speech recognition // Initialize speech recognition
// final recognitionStream = final recognitionStream =
// await _asrService.startContinuousRecognition(_audioSourceType); await _asrService.startContinuousRecognition(_audioSourceType);
// Prepare storage directory // Prepare storage directory
final appDir = await appDocDir; final appDir = await appDocDir;
@ -284,14 +284,14 @@ class MeetingRecordController extends GetxController
/// Pauses current recording session /// Pauses current recording session
Future<void> _pauseRecording() async { Future<void> _pauseRecording() async {
// await _asrService.stopContinuousRecognition(); await _asrService.stopContinuousRecognition();
await _asrService.pauseRecord(); await _asrService.pauseRecord();
pauseTimer(); pauseTimer();
} }
/// Resumes paused recording session /// Resumes paused recording session
Future<void> _resumeRecording() async { Future<void> _resumeRecording() async {
//await _asrService.startContinuousRecognition(_audioSourceType); await _asrService.startContinuousRecognition(_audioSourceType);
startTimer(); startTimer();
} }
@ -303,7 +303,6 @@ class MeetingRecordController extends GetxController
intermediateContent.value = event.text; intermediateContent.value = event.text;
break; break;
case RecognitionEventType.onAudio: case RecognitionEventType.onAudio:
print("音波数据:${event.audio!.length}");
// 添加新音频数据到波形 // 添加新音频数据到波形
_processAudioData(event.audio!); _processAudioData(event.audio!);
break; break;
@ -462,7 +461,7 @@ class MeetingRecordController extends GetxController
} }
} }
//await _asrService.stopContinuousRecognition(); await _asrService.stopContinuousRecognition();
_resetToDefaultState(); _resetToDefaultState();
isRecording.value = false; isRecording.value = false;
} }

7
local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureAsrHelper.kt

@ -717,7 +717,7 @@ class AzureAsrHelper(private val context: Context) {
if (bytesToWrite < data.size) data.copyOf(bytesToWrite) else data if (bytesToWrite < data.size) data.copyOf(bytesToWrite) else data
try { try {
continuousCallback?.onAudio(finalData) //continuousCallback?.onAudio(finalData)
pushAudioStream?.write(finalData) pushAudioStream?.write(finalData)
recordfile?.saveAudioDataToWav(finalData) recordfile?.saveAudioDataToWav(finalData)
} catch (e: Exception) { } catch (e: Exception) {
@ -922,7 +922,6 @@ class AzureAsrHelper(private val context: Context) {
fun onError(error: String) fun onError(error: String)
} }
/** /**
* 连续识别回调接口 * 连续识别回调接口
*/ */
@ -954,9 +953,9 @@ class AzureAsrHelper(private val context: Context) {
fun onSessionStopped() fun onSessionStopped()
/** /**
* 返回音频数据 * 返回音频
* *
* @param data 音频字节数组 * @param data 识别的音频
*/ */
fun onAudio(data: ByteArray) fun onAudio(data: ByteArray)

Loading…
Cancel
Save