Helicopter/HeliBLE
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Data tranfering improvement

Browse Source
This commit is contained in:
Goga Coder
2024-02-09 19:28:49 +07:00
parent 3b62743481
commit 3517414ec1
16 changed files with 251 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/com/helible/pilot/viewmodels/BluetoothDataTransferService.kt
View File

@@ -2,8 +2,12 @@ package com.helible.pilot.viewmodels
import android.bluetooth.BluetoothSocket
import android.util.Log
import com.helible.pilot.KMessage
import com.helible.pilot.toKMessage
import com.helible.pilot.dataclasses.DeviceState
import com.helible.pilot.dataclasses.DeviceStatusJsonAdapter
import com.squareup.moshi.JsonEncodingException
import com.squareup.moshi.Moshi
import com.squareup.moshi.adapter
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
@@ -14,25 +18,42 @@ import java.io.IOException
class TransferFailedException : IOException("Reading incoming data failed")
@ExperimentalStdlibApi
class BluetoothDataTransferService(
private val socket: BluetoothSocket,
) {
fun listenForIncomingMessages(): Flow<String> {
fun listenForIncomingMessages(): Flow<DeviceState> {
val moshi = Moshi.Builder().add(DeviceStatusJsonAdapter()).add(KotlinJsonAdapterFactory()).build()
val deviceStateMessageAdapter = moshi.adapter<DeviceState>()
return flow {
if (!socket.isConnected)
return@flow
val buffer = ByteArray(128)
val buffer = ByteArray(512)
while (true) {
val byteCount: Int = try {
socket.inputStream.read(buffer)
} catch (e: IOException) {
Log.e("BluetoothController", "Failed to receive incoming data")
throw TransferFailedException()
}
val strData: String = buffer.decodeToString(endIndex = byteCount)
emit(
strData
)
Log.i("BluetoothController", "Received: ${strData.dropLast(2)}")
val messageData: String = buffer.decodeToString(endIndex = byteCount)
if (!messageData.endsWith("\n\r")) {
Log.i("BluetoothController", "Package end isn't valid.")
Log.i("BluetoothController", messageData)
} else {
val messageJson = messageData.dropLast(2)
try {
val deviceState = deviceStateMessageAdapter.fromJson(messageJson)!!
emit(deviceState)
Log.i("BluetoothController", "Received: $deviceState")
} catch (e: NullPointerException) {
Log.e("BluetoothController", "Nullable message received: $messageJson")
} catch (e: JsonEncodingException) {
Log.e("BluetoothController", "Invalid message received: $messageJson")
}
}
}
}.flowOn(Dispatchers.IO)
}
@@ -42,10 +63,11 @@ class BluetoothDataTransferService(
try {
socket.outputStream.write(bytes)
} catch (e: IOException) {
e.printStackTrace()
Log.e("BluetoothController", "Failed to write message: $e")
return@withContext false
}
true
}
}
}
}