Merge branch 'main' of https://github.com/Gold872/elastic-dashboard i…

…nto nt-dependency-rework
Gold872 · Jun 25, 2024 · ecef2d9 · ecef2d9
2 parents c28656d + 86b4f4c
commit ecef2d9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/elasticlib/Elastic.java b/elasticlib/Elastic.java
@@ -11,7 +11,7 @@
 
 public final class Elastic {
     private static final StringTopic topic = NetworkTableInstance.getDefault()
-            .getStringTopic("elastic/robotnotifications");
+            .getStringTopic("/Elastic/robotnotifications");
     private static final StringPublisher publisher = topic.publish(PubSubOption.sendAll(true));
     private static final ObjectMapper objectMapper = new ObjectMapper();
 

diff --git a/lib/pages/dashboard_page.dart b/lib/pages/dashboard_page.dart
@@ -241,10 +241,11 @@ class _DashboardPageState extends State<DashboardPage> with WindowListener {
                   fontWeight: FontWeight.bold,
                 ),
               ),
+              toastDuration: const Duration(seconds: 3),
               icon: icon,
               description: Text(description),
               stackedOptions: StackedOptions(
-                key: 'robotnotification',
+                key: 'robot_notification',
                 type: StackedType.above,
                 itemOffset: const Offset(0, 5),
               ),

diff --git a/lib/services/robot_notifications_listener.dart b/lib/services/robot_notifications_listener.dart
@@ -18,30 +18,43 @@ class RobotNotificationsListener {
 
   void listen() {
     var notifications =
-        ntConnection.subscribeAll("elastic/robotnotifications", 0.2);
+        ntConnection.subscribeAll('/Elastic/robotnotifications', 0.2);
     notifications.listen((alertData, alertTimestamp) {
-      _onAlert(alertData!, alertTimestamp);
+      if (alertData == null) {
+        return;
+      }
+      _onAlert(alertData, alertTimestamp);
     });
+
+    ntConnection.addDisconnectedListener(() => _alertFirstRun = true);
   }
 
   void _onAlert(Object alertData, int timestamp) {
-    //prevent showing a notification when we connect to NT
+    // prevent showing a notification when we connect to NT
     if (_alertFirstRun) {
       _alertFirstRun = false;
       return;
     }
 
-    Map<String, dynamic> data = jsonDecode(alertData.toString());
+    Map<String, dynamic> data;
+    try {
+      data = jsonDecode(alertData.toString());
+    } catch (e) {
+      return;
+    }
+
+    if (!data.containsKey('level')) {}
+
     Icon icon;
 
-    if (data["level"] == "INFO") {
+    if (data['level'] == 'INFO') {
       icon = const Icon(Icons.info);
-    } else if (data["level"] == "WARNING") {
+    } else if (data['level'] == 'WARNING') {
       icon = const Icon(
         Icons.warning_amber,
         color: Colors.orange,
       );
-    } else if (data["level"] == "ERROR") {
+    } else if (data['level'] == 'ERROR') {
       icon = const Icon(
         Icons.error,
         color: Colors.red,