Browse Source

fix(ble_service): 添加BLE通知特征数据的日志信息

refactor(agent_service): 调整音频会话检查逻辑并添加日志
weicu
liwei1dao 9 months ago
parent
commit
f773949104
  1. 6
      local_plugins/agent_service/ios/agent_service/Sources/agent_service/AgentServiceImpl.swift
  2. 4
      local_plugins/ble_service/android/src/main/kotlin/com/yunqiinnovation/ble_service/BleService.kt

6
local_plugins/agent_service/ios/agent_service/Sources/agent_service/AgentServiceImpl.swift

@ -279,6 +279,8 @@ class AgentServiceImpl: NSObject {
self.xunfeiAccessKeySecret = xunfeiAccessKeySecret self.xunfeiAccessKeySecret = xunfeiAccessKeySecret
} }
//启动定位服务 //启动定位服务
NotificationCenter.default.post(name: .locationstartEvent, object: nil) NotificationCenter.default.post(name: .locationstartEvent, object: nil)
// addlocationmonitor() // addlocationmonitor()
@ -311,9 +313,8 @@ class AgentServiceImpl: NSObject {
LocationService.shared.getCurrentLocation() { location in LocationService.shared.getCurrentLocation() { location in
// self.locationInfo = location // self.locationInfo = location
} }
currentRecognitionMode = "normal"
checkAdnSetAudioSession() checkAdnSetAudioSession()
return isInitialized return isInitialized
} }
@ -390,6 +391,7 @@ class AgentServiceImpl: NSObject {
} }
private func checkAdnSetAudioSession() { private func checkAdnSetAudioSession() {
os_log("liwei------ 检查并设置音频会话", log: logger, type: .info)
let audioSourceType: AzureAsrHelper.AudioSourceType = BleService.shared.isConnected() ? .external : .microphone let audioSourceType: AzureAsrHelper.AudioSourceType = BleService.shared.isConnected() ? .external : .microphone
azureAsrHelper?.performAudioStart(mod: currentRecognitionMode, audioSourceType: audioSourceType, audioDataCallback: nil) azureAsrHelper?.performAudioStart(mod: currentRecognitionMode, audioSourceType: audioSourceType, audioDataCallback: nil)
} }

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

@ -953,7 +953,7 @@ object BleService {
override fun onCharacteristicChanged(g: BluetoothGatt, c: BluetoothGattCharacteristic) { override fun onCharacteristicChanged(g: BluetoothGatt, c: BluetoothGattCharacteristic) {
val data = c.value ?: return val data = c.value ?: return
Log.i(TAG, "ble指令----------- 收到通知特征数据(命令和控制 uuid=${c.uuid}")
// 根据特征UUID区分处理 // 根据特征UUID区分处理
when (c.uuid) { when (c.uuid) {
// 音频特征数据 // 音频特征数据
@ -973,7 +973,7 @@ object BleService {
} }
// 通知特征数据(命令和控制) // 通知特征数据(命令和控制)
BleConst.NOTIFY_CHAR_UUID -> { BleConst.NOTIFY_CHAR_UUID -> {
Log.i(TAG, "ble指令----------- 收到通知特征数据(命令和控制)") // Log.i(TAG, "ble指令----------- 收到通知特征数据(命令和控制)")
// 判断数据类型 // 判断数据类型
when { when {
// 设备响应 (0xBB开头) // 设备响应 (0xBB开头)

Loading…
Cancel
Save