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

lib/data/services/asr_service.dart

@@ -29,6 +29,12 @@ abstract class AsrService {
   /// 检查连续识别是否活跃
   bool isContinuousRecognitionActive();
 
+  /// 开启录音
+  Future<bool> enableRecord();
+
+  /// 停止录音
+  Future<bool> stopRecord();
+
   /// 释放资源
   Future<void> dispose();
 }

lib/data/services/speech_impl/azure_asr_service.dart

@@ -342,4 +342,28 @@ class AzureAsrService extends GetxService implements AsrService {
       return false;
     }
   }
+
+  @override
+  Future<bool> enableRecord() async {
+    try {
+      final bool result = await _channel.invokeMethod('enableRecord');
+
+      return result;
+    } catch (e) {
+      Logger.error('开始录音: ${e.toString()}');
+      rethrow;
+    }
+  }
+
+  @override
+  Future<bool> stopRecord() async {
+    try {
+      final bool result = await _channel.invokeMethod('stopRecord');
+
+      return result;
+    } catch (e) {
+      Logger.error('停止录音: ${e.toString()}');
+      rethrow;
+    }
+  }
 }

lib/modules/ota_upgrade/controllers/ota_upgrade_controller.dart

@@ -149,8 +149,20 @@ class OtaUpgradeController extends GetxController {
           deviceInfo.firmwareProductId.isEmpty) {
         throw "获取设备信息失败，请检查连接";
       }
+      // 拆分 firmwareVersion 并判断两边是否一致
+      final firmwareParts = deviceInfo.firmwareVersion.split('.');
+
+      // 从第三个 `.` 开始分割
+      final firstPart = firmwareParts.sublist(0, 3).join('.');
+      final secondPart = firmwareParts.sublist(3).join('.');
+      print("firstPart${firstPart},secondPart=${secondPart}");
+// 判断两部分是否一致
+      if (firstPart != secondPart) {
+        throw "固件版本格式错误：${deviceInfo.firmwareVersion}";
+      }
+
       // 正常流程
