ua1zbe/meshcore-sar_android
1
0
Fork 0
mirror of https://github.com/dz0ny/meshcore-sar.git synced 2026-08-11 16:30:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

feat: Update project version to 42 and enhance advertisement handling in BLE service

Browse Source
This commit is contained in:
Janez T
2025-10-27 22:47:04 +01:00
parent 8c05c331e2
commit b398dc9aa9
8 changed files with 58 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/providers/app_provider.dart
View File

@@ -245,6 +245,25 @@ class AppProvider with ChangeNotifier {
});
};
// When an advertisement is received (PUSH_CODE_ADVERT 0x80)
// This may be sent by the radio for existing contacts instead of PUSH_CODE_NEW_ADVERT (0x8A)
connectionProvider.onAdvertReceived = (publicKey) {
debugPrint('📡 [AppProvider] Advertisement received: ${publicKey.sublist(0, 6).map((b) => b.toRadixString(16).padLeft(2, '0')).join(':')}...');
// Check if this is an existing contact that might have updated location
final contact = contactsProvider.findContactByKey(publicKey);
if (contact != null) {
debugPrint(' Existing contact "${contact.advName}" - triggering contact sync for updates');
// Trigger a contact sync to get the updated contact information
Future.delayed(const Duration(milliseconds: 100), () {
if (connectionProvider.deviceInfo.isConnected) {
connectionProvider.getContacts();
}
});
} else {
debugPrint(' New contact - waiting for PUSH_CODE_NEW_ADVERT (0x8A) with full details');
}
};
// When a message is sent (RESP_CODE_SENT received)
connectionProvider.onMessageSent = (messageId, expectedAckTag, suggestedTimeoutMs) {
debugPrint('📤 [AppProvider] Message sent - Message ID: $messageId, ACK tag: $expectedAckTag');

20
lib/providers/connection_provider.dart
View File

@@ -130,6 +130,7 @@ class ConnectionProvider with ChangeNotifier {
Function(int channelIdx, String channelName)? onChannelInfoReceived;
Function(Uint8List publicKeyPrefix, int tag, Uint8List responseData)?
onBinaryResponse;
Function(Uint8List publicKey)? onAdvertReceived;
Function(Uint8List publicKey)? onPathUpdated;
Function(Uint8List publicKeyPrefix, int permissions, bool isAdmin, int tag)?
onLoginSuccess;
@@ -262,10 +263,14 @@ class ConnectionProvider with ChangeNotifier {
};
_bleService.onContactReceived = (contact) {
debugPrint('📥 [Provider] Contact received (0x8A): "${contact.advName}"');
debugPrint(' Forwarding to AppProvider via onContactReceived callback');
onContactReceived?.call(contact);
};
_bleService.onContactsComplete = (contacts) {
debugPrint('📥 [Provider] Contacts sync complete: ${contacts.length} contacts');
debugPrint(' Forwarding to AppProvider via onContactsComplete callback');
onContactsComplete?.call(contacts);
};
@@ -286,8 +291,14 @@ class ConnectionProvider with ChangeNotifier {
};
_bleService.onTelemetryReceived = (publicKey, lppData) {
debugPrint('📥 [Provider] Telemetry response (0x8B) received');
debugPrint(
' Public key: ${publicKey.sublist(0, 6).map((b) => b.toRadixString(16).padLeft(2, '0')).join(':')}...',
);
debugPrint(' LPP data: ${lppData.length} bytes');
// Mark ping as successful if this was a ping request
_pingTracker.markPingSuccessful(publicKey);
debugPrint(' Forwarding to AppProvider via onTelemetryReceived callback');
onTelemetryReceived?.call(publicKey, lppData);
};
@@ -362,11 +373,10 @@ class ConnectionProvider with ChangeNotifier {
debugPrint(
' Public key: ${publicKey.sublist(0, 6).map((b) => b.toRadixString(16).padLeft(2, '0')).join(':')}...',
);
debugPrint(
' Note: Waiting for PUSH_CODE_NEW_ADVERT (0x8A) with full contact details',
);
// The companion radio will automatically send PUSH_CODE_NEW_ADVERT if manual_add_contacts=0
// which will trigger onContactReceived callback and add/update the contact
// Forward to AppProvider to trigger contact update
// The radio may send only PUSH_CODE_ADVERT (0x80) for existing contacts
// instead of PUSH_CODE_NEW_ADVERT (0x8A), so we need to handle this
onAdvertReceived?.call(publicKey);
};
_bleService.onPathUpdated = (publicKey) {