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: Add Sensor telemetry alerts

Browse Source 
ref:
This commit is contained in:
Janez T
2026-03-15 09:13:32 +01:00
parent c05de2cf0a
commit 4557fb4b9e
18 changed files with 1862 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/providers/contacts_provider.dart
View File

@@ -450,6 +450,9 @@ class ContactsProvider with ChangeNotifier {
List<Contact> get repeaters =>
contacts.where((c) => c.isRepeater).toList()..sort(_sortByLastSeen);
List<Contact> get sensorContacts =>
contacts.where((c) => c.isSensor).toList()..sort(_sortByLastSeen);
List<Contact> get rooms =>
contacts.where((c) => c.isRoom).toList()..sort(_sortByLastSeen);
@@ -553,6 +556,7 @@ class ContactsProvider with ChangeNotifier {
);
_contacts[contact.publicKeyHex] = updatedContact;
_pendingAdverts.remove(contact.publicKeyHex);
debugPrint(
' ✅ Contact added/updated. Total contacts: ${_contacts.length}, channels: ${channels.length}',
);
@@ -581,6 +585,7 @@ class ContactsProvider with ChangeNotifier {
incomingContact: contact,
existingContact: existingContact,
);
_pendingAdverts.remove(contact.publicKeyHex);
}
if (excluded > 0) {
debugPrint(
@@ -1526,6 +1531,7 @@ class ContactsProvider with ChangeNotifier {
return {
'chat': chatContacts.length,
'repeater': repeaters.length,
'sensor': sensorContacts.length,
'room': rooms.length,
'total': contacts.length,
};

3
lib/providers/sensors_provider.dart
View File

@@ -170,7 +170,7 @@ class SensorsProvider with ChangeNotifier {
_watchedSensorKeys.contains(publicKeyHex);
Future<void> addSensor(Contact contact) async {
if (!contact.isChat && !contact.isRepeater) {
if (!contact.isChat && !contact.isRepeater && !contact.isSensor) {
return;
}
if (_watchedSensorKeys.contains(contact.publicKeyHex)) {
@@ -204,6 +204,7 @@ class SensorsProvider with ChangeNotifier {
final candidates = <Contact>[
...contactsProvider.chatContacts,
...contactsProvider.repeaters,
...contactsProvider.sensorContacts,
];
candidates.removeWhere((contact) => isWatched(contact.publicKeyHex));
candidates.sort((a, b) => b.lastSeenTime.compareTo(a.lastSeenTime));

53
lib/screens/contacts_tab.dart
View File

@@ -37,6 +37,7 @@ class _ContactsTabState extends State<ContactsTab> {
final Map<ContactSection, String> _sectionFilters = {
ContactSection.teamMembers: '',
ContactSection.repeaters: '',
ContactSection.sensors: '',
ContactSection.rooms: '',
ContactSection.channels: '',
};
@@ -44,6 +45,7 @@ class _ContactsTabState extends State<ContactsTab> {
final Map<ContactSection, ContactSortMode> _sortModes = {
ContactSection.teamMembers: ContactSortMode.lastSeen,
ContactSection.repeaters: ContactSortMode.lastSeen,
ContactSection.sensors: ContactSortMode.lastSeen,
ContactSection.rooms: ContactSortMode.lastSeen,
};
@@ -539,6 +541,10 @@ class _ContactsTabState extends State<ContactsTab> {
contactsProvider.repeaters,
ContactSection.repeaters,
);
final allSensors = _sortContacts(
contactsProvider.sensorContacts,
ContactSection.sensors,
);
final allRooms = _sortContacts(
contactsProvider.rooms,
ContactSection.rooms,
@@ -580,6 +586,19 @@ class _ContactsTabState extends State<ContactsTab> {
final showRepeatersOthersGroup =
visibleSavedRepeaterGroups.length > 1 &&
ungroupedRepeaters.isNotEmpty;
final sensors = _filterContactsForSection(
allSensors,
ContactSection.sensors,
);
final savedSensorGroups = _buildSavedGroupsForSection(
contactsProvider,
allSensors,
ContactSection.sensors,
);
final visibleSavedSensorGroups =
_showSavedGroupsForSection(ContactSection.sensors)
? savedSensorGroups
: const <_RenderedSavedGroup>[];
final rooms = _filterContactsForSection(
allRooms,
ContactSection.rooms,
@@ -608,12 +627,14 @@ class _ContactsTabState extends State<ContactsTab> {
: const <_RenderedSavedGroup>[];
final showTeamMembersSection = allChatContacts.isNotEmpty;
final showRepeatersSection = allRepeaters.isNotEmpty;
final showSensorsSection = allSensors.isNotEmpty;
final showRoomsSection = allRooms.isNotEmpty;
final showChannelsSection = allChannels.isNotEmpty;
// Check if there are any displayable contacts
final hasDisplayableContacts =
allChatContacts.isNotEmpty ||
allRepeaters.isNotEmpty ||
allSensors.isNotEmpty ||
allRooms.isNotEmpty ||
allChannels.isNotEmpty;
@@ -743,6 +764,36 @@ class _ContactsTabState extends State<ContactsTab> {
const Divider(height: 32),
],
// Sensors
if (showSensorsSection) ...[
_SectionHeader(
title: 'Sensors',
count: sensors.length,
icon: Icons.sensors,
trailing: _buildSortMenu(context, ContactSection.sensors),
),
_buildSectionFilterField(
context,
ContactSection.sensors,
contactsProvider,
),
..._buildSavedGroupCards(
visibleSavedSensorGroups,
ContactSection.sensors,
),
if (sensors.isEmpty &&
_sectionHasActiveFilter(ContactSection.sensors))
_buildNoFilterResults(context)
else
..._buildContactSectionItems(
_excludeGroupedContacts(
sensors,
visibleSavedSensorGroups,
),
),
const Divider(height: 32),
],
// Rooms
if (showRoomsSection) ...[
_SectionHeader(
@@ -1172,7 +1223,7 @@ class _ContactsTabState extends State<ContactsTab> {
enum ContactSortMode { lastSeen, distance }
enum ContactSection { teamMembers, repeaters, rooms, channels }
enum ContactSection { teamMembers, repeaters, sensors, rooms, channels }
class _RenderedSavedGroup {
final SavedContactGroup group;

771
lib/screens/sensors_tab.dart
View File

@@ -1,16 +1,13 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart' as flutter_map;
import 'package:latlong2/latlong.dart';
import 'package:provider/provider.dart';
import '../l10n/app_localizations.dart';
import '../models/contact.dart';
import '../providers/connection_provider.dart';
import '../providers/contacts_provider.dart';
import '../providers/sensors_provider.dart';
import '../utils/location_formats.dart';
import '../widgets/sensors/sensor_telemetry_card.dart';
class SensorsTab extends StatefulWidget {
const SensorsTab({super.key});
@@ -140,7 +137,7 @@ class _SensorsTabState extends State<SensorsTab> {
builder: (sheetContext) => Consumer<SensorsProvider>(
builder: (context, sensorsProvider, child) {
final visibleFields = sensorsProvider.visibleFieldsFor(publicKeyHex);
final options = _fieldOptionsFor(contact);
final options = sensorMetricOptionsFor(contact);
return SafeArea(
child: ListView(
shrinkWrap: true,
@@ -240,7 +237,7 @@ class _SensorsTabState extends State<SensorsTab> {
break;
}
}
return _SensorCard(
return SensorTelemetryCard(
contact: contact,
state: sensorsProvider.stateFor(key),
visibleFields: sensorsProvider.visibleFieldsFor(key),
@@ -347,769 +344,15 @@ class _EmptySensorsState extends StatelessWidget {
}
}
class _SensorCard extends StatelessWidget {
final Contact? contact;
final SensorRefreshState state;
final Set<String> visibleFields;
final Map<String, int> fieldSpans;
final Future<void> Function() onRemove;
final Future<void> Function() onRefresh;
final VoidCallback onCustomize;
const _SensorCard({
required this.contact,
required this.state,
required this.visibleFields,
required this.fieldSpans,
required this.onRemove,
required this.onRefresh,
required this.onCustomize,
});
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final telemetry = contact?.telemetry;
final theme = Theme.of(context);
final colorScheme = theme.colorScheme;
final metrics = contact == null || telemetry == null
? const <_MetricCardData>[]
: _buildMetricCards(l10n, telemetry, contact!);
return Container(
margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(28),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
colorScheme.surfaceContainerLow,
colorScheme.surfaceContainerHighest.withValues(alpha: 0.9),
],
),
border: Border.all(
color: colorScheme.outlineVariant.withValues(alpha: 0.35),
),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.045),
blurRadius: 12,
offset: const Offset(0, 4),
),
],
),
child: Padding(
padding: const EdgeInsets.all(12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Wrap(
spacing: 8,
runSpacing: 6,
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
contact?.displayName ?? 'Unavailable node',
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
),
),
if (state == SensorRefreshState.timeout)
const _InlineAlertBadge(label: 'No response'),
],
),
if (telemetry != null) ...[
const SizedBox(height: 2),
Wrap(
spacing: 6,
runSpacing: 4,
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
'${_formatTelemetryDateTime(telemetry.timestamp)} • ${_formatTelemetryTime(telemetry.timestamp)}',
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
if (state == SensorRefreshState.refreshing)
const _InlineStateMeta(
label: 'Refreshing',
color: Color(0xFF266AC2),
spinning: true,
),
if (state == SensorRefreshState.success)
const _InlineStateMeta(
label: 'Updated',
color: Color(0xFF218B63),
icon: Icons.check_circle,
),
if (state == SensorRefreshState.unavailable)
const _InlineStateMeta(
label: 'Unavailable',
color: Color(0xFFB13B55),
icon: Icons.error_outline,
),
],
),
],
],
),
),
PopupMenuButton<String>(
onSelected: (value) async {
if (value == 'refresh') {
await onRefresh();
} else if (value == 'remove') {
await onRemove();
} else if (value == 'customize') {
onCustomize();
}
},
itemBuilder: (context) => [
PopupMenuItem<String>(
value: 'refresh',
child: Text(l10n.refresh),
),
const PopupMenuItem<String>(
value: 'customize',
child: Text('Customize fields'),
),
const PopupMenuItem<String>(
value: 'remove',
child: Text('Remove'),
),
],
),
],
),
const SizedBox(height: 12),
if (contact == null)
const Text(
'This node is no longer available in the contact list.',
)
else if (telemetry == null)
const Text(
'No telemetry received yet. Use Refresh from the menu or pull down to fetch it.',
)
else if (metrics.isEmpty)
const Text(
'All fields are hidden. Use Visible fields to choose what to show.',
)
else
LayoutBuilder(
builder: (context, constraints) {
const spacing = 8.0;
final compactWidth = (constraints.maxWidth - spacing) / 2;
return Wrap(
spacing: spacing,
runSpacing: spacing,
children: metrics
.map(
(metric) => _MetricTile(
data: metric,
width:
(fieldSpans[metric.fieldKey] == 2 ||
metric.wide)
? constraints.maxWidth
: compactWidth,
),
)
.toList(),
);
},
),
],
),
),
);
}
List<_MetricCardData> _buildMetricCards(
AppLocalizations l10n,
dynamic telemetry,
Contact contact,
) {
final items = <_MetricCardData>[];
if (visibleFields.contains('voltage') &&
telemetry.batteryMilliVolts != null) {
items.add(
_MetricCardData(
fieldKey: 'voltage',
icon: Icons.bolt,
label: l10n.voltage,
value: '${(telemetry.batteryMilliVolts! / 1000).toStringAsFixed(3)}V',
accent: const Color(0xFF0A7D61),
),
);
}
if (visibleFields.contains('battery') &&
telemetry.batteryPercentage != null) {
items.add(
_MetricCardData(
fieldKey: 'battery',
icon: Icons.battery_5_bar,
label: l10n.battery,
value: '${telemetry.batteryPercentage!.toStringAsFixed(0)}%',
accent: const Color(0xFF4B8E2F),
),
);
}
if (visibleFields.contains('temperature') &&
telemetry.temperature != null) {
items.add(
_MetricCardData(
fieldKey: 'temperature',
icon: Icons.thermostat,
label: l10n.temperature,
value: '${telemetry.temperature!.toStringAsFixed(1)}°C',
accent: const Color(0xFFC76821),
),
);
}
if (visibleFields.contains('humidity') && telemetry.humidity != null) {
items.add(
_MetricCardData(
fieldKey: 'humidity',
icon: Icons.water_drop,
label: l10n.humidity,
value: '${telemetry.humidity!.toStringAsFixed(1)}%',
accent: const Color(0xFF246BB2),
),
);
}
if (visibleFields.contains('pressure') && telemetry.pressure != null) {
items.add(
_MetricCardData(
fieldKey: 'pressure',
icon: Icons.compress,
label: l10n.pressure,
value: '${telemetry.pressure!.toStringAsFixed(1)} hPa',
accent: const Color(0xFF6B4BAE),
),
);
}
if (visibleFields.contains('gps') && telemetry.gpsLocation != null) {
items.add(
_MetricCardData(
fieldKey: 'gps',
icon: Icons.place,
label: l10n.gpsTelemetry,
value:
'${telemetry.gpsLocation!.latitude.toStringAsFixed(5)}, ${telemetry.gpsLocation!.longitude.toStringAsFixed(5)}',
accent: const Color(0xFFAA3F57),
wide: true,
mapLocation: LatLng(
telemetry.gpsLocation!.latitude,
telemetry.gpsLocation!.longitude,
),
secondaryValue: formatPlusCode(
telemetry.gpsLocation!.latitude,
telemetry.gpsLocation!.longitude,
),
),
);
}
if (telemetry.extraSensorData != null) {
for (final entry in telemetry.extraSensorData!.entries) {
final fieldKey = _extraFieldKey(entry.key);
if (!visibleFields.contains(fieldKey)) {
continue;
}
items.add(
_MetricCardData(
fieldKey: fieldKey,
icon: Icons.sensors,
label: _formatExtraFieldLabel(entry.key),
value: '${entry.value}',
accent: const Color(0xFF3E657C),
),
);
}
}
return items;
}
String _formatTelemetryTime(DateTime timestamp) {
final diff = DateTime.now().difference(timestamp);
if (diff.inMinutes < 1) return 'now';
if (diff.inMinutes < 60) return '${diff.inMinutes}m ago';
if (diff.inHours < 24) return '${diff.inHours}h ago';
return '${diff.inDays}d ago';
}
String _formatTelemetryDateTime(DateTime timestamp) {
final local = timestamp.toLocal();
final year = local.year.toString().padLeft(4, '0');
final month = local.month.toString().padLeft(2, '0');
final day = local.day.toString().padLeft(2, '0');
final hour = local.hour.toString().padLeft(2, '0');
final minute = local.minute.toString().padLeft(2, '0');
return '$year-$month-$day $hour:$minute';
}
}
class _InlineStateMeta extends StatelessWidget {
final String label;
final Color color;
final IconData? icon;
final bool spinning;
const _InlineStateMeta({
required this.label,
required this.color,
this.icon,
this.spinning = false,
});
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
decoration: BoxDecoration(
color: color.withValues(alpha: 0.10),
borderRadius: BorderRadius.circular(999),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (spinning)
SizedBox(
width: 11,
height: 11,
child: CircularProgressIndicator(
strokeWidth: 1.7,
valueColor: AlwaysStoppedAnimation<Color>(color),
),
)
else if (icon != null)
Icon(icon, size: 11, color: color),
const SizedBox(width: 4),
Text(
label,
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: color,
fontWeight: FontWeight.w700,
),
),
],
),
);
}
}
class _InlineAlertBadge extends StatelessWidget {
final String label;
const _InlineAlertBadge({required this.label});
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
decoration: BoxDecoration(
color: const Color(0xFFC17B1D).withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(999),
),
child: Text(
label,
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: const Color(0xFFC17B1D),
fontWeight: FontWeight.w700,
),
),
);
}
}
class _MetricTile extends StatelessWidget {
final _MetricCardData data;
final double width;
const _MetricTile({required this.data, required this.width});
Future<void> _showExpandedMap(BuildContext context) async {
final location = data.mapLocation;
if (location == null) return;
await Navigator.of(context).push(
MaterialPageRoute<void>(
builder: (pageContext) {
return Scaffold(
appBar: AppBar(
title: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(data.label),
Text(
data.value,
style: Theme.of(pageContext).textTheme.bodySmall,
),
],
),
),
body: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (data.secondaryValue != null)
Padding(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
child: Text(
data.secondaryValue!,
style: Theme.of(pageContext).textTheme.bodyMedium,
),
),
Expanded(
child: flutter_map.FlutterMap(
options: flutter_map.MapOptions(
initialCenter: location,
initialZoom: 15,
),
children: [
flutter_map.TileLayer(
urlTemplate:
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName:
'com.meshcore.sar.meshcore_sar_app',
),
flutter_map.MarkerLayer(
markers: [
flutter_map.Marker(
point: location,
width: 40,
height: 40,
child: Icon(
Icons.location_on,
color: data.accent,
size: 34,
),
),
],
),
],
),
),
],
),
);
},
fullscreenDialog: true,
),
);
}
@override
Widget build(BuildContext context) {
return Container(
width: width,
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: data.accent.withValues(alpha: 0.08),
borderRadius: BorderRadius.circular(22),
border: Border.all(color: data.accent.withValues(alpha: 0.14)),
),
child: data.mapLocation == null
? Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_MetricIcon(accent: data.accent, icon: data.icon),
const SizedBox(width: 10),
Expanded(child: _MetricText(data: data)),
],
)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_MetricIcon(accent: data.accent, icon: data.icon),
const SizedBox(width: 10),
Expanded(child: _MetricText(data: data)),
],
),
const SizedBox(height: 10),
Material(
color: Colors.transparent,
child: InkWell(
borderRadius: BorderRadius.circular(14),
onTap: () => _showExpandedMap(context),
child: ClipRRect(
borderRadius: BorderRadius.circular(14),
child: SizedBox(
height: 104,
width: double.infinity,
child: Stack(
children: [
flutter_map.FlutterMap(
options: flutter_map.MapOptions(
initialCenter: data.mapLocation!,
initialZoom: 14,
interactionOptions:
const flutter_map.InteractionOptions(
flags: flutter_map.InteractiveFlag.none,
),
),
children: [
flutter_map.TileLayer(
urlTemplate:
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName:
'com.meshcore.sar.meshcore_sar_app',
),
flutter_map.MarkerLayer(
markers: [
flutter_map.Marker(
point: data.mapLocation!,
width: 32,
height: 32,
child: Icon(
Icons.location_on,
color: data.accent,
size: 28,
),
),
],
),
],
),
Positioned(
right: 8,
bottom: 8,
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 6,
vertical: 3,
),
decoration: BoxDecoration(
color: Colors.black.withValues(alpha: 0.55),
borderRadius: BorderRadius.circular(999),
),
child: const Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.open_in_full,
size: 12,
color: Colors.white,
),
SizedBox(width: 4),
Text(
'Open map',
style: TextStyle(
color: Colors.white,
fontSize: 11,
fontWeight: FontWeight.w600,
),
),
],
),
),
),
],
),
),
),
),
),
],
),
);
}
}
class _MetricIcon extends StatelessWidget {
final Color accent;
final IconData icon;
const _MetricIcon({required this.accent, required this.icon});
@override
Widget build(BuildContext context) {
return Container(
width: 32,
height: 32,
decoration: BoxDecoration(
color: accent.withValues(alpha: 0.14),
borderRadius: BorderRadius.circular(12),
),
child: Icon(icon, color: accent, size: 18),
);
}
}
class _MetricText extends StatelessWidget {
final _MetricCardData data;
const _MetricText({required this.data});
@override
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
data.label,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.labelMedium?.copyWith(
color: data.accent,
fontWeight: FontWeight.w700,
),
),
const SizedBox(height: 4),
Text(
data.value,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
height: 1.1,
),
),
if (data.secondaryValue != null) ...[
const SizedBox(height: 4),
Text(
data.secondaryValue!,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
fontWeight: FontWeight.w600,
),
),
],
],
);
}
}
class _MetricCardData {
final String fieldKey;
final IconData icon;
final String label;
final String value;
final String? secondaryValue;
final Color accent;
final bool wide;
final LatLng? mapLocation;
const _MetricCardData({
required this.fieldKey,
required this.icon,
required this.label,
required this.value,
this.secondaryValue,
required this.accent,
this.wide = false,
this.mapLocation,
});
}
class _FieldOption {
final String key;
final String label;
const _FieldOption({required this.key, required this.label});
}
List<_FieldOption> _fieldOptionsFor(Contact? contact) {
final telemetry = contact?.telemetry;
final options = <_FieldOption>[
if (telemetry?.batteryMilliVolts != null)
const _FieldOption(key: 'voltage', label: 'Voltage'),
if (telemetry?.batteryPercentage != null)
const _FieldOption(key: 'battery', label: 'Battery'),
if (telemetry?.temperature != null)
const _FieldOption(key: 'temperature', label: 'Temperature'),
if (telemetry?.humidity != null)
const _FieldOption(key: 'humidity', label: 'Humidity'),
if (telemetry?.pressure != null)
const _FieldOption(key: 'pressure', label: 'Pressure'),
if (telemetry?.gpsLocation != null)
const _FieldOption(key: 'gps', label: 'GPS'),
];
final extraSensorData = telemetry?.extraSensorData;
if (extraSensorData != null) {
for (final key in extraSensorData.keys) {
options.add(
_FieldOption(
key: _extraFieldKey(key),
label: _formatExtraFieldLabel(key),
),
);
}
}
return options;
}
String _extraFieldKey(String label) {
return 'extra:$label';
}
String _formatExtraFieldLabel(String rawKey) {
final knownPrefixes = <String, String>{
'altitude': 'Altitude',
'illuminance': 'Illuminance',
'presence': 'Presence',
'digital_input': 'Digital input',
'digital_output': 'Digital output',
'analog_input': 'Analog input',
'analog_output': 'Analog output',
'accelerometer': 'Accelerometer',
'gyrometer': 'Gyrometer',
};
for (final entry in knownPrefixes.entries) {
final prefix = '${entry.key}_';
if (rawKey == entry.key) {
return entry.value;
}
if (rawKey.startsWith(prefix)) {
final suffix = rawKey.substring(prefix.length);
final channel = int.tryParse(suffix);
if (channel != null) {
return '${entry.value} (ch $channel)';
}
return entry.value;
}
}
final parts = rawKey.split('_');
if (parts.isEmpty) return rawKey;
final channel = parts.length > 1 ? parts.last : null;
final base = parts.length > 1
? parts.sublist(0, parts.length - 1).join(' ')
: rawKey;
final title = base
.split(' ')
.where((part) => part.isNotEmpty)
.map((part) => '${part[0].toUpperCase()}${part.substring(1)}')
.join(' ');
if (channel != null && int.tryParse(channel) != null) {
return '$title (ch $channel)';
}
return title;
}
IconData _typeIcon(Contact contact) {
if (contact.isSensor) {
return Icons.sensors;
}
if (contact.isRepeater) {
return Icons.router;
}
if (contact.isChat) {
return Icons.sensors;
return Icons.person;
}
return Icons.device_hub;
}

