Fehlerkorrekturen

android/app/build.gradle

@@ -49,14 +49,11 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "de.assecutor.stadtbote"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
-        versionCode 2
+        versionCode 3
-        versionName 'A212'
+        versionName 'A213'
         minSdkVersion 28
     }
 

lib/content_views/assigned_jobs_page.dart

@@ -191,6 +191,8 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
   }
 
   _sendAnswer(Job job, int item) async {
+    var currentPosition = MyApp.currentPosition;
+
     var message = AcceptJobMessage();
     message.reaction = Reaction();
     message.reaction.id = job.id.toString();
@@ -198,10 +200,12 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
     message.reaction.item = item;
     message.reaction.track = Track();
     message.reaction.track.time = DateTime.now().toUtc().toIso8601String();
+    if (currentPosition != null) {
       message.reaction.track.pos = FinTaskPos();
-    message.reaction.track.pos.lat = 0;
+      message.reaction.track.pos!.lat = 0;
-    message.reaction.track.pos.long = 0;
+      message.reaction.track.pos!.long = 0;
-    message.reaction.track.pos.acc = 1;
+      message.reaction.track.pos!.acc = 1;
+    }
 
     MqttCore.instance.publishPayloadMessage("job", message.toJson());
 

lib/content_views/task_list_page.dart

@@ -465,8 +465,8 @@ class _TaskListPageState extends State<TaskListPage> {
       finTourMessage.finTour.track = Track();
       finTourMessage.finTour.track.time = DateTime.now().toIso8601String();
       finTourMessage.finTour.track.pos = FinTaskPos();
-      finTourMessage.finTour.track.pos.lat = position.latitude;
+      finTourMessage.finTour.track.pos!.lat = position.latitude;
-      finTourMessage.finTour.track.pos.long = position.longitude;
+      finTourMessage.finTour.track.pos!.long = position.longitude;
     }
 
     finTourMessage.finTour.tasks = [];
@@ -504,8 +504,8 @@ class _TaskListPageState extends State<TaskListPage> {
           var position = MyApp.currentPosition;
           if (position != null) {
             message.pos = PicMessagePos();
-            message.pos.lat = position.latitude;
+            message.pos!.lat = position.latitude;
-            message.pos.long = position.longitude;
+            message.pos!.long = position.longitude;
           }
 
           MqttCore.instance.publishPayloadMessage("job", message.toJson());

lib/popups/accept_jobs_popup.dart

@@ -211,16 +211,20 @@ _sendAnswer(Job job, int item) {
   var currentPosition = MyApp.currentPosition;
 
   var message = AcceptJobMessage();
+  var position = MyApp.currentPosition;
+
   message.reaction = Reaction();
   message.reaction.id = job.id.toString();
   message.reaction.ver = job.ver.toString();
   message.reaction.item = item;
   message.reaction.track = Track();
   message.reaction.track.time = DateTime.now().toUtc().toIso8601String();
+  if (position != null) {
     message.reaction.track.pos = FinTaskPos();
-  message.reaction.track.pos.lat = currentPosition != null ? currentPosition.latitude : 0.0;
+    message.reaction.track.pos!.lat = currentPosition!.latitude;
-  message.reaction.track.pos.long = currentPosition != null ? currentPosition.longitude : 0.0;
+    message.reaction.track.pos!.long = currentPosition.longitude;
-  message.reaction.track.pos.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0;
+    message.reaction.track.pos!.acc = currentPosition.accuracy.toInt();
+  }
 
   MqttCore.instance.publishPayloadMessage("job", message.toJson());
 

lib/protocoll_messages/accept_job_message.dart

@@ -31,7 +31,8 @@ class Reaction {
 @JsonSerializable()
 @JsonSerializable()class Track {
   late String time;
-  late FinTaskPos pos;
+
+  FinTaskPos? pos;
 
   Track();
 

lib/protocoll_messages/fin_task_message.dart

@@ -35,7 +35,7 @@ class Task {
 
   late String time;
 
-  late FinTaskPos? pos;
+  FinTaskPos? pos;
 
   Task();
 

lib/protocoll_messages/fin_tour_message.dart

@@ -49,7 +49,7 @@ class FinTourTask {
 
   List<String>? codes;
 
-  late FinTaskPos? pos;
+  FinTaskPos? pos;
 
   FinTourTask();
 

lib/protocoll_messages/logout_message.dart

@@ -6,7 +6,7 @@ part 'logout_message.g.dart';
 class LogoutMessage {
   late bool logout;
 
-  late LogoutMessagePosition? pos;
+  LogoutMessagePosition? pos;
 
   LogoutMessage();
 

lib/protocoll_messages/pic_message.dart

@@ -6,7 +6,7 @@ part 'pic_message.g.dart';
 class PicMessage {
   late PicData pic;
 
-  late PicMessagePos pos;
+  PicMessagePos? pos;
 
   PicMessage();