Rename the Fly-mode Warnings tab to System Messages, log connection/upload events
Renames DroneEvent/DroneEventSeverity/droneEventLogProvider/ DroneStatusWarningsPanel to SystemMessage/SystemMessageSeverity/ systemMessageLogProvider/DroneStatusMessagesPanel throughout, matching what the tab now actually shows - general system messages, not just drone-health warnings. Adds a new SystemMessageSeverity.info level (blue) for messages that aren't a warning/error, and three new message sources on top of the existing battery/failsafe detection: - "Connected", logged the first time telemetryProvider produces a frame after having none - the mirror image of the existing "Connection lost" detection (which already fires on the first stream error after having had data), so no new transport-specific dependency was needed. - "Connection type changed to X", from watching connectionSettingsProvider (skips the initial load so it doesn't fire on every app start). - "Mission sent (N waypoints)" / "Mission upload failed: ...", logged from FlyScreen's send handler via a new public log() method on the notifier, alongside the existing snackbar. Verified on the Pixel_10a emulator: entering Fly mode logs "Connected" once the mock telemetry starts, and tapping the send button logs "Mission sent (3 waypoints)" right after the snackbar. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Constantin Leue
co-authored by
Claude Sonnet 5
Claude Sonnet 5
parent
13475cc4f3
commit
b09d00ab9f
@@ -0,0 +1,307 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
|
||||
import '../../domain/telemetry/drone_status.dart';
|
||||
import '../../domain/telemetry/system_message.dart';
|
||||
import '../../domain/telemetry/telemetry_field_status.dart';
|
||||
import '../dmc_colors.dart';
|
||||
import '../providers/active_drone_profile_provider.dart';
|
||||
import '../providers/system_message_log_provider.dart';
|
||||
import '../providers/telemetry_provider.dart';
|
||||
|
||||
enum _PanelTab { status, messages }
|
||||
|
||||
/// Vollbild-Statusmenue fuer den Fly-Modus (Doku: "ein neues menue anlegen
|
||||
/// fuer die neue drone status pille, nach dem vorbild des menues fuer
|
||||
/// drones and missions, aber jetzt fuer drone status and system messages") -
|
||||
/// dieselbe Tab-Struktur wie [MissionsDronesPanel], nur mit den beiden
|
||||
/// telemetriebezogenen Tabs Status/System Messages statt Missions/Drones.
|
||||
/// Erreichbar ueber die Drohnen-Status-Pille (Status-Tab) bzw. den
|
||||
/// Sende-Knopf-Nachbarn/Warnungs-Knopf (System-Messages-Tab) in der
|
||||
/// Fusszeile im Fly-Modus (siehe bottom_stats_bar.dart/fly_screen.dart).
|
||||
class DroneStatusMessagesPanel extends ConsumerStatefulWidget {
|
||||
const DroneStatusMessagesPanel.status({super.key}) : _initialTab = _PanelTab.status;
|
||||
const DroneStatusMessagesPanel.messages({super.key}) : _initialTab = _PanelTab.messages;
|
||||
|
||||
final _PanelTab _initialTab;
|
||||
|
||||
@override
|
||||
ConsumerState<DroneStatusMessagesPanel> createState() => _DroneStatusMessagesPanelState();
|
||||
}
|
||||
|
||||
class _DroneStatusMessagesPanelState extends ConsumerState<DroneStatusMessagesPanel> {
|
||||
late _PanelTab _tab = widget._initialTab;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Material(
|
||||
color: const Color(0xEB080808),
|
||||
child: SafeArea(
|
||||
child: Column(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 12, 8, 12),
|
||||
child: Row(
|
||||
children: [
|
||||
const Expanded(
|
||||
child: Text(
|
||||
'Drone Status & System Messages',
|
||||
style: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
),
|
||||
IconButton(
|
||||
onPressed: () => Navigator.of(context).pop(),
|
||||
icon: const Icon(Icons.close, color: Colors.white),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
_tabButton('Status', _PanelTab.status),
|
||||
_tabButton('System Messages', _PanelTab.messages),
|
||||
],
|
||||
),
|
||||
const Divider(color: Colors.white24, height: 1),
|
||||
Expanded(
|
||||
child: switch (_tab) {
|
||||
_PanelTab.status => _statusTab(),
|
||||
_PanelTab.messages => _messagesTab(),
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _tabButton(String label, _PanelTab tab) {
|
||||
final active = _tab == tab;
|
||||
return Expanded(
|
||||
child: InkWell(
|
||||
onTap: () => setState(() => _tab = tab),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(vertical: 10),
|
||||
decoration: BoxDecoration(
|
||||
border: Border(
|
||||
bottom: BorderSide(
|
||||
color: active ? const Color(0xFF4D9DFF) : Colors.transparent,
|
||||
width: 2,
|
||||
),
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
label,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
color: active ? Colors.white : Colors.white60,
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 14,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
// --- Status ---
|
||||
|
||||
// Zeigt die Statuszeilen unabhaengig davon, ob bereits ein Telemetrie-Frame
|
||||
// vorliegt (Doku: "endloser Lade-Screen ohne die Datenfelder anzuzeigen" -
|
||||
// z.B. WLAN gewaehlt, aber noch nicht verbunden) - `telemetry` bleibt dann
|
||||
// dauerhaft AsyncLoading, .value ist einfach null. Analog zu FlyScreen.
|
||||
// droneStatus (siehe dortige Doku) werden Platzhalterwerte verwendet, damit
|
||||
// computeTelemetryFieldStatus trotzdem eine (dann durchgehend rote) Ampel
|
||||
// liefert, statt hier zusaetzlich zwischen "noch nie verbunden" und
|
||||
// "Verbindung verloren" zu unterscheiden. Einzelne Werte zeigen dennoch
|
||||
// '—' statt eines erfundenen Messwerts (0 A/0 V saehe sonst wie ein echter,
|
||||
// kritischer Messwert statt wie "keine Daten" aus).
|
||||
Widget _statusTab() {
|
||||
final frame = ref.watch(telemetryProvider).value;
|
||||
final droneProfile = ref.watch(activeDroneProfileProvider);
|
||||
final fieldStatus = computeTelemetryFieldStatus(
|
||||
numSat: frame?.numSat ?? 0,
|
||||
hasFix: frame?.hasFix ?? false,
|
||||
hdop: frame?.hdop ?? 99.0,
|
||||
currentA: frame?.currentA ?? 0,
|
||||
batteryVoltage: frame?.batteryVoltage ?? 0,
|
||||
linkQuality: frame?.linkQuality ?? 0,
|
||||
snrDb: frame?.snrDb ?? -99,
|
||||
profile: droneProfile,
|
||||
hasData: frame != null,
|
||||
);
|
||||
return ListView(
|
||||
padding: const EdgeInsets.all(16),
|
||||
children: _statusGrid([
|
||||
// Farbcodierte Felder zuerst (Doku: "drone status felder im menue
|
||||
// auch farblich kodieren", Schwellwerte je Drohnenprofil - siehe
|
||||
// computeTelemetryFieldStatus), informelle Felder ohne Ampel-
|
||||
// Bewertung (Koordinaten/Heading/Alt/Speed) danach. Je 2 Felder pro
|
||||
// Zeile (Doku: "platz effizienter nutzen").
|
||||
_statusRow('GPS satellites', frame != null ? '${frame.numSat}' : '—', level: fieldStatus.numSat),
|
||||
_statusRow(
|
||||
'GPS precision (HDOP)',
|
||||
frame != null && frame.hasFix ? frame.hdop.toStringAsFixed(2) : '—',
|
||||
level: fieldStatus.hdop,
|
||||
),
|
||||
_statusRow(
|
||||
'Current draw',
|
||||
frame != null ? '${frame.currentA.toStringAsFixed(1)} A' : '—',
|
||||
level: fieldStatus.currentA,
|
||||
),
|
||||
_statusRow(
|
||||
'Battery voltage',
|
||||
frame != null ? '${frame.batteryVoltage.toStringAsFixed(2)} V' : '—',
|
||||
level: fieldStatus.batteryVoltage,
|
||||
),
|
||||
_statusRow('RX quality', frame != null ? '${frame.linkQuality}%' : '—', level: fieldStatus.rxQuality),
|
||||
_statusRow('RX SNR', frame != null ? '${frame.snrDb} dB' : '—', level: fieldStatus.rxSnr),
|
||||
_statusRow(
|
||||
'GPS coordinates',
|
||||
frame != null && frame.hasFix
|
||||
? '${frame.lat.toStringAsFixed(6)}, ${frame.lon.toStringAsFixed(6)}'
|
||||
: '—',
|
||||
),
|
||||
_statusRow('Heading', frame != null ? '${frame.headingDeg.round()}°' : '—'),
|
||||
_statusRow('Altitude', frame != null ? '${frame.altitudeM.toStringAsFixed(0)} m' : '—'),
|
||||
_statusRow('Speed', frame != null ? '${frame.speedMs.toStringAsFixed(1)} m/s' : '—'),
|
||||
]),
|
||||
);
|
||||
}
|
||||
|
||||
/// Ordnet die Statuszeilen zu je 2 pro Zeile an (Doku: "2 felder pro zeile
|
||||
/// im drone status menue erlauben um platz effizienter zu nutzen") - bei
|
||||
/// ungerader Feldanzahl bleibt die letzte Zeile einspaltig statt sie
|
||||
/// kuenstlich zu strecken.
|
||||
List<Widget> _statusGrid(List<Widget> tiles) {
|
||||
final rows = <Widget>[];
|
||||
for (var i = 0; i < tiles.length; i += 2) {
|
||||
final hasPair = i + 1 < tiles.length;
|
||||
// Kein CrossAxisAlignment.stretch: diese Row sitzt direkt als
|
||||
// ListView-Kind, das seinen Kindern unbegrenzte Hoehe gibt (0<=h<=
|
||||
// Infinity) - stretch verlangt aber eine endliche Hoehe, um die Kacheln
|
||||
// darauf zu strecken, und wirft sonst "BoxConstraints forces an
|
||||
// infinite height" (fuehrte zum komplett schwarzen Status-Tab). Default
|
||||
// (center) reicht, da beide Kacheln einer Zeile ohnehin fast gleich
|
||||
// hohen Inhalt haben.
|
||||
rows.add(Row(
|
||||
children: [
|
||||
Expanded(child: tiles[i]),
|
||||
if (hasPair) ...[
|
||||
const SizedBox(width: 8),
|
||||
Expanded(child: tiles[i + 1]),
|
||||
],
|
||||
],
|
||||
));
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
|
||||
static const _signalColors = {
|
||||
SignalLevel.green: DmcColors.flyModeColor,
|
||||
SignalLevel.yellow: DmcColors.pafAmber,
|
||||
SignalLevel.red: DmcColors.warnRed,
|
||||
};
|
||||
|
||||
// Label ueber Wert statt nebeneinander (Doku: "2 felder pro zeile") - bei
|
||||
// halber Zeilenbreite kollidiert ein nebeneinander angeordnetes Label wie
|
||||
// "GPS precision (HDOP)" sonst mit dem Wert; gestapelt bleibt auch bei
|
||||
// laengeren Labeln/Werten genug Platz.
|
||||
Widget _statusRow(String label, String value, {SignalLevel? level}) {
|
||||
final valueColor = level != null ? _signalColors[level]! : Colors.white;
|
||||
return Container(
|
||||
margin: const EdgeInsets.symmetric(vertical: 4),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white.withValues(alpha: 0.04),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
label,
|
||||
style: const TextStyle(color: Colors.white70, fontSize: 12),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Row(
|
||||
children: [
|
||||
if (level != null) ...[
|
||||
Container(
|
||||
width: 8,
|
||||
height: 8,
|
||||
margin: const EdgeInsets.only(right: 6),
|
||||
decoration: BoxDecoration(color: valueColor, shape: BoxShape.circle),
|
||||
),
|
||||
],
|
||||
Flexible(
|
||||
child: Text(
|
||||
value,
|
||||
style: TextStyle(color: valueColor, fontWeight: FontWeight.w600),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
// --- System Messages ---
|
||||
|
||||
Widget _messagesTab() {
|
||||
final events = ref.watch(systemMessageLogProvider);
|
||||
if (events.isEmpty) {
|
||||
return const Center(
|
||||
child: Text('No messages yet', style: TextStyle(color: Colors.white60, fontSize: 15)),
|
||||
);
|
||||
}
|
||||
return ListView.builder(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
itemCount: events.length,
|
||||
itemBuilder: (context, index) => _messageRow(events[index]),
|
||||
);
|
||||
}
|
||||
|
||||
static const _severityColors = {
|
||||
SystemMessageSeverity.critical: DmcColors.warnRed,
|
||||
SystemMessageSeverity.warning: DmcColors.pafAmber,
|
||||
SystemMessageSeverity.info: DmcColors.setBlue,
|
||||
};
|
||||
|
||||
Widget _messageRow(SystemMessage event) {
|
||||
final color = _severityColors[event.severity]!;
|
||||
return Container(
|
||||
margin: const EdgeInsets.symmetric(vertical: 4),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white.withValues(alpha: 0.04),
|
||||
border: Border.all(color: color.withValues(alpha: 0.4)),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Text(_formatTime(event.timestamp), style: const TextStyle(color: Colors.white60)),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Text(
|
||||
event.message,
|
||||
style: TextStyle(color: color, fontWeight: FontWeight.w600),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
String _formatTime(DateTime dt) =>
|
||||
'${dt.hour.toString().padLeft(2, '0')}:'
|
||||
'${dt.minute.toString().padLeft(2, '0')}:'
|
||||
'${dt.second.toString().padLeft(2, '0')}';
|
||||
}
|
||||
Reference in New Issue
Block a user