修复1.ble连接异常问题 2.第二次进入扫描异常问题

android/app/src/main/kotlin/com/yunqiinnovation/deepsound/BleBroadcastReceiver.kt

@@ -22,13 +22,13 @@ class BleBroadcastReceiver : BroadcastReceiver() {
     
     override fun onReceive(context: Context, intent: Intent) {
         FileLogger.init(context)
-        FileLogger.d(TAG, "接收到广播: ${intent.action}")
+        //FileLogger.d(TAG, "接收到广播: ${intent.action}")
         
         if (intent.action == ACTION_BLE_SCAN_RESULT) {
-            FileLogger.d(TAG, "收到系统BLE扫描唤醒事件")
+            //FileLogger.d(TAG, "收到系统BLE扫描唤醒事件")
             
             // 打印日志，表明唤醒成功
-            FileLogger.d(TAG, "应用被蓝牙BLE广播唤醒成功")
+            //FileLogger.d(TAG, "应用被蓝牙BLE广播唤醒成功")
             
             // 启动BLE唤醒服务，该服务将执行后续操作
             val serviceIntent = Intent(context, BleWakeService::class.java)

android/app/src/main/kotlin/com/yunqiinnovation/deepsound/BleWakeService.kt

@@ -78,11 +78,11 @@ class BleWakeService : Service() {
     }
     
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        FileLogger.d(TAG, "收到onStartCommand: intent=$intent")
+       // FileLogger.d(TAG, "收到onStartCommand: intent=$intent")
         
         // 如果是PendingIntent触发（BLE广播唤醒），打印日志
         if (intent?.action == "android.bluetooth.adapter.action.REQUEST_ENABLE") {
-            FileLogger.d(TAG, "收到BLE广播唤醒事件，应用被唤醒")
+            //FileLogger.d(TAG, "收到BLE广播唤醒事件，应用被唤醒")
             
             // 在这里可以执行唤醒后的动作，如启动语音交互服务
             val serviceIntent = Intent(this, VoiceInteractionService::class.java)

android/app/src/main/kotlin/com/yunqiinnovation/deepsound/VoiceInteractionService.kt

@@ -481,7 +481,7 @@ class VoiceInteractionService : Service() {
      * 当 Service 被启动时调用
      */
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        FileLogger.d(TAG, "onStartCommand: intent=$intent, action=${intent?.action}")
+        //FileLogger.d(TAG, "onStartCommand: intent=$intent, action=${intent?.action}")
 
         intent?.let {receivedIntent ->
             when(receivedIntent.action) {
@@ -497,7 +497,7 @@ class VoiceInteractionService : Service() {
                 }
 
                 else -> {
-                    FileLogger.d(TAG, "onStartCommand收到未知Intent: action=${receivedIntent.action}")
+                    //FileLogger.d(TAG, "onStartCommand收到未知Intent: action=${receivedIntent.action}")
                 }
             }
         }

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

@@ -34,6 +34,10 @@ class AzureAsrHelper(private val context: Context) {
     private var customAudioProcessor: CustomAudioProcessor? = null
     private var pushStream: PushAudioInputStream? = null
     private var audioConfig: AudioConfig? = null
+    // 公共方法：允许外部写入音频数据
+    fun pushAudioData(data: ByteArray) {
+        pushStream?.write(data)  // 使用 SDK 的正确方法（如 push）
+    }
 
     // 初始化SDK并创建recognizer
     fun initialize(subscriptionKey: String, region: String, 

local_plugins/jieli/android/build.gradle.kts

@@ -52,4 +52,5 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0")
     implementation("androidx.lifecycle:lifecycle-service:2.4.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2")
+        implementation(project(":azure_speech"))
 } 

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

@@ -10,8 +10,12 @@ import android.util.Log
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.*
+import java.io.File
+import java.io.FileOutputStream
+import java.text.SimpleDateFormat
 import java.util.*
-
+import com.yunqiinnovation.azure_speech.AzureAsrHelper
+import com.yunqiinnovation.azure_speech.AzureTtsHelper
 /**
  * BLE服务类，提供核心蓝牙功能
  */
@@ -21,10 +25,14 @@ class BleService(private val context: Context) {
 
         // 服务和特征UUID - 根据协议规范重新定义
         // private const val AUDIO_SERVICE_UUID = "0000faa0-0000-1000-8000-00805f9b34fb" // 主服务UUID
-        private const val AUDIO_SERVICE_UUID = "0000fd7b-0000-1000-8000-00805f9b34fb" // 主服务UUID
+        private const val AUDIO_SERVICE_UUID = "0000abc0-0000-1111-2222-123456789abc" // 主服务UUID
-        private const val NOTIFY_CHAR_UUID = "0000faa2-0000-1000-8000-00805f9b34fb"  // 用于接收数据的特征(notify)
+        private const val NOTIFY_CHAR_UUID =
-        private const val WRITE_CHAR_UUID = "0000faa1-0000-1000-8000-00805f9b34fb"   // 用于发送命令的特征(write without response)
+            "0000abc2-0000-1111-2222-123456789abc"  // 用于接收数据的特征(notify)
-        private const val CLIENT_CHAR_CONFIG_UUID = "00002902-0000-1000-8000-00805f9b34fb" // 标准的客户端特征配置描述符
+        private const val WRITE_CHAR_UUID =
+            "0000abc1-0000-1111-2222-123456789abc"   // 用于发送命令的特征(write without response)
+        private const val CLIENT_CHAR_CONFIG_UUID =
+            "00002902-0000-1000-8000-00805f9b34fb" // 标准的客户端特征配置描述符
+
         // 连接状态常量
         const val STATE_DISCONNECTED = 0
         const val STATE_CONNECTING = 1
@@ -50,8 +58,16 @@ class BleService(private val context: Context) {
         fun onCommandResult(commandType: Int, success: Boolean)
     }
 
+    // region 文件相关
+    private var outputFile: File? = null
+    private var fos: FileOutputStream? = null
+
+    // Azure服务
+    private var azureAsrHelper: AzureAsrHelper? = null
+    private var azureTtsHelper: AzureTtsHelper? = null
     // 蓝牙管理器和适配器
-    private val bluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+    private val bluetoothManager =
+        context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
     private val bluetoothAdapter: BluetoothAdapter? = bluetoothManager.adapter
     private val bluetoothLeScanner: BluetoothLeScanner? = bluetoothAdapter?.bluetoothLeScanner
 
@@ -102,7 +118,10 @@ class BleService(private val context: Context) {
 
         // 设置超时停止扫描
         scanHandler.postDelayed({
-            Log.d(TAG, "定时器触发，准备停止扫描 [主线程:${Looper.myLooper() == Looper.getMainLooper()}]")
+            Log.d(
+                TAG,
+                "定时器触发，准备停止扫描 [主线程:${Looper.myLooper() == Looper.getMainLooper()}]"
+            )
             stopScan()
         }, scanTimeout)
 
@@ -142,7 +161,7 @@ class BleService(private val context: Context) {
             // if (!deviceName.contains("sanag") && !deviceName.contains("Ola Friend")) {
             //     return
             // }
-            Log.d(TAG, "============发现设备: $deviceName [$deviceAddress], RSSI: $rssi")
+            //Log.d(TAG, "============发现设备: $deviceName [$deviceAddress], RSSI: $rssi")
 
             // 打印所有发现的UUID以便调试
             val serviceUuids = scanRecord?.serviceUuids
@@ -156,16 +175,20 @@ class BleService(private val context: Context) {
             for (i in 0 until 65535) {
                 val manufacturerData = scanRecord?.getManufacturerSpecificData(i)
                 if (manufacturerData != null) {
-                    Log.d(TAG, "发现厂商ID: $i, 数据长度: ${manufacturerData.size}")
+                   // Log.d(TAG, "发现厂商ID: $i, 数据长度: ${manufacturerData.size}")
                     // 这里可以根据已知的厂商ID和格式解析数据
                 }
             }
 
             // 避免重复添加
+            
             val existingIndex = scanResults.indexOfFirst { it.device.address == deviceAddress }
+           
             if (existingIndex >= 0) {
+                 
                 scanResults[existingIndex] = result
             } else {
+                   Log.d(TAG, "扫描回调A, scanResults[existingIndex]ADD")
                 scanResults.add(result)
             }
 
@@ -217,7 +240,8 @@ class BleService(private val context: Context) {
 
             // 连接GATT服务器
             Log.i(TAG, "正在连接设备: ${device.name ?: "未知设备"} [$deviceAddress]")
-            bluetoothGatt = device.connectGatt(context, false, gattCallback)
+            bluetoothGatt =
+                device.connectGatt(context, false, gattCallback, BluetoothDevice.TRANSPORT_LE)
         } catch (e: Exception) {
             Log.e(TAG, "连接设备时发生错误: ${e.message}")
             updateConnectionState(STATE_ERROR)
@@ -244,6 +268,8 @@ class BleService(private val context: Context) {
      * GATT回调
      */
     private val gattCallback = object : BluetoothGattCallback() {
+
+
         override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
             if (newState == BluetoothProfile.STATE_CONNECTED && status == BluetoothGatt.GATT_SUCCESS) {
                 Log.i(TAG, "设备已连接，开始发现服务...")
@@ -276,12 +302,15 @@ class BleService(private val context: Context) {
                 // 查找目标服务
                 val audioService = gatt.getService(UUID.fromString(AUDIO_SERVICE_UUID))
                 if (audioService != null) {
-                    Log.i(TAG, "找到音频服务")
+                    Log.i(TAG, "找到音频服务，开始遍历特征...")
+                    audioService.characteristics.forEach { char ->
+                        Log.i(TAG, "特征UUID: ${char.uuid}")
+                    }
+                    Log.i(TAG, "找到音频服务$")
 
                     // 获取特征
                     notifyChar = audioService.getCharacteristic(UUID.fromString(NOTIFY_CHAR_UUID))
                     writeChar = audioService.getCharacteristic(UUID.fromString(WRITE_CHAR_UUID))
-                    
                     if (notifyChar != null && writeChar != null) {
                         Log.i(TAG, "找到所需特征")
 
@@ -290,6 +319,7 @@ class BleService(private val context: Context) {
 
                         // 注册特征通知
                         setupNotifications(gatt)
+
                     } else {
                         Log.e(TAG, "未找到所需特征")
                         updateConnectionState(STATE_ERROR)
@@ -303,8 +333,15 @@ class BleService(private val context: Context) {
                 updateConnectionState(STATE_ERROR)
             }
         }
+        // 添加扩展函数（在文件顶部声明）
+        fun List<Byte>.toByteArray(): ByteArray {
+            return ByteArray(this.size) { this[it] }
+        }
 
-        override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) {
+        override fun onCharacteristicChanged(
+            gatt: BluetoothGatt,
+            characteristic: BluetoothGattCharacteristic
+        ) {
             val characteristicUuid = characteristic.uuid.toString()
             Log.d(TAG, "收到特征变化通知: $characteristicUuid")
 
@@ -321,6 +358,16 @@ class BleService(private val context: Context) {
                     val value = characteristic.value
                     Log.i(TAG, "收到控制通知: ${value.contentToString()}")
 
+                    // 判断是否收到音频数据
+                    if (value.isNotEmpty() && (value[0].toInt() and 0xFF == 0x4b || value[0].toInt() and 0xFF == 0x48)) {
+                        // 处理设备返回的协议数据
+                        fos?.write(value)
+                // 方法1：手动转换
+val byteArray = ByteArray(value.size) { index -> value[index] }
+       
+// 或者直接使用现有
+                          azureAsrHelper?.pushAudioData(byteArray)
+                    }
                     // 判断是否是协议格式响应
                     if (value.isNotEmpty() && value[0].toInt() and 0xFF == 0xA5) {
                         // 处理设备返回的协议数据
@@ -334,12 +381,18 @@ class BleService(private val context: Context) {
 
                         // 收到唤醒后自动发送开始录音命令
                         sendStartRecordingCommand()
+
+
                     }
                 }
             }
         }
 
-        override fun onCharacteristicWrite(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) {
+        override fun onCharacteristicWrite(
+            gatt: BluetoothGatt,
+            characteristic: BluetoothGattCharacteristic,
+            status: Int
+        ) {
             if (characteristic.uuid.toString() == WRITE_CHAR_UUID) {
                 if (status == BluetoothGatt.GATT_SUCCESS) {
                     Log.i(TAG, "命令发送成功: ${characteristic.value.contentToString()}")
@@ -349,7 +402,11 @@ class BleService(private val context: Context) {
             }
         }
 
-        override fun onDescriptorWrite(gatt: BluetoothGatt, descriptor: BluetoothGattDescriptor, status: Int) {
+        override fun onDescriptorWrite(
+            gatt: BluetoothGatt,
+            descriptor: BluetoothGattDescriptor,
+            status: Int
+        ) {
             if (status == BluetoothGatt.GATT_SUCCESS) {
                 Log.i(TAG, "描述符写入成功: ${descriptor.uuid}")
                 Log.i(TAG, "特征通知设置成功，设备就绪")
@@ -380,6 +437,7 @@ class BleService(private val context: Context) {
         }
     }
 
+
     /**
      * 处理设备返回的数据
      * 协议格式:
@@ -448,6 +506,23 @@ class BleService(private val context: Context) {
         try {
             val commandData = byteArrayOf(0x01)
             writeChar?.value = commandData
+            // 获取外部存储目录路径
+            // 生成带时间戳的文件名（格式：yyyyMMdd_HHmmss_audio.opus）
+            val timeStamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
+            val fileName = "${timeStamp}_audio.opus"
+            val externalDir = context.getExternalFilesDir(null)
+            outputFile = File(externalDir, fileName)
+            fos = FileOutputStream(outputFile).also {
+                Log.i(TAG, "音频文件创建成功：${outputFile?.absolutePath}")
+            }
+
+            // val subscriptionKey = call.argument<String>("subscriptionKey") ?: ""
+            // val region = call.argument<String>("region") ?: ""
+            // val supportedLanguages = call.argument<List<String>>("supportedLanguages") ?: listOf("zh-CN")
+    
+            // val success = azureAsrHelper.initialize(subscriptionKey, region, supportedLanguages.toTypedArray())
+            // result.success(success)
+         
 
             val success = bluetoothGatt?.writeCharacteristic(writeChar) ?: false
 
@@ -478,7 +553,7 @@ class BleService(private val context: Context) {
             writeChar?.value = commandData
 
             val success = bluetoothGatt?.writeCharacteristic(writeChar) ?: false
-            
+            fos?.close()
             if (success) {
                 Log.i(TAG, "停止录音命令已发送")
             } else {
@@ -498,6 +573,10 @@ class BleService(private val context: Context) {
      * 协议头(0xAA) + 字段类型(0x01) + 数据长度(0x01) + 音量值(0~16) + 校验和
      */
     fun adjustVolume(volume: Int): Boolean {
+        Log.e(
+            TAG,
+            "adjustVolume,bluetoothGatt=${bluetoothGatt},writeChar=${writeChar},connectionState=${connectionState.value}"
+        )
         if (bluetoothGatt == null || writeChar == null || connectionState.value != STATE_CONNECTED) {
             Log.e(TAG, "无法发送音量调整命令，设备未连接")
             return false
@@ -515,9 +594,9 @@ class BleService(private val context: Context) {
 
             // 计算校验和
             val checksum = ((header.toInt() and 0xFF) +
-                          (fieldType.toInt() and 0xFF) + 
+                    (fieldType.toInt() and 0xFF) +
-                          (dataLen.toInt() and 0xFF) + 
+                    (dataLen.toInt() and 0xFF) +
-                          (volumeData.toInt() and 0xFF)) and 0xFF
+                    (volumeData.toInt() and 0xFF)) and 0xFF
 
             // 创建完整命令
             val commandData = byteArrayOf(header, fieldType, dataLen, volumeData, checksum.toByte())

local_plugins/jieli/lib/jieli.dart

@@ -51,8 +51,10 @@ class EventType {
 
 /// 杰理BLE插件主类
 class Jieli {
-  static const MethodChannel _methodChannel = MethodChannel('com.yunqiinnovation.jieli');
+  static const MethodChannel _methodChannel =
-  static const EventChannel _eventChannel = EventChannel('com.yunqiinnovation.jieli/events');
+      MethodChannel('com.yunqiinnovation.jieli');
+  static const EventChannel _eventChannel =
+      EventChannel('com.yunqiinnovation.jieli/events');
 
   /// 扫描结果流
   static final StreamController<List<BleDevice>> _scanController =
@@ -77,7 +79,8 @@ class Jieli {
   /// 命令结果流
   static final StreamController<CommandResult> _commandResultController =
       StreamController<CommandResult>.broadcast();
-  Stream<CommandResult> get commandResultStream => _commandResultController.stream;
+  Stream<CommandResult> get commandResultStream =>
+      _commandResultController.stream;
 
   /// 原始事件流
   Stream<Map<String, dynamic>>? _eventStream;
@@ -95,7 +98,8 @@ class Jieli {
 
   /// 设置事件监听器
   void _setupEventListener() {
-    _eventSubscription = _eventChannel.receiveBroadcastStream().listen(_handleEvent);
+    _eventSubscription =
+        _eventChannel.receiveBroadcastStream().listen(_handleEvent);
   }
 
   /// 处理来自原生平台的事件
@@ -110,7 +114,8 @@ class Jieli {
       case EventType.scanResult:
         if (data is List<dynamic>) {
           final deviceList = data
-              .map((item) => BleDevice.fromJson(Map<String, dynamic>.from(item)))
+              .map(
+                  (item) => BleDevice.fromJson(Map<String, dynamic>.from(item)))
               .toList();
           _scanController.add(deviceList);
         }
@@ -175,37 +180,41 @@ class Jieli {
 
   /// 发送开始录音命令
   Future<bool> sendStartRecordingCommand() async {
-    final result = await _methodChannel.invokeMethod<bool>('sendStartRecordingCommand');
+    final result =
+        await _methodChannel.invokeMethod<bool>('sendStartRecordingCommand');
     return result ?? false;
   }
 
   /// 发送停止录音命令
   Future<bool> sendStopRecordingCommand() async {
-    final result = await _methodChannel.invokeMethod<bool>('sendStopRecordingCommand');
+    final result =
+        await _methodChannel.invokeMethod<bool>('sendStopRecordingCommand');
     return result ?? false;
   }
 
   /// 关闭插件，释放资源
   Future<void> dispose() async {
     await stopScan();
-    await disconnect();
+    // await disconnect();
-    _eventSubscription?.cancel();
+    // _eventSubscription?.cancel();
-    _scanController.close();
+    // _scanController.close();
-    _connectionController.close();
+    // _connectionController.close();
-    _audioController.close();
+    // _audioController.close();
-    _wakeupController.close();
+    // _wakeupController.close();
-    _commandResultController.close();
+    // _commandResultController.close();
   }
 
   /// 检查蓝牙是否已启用
   Future<bool> isBluetoothEnabled() async {
-    final result = await _methodChannel.invokeMethod<bool>('isBluetoothEnabled');
+    final result =
+        await _methodChannel.invokeMethod<bool>('isBluetoothEnabled');
     return result ?? false;
   }
 
   /// 请求打开蓝牙
   Future<bool> requestBluetoothEnable() async {
-    final result = await _methodChannel.invokeMethod<bool>('requestBluetoothEnable');
+    final result =
+        await _methodChannel.invokeMethod<bool>('requestBluetoothEnable');
     return result ?? false;
   }
 
@@ -268,5 +277,6 @@ class CommandResult {
   });
 
   @override
-  String toString() => 'CommandResult{commandType: $commandType, success: $success}';
+  String toString() =>
+      'CommandResult{commandType: $commandType, success: $success}';
 }