diff --git a/lib/modules/translation/controllers/translation_controller.dart b/lib/modules/translation/controllers/translation_controller.dart index f9e4ac3f9..06211dbe8 100644 --- a/lib/modules/translation/controllers/translation_controller.dart +++ b/lib/modules/translation/controllers/translation_controller.dart @@ -637,13 +637,6 @@ class TranslationController extends GetxController with WidgetsBindingObserver { } print("处理识别中事件:${event.text}"); handleIntermediateResult(event.text); - } else if (event.type == RecognitionEventType.finalResult1 && - event.text.isNotEmpty) { - if (event.detectedLanguage.isNotEmpty) { - detectedLanguageCode1.value = event.detectedLanguage; - } - latestRecognitionText.value = event.text; - print("处理麦:${event.text}"); } else if (event.type == RecognitionEventType.error) { Get.snackbar('error'.tr, event.error); isRecognizing.value = false; @@ -948,11 +941,9 @@ class TranslationController extends GetxController with WidgetsBindingObserver { /// 处理TTS播放 /// [translationResult] 翻译结果 Future _handleTtsPlayback(String translationResult) async { - //if (isTtsEnabled.value && currentMode.value != 'faceToFace') { - await playTranslatedText(translationResult); - // } else { - // await _handleFaceToFaceTts(translationResult); - // } + if (isTtsEnabled.value) { + await playTranslatedText(translationResult); + } } // /// 处理面对面TTS diff --git a/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleAgent.kt b/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleAgent.kt index 3c4cb9144..73a2e51c9 100644 --- a/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleAgent.kt +++ b/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleAgent.kt @@ -135,7 +135,7 @@ Log.d(TAG, "手动启动语音识别: ") AgentService.pushAudioData(data) // 可选:处理音频数据 } - override fun onAudioDataReceived1(data: ByteArray) { + override fun onAudioDataReceivedCall(data: ByteArray) { } /** diff --git a/local_plugins/agent_service/ios/agent_service/Sources/agent_service/AgentServiceImpl.swift b/local_plugins/agent_service/ios/agent_service/Sources/agent_service/AgentServiceImpl.swift index e6701e459..0b15a3942 100644 --- a/local_plugins/agent_service/ios/agent_service/Sources/agent_service/AgentServiceImpl.swift +++ b/local_plugins/agent_service/ios/agent_service/Sources/agent_service/AgentServiceImpl.swift @@ -1510,7 +1510,7 @@ extension AgentServiceImpl: BleService.Callback { pushAudioData(data) } - func onAudioDataReceived1(data: Data) { + func onAudioDataReceivedCall(data: Data) { } diff --git a/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt b/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt index e568d9ac3..2341bfb48 100644 --- a/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt +++ b/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt @@ -1003,9 +1003,9 @@ class AzureSpeechPlugin : BleService.Callback, FlutterPlugin { // 可选:处理音频数据 } - override fun onAudioDataReceived1(data: ByteArray) { + override fun onAudioDataReceivedCall(data: ByteArray) { - // FileLogger.d(tag, "onAudioDataReceived1: ${data.size}") + // FileLogger.d(tag, "onAudioDataReceivedCall: ${data.size}") azureAstHelper.pushAudioData(data) // 可选:处理音频数据 diff --git a/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift b/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift index 2f5f25bd5..d7d1a04d4 100644 --- a/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift +++ b/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift @@ -947,7 +947,7 @@ extension AzureSpeechPlugin: BleService.Callback { /// 接收到音频数据回调1 /// - Parameter data: 音频数据 - public func onAudioDataReceived1(data: Data) { + public func onAudioDataReceivedCall(data: Data) { // 安全解包版本 guard let audioStream = azureAstHelper.audioProcessor else { os_log("音频流未初始化", type: .error) diff --git a/local_plugins/azure_speech/ios/azure_speech/Sources/tools/MicrophoneCapture.swift b/local_plugins/azure_speech/ios/azure_speech/Sources/tools/MicrophoneCapture.swift index 06ecbeaab..a175aa829 100644 --- a/local_plugins/azure_speech/ios/azure_speech/Sources/tools/MicrophoneCapture.swift +++ b/local_plugins/azure_speech/ios/azure_speech/Sources/tools/MicrophoneCapture.swift @@ -318,7 +318,7 @@ public class MicrophoneCapture: NSObject { // 转换成功且无错误 if status == .haveData, error == nil { let data = strongSelf.audioBufferToData(convertedBuffer) - print("转换后数据长度: \(data.count)") + //print("转换后数据长度: \(data.count)") strongSelf.audioDataHandler?(data) } } diff --git a/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleService.kt b/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleService.kt index dc8389a0e..4f4660c80 100644 --- a/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleService.kt +++ b/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleService.kt @@ -55,7 +55,7 @@ object BleService { // 数据相关回调 fun onAudioDataReceived(data: ByteArray) // 数据相关回调 - fun onAudioDataReceived1(data: ByteArray) + fun onAudioDataReceivedCall(data: ByteArray) // 唤醒信号相关回调 fun onWakeupSignalReceived() @@ -1995,7 +1995,7 @@ startBytesStatistics() private fun notifyAudioDataReceived1(data: ByteArray) { for (callback in callbacks) { try { - callback.onAudioDataReceived1(data) + callback.onAudioDataReceivedCall(data) } catch (e: Exception) { Log.e(TAG, "分发音频数据回调异常", e) } diff --git a/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleServicePlugin.kt b/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleServicePlugin.kt index 12a29477d..80fcb7780 100644 --- a/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleServicePlugin.kt +++ b/local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleServicePlugin.kt @@ -361,7 +361,7 @@ class BleServicePlugin : FlutterPlugin, MethodCallHandler, ActivityAware, // sendEvent(dataEventSink, mapOf("type" to "audioData", "data" to data), "发送音频数据异常") } - override fun onAudioDataReceived1(data: ByteArray) { + override fun onAudioDataReceivedCall(data: ByteArray) { // sendEvent(dataEventSink, mapOf("type" to "audioData", "data" to data), "发送音频数据异常") } diff --git a/local_plugins/ble_service/ios/ble_service/Sources/ble_service/BleService.swift b/local_plugins/ble_service/ios/ble_service/Sources/ble_service/BleService.swift index f7972197a..942728de5 100644 --- a/local_plugins/ble_service/ios/ble_service/Sources/ble_service/BleService.swift +++ b/local_plugins/ble_service/ios/ble_service/Sources/ble_service/BleService.swift @@ -28,7 +28,7 @@ public class BleService: NSObject { // 数据相关回调 func onAudioDataReceived(data: Data) - func onAudioDataReceived1(data: Data) + func onAudioDataReceivedCall(data: Data) // 唤醒信号回调 func onWakeupSignalReceived() @@ -532,7 +532,7 @@ private var cmdReplyType: UInt8 = 0 /// 通知所有回调接收到音频数据 private func notifyAudioDataReceived1(data: Data) { for callback in callbacks { - callback.onAudioDataReceived1(data: data) + callback.onAudioDataReceivedCall(data: data) } } @@ -1189,7 +1189,7 @@ extension BleService: SwiftOpusAudioProcessor.AudioDataCallback { } /// 接收到解码后的PCM音频数据 - func onAudioDataReceived1(data: Data) { + func onAudioDataReceivedCall(data: Data) { notifyAudioDataReceived1(data: data) } diff --git a/local_plugins/ble_service/ios/ble_service/Sources/ble_service/SwiftBleServicePlugin.swift b/local_plugins/ble_service/ios/ble_service/Sources/ble_service/SwiftBleServicePlugin.swift index 4a664d583..da70071fe 100644 --- a/local_plugins/ble_service/ios/ble_service/Sources/ble_service/SwiftBleServicePlugin.swift +++ b/local_plugins/ble_service/ios/ble_service/Sources/ble_service/SwiftBleServicePlugin.swift @@ -236,7 +236,7 @@ extension SwiftBleServicePlugin: BleService.Callback { } } - public func onAudioDataReceived1(data: Data) { + public func onAudioDataReceivedCall(data: Data) { } diff --git a/local_plugins/ble_service/ios/ble_service/Sources/ble_service/SwiftOpusAudioProcessor.swift b/local_plugins/ble_service/ios/ble_service/Sources/ble_service/SwiftOpusAudioProcessor.swift index 5f4c4c69d..5030de4ee 100644 --- a/local_plugins/ble_service/ios/ble_service/Sources/ble_service/SwiftOpusAudioProcessor.swift +++ b/local_plugins/ble_service/ios/ble_service/Sources/ble_service/SwiftOpusAudioProcessor.swift @@ -9,7 +9,7 @@ class SwiftOpusAudioProcessor: NSObject { /// 音频数据回调协议 protocol AudioDataCallback: AnyObject { func onAudioDataReceived(data: Data) - func onAudioDataReceived1(data: Data) + func onAudioDataReceivedCall(data: Data) func onEncodedDataReceived(data: Data) // 编码数据回调 } @@ -336,7 +336,7 @@ class SwiftOpusAudioProcessor: NSObject { // 回调分离后的音频数据 DispatchQueue.main.async { [weak self] in self?.callback?.onAudioDataReceived(data: rightBuffer) - self?.callback?.onAudioDataReceived1(data: leftBuffer) + self?.callback?.onAudioDataReceivedCall(data: leftBuffer) } } diff --git a/local_plugins/ota/android/src/main/kotlin/com/example/ota/OtaPlugin.kt b/local_plugins/ota/android/src/main/kotlin/com/example/ota/OtaPlugin.kt index 1830237b1..083ce0f70 100644 --- a/local_plugins/ota/android/src/main/kotlin/com/example/ota/OtaPlugin.kt +++ b/local_plugins/ota/android/src/main/kotlin/com/example/ota/OtaPlugin.kt @@ -383,7 +383,7 @@ class OtaPlugin : BleService.Callback, FlutterPlugin, MethodCallHandler { // 可选:处理音频数据 } - override fun onAudioDataReceived1(data: ByteArray) { + override fun onAudioDataReceivedCall(data: ByteArray) { } /**