dearsky/LBJ_Console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 29 Wiki Activity

fix: simplify device name matching logic

Browse Source
This commit is contained in:
Nedifinita
2025-07-26 00:52:18 +08:00
parent c8ab5f7ff8
commit e1773370d6
3 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/noxylva/lbjconsole/BLEClient.kt
View File

@@ -66,24 +66,7 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
deviceName != null && deviceName.equals(targetDeviceName, ignoreCase = true)
}
else -> {
deviceName != null && (
deviceName.contains("LBJ", ignoreCase = true) ||
deviceName.contains("Receiver", ignoreCase = true) ||
deviceName.contains("Train", ignoreCase = true) ||
deviceName.contains("Console", ignoreCase = true) ||
deviceName.contains("ESP", ignoreCase = true) ||
deviceName.contains("Arduino", ignoreCase = true) ||
deviceName.contains("BLE", ignoreCase = true) ||
deviceName.contains("UART", ignoreCase = true) ||
deviceName.contains("Serial", ignoreCase = true)
) && !(
deviceName.contains("Midea", ignoreCase = true) ||
deviceName.contains("TV", ignoreCase = true) ||
deviceName.contains("Phone", ignoreCase = true) ||
deviceName.contains("Watch", ignoreCase = true) ||
deviceName.contains("Headset", ignoreCase = true) ||
deviceName.contains("Speaker", ignoreCase = true)
)
true
}
}

6
app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt
View File

@@ -639,10 +639,10 @@ class MainActivity : ComponentActivity() {
bleClient.setAutoReconnect(true)
val targetDeviceName = if (settingsDeviceName.isNotBlank() && settingsDeviceName != "LBJReceiver") {
val targetDeviceName = if (settingsDeviceName.isNotBlank()) {
settingsDeviceName
} else {
"LBJReceiver"
null
}
Log.d(TAG, "Auto scanning for target device: $targetDeviceName")
@@ -680,7 +680,7 @@ class MainActivity : ComponentActivity() {
isScanning = true
foundDevices = emptyList()
val targetDeviceName = if (settingsDeviceName.isNotBlank() && settingsDeviceName != "LBJReceiver") {
val targetDeviceName = if (settingsDeviceName.isNotBlank()) {
settingsDeviceName
} else {
null