18
lib/screens/settings_screen.dart
View File

@@ -80,6 +80,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
bool _openMapInFullscreen = false;
bool _messageNotificationsEnabled = true;
bool _sarNotificationsEnabled = true;
bool _discoveryNotificationsEnabled = true;
bool _updateNotificationsEnabled = true;
bool _muteForegroundNotifications = true;
bool _isDeveloperModeEnabled = false;
@@ -149,6 +150,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
setState(() {
_messageNotificationsEnabled = service.messageNotificationsEnabled;
_sarNotificationsEnabled = service.sarNotificationsEnabled;
_discoveryNotificationsEnabled = service.discoveryNotificationsEnabled;
_updateNotificationsEnabled = service.updateNotificationsEnabled;
_muteForegroundNotifications = service.muteForegroundNotifications;
});
@@ -1052,6 +1054,22 @@ class _SettingsScreenState extends State<SettingsScreen> {
},
),
SwitchListTile(
SwitchListTile(
secondary: const Icon(Icons.contact_page_outlined),
title: const Text('Discovery notifications'),
subtitle: const Text(
'Notify when new contacts appear in Discovery',
),
value: _discoveryNotificationsEnabled,
onChanged: (value) async {
setState(() {
_discoveryNotificationsEnabled = value;
});
await NotificationService().setDiscoveryNotificationsEnabled(
value,
);
},
),
secondary: const Icon(Icons.system_update),
title: const Text('Update notifications'),
subtitle: const Text(

182
lib/services/cayenne_lpp_parser.dart
View File

@@ -5,6 +5,22 @@ import 'package:meshcore_client/meshcore_client.dart';
/// Cayenne LPP (Low Power Payload) data parser
/// Used for decoding telemetry sensor data from MeshCore devices
class CayenneLppParser {
static const int _selfTelemetryChannel = 1;
static const int _lppGenericSensor = 100;
static const int _lppCurrent = 117;
static const int _lppFrequency = 118;
static const int _lppPercentage = 120;
static const int _lppAltitude = 121;
static const int _lppConcentration = 125;
static const int _lppPower = 128;
static const int _lppSpeed = 129;
static const int _lppDistance = 130;
static const int _lppEnergy = 131;
static const int _lppDirection = 132;
static const int _lppUnixTime = 133;
static const int _lppColour = 135;
static const int _lppSwitch = 142;
/// Parse Cayenne LPP data into ContactTelemetry
static ContactTelemetry parse(Uint8List data) {
debugPrint(' [CayenneLPP] Parsing LPP data...');
@@ -25,7 +41,8 @@ class CayenneLppParser {
int fieldCount = 0;
while (reader.hasRemaining) {
if (fieldCount > 0 && _isZeroPaddedTail(data, reader.remainingBytesCount)) {
if (fieldCount > 0 &&
_isZeroPaddedTail(data, reader.remainingBytesCount)) {
debugPrint(
' Detected zero-padded telemetry tail, stopping parse at position '
'${data.length - reader.remainingBytesCount}',
@@ -65,14 +82,14 @@ class CayenneLppParser {
final value = rawValue / 100.0;
debugPrint(' Analog Input (raw): $rawValue');
debugPrint(' Analog Input (volts): ${value}V');
extraSensorData['analog_input_$channel'] = value;
// If this is a battery reading
if (channel == 0 || channel == 1) {
if (_isBatteryChannel(channel)) {
batteryMilliVolts = value * 1000;
batteryPercentage = _calculateBatteryPercentage(value);
debugPrint(
' → Battery: ${batteryPercentage.toStringAsFixed(1)}% (${batteryMilliVolts.toStringAsFixed(0)}mV)',
);
} else {
extraSensorData['analog_input_$channel'] = value;
}
break;
@@ -85,7 +102,7 @@ class CayenneLppParser {
break;
case MeshCoreConstants.lppIlluminanceSensor:
final value = reader.readUInt16BE();
final value = reader.readUInt16BE().toDouble();
debugPrint(' Illuminance: $value lux');
extraSensorData['illuminance_$channel'] = value;
break;
@@ -98,18 +115,28 @@ class CayenneLppParser {
case MeshCoreConstants.lppTemperatureSensor:
final rawValue = reader.readInt16BE();
temperature = rawValue / 10.0;
final value = rawValue / 10.0;
debugPrint(' Temperature (raw): $rawValue');
debugPrint(
' Temperature: ${temperature.toStringAsFixed(1)}°C',
);
debugPrint(' Temperature: ${value.toStringAsFixed(1)}°C');
if (channel == _selfTelemetryChannel) {
temperature = value;
} else {
extraSensorData['temperature_$channel'] = value;
temperature ??= value;
}
break;
case MeshCoreConstants.lppHumiditySensor:
final rawValue = reader.readByte();
humidity = rawValue / 2.0;
final value = rawValue / 2.0;
debugPrint(' Humidity (raw): $rawValue');
debugPrint(' Humidity: ${humidity.toStringAsFixed(1)}%');
debugPrint(' Humidity: ${value.toStringAsFixed(1)}%');
if (channel == _selfTelemetryChannel) {
humidity = value;
} else {
extraSensorData['humidity_$channel'] = value;
humidity ??= value;
}
break;
case MeshCoreConstants.lppAccelerometer:
@@ -126,9 +153,15 @@ class CayenneLppParser {
case MeshCoreConstants.lppBarometer:
final rawValue = reader.readUInt16BE();
pressure = rawValue / 10.0;
final value = rawValue / 10.0;
debugPrint(' Barometer (raw): $rawValue');
debugPrint(' Barometer: ${pressure.toStringAsFixed(1)} hPa');
debugPrint(' Barometer: ${value.toStringAsFixed(1)} hPa');
if (channel == _selfTelemetryChannel) {
pressure = value;
} else {
extraSensorData['pressure_$channel'] = value;
pressure ??= value;
}
break;
case MeshCoreConstants.lppVoltageSensor:
@@ -136,12 +169,15 @@ class CayenneLppParser {
final value = rawValue / 100.0;
debugPrint(' Voltage (raw): $rawValue');
debugPrint(' Voltage: ${value}V');
// Treat voltage sensor as battery reading
batteryMilliVolts = value * 1000;
batteryPercentage = _calculateBatteryPercentage(value);
debugPrint(
' → Battery: ${batteryPercentage.toStringAsFixed(1)}% (${batteryMilliVolts.toStringAsFixed(0)}mV)',
);
if (_isBatteryChannel(channel)) {
batteryMilliVolts = value * 1000;
batteryPercentage = _calculateBatteryPercentage(value);
debugPrint(
' → Battery: ${batteryPercentage.toStringAsFixed(1)}% (${batteryMilliVolts.toStringAsFixed(0)}mV)',
);
} else {
extraSensorData['voltage_$channel'] = value;
}
break;
case MeshCoreConstants.lppGyrometer:
@@ -197,6 +233,106 @@ class CayenneLppParser {
extraSensorData['altitude_$channel'] = alt;
break;
case _lppGenericSensor:
final value = _readUInt32BE(reader).toDouble();
debugPrint(' Generic Sensor: $value');
extraSensorData['generic_sensor_$channel'] = value;
break;
case _lppCurrent:
final rawValue = reader.readInt16BE();
final value = rawValue / 1000.0;
debugPrint(' Current (raw): $rawValue');
debugPrint(' Current: ${value}A');
extraSensorData['current_$channel'] = value;
break;
case _lppFrequency:
final value = _readUInt32BE(reader).toDouble();
debugPrint(' Frequency: ${value}Hz');
extraSensorData['frequency_$channel'] = value;
break;
case _lppPercentage:
final value = reader.readByte().toDouble();
debugPrint(' Percentage: $value%');
if (_isBatteryChannel(channel)) {
batteryPercentage = value;
} else {
extraSensorData['percentage_$channel'] = value;
}
break;
case _lppAltitude:
final rawValue = reader.readInt16BE();
final value = rawValue.toDouble();
debugPrint(' Altitude: ${value}m');
extraSensorData['altitude_$channel'] = value;
break;
case _lppConcentration:
final value = reader.readUInt16BE().toDouble();
debugPrint(' Concentration: ${value}ppm');
extraSensorData['concentration_$channel'] = value;
break;
case _lppPower:
final value = reader.readUInt16BE().toDouble();
debugPrint(' Power: ${value}W');
extraSensorData['power_$channel'] = value;
break;
case _lppSpeed:
final rawValue = reader.readUInt16BE();
final value = rawValue / 100.0;
debugPrint(' Speed: ${value}m/s');
extraSensorData['speed_$channel'] = value;
break;
case _lppDistance:
final rawValue = _readUInt32BE(reader);
final value = rawValue / 1000.0;
debugPrint(' Distance: ${value}m');
extraSensorData['distance_$channel'] = value;
break;
case _lppEnergy:
final rawValue = _readUInt32BE(reader);
final value = rawValue / 1000.0;
debugPrint(' Energy: ${value}kWh');
extraSensorData['energy_$channel'] = value;
break;
case _lppDirection:
final value = reader.readUInt16BE().toDouble();
debugPrint(' Direction: $value°');
extraSensorData['direction_$channel'] = value;
break;
case _lppUnixTime:
final value = _readUInt32BE(reader);
debugPrint(' Unix time: $value');
extraSensorData['unixtime_$channel'] = value;
break;
case _lppColour:
final red = reader.readByte();
final green = reader.readByte();
final blue = reader.readByte();
debugPrint(' Colour: r=$red, g=$green, b=$blue');
extraSensorData['colour_$channel'] = {
'r': red,
'g': green,
'b': blue,
};
break;
case _lppSwitch:
final value = reader.readByte();
debugPrint(' Switch: $value');
extraSensorData['switch_$channel'] = value;
break;
default:
debugPrint(
' ⚠️ Unknown type, skipping remaining ${reader.remainingBytesCount} bytes',
@@ -258,6 +394,14 @@ class CayenneLppParser {
return ((voltage - 3.0) / 1.2) * 100.0;
}
static bool _isBatteryChannel(int channel) =>
channel == 0 || channel == _selfTelemetryChannel;
static int _readUInt32BE(BufferReader reader) {
final bytes = reader.readBytes(4);
return (bytes[0] << 24) | (bytes[1] << 16) | (bytes[2] << 8) | bytes[3];
}
static bool _isZeroPaddedTail(Uint8List data, int remainingBytes) {
final start = data.length - remainingBytes;
for (int i = start; i < data.length; i++) {

13
lib/services/notification_service.dart
View File

@@ -16,6 +16,7 @@ class NotificationService {
FlutterLocalNotificationsPlugin();
static const String _prefMessagesEnabled = 'notifications_messages_enabled';
static const String _prefSarEnabled = 'notifications_sar_enabled';
static const String _prefDiscoveryEnabled = 'notifications_discovery_enabled';
static const String _prefUpdatesEnabled = 'notifications_updates_enabled';
static const String _prefMuteForeground = 'notifications_mute_foreground';
@@ -23,6 +24,7 @@ class NotificationService {
bool _permissionGranted = false;
bool _messageNotificationsEnabled = true;
bool _sarNotificationsEnabled = true;
bool _discoveryNotificationsEnabled = true;
bool _updateNotificationsEnabled = true;
bool _muteForegroundNotifications = true;
AppLifecycleState _lifecycleState = AppLifecycleState.resumed;
@@ -63,6 +65,7 @@ class NotificationService {
bool get messageNotificationsEnabled => _messageNotificationsEnabled;
bool get sarNotificationsEnabled => _sarNotificationsEnabled;
bool get discoveryNotificationsEnabled => _discoveryNotificationsEnabled;
bool get updateNotificationsEnabled => _updateNotificationsEnabled;
bool get muteForegroundNotifications => _muteForegroundNotifications;
bool get isAppInForeground => _lifecycleState == AppLifecycleState.resumed;
@@ -175,6 +178,8 @@ class NotificationService {
final prefs = await SharedPreferences.getInstance();
_messageNotificationsEnabled = prefs.getBool(_prefMessagesEnabled) ?? true;
_sarNotificationsEnabled = prefs.getBool(_prefSarEnabled) ?? true;
_discoveryNotificationsEnabled =
prefs.getBool(_prefDiscoveryEnabled) ?? true;
_updateNotificationsEnabled = prefs.getBool(_prefUpdatesEnabled) ?? true;
_muteForegroundNotifications = prefs.getBool(_prefMuteForeground) ?? true;
}
@@ -191,6 +196,12 @@ class NotificationService {
await prefs.setBool(_prefSarEnabled, value);
}
Future<void> setDiscoveryNotificationsEnabled(bool value) async {
_discoveryNotificationsEnabled = value;
final prefs = await SharedPreferences.getInstance();
await prefs.setBool(_prefDiscoveryEnabled, value);
}
Future<void> setUpdateNotificationsEnabled(bool value) async {
_updateNotificationsEnabled = value;
final prefs = await SharedPreferences.getInstance();
@@ -854,7 +865,7 @@ class NotificationService {
}) async {
if (!_isInitialized) return false;
if (!_permissionGranted) return false;
if (!_messageNotificationsEnabled) return false;
if (!_discoveryNotificationsEnabled) return false;
if (_shouldSuppressForegroundNotifications()) return false;
final shortKey = contactKey.length > 12

4
lib/widgets/common/contact_avatar.dart
View File

@@ -108,6 +108,8 @@ class ContactAvatar extends StatelessWidget {
return Colors.orange;
case ContactType.room:
return Colors.purple;
case ContactType.sensor:
return Colors.green;
case ContactType.channel:
return Colors.teal;
}
@@ -130,6 +132,8 @@ class ContactAvatar extends StatelessWidget {
return Icons.router;
case ContactType.room:
return Icons.meeting_room;
case ContactType.sensor:
return Icons.sensors;
case ContactType.channel:
return Icons.public;
}

60
lib/widgets/contacts/contact_tile.dart
View File

@@ -16,6 +16,7 @@ import 'contact_route_dialog.dart';
import 'contact_trace_sheet.dart';
import 'room_login_sheet.dart';
import '../common/contact_avatar.dart';
import '../sensors/sensor_telemetry_card.dart';
import '../../utils/toast_logger.dart';
import '../../l10n/app_localizations.dart';
@@ -327,10 +328,13 @@ class ContactTile extends StatelessWidget {
final canSetPath =
contact.type == ContactType.chat ||
contact.type == ContactType.room ||
contact.type == ContactType.repeater;
contact.type == ContactType.repeater ||
contact.type == ContactType.sensor;
final canAddToSensors =
contact.type == ContactType.chat ||
contact.type == ContactType.repeater;
contact.type == ContactType.repeater ||
contact.type == ContactType.sensor;
final canPreviewSensor = contact.isSensor;
final sensorsProvider = context.read<SensorsProvider>();
final isInSensors = sensorsProvider.isWatched(contact.publicKeyHex);
@@ -381,6 +385,17 @@ class ContactTile extends StatelessWidget {
_showRoomLoginDialog(context, contact);
},
),
if (canPreviewSensor)
ListTile(
leading: const Icon(Icons.visibility_outlined),
title: const Text('Preview'),
onTap: () async {
Navigator.pop(sheetContext);
await Future<void>.delayed(Duration.zero);
if (!context.mounted) return;
await _showSensorPreviewSheet(context, contact);
},
),
if (canAddToSensors)
ListTile(
leading: Icon(
@@ -454,6 +469,47 @@ class ContactTile extends StatelessWidget {
);
}
Future<void> _showSensorPreviewSheet(
BuildContext context,
Contact contact,
) async {
final publicKeyHex = contact.publicKeyHex;
await showModalBottomSheet<void>(
context: context,
isScrollControlled: true,
showDragHandle: true,
builder: (sheetContext) => Consumer2<ContactsProvider, SensorsProvider>(
builder: (context, contactsProvider, sensorsProvider, child) {
Contact? liveContact;
for (final entry in contactsProvider.contacts) {
if (entry.publicKeyHex == publicKeyHex) {
liveContact = entry;
break;
}
}
final previewContact = liveContact ?? contact;
final visibleFields = sensorMetricKeysFor(previewContact);
return SafeArea(
child: SingleChildScrollView(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 24),
child: SensorTelemetryCard(
contact: previewContact,
state: sensorsProvider.stateFor(publicKeyHex),
visibleFields: visibleFields,
fieldSpans: sensorDefaultFieldSpans(visibleFields),
margin: EdgeInsets.zero,
emptyMetricsMessage: 'No telemetry fields available yet.',
),
),
);
},
),
);
}
void _showContactOnMap(BuildContext context, Contact contact) {
final location = contact.displayLocation;
if (location == null) {

1337
lib/widgets/sensors/sensor_telemetry_card.dart Normal file
View File

File diff suppressed because it is too large Load Diff