Browse Source

Merge commit 'cfedd104f1181ff3807cbb7fa9618e2e5b3cf29d' into new_dev

newdev_shunjiawei
lxm 1 year ago
parent
commit
839dd3dc27
  1. 10
      lib/modules/translation/controllers/translation_controller.dart
  2. 21
      local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureAsrHelper.kt
  3. 7
      local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt

10
lib/modules/translation/controllers/translation_controller.dart

@ -572,11 +572,11 @@ class TranslationController extends GetxController {
}
Future<void> _startAsrService() async {
if (bluetoothManager.currentDeviceRx.value != null) {
restoreOriginalAudioState();
} else {
disableBluetoothAudio();
}
// if (bluetoothManager.currentDeviceRx.value != null) {
// restoreOriginalAudioState();
// } else {
// disableBluetoothAudio();
// }
await _asrService.startContinuousRecognition(_audioSourceType);
}

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

@ -487,9 +487,9 @@ class AzureAsrHelper(private val context: Context) {
return false
}
if (!isContinuousRecognitionActive) {
return true
}
// if (!isContinuousRecognitionActive) {
// return true
// }
try {
@ -884,20 +884,7 @@ class AzureAsrHelper(private val context: Context) {
}
setupEventListeners(callback)
// 重新启动音频处理
if (audioStream?.isWriting() != true) {
audioStream?.startAudioRecord(
when (audioSourceType) {
AudioSourceType.MICROPHONE -> SimpleAudioReceiver.AudioSourceType.MICROPHONE
AudioSourceType.EXTERNAL -> SimpleAudioReceiver.AudioSourceType.EXTERNAL
},
null
)
}
// 重新启动连续识别
recognizer?.startContinuousRecognitionAsync()
isNetworkRecovering = false
Log.d(tag, "连续识别重新启动成功")

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

@ -256,10 +256,11 @@ class AzureSpeechPlugin : BleService.Callback, FlutterPlugin {
}
override fun onError(error: String) {
override fun onError(code: Int, error: String) {
sendAsrEvent(
mapOf(
"type" to "error",
"code" to code,
"message" to error
)
)
@ -386,8 +387,8 @@ class AzureSpeechPlugin : BleService.Callback, FlutterPlugin {
)
}
override fun onError(error: String) {
result.error("RECOGNITION_ERROR", error, null)
override fun onError(code: Int, error: String) {
result.error(code.toString(), "错误码: $code, 错误信息: $error", null)
}
}, audioSourceType)
} catch (e: Exception) {

Loading…
Cancel
Save