Redesign service approach

This commit is contained in:
Sylwester Zieliński
2022-02-10 16:37:22 +01:00
parent 7c69fe14a5
commit d12409cffd
14 changed files with 275 additions and 141 deletions

View File

@@ -2,18 +2,13 @@ package no.nordicsemi.android.bps.data
import android.bluetooth.BluetoothDevice
import android.content.Context
import android.util.Log
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.android.scopes.ViewModelScoped
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.awaitCancellation
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import no.nordicsemi.android.ble.ktx.suspend
import no.nordicsemi.android.bps.repository.BPSManager
import no.nordicsemi.android.service.BleManagerResult
import javax.inject.Inject
@@ -32,19 +27,13 @@ internal class BPSRepository @Inject constructor(
trySend(it)
}.launchIn(scope)
try {
manager.connect(device)
.useAutoConnect(false)
.retry(3, 100)
.suspend()
} catch (e: Exception) {
e.printStackTrace()
}
manager.connect(device)
.useAutoConnect(false)
.retry(3, 100)
.enqueue()
awaitClose {
launch {
manager.disconnect().suspend()
}
manager.disconnect().enqueue()
}
}
}

View File

@@ -1,6 +1,5 @@
package no.nordicsemi.android.bps.view
import android.util.Log
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
@@ -29,8 +28,6 @@ fun BPSScreen() {
viewModel.onEvent(DisconnectEvent)
}
Log.d("AAATESTAAA", "state: $state")
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
when (state) {
NoDeviceState -> NoDeviceView()