-      currentVersion.value = deviceInfo.firmwareVersion;
+      currentVersion.value = firstPart;
       print('getequipmentinfo,id: ${deviceInfo.firmwareProductId}');
       // API请求
       final response = await Api.getequipmentinfo({

lib/modules/translation/controllers/translation_controller.dart

@@ -33,7 +33,7 @@ class TranslationController extends GetxController {
   final isRecognizing = false.obs;
   final isTranslating = false.obs;
   final isTtsEnabled = true.obs;
-
+  final isRecording = false.obs;
   // 语言相关
   final sourceLanguage = '中文(简体)'.obs;
   final targetLanguage = '英语'.obs;
@@ -193,6 +193,16 @@ class TranslationController extends GetxController {
   // 切换TTS功能
   void toggleTts() => isTtsEnabled.toggle();
 
+  // 切换录音功能
+  Future<void> toggleisRecord() async {
+    isRecording.toggle();
+    if (isRecording.value) {
+      await _asrService.enableRecord();
+    } else {
+      await _asrService.stopRecord();
+    }
+  }
+
   // 开始语音识别
   Future<void> startRecognition() async {
     Logger.info('开始语音识别');
@@ -233,15 +243,18 @@ class TranslationController extends GetxController {
         _bleManager.openDecoder();
         // 发送ble音乐或者通话远端声音
         _audioSourceType = true;
+        isTtsEnabled.value = false; // 禁用TTS以避免干扰
         Logger.info('发送ble音乐或者通话远端声音');
       } else if (currentMode.value == "call") {
         // 发送ble系统mic和dac（音乐或者通话远端）声音
         _bleManager.openA2DPDecoder();
         _audioSourceType = true;
+        isTtsEnabled.value = true;
         Logger.info('发送ble系统mic和dac（音乐或者通话远端）声音');
       } else {
         // 开始连续语音识别
         _audioSourceType = false;
+        isTtsEnabled.value = true;
       }
       final recognitionStream =
           await _asrService.startContinuousRecognition(_audioSourceType);
@@ -476,6 +489,11 @@ class TranslationController extends GetxController {
   // 停止所有操作
   Future<void> stopAll() async {
     try {
+      if (currentMode.value == "audioVideo" || currentMode.value == "call") {
+        _bleManager.closeCodec();
+        // 发送ble音乐或者通话远端声音
+        Logger.info('发送ble音乐或者通话远端声音');
+      }
       if (isRecognizing.value) {
         await stopRecognition();
       }

lib/modules/translation/views/translation_view.dart

@@ -87,13 +87,13 @@ class TranslationView extends GetView<TranslationController> {
         // TTS toggle button
         Obx(() => IconButton(
               icon: Icon(
-                controller.isTtsEnabled.value ? Icons.mic : Icons.mic_off,
+                controller.isRecording.value ? Icons.mic : Icons.mic_off,
                 color: isDarkMode ? Colors.white : Colors.black,
                 size: 24.sp,
               ),
               // onPressed: controller.toggleTts,默认播放
-              onPressed: controller.toggleTts,
+              onPressed: controller.toggleisRecord,
-              tooltip: '自动播放翻译结果',
+              tooltip: '是否开启录音',
             )),
 
         // 历史记录按钮

local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleAgent.kt

@@ -1,8 +1,6 @@
 package com.yunqiinnovation.agent_service
 
 import android.content.Context
-import com.yunqiinnovation.agent_service.AgentService
-import com.yunqiinnovation.agent_service.AgentServiceListener
 import android.util.Log
 import com.yunqiinnovation.ble_service.BleService
 import com.yunqiinnovation.ble_service.BleConst

local_plugins/azure_speech/android/build.gradle.kts

@@ -54,5 +54,6 @@ dependencies {
     // 添加Microsoft语音SDK
     implementation("com.microsoft.cognitiveservices.speech:client-sdk:1.43.0")
     implementation(project(":speech"))
+    add("compileOnly", project(":ble_service"))
     
 } 

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

@@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit
 import java.io.File
 import java.io.FileOutputStream
 import java.io.RandomAccessFile
+
 /**
  * Azure语音识别辅助类，支持麦克风和外部音频源的单次和连续语音识别
  *
@@ -53,12 +54,16 @@ class AzureAsrHelper(private val context: Context) {
     private var region = ""
 
     // 音频源配置
-    private var audioSourceType = AudioSourceType.MICROPHONE
+    var audioSourceType = AudioSourceType.MICROPHONE
 
     // 音频处理
     private var microphoneStream: MicrophoneStream? = null
     private var externalAudioStream: ExternalAudioPullStream? = null
 
+    // 录音文件处理
+    private var recordfile: RecordingFile? = null
+    private var isRecording = false
+
     /**
      * 音频来源类型
      */
@@ -130,7 +135,8 @@ class AzureAsrHelper(private val context: Context) {
                 // 设置分段策略为时间模式
                 setProperty("Speech_SegmentationStrategy", "Time")
             }
-
+            // 录音文件类
+            recordfile = RecordingFile()
             // 创建识别器
             return setupRecognizer()
         } catch (e: Exception) {
@@ -152,7 +158,8 @@ class AzureAsrHelper(private val context: Context) {
             when (audioSourceType) {
                 AudioSourceType.MICROPHONE -> {
                     // 判断是否使用手机扬声器输出和耳机连接状态
-                    val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+                    val audioManager =
+                        context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
                     val isSpeakerphoneOn = audioManager.isSpeakerphoneOn
 
                     // 检查是否连接了有线耳机
@@ -178,6 +185,7 @@ class AzureAsrHelper(private val context: Context) {
                         audioConfig = AudioConfig.fromDefaultMicrophoneInput()
                     }
                 }
+
                 AudioSourceType.EXTERNAL -> {
                     // 改用拉流方式处理外部音频
                     setupExternalAudioStream()
@@ -186,7 +194,8 @@ class AzureAsrHelper(private val context: Context) {
 
             // 创建识别器
             recognizer = if (isAutoDetectLanguage) {
-                val autoDetectConfig = AutoDetectSourceLanguageConfig.fromLanguages(supportedLanguages.toList())
+                val autoDetectConfig =
+                    AutoDetectSourceLanguageConfig.fromLanguages(supportedLanguages.toList())
                 SpeechRecognizer(speechConfig, autoDetectConfig, audioConfig)
             } else {
                 SpeechRecognizer(speechConfig, audioConfig)
@@ -245,6 +254,7 @@ class AzureAsrHelper(private val context: Context) {
 
         // 使用拉流模式，将数据推入队列
         externalAudioStream?.pushAudio(data)
+
     }
 
     /**
@@ -252,7 +262,10 @@ class AzureAsrHelper(private val context: Context) {
      *
      * @param callback 识别结果回调
      */
-    fun recognizeOnce(callback: RecognizeCallback,  audioSourceType: AudioSourceType = AudioSourceType.MICROPHONE) {
+    fun recognizeOnce(
+        callback: RecognizeCallback,
+        audioSourceType: AudioSourceType = AudioSourceType.MICROPHONE
+    ) {
         if (speechConfig == null) {
             callback.onError("语音服务未初始化")
             return
@@ -280,7 +293,8 @@ class AzureAsrHelper(private val context: Context) {
             stopAudioProcessing()
 
             if (result != null && result.reason == ResultReason.RecognizedSpeech) {
-                val detectedLanguage = AutoDetectSourceLanguageResult.fromResult(result)?.language ?: supportedLanguages[0]
+                val detectedLanguage = AutoDetectSourceLanguageResult.fromResult(result)?.language
+                    ?: supportedLanguages[0]
                 callback.onResult(result.text, detectedLanguage)
             } else {
                 callback.onError("未能识别语音")
@@ -297,7 +311,10 @@ class AzureAsrHelper(private val context: Context) {
      * @param callback 连续识别结果回调
      * @return 是否成功开始识别
      */
-    fun startContinuousRecognition(callback: ContinuousRecognizeCallback,  audioSourceType: AudioSourceType = AudioSourceType.MICROPHONE): Boolean {
+    fun startContinuousRecognition(
+        callback: ContinuousRecognizeCallback,
+        audioSourceType: AudioSourceType = AudioSourceType.MICROPHONE
+    ): Boolean {
         if (speechConfig == null) {
             callback.onError("语音服务未初始化")
             return false
@@ -323,7 +340,10 @@ class AzureAsrHelper(private val context: Context) {
             // 开始连续识别
             recognizer?.startContinuousRecognitionAsync()
             isContinuousRecognitionActive = true
-            
+            Log.e(tag, "开始连续语音识别 是否录音${isRecording}")
+            if (isRecording) {
+                enableRecord()
+            }
             return true
         } catch (e: Exception) {
             stopAudioProcessing()
@@ -340,7 +360,8 @@ class AzureAsrHelper(private val context: Context) {
         // 识别中事件
         recognizer?.recognizing?.addEventListener(
             EventHandler<SpeechRecognitionEventArgs> { _, event ->
-                val detectedLanguage = AutoDetectSourceLanguageResult.fromResult(event.result)?.language ?: ""
+                val detectedLanguage =
+                    AutoDetectSourceLanguageResult.fromResult(event.result)?.language ?: ""
                 // 直接在当前线程调用回调
                 callback.onRecognizing(event.result.text, detectedLanguage)
             }
@@ -350,7 +371,8 @@ class AzureAsrHelper(private val context: Context) {
         recognizer?.recognized?.addEventListener(
             EventHandler<SpeechRecognitionEventArgs> { _, event ->
                 if (event.result.reason == ResultReason.RecognizedSpeech) {
-                    val detectedLanguage = AutoDetectSourceLanguageResult.fromResult(event.result)?.language ?: ""
+                    val detectedLanguage =
+                        AutoDetectSourceLanguageResult.fromResult(event.result)?.language ?: ""
                     // 直接在当前线程调用回调
                     callback.onResult(event.result.text, detectedLanguage)
                 }
@@ -416,7 +438,8 @@ class AzureAsrHelper(private val context: Context) {
 
             // 停止音频处理
             stopAudioProcessing()
-            
+            // 停止录音
+            recordfile!!.closeFile()
             // 会话结束事件会设置isContinuousRecognitionActive = false
             return true
         } catch (e: Exception) {
@@ -426,7 +449,7 @@ class AzureAsrHelper(private val context: Context) {
 
             // 停止音频处理
             stopAudioProcessing()
-            
+            recordfile!!.closeFile()
             // 尝试强制关闭识别器
             try {
                 recognizer?.close()
@@ -458,7 +481,8 @@ class AzureAsrHelper(private val context: Context) {
 
             // 停止音频处理
             stopAudioProcessing()
-            
+            // 停止录音
+            recordfile!!.closeFile()
             // 释放recognizer
             recognizer?.close()
             recognizer = null
@@ -500,6 +524,7 @@ class AzureAsrHelper(private val context: Context) {
                 // 拉流模式不需要额外启动，SDK会自动拉取数据
                 // 无需执行任何操作
             }
+
             AudioSourceType.EXTERNAL -> {
                 // 外部音频数据模式下不需要启动处理，等待外部调用pushAudioData
             }
@@ -531,6 +556,30 @@ class AzureAsrHelper(private val context: Context) {
         }
     }
 
+    /**
+     * 开启录音
+     */
+    fun enableRecord() {
+        Log.i(tag, "开启录音:")
+        isRecording = true
+        recordfile!!.closeFile()
+
+
+        if (isContinuousRecognitionActive) {
+            recordfile!!.creatingFiles()
+        }
+
+    }
+
+    /**
+     * 停止录音
+     */
+    fun stopRecord() {
+        Log.i(tag, "停止连续录音:")
+        isRecording = false
+        recordfile!!.closeFile()
+    }
+
     /**
      * 麦克风流 - 拉流模式
      * 实现PullAudioInputStreamCallback，为Azure SDK提供音频数据
@@ -538,12 +587,7 @@ class AzureAsrHelper(private val context: Context) {
     private inner class MicrophoneStream : PullAudioInputStreamCallback() {
         private var audioRecord: AudioRecord? = null
         private var echoCanceler: AcousticEchoCanceler? = null
-         private var currentAudioFile: File? = null
-    private var fos: FileOutputStream? = null
 
-    // 用于存储音频数据的缓冲区
-    private val dataBuffer = mutableListOf<ByteArray>()
-    private var totalBytesWritten = 0
         // 音频配置
         private val sampleRate = 16000
         private val channelConfig = AudioFormat.CHANNEL_IN_MONO
@@ -561,20 +605,6 @@ class AzureAsrHelper(private val context: Context) {
          */
         private fun initMicrophone() {
             try {
-                    // 创建新的音频文件
-        val timestamp = System.currentTimeMillis()
-            val filePath = context.getExternalFilesDir(null)?.absolutePath + "/recorded_audio_$timestamp.wav"
-            currentAudioFile = File(filePath)
-            currentAudioFile?.createNewFile()
-            
-            // 仅写入初始文件头
-            fos = FileOutputStream(currentAudioFile).apply {
-                write(generateWavHeader(0)) // 初始0长度
-                close()
-            }
-
-        // 追加音频数据到文件
-        fos = FileOutputStream(currentAudioFile, true)
                 // 创建录音对象
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
                     val format = AudioFormat.Builder()
@@ -632,7 +662,8 @@ class AzureAsrHelper(private val context: Context) {
         /**
          * 获取音频格式
          */
-        fun getFormat(): AudioStreamFormat = AudioStreamFormat.getWaveFormatPCM(16000.toLong(), 16.toShort(), 1.toShort())
+        fun getFormat(): AudioStreamFormat =
+            AudioStreamFormat.getWaveFormatPCM(16000.toLong(), 16.toShort(), 1.toShort())
 
         /**
          * Azure SDK 调用此方法获取音频数据
@@ -645,80 +676,23 @@ class AzureAsrHelper(private val context: Context) {
                     Log.e(tag, "读取音频数据失败: $result")
                     return 0
                 }
+                Log.i(tag, "麦克风:")
                 // 将音频数据保存成wav格式的音频文件
-        saveAudioDataToWav(buffer, result)
+                recordfile?.saveAudioDataToWav(buffer)
                 return result
             } catch (e: Exception) {
                 Log.e(tag, "读取音频异常: ${e.message}")
                 return 0
             }
         }
-             /**
- * 保存音频数据到 WAV 文件
- */
-private fun saveAudioDataToWav(buffer: ByteArray, length: Int) {
-     // 复制数据到新数组
-        val copy = ByteArray(length)
-        System.arraycopy(buffer, 0, copy, 0, length)
-        
-        // 添加到缓冲区
-        dataBuffer.add(copy)
-        totalBytesWritten += length
-        
-        // 写入文件
-        try {
-            fos?.write(copy, 0, length)
-        } catch (e: Exception) {
-            Log.e(tag, "写入音频数据失败: ${e.message}")
-        }
-}
 
-  // 更新文件头生成（修正RIFF长度计算）
-    private fun generateWavHeader(dataLength: Int): ByteArray {
-        val totalLength = 36 + dataLength // RIFF块总长度 = 头部36字节 + 音频数据
-        val byteRate = sampleRate * 2 * 1 // 采样率 * 字节/样本 * 通道数
 
-        return byteArrayOf(
-            'R'.code.toByte(), 'I'.code.toByte(), 'F'.code.toByte(), 'F'.code.toByte(),
-            (totalLength and 0xFF).toByte(), ((totalLength shr 8) and 0xFF).toByte(),
-            ((totalLength shr 16) and 0xFF).toByte(), ((totalLength shr 24) and 0xFF).toByte(),
-            'W'.code.toByte(), 'A'.code.toByte(), 'V'.code.toByte(), 'E'.code.toByte(),
-            'f'.code.toByte(), 'm'.code.toByte(), 't'.code.toByte(), ' '.code.toByte(),
-            16, 0, 0, 0,  // PCM头长度
-            1, 0,         // PCM格式
-            1, 0,         // 单声道
-            (sampleRate and 0xFF).toByte(), ((sampleRate shr 8) and 0xFF).toByte(), 0, 0, // 采样率
-            (byteRate and 0xFF).toByte(), ((byteRate shr 8) and 0xFF).toByte(), 0, 0,     // 字节率
-            2, 0,         // 块对齐 (通道数 * 样本位数/8)
-            16, 0,        // 样本位数
-            'd'.code.toByte(), 'a'.code.toByte(), 't'.code.toByte(), 'a'.code.toByte(),
-            (dataLength and 0xFF).toByte(), ((dataLength shr 8) and 0xFF).toByte(),
-            ((dataLength shr 16) and 0xFF).toByte(), ((dataLength shr 24) and 0xFF).toByte()
-        )
-    }
         /**
          * 关闭音频资源
          */
         override fun close() {
             releaseAudioResources()
-                 try {
-            // 关闭文件流
-            fos?.close()
 
-            // 更新WAV文件头
-            currentAudioFile?.let { file ->
-                RandomAccessFile(file, "rw").use { raf ->
-                    raf.seek(0)
-                    raf.write(generateWavHeader(totalBytesWritten))
-                }
-                Log.d(tag, "音频文件保存完成: ${file.absolutePath}")
-            }
-        } catch (e: Exception) {
-            Log.e(tag, "更新WAV文件头失败: ${e.message}")
-        } finally {
-            fos = null
-            currentAudioFile = null
-        }
         }
 
         /**
@@ -757,6 +731,8 @@ private fun saveAudioDataToWav(buffer: ByteArray, length: Int) {
          * @param data 音频数据
          */
         fun pushAudio(data: ByteArray) {
+            // 将音频数据保存成wav格式的音频文件
+            recordfile?.saveAudioDataToWav(data)
             if (!closed) {
                 queue.offer(data)
             }
@@ -769,10 +745,12 @@ private fun saveAudioDataToWav(buffer: ByteArray, length: Int) {
          */
         override fun read(buffer: ByteArray): Int {
             try {
+
                 // 阻塞等待下一块数据
                 val chunk = queue.take()
                 val toCopy = minOf(chunk.size, buffer.size)
                 System.arraycopy(chunk, 0, buffer, 0, toCopy)
+                Log.i(tag, "外部音频:")
                 return toCopy
             } catch (e: InterruptedException) {
                 Thread.currentThread().interrupt()
@@ -857,4 +835,111 @@ private fun saveAudioDataToWav(buffer: ByteArray, length: Int) {
          */
         fun onError(error: String)
     }
+
+
+    private inner class RecordingFile {
+        private var currentAudioFile: File? = null
+        private var fos: FileOutputStream? = null
+
+        // 用于存储音频数据的缓冲区
+        private val dataBuffer = mutableListOf<ByteArray>()
+        private var totalBytesWritten = 0
+
+        // 音频配置
+        private val sampleRate = 16000
+
+
+        internal fun creatingFiles() {
+            if (fos != null || currentAudioFile != null) {
+                return
+            }
+            // 创建新的音频文件
+            val timestamp = System.currentTimeMillis()
+            val filePath =
+                context.getExternalFilesDir(null)?.absolutePath + "/recorded_audio_$timestamp.wav"
+            currentAudioFile = File(filePath)
+            currentAudioFile?.createNewFile()
+
+            // 仅写入初始文件头
+            fos = FileOutputStream(currentAudioFile).apply {
+                write(generateWavHeader(0)) // 初始0长度
+                close()
+            }
+
+            // 追加音频数据到文件
+            fos = FileOutputStream(currentAudioFile, true)
+        }
+
+        /**
+         * 保存音频数据到 WAV 文件
+         */
+        internal fun saveAudioDataToWav(buffer: ByteArray) {
+            if (fos == null || currentAudioFile == null) {
+                return
+            }
+            // 复制数据到新数组
+            val copy = ByteArray(buffer.size)
+            System.arraycopy(buffer, 0, copy, 0, buffer.size)
+
+            // 添加到缓冲区
+            dataBuffer.add(copy)
+            totalBytesWritten += buffer.size
+
+            // 写入文件
+            try {
+                fos?.write(copy, 0, buffer.size)
+            } catch (e: Exception) {
+                Log.e(tag, "写入音频数据失败: ${e.message}")
+            }
+        }
+
+        // 更新文件头生成（修正RIFF长度计算）
+        private fun generateWavHeader(dataLength: Int): ByteArray {
+            val totalLength = 36 + dataLength // RIFF块总长度 = 头部36字节 + 音频数据
+            val byteRate = sampleRate * 2 * 1 // 采样率 * 字节/样本 * 通道数
+
+            return byteArrayOf(
+                'R'.code.toByte(), 'I'.code.toByte(), 'F'.code.toByte(), 'F'.code.toByte(),
+                (totalLength and 0xFF).toByte(), ((totalLength shr 8) and 0xFF).toByte(),
+                ((totalLength shr 16) and 0xFF).toByte(), ((totalLength shr 24) and 0xFF).toByte(),
+                'W'.code.toByte(), 'A'.code.toByte(), 'V'.code.toByte(), 'E'.code.toByte(),
+                'f'.code.toByte(), 'm'.code.toByte(), 't'.code.toByte(), ' '.code.toByte(),
+                16, 0, 0, 0,  // PCM头长度
+                1, 0,         // PCM格式
+                1, 0,         // 单声道
+                (sampleRate and 0xFF).toByte(), ((sampleRate shr 8) and 0xFF).toByte(), 0, 0, // 采样率
+                (byteRate and 0xFF).toByte(), ((byteRate shr 8) and 0xFF).toByte(), 0, 0,     // 字节率
+                2, 0,         // 块对齐 (通道数 * 样本位数/8)
+                16, 0,        // 样本位数
+                'd'.code.toByte(), 'a'.code.toByte(), 't'.code.toByte(), 'a'.code.toByte(),
+                (dataLength and 0xFF).toByte(), ((dataLength shr 8) and 0xFF).toByte(),
+                ((dataLength shr 16) and 0xFF).toByte(), ((dataLength shr 24) and 0xFF).toByte()
+            )
+        }
+
+        internal fun closeFile() {
+            try {
+                if (fos == null || currentAudioFile == null) {
+                    return
+                }
+                // 关闭文件流
+                fos?.close()
+
+                // 更新WAV文件头
+                currentAudioFile?.let { file ->
+                    RandomAccessFile(file, "rw").use { raf ->
+                        raf.seek(0)
+                        raf.write(generateWavHeader(totalBytesWritten))
+                    }
+                    Log.d(tag, "音频文件保存完成: ${file.absolutePath}")
+                }
+
+            } catch (e: Exception) {
+                Log.e(tag, "更新WAV文件头失败: ${e.message}")
+            } finally {
+                fos = null
+                currentAudioFile = null
+            }
+        }
+    }
 } 

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

@@ -15,27 +15,32 @@ import com.microsoft.cognitiveservices.speech.audio.*
 import com.deep_voice.speech.tts.TtsEvent
 import com.deep_voice.speech.tts.TtsEventListener
 import com.deep_voice.speech.tts.TtsEventType
+import com.yunqiinnovation.ble_service.BleService
 
 /** AzureSpeechPlugin */
-class AzureSpeechPlugin: FlutterPlugin {
+class AzureSpeechPlugin : BleService.Callback, FlutterPlugin {
     private val tag = "AzureSpeechPlugin"
     private lateinit var context: Context
     private val mainHandler = Handler(Looper.getMainLooper())
 
     // ASR相关
-  private lateinit var asrChannel : MethodChannel
+    private lateinit var asrChannel: MethodChannel
     private lateinit var asrEventChannel: EventChannel
     private var asrEventSink: EventChannel.EventSink? = null
     private lateinit var azureAsrHelper: AzureAsrHelper
 
     // TTS相关
-  private lateinit var ttsChannel : MethodChannel
+    private lateinit var ttsChannel: MethodChannel
     private lateinit var ttsEventChannel: EventChannel
     private var ttsEventSink: EventChannel.EventSink? = null
     private lateinit var azureTtsHelper: AzureTtsHelper
+
     // 是否已添加TTS事件监听器
     private var isTtsListenerAdded = false
 
+    // 是否已注册BLE回调
+    private var isRegisteredToBle = false
+
     // ASR 事件发送方法
     private fun sendAsrEvent(event: Map<String, Any>) {
         if (asrEventSink == null) {
@@ -81,7 +86,8 @@ class AzureSpeechPlugin: FlutterPlugin {
         ttsChannel.setMethodCallHandler(TtsMethodHandler())
 
         // 初始化ASR事件通道
-    asrEventChannel = EventChannel(flutterPluginBinding.binaryMessenger, "azure_speech/asr_events")
+        asrEventChannel =
+            EventChannel(flutterPluginBinding.binaryMessenger, "azure_speech/asr_events")
         asrEventChannel.setStreamHandler(object : EventChannel.StreamHandler {
             override fun onListen(arguments: Any?, events: EventChannel.EventSink?) {
                 asrEventSink = events
@@ -93,7 +99,8 @@ class AzureSpeechPlugin: FlutterPlugin {
         })
 
         // 初始化TTS事件通道
-    ttsEventChannel = EventChannel(flutterPluginBinding.binaryMessenger, "azure_speech/tts_events")
+        ttsEventChannel =
+            EventChannel(flutterPluginBinding.binaryMessenger, "azure_speech/tts_events")
         ttsEventChannel.setStreamHandler(object : EventChannel.StreamHandler {
             override fun onListen(arguments: Any?, events: EventChannel.EventSink?) {
                 ttsEventSink = events
@@ -108,6 +115,21 @@ class AzureSpeechPlugin: FlutterPlugin {
         // 初始化Azure语音服务
         azureTtsHelper = AzureTtsHelper(context)
         azureAsrHelper = AzureAsrHelper(context)
+
+        // 2. 初始化BleService并注册回调
+        if (BleService.initialize(context)) {
+
+            if (BleService.addCallback(this)) {
+                isRegisteredToBle = true
+                FileLogger.d(tag, "已注册BLE回调")
+            } else {
+                FileLogger.w(tag, "BLE回调注册失败")
+            }
+
+        } else {
+            FileLogger.e(tag, "BLE服务初始化失败")
+
+        }
     }
 
     /**
@@ -123,9 +145,11 @@ class AzureSpeechPlugin: FlutterPlugin {
                         TtsEventType.SYNTHESIS_STARTED -> mapOf(
                             "type" to "synthesis_started"
                         )
+
                         TtsEventType.SYNTHESIS_COMPLETED -> mapOf(
                             "type" to "synthesis_completed"
                         )
+
                         TtsEventType.SYNTHESIS_CANCELED -> {
                             val params = event.params
                             mapOf(
@@ -134,6 +158,7 @@ class AzureSpeechPlugin: FlutterPlugin {
                                 "errorDetails" to (params["errorDetails"] ?: "")
                             )
                         }
+
                         TtsEventType.ERROR -> {
                             val params = event.params
                             mapOf(
@@ -142,6 +167,7 @@ class AzureSpeechPlugin: FlutterPlugin {
                                 "errorMessage" to (params["errorMessage"] ?: "未知错误")
                             )
                         }
+
                         else -> mapOf(
                             "type" to event.type.toString().lowercase(),
                             "params" to event.params
@@ -164,7 +190,8 @@ class AzureSpeechPlugin: FlutterPlugin {
                 "initialize" -> {
                     val subscriptionKey = call.argument<String>("subscriptionKey") ?: ""
                     val region = call.argument<String>("region") ?: ""
-          val supportedLanguages = call.argument<List<String>>("supportedLanguages") ?: listOf("zh-CN")
+                    val supportedLanguages =
+                        call.argument<List<String>>("supportedLanguages") ?: listOf("zh-CN")
                     val useExternalAudio = call.argument<Boolean>("useExternalAudio") ?: false
 
                     try {
@@ -188,6 +215,7 @@ class AzureSpeechPlugin: FlutterPlugin {
                         result.error("INITIALIZATION_ERROR", e.message, null)
                     }
                 }
+
                 "recognizeOnce" -> {
                     val useExternalAudio = call.argument<Boolean>("useExternalAudio") ?: false
                     try {
@@ -202,25 +230,32 @@ class AzureSpeechPlugin: FlutterPlugin {
                         azureAsrHelper.recognizeOnce(object : AzureAsrHelper.RecognizeCallback {
                             override fun onResult(text: String, detectedLanguage: String) {
                                 // 直接返回结果，不发送事件
-                result.success(mapOf(
+                                result.success(
+                                    mapOf(
                                         "text" to text,
                                         "detectedLanguage" to detectedLanguage
-                ))
+                                    )
+                                )
                             }
 
                             override fun onError(error: String) {
                                 result.error("RECOGNITION_ERROR", error, null)
                             }
-            },audioSourceType)
+                        }, audioSourceType)
                     } catch (e: Exception) {
                         result.error("RECOGNITION_ERROR", "识别过程异常: ${e.message}", null)
                     }
                 }
+
                 "startContinuousRecognition" -> {
                     val useExternalAudio = call.argument<Boolean>("audioSourceType") ?: false
                     // 确保事件通道已准备好
                     if (asrEventSink == null) {
-            result.error("EVENT_CHANNEL_NOT_READY", "事件通道未准备好，无法开始连续识别", null)
+                        result.error(
+                            "EVENT_CHANNEL_NOT_READY",
+                            "事件通道未准备好，无法开始连续识别",
+                            null
+                        )
                         return
                     }
 
@@ -233,21 +268,29 @@ class AzureSpeechPlugin: FlutterPlugin {
                             AzureAsrHelper.AudioSourceType.MICROPHONE
                         }
 
-            val success = azureAsrHelper.startContinuousRecognition(object : AzureAsrHelper.ContinuousRecognizeCallback {
+                        val success = azureAsrHelper.startContinuousRecognition(object :
+                            AzureAsrHelper.ContinuousRecognizeCallback {
                             override fun onResult(text: String, detectedLanguage: String) {
-                sendAsrEvent(mapOf(
+                                sendAsrEvent(
+                                    mapOf(
                                         "type" to "result",
                                         "text" to text,
                                         "detectedLanguage" to detectedLanguage
-                ))
+                                    )
+                                )
                             }
 
-              override fun onRecognizing(recognizing: String, detectedLanguage: String) {
+                            override fun onRecognizing(
-                sendAsrEvent(mapOf(
+                                recognizing: String,
+                                detectedLanguage: String
+                            ) {
+                                sendAsrEvent(
+                                    mapOf(
                                         "type" to "recognizing",
                                         "text" to recognizing,
                                         "detectedLanguage" to detectedLanguage
-                ))
+                                    )
+                                )
                             }
 
                             override fun onSessionStarted() {
@@ -259,25 +302,30 @@ class AzureSpeechPlugin: FlutterPlugin {
                             }
 
                             override fun onCanceled(reason: String, errorDetails: String) {
-                sendAsrEvent(mapOf(
+                                sendAsrEvent(
+                                    mapOf(
                                         "type" to "canceled",
                                         "reason" to reason,
                                         "errorDetails" to errorDetails
-                ))
+                                    )
+                                )
                             }
 
                             override fun onError(error: String) {
-                sendAsrEvent(mapOf(
+                                sendAsrEvent(
+                                    mapOf(
                                         "type" to "error",
                                         "message" to error
-                ))
+                                    )
+                                )
                             }
-            },audioSourceType)
+                        }, audioSourceType)
                         result.success(success)
                     } catch (e: Exception) {
                         result.error("START_RECOGNITION_ERROR", e.message, null)
                     }
                 }
+
                 "stopContinuousRecognition" -> {
                     try {
                         val success = azureAsrHelper.stopContinuousRecognition()
@@ -286,18 +334,36 @@ class AzureSpeechPlugin: FlutterPlugin {
                         result.error("STOP_ERROR", e.message, null)
                     }
                 }
+
                 "isContinuousRecognitionActive" -> {
                     result.success(azureAsrHelper.isContinuousRecognitionActive())
                 }
+
                 "dispose" -> {
                     azureAsrHelper.dispose()
                     result.success(true)
                 }
+
                 "pushAudioData" -> {
-          val data = call.argument<ByteArray>("data") ?: return result.error("INVALID_ARGUMENTS", "音频数据不能为空", null)
+                    val data = call.argument<ByteArray>("data") ?: return result.error(
+                        "INVALID_ARGUMENTS",
+                        "音频数据不能为空",
+                        null
+                    )
                     azureAsrHelper.pushAudioData(data)
                     result.success(true)
                 }
+
+                "enableRecord" -> {
+                    azureAsrHelper.enableRecord()
+                    result.success(true)
+                }
+
+                "stopRecord" -> {
+                    azureAsrHelper.stopRecord()
+                    result.success(true)
+                }
+
                 else -> {
                     result.notImplemented()
                 }
@@ -312,7 +378,8 @@ class AzureSpeechPlugin: FlutterPlugin {
                 "initialize" -> {
                     val subscriptionKey = call.argument<String>("subscriptionKey") ?: ""
                     val region = call.argument<String>("region") ?: ""
-          val useCustomAudioOutput = call.argument<Boolean>("useCustomAudioOutput") ?: false
+                    val useCustomAudioOutput =
+                        call.argument<Boolean>("useCustomAudioOutput") ?: false
 
                     try {
                         // 初始化TTS引擎（使用新的接口方法）
@@ -343,12 +410,19 @@ class AzureSpeechPlugin: FlutterPlugin {
                         result.error("INITIALIZATION_ERROR", "TTS初始化失败: ${e.message}", null)
                     }
                 }
+
                 "setVoice" -> {
-          val voiceName = call.argument<String>("voiceName") ?: return result.error("INVALID_ARGUMENTS", "语音名称不能为空", null)
+                    val voiceName = call.argument<String>("voiceName")
+                        ?: return result.error("INVALID_ARGUMENTS", "语音名称不能为空", null)
                     result.success(azureTtsHelper.setVoice(voiceName))
                 }
+
                 "speakText" -> {
-          val text = call.argument<String>("text") ?: return result.error("INVALID_ARGUMENTS", "文本不能为空", null)
+                    val text = call.argument<String>("text") ?: return result.error(
+                        "INVALID_ARGUMENTS",
+                        "文本不能为空",
+                        null
+                    )
 
                     // 直接调用speakOnce方法
                     try {
@@ -358,6 +432,7 @@ class AzureSpeechPlugin: FlutterPlugin {
                         result.error("SPEAK_ERROR", "语音合成失败: ${e.message}", null)
                     }
                 }
+
                 "stopSpeaking" -> {
                     // 直接调用stop方法
                     try {
@@ -367,13 +442,16 @@ class AzureSpeechPlugin: FlutterPlugin {
                         result.error("STOP_ERROR", "停止语音合成失败: ${e.message}", null)
                     }
                 }
+
                 "isSpeaking" -> {
                     result.success(azureTtsHelper.isSpeaking())
                 }
+
                 "dispose" -> {
                     azureTtsHelper.release()
                     result.success(true)
                 }
+
                 else -> {
                     result.notImplemented()
                 }
@@ -388,11 +466,48 @@ class AzureSpeechPlugin: FlutterPlugin {
         ttsEventChannel.setStreamHandler(null)
 
         try {
+            if (isRegisteredToBle) {
+                if (BleService.removeCallback(this)) {
+                    isRegisteredToBle = false
+                    FileLogger.d(tag, "已取消BLE回调")
+                } else {
+                    FileLogger.w(tag, "BLE回调取消失败")
+                }
+            }
             // 释放资源
             azureTtsHelper.release()
             azureAsrHelper.dispose()
+
         } catch (e: Exception) {
             FileLogger.e(tag, "释放资源失败: ${e.message}")
         }
     }
+
+
+    // BleService.Callback 接口实现
+    override fun onScanResult(devices: List<Map<String, Any>>) {
+        // 不处理扫描结果
+    }
+
+    override fun onConnectionStateChanged(state: Int) {
+    }
+
+    override fun onAudioDataReceived(data: ByteArray) {
+        if (azureAsrHelper.audioSourceType == AzureAsrHelper.AudioSourceType.EXTERNAL) {
+            azureAsrHelper.pushAudioData(data)
+        }
+        // 可选：处理音频数据
+    }
+
+    /**
+     * 处理唤醒信号
+     * 在收到唤醒信号时启动语音识别
+     */
+    override fun onWakeupSignalReceived() {
+
+    }
+
+    override fun onDeviceInfoReceived(infoType: Int, infoData: Map<String, Any>) {
+        // 不处理设备信息
+    }
 } 

local_plugins/azure_speech/pubspec.yaml

@@ -10,12 +10,15 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  ble_service:
+    path: ../ble_service
     
 dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^2.0.0
   
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 

local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleService.kt

@@ -1,38 +1,18 @@
 package com.yunqiinnovation.ble_service
 
-import android.Manifest
-import android.app.PendingIntent
 import android.bluetooth.*
 import android.bluetooth.le.*
 import android.content.Context
-import android.content.Intent
 import android.os.*
 import androidx.lifecycle.MutableLiveData
 import android.util.Log
-import java.io.File
-import java.io.FileOutputStream
-import java.text.SimpleDateFormat
 import java.util.*
-import android.os.ParcelUuid
-import android.annotation.SuppressLint
-import android.content.BroadcastReceiver
-import android.content.IntentFilter
-import android.os.SystemClock
-import android.content.pm.PackageManager
-import androidx.core.content.ContextCompat
-import java.util.concurrent.ConcurrentHashMap
-import android.content.pm.ServiceInfo
 import java.util.concurrent.CopyOnWriteArrayList
 // Import Jieli Opus SDK classes
 import com.jieli.jl_audio_decode.opus.model.OpusOption
 import com.jieli.jl_audio_decode.callback.OnDecodeStreamCallback
-import com.jieli.jl_audio_decode.callback.OnStateCallback
 import com.jieli.jl_audio_decode.opus.OpusManager
 import com.jieli.jl_audio_decode.exceptions.OpusException
-import com.yunqiinnovation.ble_service.BleCompanionManager
-import com.jieli.jl_bt_ota.model.BluetoothOTAConfigure;
-import com.jieli.jl_bt_ota.constant.ErrorCode;
-import com.jieli.jl_bt_ota.constant.StateCode;
 
 /**
  * BLE服务类：提供蓝牙低功耗设备的扫描、连接和通信功能

local_plugins/ota/android/src/main/kotlin/com/example/ota/OtaPlugin.kt

@@ -9,28 +9,18 @@ import io.flutter.plugin.common.MethodChannel.Result
 import android.bluetooth.BluetoothDevice
 import android.content.Context
 import com.jieli.otasdk.tool.ota.OTAManager
-import com.jieli.jl_bt_ota.constant.ErrorCode
 import com.jieli.jl_bt_ota.constant.StateCode
 import com.jieli.jl_bt_ota.interfaces.BtEventCallback
 import com.jieli.jl_bt_ota.interfaces.IUpgradeCallback
 import com.jieli.jl_bt_ota.model.base.BaseError
-import com.jieli.jl_bt_ota.model.response.TargetInfoResponse
-import com.jieli.jl_bt_ota.util.BluetoothUtil
-import com.jieli.jl_bt_ota.util.CHexConver
-import com.jieli.jl_bt_ota.util.JL_Log
 import com.jieli.otasdk.tool.bluetooth.BluetoothHelper
-import androidx.lifecycle.MutableLiveData
 import android.util.Log
-import androidx.annotation.NonNull
 import com.jieli.otasdk.tool.config.ConfigHelper
 import com.yunqiinnovation.ble_service.BleService
 import com.yunqiinnovation.ble_service.BleConst
 import android.os.Handler
 import android.os.Looper
 
-import java.io.File
-import java.io.FileOutputStream
-import java.io.RandomAccessFile
 import io.flutter.plugin.common.EventChannel
 
 class CustomUpdateCallback(
@@ -129,7 +119,10 @@ class CustomUpdateCallback(
         Log.d(TAG, "升级失败: ${error?.message ?: "未知错误"}")
         if (streamSink != null) {
             if (Looper.myLooper() == Looper.getMainLooper()) {
-                 Log.d(TAG, "升级失败:error?.message ${error?.message}未知错误 error?.code${error?.code}")
+                Log.d(
+                    TAG,
+                    "升级失败:error?.message ${error?.message}未知错误 error?.code${error?.code}"
+                )
                 streamSink.success(
                     mapOf(
                         "event" to "onError",
@@ -281,8 +274,20 @@ class OtaPlugin : BleService.Callback, FlutterPlugin, MethodCallHandler {
         bluetoothHelper = BluetoothHelper(context)
         // 如果需要额外的初始化逻辑，请在这里添加
         otaManager.registerBluetoothCallback(bluetoothCallback)
-        BleService.addCallback(this)
+        // 初始化BleService
+        // 2. 初始化BleService并注册回调
+        if (BleService.initialize(context)) {
+            if (BleService.addCallback(this)) {
                 isRegisteredToBle = true
+                Log.d(TAG, "已注册BLE回调")
+            } else {
+                Log.w(TAG, "BLE回调注册失败")
+            }
+        } else {
+            Log.e(TAG, "BLE服务初始化失败")
+   
+        }
+
         Log.i("TAG", "onAttachedToEngine")
 
     }
@@ -308,11 +313,10 @@ class OtaPlugin : BleService.Callback, FlutterPlugin, MethodCallHandler {
                 otaDevice = bluetoothGatt.device
                 BleService.disconnect()
 
-            } else if(otaDevice != null)
+            } else if (otaDevice != null) {
-            {    isDisconnect = true
+                isDisconnect = true
                 BleService.disconnect()
-               } 
+            } else {
-            else{
                 Log.e("TAG", "BluetoothGatt 或 device 为 null，无法执行操作")
                 sendEventOnMainThread(
                     mapOf(
@@ -350,6 +354,7 @@ class OtaPlugin : BleService.Callback, FlutterPlugin, MethodCallHandler {
     }
 
 
+    // BleService.Callback 接口实现
     override fun onScanResult(devices: List<Map<String, Any>>) {
         // 不处理扫描结果
     }