Fehlerkorrekturen und Erweiterungen

lib/content_views/main_page.dart

@@ -1,7 +1,6 @@
 import 'package:dart_mq/dart_mq.dart';
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
-import 'package:mqtt5_client/mqtt5_client.dart';
 import 'package:stadtbote/content_views/accepted_jobs_page.dart';
 import 'package:stadtbote/content_views/approach_area_page.dart';
 import 'package:stadtbote/content_views/assigned_jobs_page.dart';
@@ -21,6 +20,7 @@ import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 import 'package:stadtbote/tools/messages/connect_client_message.dart';
 import 'package:stadtbote/tools/messages/disconnect_client_message.dart';
 import 'package:badges/badges.dart' as badges;
+import 'package:stadtbote/tools/messages/remove_state_0_job_from_map.dart';
 import 'package:stadtbote/tools/util.dart';
 
 class MainPage extends ContentViewWidget {
@@ -211,15 +211,30 @@ class _MainPageState extends State<MainPage> with ConsumerMixin, ProducerMixin {
                 child: getDefaultButton(
                     'Anfahrtsbereich',
                     image: Image.asset('assets/anfahrtsbereich.png', width: 30, height: 30),
-                    () async => {
+                        () async => {
                       // TODO MESSAGING
                       sendMessage(
                         routingKey: Constants.messageTopicPushContentView,
                         payload: const ApproachAreaPage(),
                       )
                       //await MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const ApproachAreaPage())
-                        }),
+                    }),
               ),
+              /*SizedBox(height: _loggedOut == true ? 0 : 20),
+              Visibility(
+                visible: !_loggedOut,
+                child: getDefaultButton(
+                    'Wunschziel für heute',
+                    image: Image.asset('assets/anfahrtsbereich.png', width: 30, height: 30),
+                        () async => {
+                      // TODO MESSAGING
+                      sendMessage(
+                        routingKey: Constants.messageTopicPushContentView,
+                        payload: const SetDesiredZipPage(),
+                      )
+                      //await MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const ApproachAreaPage())
+                    }),
+              ),*/
               SizedBox(height: _loggedOut == true ? 0 : 20),
               getDefaultButton(_loggedOut ? 'Anmelden' : 'Abmelden',
                   image: Image.asset(_loggedOut ? 'assets/anmelden.png' : 'assets/abmelden.png', width: 30, height: 30), () async {
@@ -262,9 +277,6 @@ class _MainPageState extends State<MainPage> with ConsumerMixin, ProducerMixin {
         _jobReceived((message.payload as JobReceivedMessage).job);
       },
     );
-    /*MessageService().subscribe<JobReceivedMessage>(Constants.messageTopicJobReceived, this, (JobReceivedMessage jobReceivedMessage) {
-      _jobReceived(jobReceivedMessage.job);
-    });*/
 
     subscribe(
       queueId: Constants.messageTopicMessageReceived,
@@ -272,9 +284,6 @@ class _MainPageState extends State<MainPage> with ConsumerMixin, ProducerMixin {
         _refreshBadges();
       },
     );
-    /*MessageService().subscribe<MessageReceivedMessage>(Constants.messageTopicMessageReceived, this, (MessageReceivedMessage mesage) {
-      _refreshBadges();
-    });*/
 
     subscribe(
       queueId: Constants.messageTopicJobDeleted,
@@ -282,9 +291,6 @@ class _MainPageState extends State<MainPage> with ConsumerMixin, ProducerMixin {
         _refreshBadges();
       },
     );
-    /*MessageService().subscribe<JobDeletedMessage>(Constants.messageTopicJobDeleted, this, (JobDeletedMessage job) {
-      _refreshBadges();
-    });*/
 
     subscribe(
       queueId: Constants.messageTopicUpdateBadges,
@@ -292,9 +298,6 @@ class _MainPageState extends State<MainPage> with ConsumerMixin, ProducerMixin {
         _refreshBadges();
       },
     );
-    /*MessageService().subscribe<RefreshBadgesMessage>(Constants.messageTopicUpdateBadges, this, (RefreshBadgesMessage message) {
-      _refreshBadges();
-    });*/
   }
 
   void _refreshBadges() async {
@@ -311,14 +314,11 @@ class _MainPageState extends State<MainPage> with ConsumerMixin, ProducerMixin {
     if (!_loggedOut) {
       showLogoutAlertDialog(context);
     } else {
-      // TODO MESSAGING
       sendMessage(
         routingKey: Constants.messageTopicConnectClient,
         payload: ConnectClientMessage(),
       );
 
-      //await MessageService().publish<ConnectClientMessage>(Constants.messageTopicConnectClient, arguments: ConnectClientMessage());
-
       _loggedOut = false;
 
       setState(() {});
@@ -338,14 +338,11 @@ class _MainPageState extends State<MainPage> with ConsumerMixin, ProducerMixin {
         _loggedOut = true;
 
         Future.delayed(const Duration(seconds: 2), () async {
-          // TODO MESSAGING
           sendMessage(
             routingKey: Constants.messageTopicDisconnectClient,
             payload: DisconnectClientMessage(),
           );
 
-          //await MessageService().publish<DisconnectClientMessage>(Constants.messageTopicDisconnectClient, arguments: DisconnectClientMessage());
-
           Future.delayed(const Duration(seconds: 3), () async {
             // TODO MESSAGING
             sendMessage(
@@ -404,7 +401,7 @@ class _MainPageState extends State<MainPage> with ConsumerMixin, ProducerMixin {
     // TODO MESSAGING
     sendMessage(
       routingKey: Constants.messageTopicPublishPayload,
-      payload: PublishPayloadMessage(topic: "logout", message: logoutMessage.toJson(), qos: MqttQos.exactlyOnce),
+      payload: PublishPayloadMessage(topic: "logout", message: logoutMessage.toJson(), acknowledgeRequired: false),
     );
 
     //await MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "logout", message: logoutMessage.toJson(), qos: MqttQos.exactlyOnce));