Location Status eingebaut

Ranking wieder teilaktivert.

lib/content_views/approach_area_page.dart

@@ -1,17 +1,19 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
+import 'package:isar/isar.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/content_views/utils/header_info.dart';
-//import 'package:stadtbote/model/ranking.dart';
+import 'package:stadtbote/main.dart';
+import 'package:stadtbote/model/rank.dart';
+import 'package:stadtbote/popups/tasks_popups/zip_popup.dart';
+import 'package:stadtbote/protocoll_messages/zip_message.dart';
 import 'package:stadtbote/tools/constants.dart';
 import 'package:stadtbote/tools/message_service.dart';
+import 'package:stadtbote/tools/mqtt_core.dart';
 
 import '../tools/util.dart';
 
-enum ModeEnum {
-  set,
-  request
-}
-
 class ApproachAreaPage extends ContentViewWidget {
   const ApproachAreaPage({super.key});
 
@@ -38,7 +40,7 @@ class ApproachAreaPage extends ContentViewWidget {
 }
 
 class _ApproachAreaPageState extends State<ApproachAreaPage> {
-  //late Ranking? _ranking;
+  late List<Rank>? _ranking;
 
   late bool _initCompleted = false;
 
@@ -47,10 +49,12 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
     super.initState();
 
     Future.delayed(const Duration(seconds: 0), () async {
-      //_ranking = await MyApp.isarInstance.rankings.where().findFirst();
+      _ranking = await MyApp.isarInstance.ranks.where().findAll();
 
       _initCompleted = true;
 
+      _sendZip(Rank(), "24893");
+
       setState(() {});
     });
 
@@ -88,16 +92,16 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
   List<Widget> _fillColumns() {
     List<Widget> columns = [];
 
-    /*if (_ranking != null) {
-      for (int i = 0; i < _ranking!.ranks.length; i++) {
-        var rank = _ranking!.ranks[i];
+    if (_ranking != null) {
+      for (int i = 0; i < _ranking!.length; i++) {
+        var rank = _ranking![i];
 
         List<Widget> entries = [];
         entries.add(
           GestureDetector(
             onTap: () => {
               if (i == 0) {
-                showZipPopup(context, 'ACHTUNG: Wenn Sie Ihre PLZ ändern, verlieren Sie Ihr Ranking!\n', 'Freimelden', (zip) => {_sendZip(rank, zip, ModeEnum.set)}),
+                showZipPopup(context, 'ACHTUNG: Wenn Sie Ihre PLZ ändern, verlieren Sie Ihr Ranking!\n', 'Freimelden', (zip) => {_sendZip(rank, zip)}),
               }
             },
             child: Container(
@@ -165,36 +169,31 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
           ),
         ));
       }
-    }*/
+    }
 
     return columns;
   }
 
-  /*_sendZip(Rank rank, String zip, ModeEnum mode) {
-    var zipMessage = ZipMessage();
+  _sendZip(Rank rank, String zip) {
+    var position = MyApp.currentPosition;
 
-    if (mode == ModeEnum.set) {
-      var position = MyApp.currentPosition;
+    var setPosMessage = ZipSetPos();
+    setPosMessage.zip = zip;
 
-      zipMessage.setPos = ZipSetPos();
-      zipMessage.setPos!.zip = zip;
-
-      if (position != null) {
-        zipMessage.setPos!.track = ZipTrack();
-        zipMessage.setPos!.track!.time = DateTime.now().toIso8601String();
-        zipMessage.setPos!.track!.pos = ZipTrackPos();
-        zipMessage.setPos!.track!.pos!.lat = position.latitude;
-        zipMessage.setPos!.track!.pos!.long = position.longitude;
-        zipMessage.setPos!.track!.pos!.acc = position.accuracy.toInt();
-      }
-    } else {
-      zipMessage.reqZip = ZipReqZip();
-      zipMessage.reqZip!.id = rank.id;
-      zipMessage.reqZip!.zip = zip;
+    if (position != null) {
+      setPosMessage.track = ZipTrack();
+      setPosMessage.track!.time = DateTime.now().toIso8601String();
+      setPosMessage.track!.pos = ZipTrackPos();
+      setPosMessage.track!.pos!.lat = position.latitude;
+      setPosMessage.track!.pos!.long = position.longitude;
+      setPosMessage.track!.pos!.acc = position.accuracy.toInt();
     }
 
-    MqttCore.instance.publishPayloadMessage("rank", zipMessage.toJson());
-  }*/
+    var json = jsonEncode(setPosMessage.toJson());
+    Util.logInfo(json);
+
+    MqttCore.instance.publishMessage("set_zip", jsonEncode(setPosMessage.toJson()));
+  }
 
   _initMessages() {
     /*MessageService().subscribe<RankingUpdated>(Constants.messageTopicRankingUpdated, this, (rankingUpdateMessage) async {

lib/content_views/main_page.dart

@@ -13,7 +13,7 @@ import 'package:stadtbote/content_views/utils/header_info.dart';
 import 'package:stadtbote/model/job.dart';
 import 'package:stadtbote/model/message.dart';
 import 'package:stadtbote/model/session_status.dart';
-import 'package:stadtbote/model/status.dart';
+import 'package:stadtbote/model/location_status.dart';
 import 'package:stadtbote/popups/infos_popup.dart';
 import 'package:stadtbote/protocoll_messages/logout_message.dart';
 import 'package:stadtbote/tools/message_service.dart';
@@ -265,7 +265,7 @@ class _MainPageState extends State<MainPage> {
       widget.sidValueNotifier.value = sessionStatusInfoUpdateMessage.status.sid;
     });
 
-    MessageService().subscribe<StatusInfoUpdate>(Constants.messageTopicStatusInfoUpdated, this, (statusInfoUpdateMessage) {
+    MessageService().subscribe<LocationStatusUpdate>(Constants.messageTopicLocationStatusUpdated, this, (statusInfoUpdateMessage) {
       _updateHeader();
     });
 
@@ -303,11 +303,11 @@ class _MainPageState extends State<MainPage> {
   }
 
   void _updateHeader() async {
-    var status = await MyApp.isarInstance.status.where().findFirst();
+    var status = await MyApp.isarInstance.locationStatus.where().findFirst();
     var sessionStatus = await MyApp.isarInstance.sessionStatus.where().findFirst();
 
     if (status != null) {
-      widget._zipValueNotifier.value = '${status.pos.zip} (${status.pos.zipReal})';
+      widget._zipValueNotifier.value = '${status.zip} (${status.zipReal})';
     } else if (sessionStatus != null) {
       widget._zipValueNotifier.value = sessionStatus.locZip;
     } else {