|
|
|
@ -586,6 +586,7 @@ object BleService { |
|
|
|
* 断开当前连接 |
|
|
|
*/ |
|
|
|
fun disconnect() { |
|
|
|
Log.d(TAG, "主动断开当前连接") |
|
|
|
bluetoothGatt?.disconnect() |
|
|
|
updateConnectionState(BleConst.STATE_DISCONNECTING) |
|
|
|
} |
|
|
|
@ -616,6 +617,7 @@ object BleService { |
|
|
|
* 更新连接状态并通知回调 |
|
|
|
*/ |
|
|
|
private fun updateConnectionState(state: Int) { |
|
|
|
Log.d(TAG, "fdp--------- 更新连接状态: $state") |
|
|
|
connectionState.postValue(state) |
|
|
|
notifyConnectionStateChanged(state) |
|
|
|
} |
|
|
|
@ -648,17 +650,24 @@ object BleService { |
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { |
|
|
|
try { |
|
|
|
// 首先尝试读取当前PHY状态 |
|
|
|
g.readPhy() |
|
|
|
val readResult = g.readPhy() |
|
|
|
Log.d(TAG, "读取PHY状态请求结果: $readResult") |
|
|
|
|
|
|
|
// 然后请求设置2M PHY |
|
|
|
g.setPreferredPhy( |
|
|
|
BluetoothDevice.PHY_LE_2M_MASK, // TX PHY: 2M |
|
|
|
BluetoothDevice.PHY_LE_2M_MASK, // RX PHY: 2M |
|
|
|
BluetoothDevice.PHY_OPTION_NO_PREFERRED |
|
|
|
) |
|
|
|
Log.d(TAG, "已请求设置PHY为2M") |
|
|
|
// 延迟一段时间后再设置PHY，确保readPhy完成 |
|
|
|
Handler(Looper.getMainLooper()).postDelayed({ |
|
|
|
try { |
|
|
|
val setResult = g.setPreferredPhy( |
|
|
|
BluetoothDevice.PHY_LE_2M_MASK, // TX PHY: 2M |
|
|
|
BluetoothDevice.PHY_LE_2M_MASK, // RX PHY: 2M |
|
|
|
BluetoothDevice.PHY_OPTION_NO_PREFERRED |
|
|
|
) |
|
|
|
Log.d(TAG, "设置PHY为2M请求结果: $setResult") |
|
|
|
} catch (e: Exception) { |
|
|
|
Log.w(TAG, "设置PHY失败: ${e.message}") |
|
|
|
} |
|
|
|
}, 500) // 延迟500ms |
|
|
|
} catch (e: Exception) { |
|
|
|
Log.w(TAG, "设置PHY失败: ${e.message}，将使用默认1M PHY") |
|
|
|
Log.w(TAG, "读取PHY失败: ${e.message}，将使用默认1M PHY") |
|
|
|
} |
|
|
|
} else { |
|
|
|
Log.w(TAG, "当前Android版本不支持PHY设置（需要API 26+），使用默认1M PHY") |
|
|
|
@ -669,11 +678,13 @@ object BleService { |
|
|
|
|
|
|
|
newState == BluetoothProfile.STATE_DISCONNECTED -> { |
|
|
|
updateConnectionState(BleConst.STATE_DISCONNECTED) |
|
|
|
Log.d(TAG, "监听到已断开连接") |
|
|
|
disconnectGatt() |
|
|
|
} |
|
|
|
|
|
|
|
else -> { |
|
|
|
updateConnectionState(BleConst.STATE_ERROR) |
|
|
|
Log.d(TAG, "监听到连接错误") |
|
|
|
disconnectGatt() |
|
|
|
} |
|
|
|
} |
|
|
|
@ -699,6 +710,7 @@ object BleService { |
|
|
|
*/ |
|
|
|
override fun onPhyUpdate(gatt: BluetoothGatt, txPhy: Int, rxPhy: Int, status: Int) { |
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { |
|
|
|
Log.d(TAG, "PHY更新回调: status=$status, txPhy=$txPhy, rxPhy=$rxPhy") |
|
|
|
when (status) { |
|
|
|
BluetoothGatt.GATT_SUCCESS -> { |
|
|
|
val txPhyStr = getPhyString(txPhy) |
|
|
|
@ -712,7 +724,7 @@ object BleService { |
|
|
|
Log.w(TAG, "PHY更新出现一般性错误，可能是设备兼容性问题") |
|
|
|
} |
|
|
|
else -> { |
|
|
|
Log.w(TAG, "PHY更新失败: status=$status") |
|
|
|
Log.w(TAG, "PHY更新失败: status=$status，设备可能不支持2M PHY") |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1497,39 +1509,39 @@ startBytesStatistics() |
|
|
|
failureReason.append(" - 原因: BluetoothGatt为空") |
|
|
|
} else { |
|
|
|
// 检查连接状态 |
|
|
|
val connectionState = bluetoothManager.getConnectionState( |
|
|
|
val State = bluetoothManager.getConnectionState( |
|
|
|
bluetoothGatt!!.device, |
|
|
|
BluetoothProfile.GATT |
|
|
|
) |
|
|
|
when (connectionState) { |
|
|
|
when (State) { |
|
|
|
BluetoothProfile.STATE_DISCONNECTED -> { |
|
|
|
failureReason.append(" - 原因: 设备已断开连接") |
|
|
|
failureReason.append(" -发送失败 原因: 设备已断开连接") |
|
|
|
} |
|
|
|
BluetoothProfile.STATE_CONNECTING -> { |
|
|
|
failureReason.append(" - 原因: 设备正在连接中") |
|
|
|
failureReason.append(" -发送失败 原因: 设备正在连接中") |
|
|
|
} |
|
|
|
BluetoothProfile.STATE_DISCONNECTING -> { |
|
|
|
failureReason.append(" - 原因: 设备正在断开连接") |
|
|
|
failureReason.append(" -发送失败 原因: 设备正在断开连接") |
|
|
|
} |
|
|
|
BluetoothProfile.STATE_CONNECTED -> { |
|
|
|
// 连接正常，检查其他原因 |
|
|
|
if (callWriteChar == null) { |
|
|
|
failureReason.append(" - 原因: 写入特征值为空") |
|
|
|
failureReason.append(" -发送失败 原因: 写入特征值为空") |
|
|
|
} else { |
|
|
|
// 检查特征值属性 |
|
|
|
val properties = callWriteChar!!.properties |
|
|
|
if ((properties and BluetoothGattCharacteristic.PROPERTY_WRITE) == 0 && |
|
|
|
(properties and BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) == 0) { |
|
|
|
failureReason.append(" - 原因: 特征值不支持写入操作") |
|
|
|
failureReason.append(" -发送失败 原因: 特征值不支持写入操作") |
|
|
|
} else if (chunk.size > 512) { // BLE MTU通常限制 |
|
|
|
failureReason.append(" - 原因: 数据块过大 (${chunk.size} > 512字节)") |
|
|
|
failureReason.append(" -发送失败 原因: 数据块过大 (${chunk.size} > 512字节)") |
|
|
|
} else { |
|
|
|
failureReason.append(" - 原因: 未知错误，可能是设备忙碌或缓冲区满") |
|
|
|
failureReason.append(" -发送失败 原因: 未知错误，可能是设备忙碌或缓冲区满") |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else -> { |
|
|
|
failureReason.append(" - 原因: 未知连接状态($connectionState)") |
|
|
|
failureReason.append(" -发送失败 原因: 未知连接状态($connectionState)") |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
fdp
1 year ago