Browse Source

Merge branch 'new_dev' of https://github.com/deepcloud2048/deep_voice into new_dev

newdev_shunjiawei
tanlongsheng 1 year ago
parent
commit
a0e062aa4e
  1. 3
      lib/data/services/asr_service.dart
  2. 3
      lib/data/services/ast_service.dart
  3. 12
      lib/data/services/speech_impl/azure_asr_service.dart
  4. 7
      lib/data/services/speech_impl/azure_ast_service.dart
  5. 4
      lib/modules/meeting/controllers/meeting_record_controller.dart
  6. 3
      lib/modules/speech_test/controllers/speech_test_controller.dart
  7. 4
      local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt
  8. 8
      local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureAsrHelper.kt
  9. 8
      local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt

3
lib/data/services/asr_service.dart

@ -85,9 +85,6 @@ enum RecognitionEventType {
/// 中间识别结果(实时反馈)
intermediateResult,
/// 音频
onAudio,
/// 会话开始
sessionStarted,

3
lib/data/services/ast_service.dart

@ -36,9 +36,6 @@ enum RecognitionEventType1 {
/// 中间识别结果(实时反馈)
intermediateResult,
/// 音频
onAudio,
/// 会话开始
sessionStarted,

12
lib/data/services/speech_impl/azure_asr_service.dart

@ -261,11 +261,6 @@ class AzureAsrService extends GetxService implements AsrService {
// 发送到音频数据流
_audioDataStreamController?.add(data);
// 也可以通过识别事件流发送
_eventStreamController?.add(RecognitionEvent(
type: RecognitionEventType.onAudio,
audio: data,
));
break;
}
}
@ -322,13 +317,6 @@ class AzureAsrService extends GetxService implements AsrService {
detectedLanguage: detectedLanguage,
));
break;
case 'onAudio':
final Uint8List data = eventMap['data'] as Uint8List? ?? Uint8List(0);
_eventStreamController?.add(RecognitionEvent(
type: RecognitionEventType.onAudio,
audio: data,
));
break;
case 'sessionStarted':
_eventStreamController?.add(RecognitionEvent(
type: RecognitionEventType.sessionStarted,

7
lib/data/services/speech_impl/azure_ast_service.dart

@ -97,13 +97,6 @@ class AzureAstService extends GetxService implements AstService {
detectedLanguage: detectedLanguage,
));
break;
case 'onAudio':
final Uint8List data = eventMap['data'] as Uint8List? ?? Uint8List(0);
_eventStreamController?.add(RecognitionEvent1(
type: RecognitionEventType1.onAudio,
audio: data,
));
break;
case 'sessionStarted':
_eventStreamController?.add(RecognitionEvent1(
type: RecognitionEventType1.sessionStarted,

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

@ -320,10 +320,6 @@ class MeetingRecordController extends GetxController
case RecognitionEventType.intermediateResult:
intermediateContent.value = event.text;
break;
case RecognitionEventType.onAudio:
// 添加新音频数据到波形
_processAudioData(event.audio!);
break;
case RecognitionEventType.finalResult:
finalContent.value += _formatTranscript(event);
intermediateContent.value = '';

3
lib/modules/speech_test/controllers/speech_test_controller.dart

@ -184,9 +184,6 @@ class SpeechTestController extends GetxController {
// 清空中间结果
intermediateResult.value = '';
break;
case RecognitionEventType.onAudio:
// TODO: Handle this case.
break;
}
}, onError: (error) {
isListening.value = false;

4
local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt

@ -591,9 +591,7 @@ object AgentService : CoroutineScope {
}
override fun onAudio(data: ByteArray) {
}
override fun onSessionStopped() {
sendEvent("recognition_stopped", mapOf("status" to "stopped"))

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

@ -681,13 +681,7 @@ class AzureAsrHelper(private val context: Context) {
*/
fun onSessionStopped()
/**
* 返回音频
*
* @param data 识别的音频
*/
fun onAudio(data: ByteArray)
/**
* 识别取消时调用
*

8
local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt

@ -242,14 +242,6 @@ class AzureSpeechPlugin : BleService.Callback, FlutterPlugin {
sendAsrEvent(mapOf("type" to "sessionStopped"))
}
override fun onAudio(data: ByteArray) {
sendAsrEvent(
mapOf(
"type" to "onAudio",
"data" to data
)
)
}
override fun onCanceled(reason: String, errorDetails: String) {

Loading…
Cancel
Save