awin/vc-kirby-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: improve scanning stability & connect to freshly bonded devs

Browse Source
This commit is contained in:
Stefan Zollinger
2024-08-19 14:39:23 +02:00
parent 48c6b2c314
commit d210a2754d
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/logitech/vc/kirbytest/ConnectionManager.kt
View File

@@ -18,6 +18,7 @@ import android.bluetooth.le.ScanCallback
import android.bluetooth.le.ScanFilter import android.bluetooth.le.ScanFilter
import android.bluetooth.le.ScanResult import android.bluetooth.le.ScanResult
import android.bluetooth.le.ScanSettings import android.bluetooth.le.ScanSettings
import android.bluetooth.le.ScanSettings.MATCH_NUM_ONE_ADVERTISEMENT
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@@ -210,6 +211,7 @@ class ConnectionManager(val context: Context, bleAdapter: BluetoothAdapter) {
private val scanSettings = ScanSettings.Builder() private val scanSettings = ScanSettings.Builder()
.setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY) .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
.setNumOfMatches(ScanSettings.MATCH_NUM_ONE_ADVERTISEMENT)
.build() .build()
private val bleScanner by lazy { private val bleScanner by lazy {
@@ -308,7 +310,8 @@ class ConnectionManager(val context: Context, bleAdapter: BluetoothAdapter) {
fun startScan() { fun startScan() {
if (!isScanning) { if (!isScanning) {
isScanning = true isScanning = true
bleScanner.startScan( null, scanSettings, scanCallback) val filter = ScanFilter.Builder().setDeviceName("KIRBY").build()
bleScanner.startScan(listOf(filter), scanSettings, scanCallback)
} }
} }

10
app/src/main/java/com/logitech/vc/kirbytest/MainActivity.kt
View File

@@ -21,6 +21,7 @@ import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View.INVISIBLE import android.view.View.INVISIBLE
import android.view.View.VISIBLE import android.view.View.VISIBLE
import android.view.WindowManager
import android.widget.Toast import android.widget.Toast
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts.CreateDocument import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
@@ -160,6 +161,10 @@ class MainActivity : AppCompatActivity() {
lifecycleScope.launch { lifecycleScope.launch {
settings.loadSettings() settings.loadSettings()
if(settings.getSettings().lowPowerMode) {
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
}
} }
} }
@@ -202,6 +207,7 @@ class MainActivity : AppCompatActivity() {
} }
private fun addBondedDevices(): Unit { private fun addBondedDevices(): Unit {
bondedDevices.clear()
bluetoothAdapter.bondedDevices.filter { isKirbyDevice(it) }.forEach { bluetoothAdapter.bondedDevices.filter { isKirbyDevice(it) }.forEach {
bondedDevices.add(it.address) bondedDevices.add(it.address)
newKirbyDevice(it) newKirbyDevice(it)
@@ -235,12 +241,8 @@ class MainActivity : AppCompatActivity() {
kirbyDevice.onScanResult(callbackType, result) kirbyDevice.onScanResult(callbackType, result)
} }
if (bondedDevices.contains(result.device.address)) {
Log.i("KirbyDevice", "Auto connecting to bonded device" + result.device.address)
kirbyDevice.connect() kirbyDevice.connect()
} }
}
} }
}) })
return mngr return mngr