aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-19 15:34:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix scanning

Browse Source
This commit is contained in:
Sylwester Zielinski
2023-03-07 16:04:23 +01:00
parent f54d4c2360
commit 7630a3113b
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -31,7 +31,7 @@
#Mon Feb 14 14:46:55 CET 2022 #Mon Feb 14 14:46:55 CET 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

3
lib_scanner/src/main/java/no/nordicsemi/android/toolbox/scanner/ScannerDestination.kt
View File

@@ -9,6 +9,7 @@ import no.nordicsemi.android.common.ui.scanner.DeviceSelected
import no.nordicsemi.android.common.ui.scanner.ScannerScreen import no.nordicsemi.android.common.ui.scanner.ScannerScreen
import no.nordicsemi.android.common.ui.scanner.ScanningCancelled import no.nordicsemi.android.common.ui.scanner.ScanningCancelled
import no.nordicsemi.android.kotlin.ble.core.ServerDevice import no.nordicsemi.android.kotlin.ble.core.ServerDevice
import java.util.*
val ScannerDestinationId = createDestination<ParcelUuid, ServerDevice>("uiscanner-destination") val ScannerDestinationId = createDestination<ParcelUuid, ServerDevice>("uiscanner-destination")
@@ -18,7 +19,7 @@ val ScannerDestination = defineDestination(ScannerDestinationId) {
val arg = navigationViewModel.parameterOf(ScannerDestinationId) val arg = navigationViewModel.parameterOf(ScannerDestinationId)
ScannerScreen( ScannerScreen(
uuid = arg, uuid = ParcelUuid(UUID.fromString("00001816-0000-1000-8000-00805f9b34fb")),
onResult = { onResult = {
when (it) { when (it) {
is DeviceSelected -> navigationViewModel.navigateUpWithResult(ScannerDestinationId, it.device) is DeviceSelected -> navigationViewModel.navigateUpWithResult(ScannerDestinationId, it.device)

6
profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt
View File

@@ -37,7 +37,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import no.nordicsemi.android.common.logger.NordicLogger import no.nordicsemi.android.common.logger.NordicLogger
import no.nordicsemi.android.common.logger.NordicLoggerFactory
import no.nordicsemi.android.csc.data.CSCServicesData import no.nordicsemi.android.csc.data.CSCServicesData
import no.nordicsemi.android.kotlin.ble.core.ServerDevice import no.nordicsemi.android.kotlin.ble.core.ServerDevice
import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
@@ -45,7 +44,6 @@ import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSize import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSize
import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSizes import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSizes
import no.nordicsemi.android.service.ServiceManager import no.nordicsemi.android.service.ServiceManager
import no.nordicsemi.android.ui.view.StringConst
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@@ -54,8 +52,6 @@ class CSCRepository @Inject constructor(
@ApplicationContext @ApplicationContext
private val context: Context, private val context: Context,
private val serviceManager: ServiceManager, private val serviceManager: ServiceManager,
private val loggerFactory: NordicLoggerFactory,
private val stringConst: StringConst
) { ) {
private var logger: NordicLogger? = null private var logger: NordicLogger? = null
@@ -66,8 +62,6 @@ class CSCRepository @Inject constructor(
internal val data = _data.asStateFlow() internal val data = _data.asStateFlow()
val isRunning = data.map { it.connectionState == GattConnectionState.STATE_CONNECTED } val isRunning = data.map { it.connectionState == GattConnectionState.STATE_CONNECTED }
val hasBeenDisconnected =
data.map { it.connectionState != GattConnectionState.STATE_CONNECTED && it.connectionState != GattConnectionState.STATE_CONNECTING }
fun launch(device: ServerDevice) { fun launch(device: ServerDevice) {
serviceManager.startService(CSCService::class.java, device) serviceManager.startService(CSCService::class.java, device)

2
settings.gradle.kts
View File

@@ -49,7 +49,7 @@ dependencyResolutionManagement {
} }
versionCatalogs { versionCatalogs {
create("libs") { create("libs") {
from("no.nordicsemi.android.gradle:version-catalog:1.3.1") from("no.nordicsemi.android.gradle:version-catalog:1.3.3")
} }
} }
} }