From 32e4e6698eefc6294aa7e24ffed234693f41045f Mon Sep 17 00:00:00 2001 From: grendervill Date: Thu, 20 Aug 2026 11:45:13 +0300 Subject: [PATCH] =?UTF-8?q?AeroToss:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BF=D0=BE=D1=82=D0=B5=D1=80?= =?UTF-8?q?=D0=B8=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B8=20+=20=D1=83=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B0=20=D0=BB=D0=B8=D1=88=D0=BD=D1=8F=D1=8F?= =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - onBroadcastReceived: обновляет device если IP/name изменились - Убрана FAB 'Обновить' внизу (осталась TextButton 'Обновить' справа) - Устройства снова видят друг друга после переподключения --- .../com/aerotoss/discovery/TcpDiscovery.kt | 16 +++++++++++++--- .../com/aerotoss/ui/screens/HomeScreen.kt | 18 +++++------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/src/commonMain/kotlin/com/aerotoss/discovery/TcpDiscovery.kt b/app/src/commonMain/kotlin/com/aerotoss/discovery/TcpDiscovery.kt index 279aacf..b68d05e 100644 --- a/app/src/commonMain/kotlin/com/aerotoss/discovery/TcpDiscovery.kt +++ b/app/src/commonMain/kotlin/com/aerotoss/discovery/TcpDiscovery.kt @@ -151,10 +151,20 @@ class TcpDiscovery( if (remoteId == deviceId) return if (remoteServicePort == myServicePort) return - // Skip if already known - if (discoveredDevices.containsKey(remoteId)) return - val host = pkt.address.hostAddress ?: return + + // Update existing device if IP or name changed (e.g. after reconnect) + val existing = discoveredDevices[remoteId] + if (existing != null) { + if (existing.hostAddress != host || existing.name != remoteName) { + val updated = existing.copy(hostAddress = host, name = remoteName) + discoveredDevices[remoteId] = updated + _devices.value = discoveredDevices.values.toList() + } + return + } + + // New device - query it val device = queryRemote(host, remoteTcpPort) if (device != null) { discoveredDevices[device.id] = device diff --git a/app/src/commonMain/kotlin/com/aerotoss/ui/screens/HomeScreen.kt b/app/src/commonMain/kotlin/com/aerotoss/ui/screens/HomeScreen.kt index 337395c..2c5dd1d 100644 --- a/app/src/commonMain/kotlin/com/aerotoss/ui/screens/HomeScreen.kt +++ b/app/src/commonMain/kotlin/com/aerotoss/ui/screens/HomeScreen.kt @@ -35,19 +35,11 @@ fun HomeScreen( ) }, floatingActionButton = { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { - FloatingActionButton( - onClick = { manager.rescan() }, - containerColor = MaterialTheme.colorScheme.tertiaryContainer - ) { - Text("Обновить", style = MaterialTheme.typography.labelLarge) - } - FloatingActionButton( - onClick = onReceiveClick, - containerColor = MaterialTheme.colorScheme.secondaryContainer - ) { - Text("Получить", style = MaterialTheme.typography.labelLarge) - } + FloatingActionButton( + onClick = onReceiveClick, + containerColor = MaterialTheme.colorScheme.secondaryContainer + ) { + Text("Получить", style = MaterialTheme.typography.labelLarge) } } ) { padding ->