From 6089b5cbd9dba08e2f47081d1a70ae4b8f6fff29 Mon Sep 17 00:00:00 2001 From: Sven Carstensen Date: Fri, 8 Mar 2024 20:03:23 +0100 Subject: [PATCH] Fehlerkorrekturen --- android/app/build.gradle | 7 ++----- lib/content_views/assigned_jobs_page.dart | 12 ++++++++---- lib/content_views/task_list_page.dart | 8 ++++---- lib/popups/accept_jobs_popup.dart | 12 ++++++++---- lib/protocoll_messages/accept_job_message.dart | 3 ++- lib/protocoll_messages/fin_task_message.dart | 2 +- lib/protocoll_messages/fin_tour_message.dart | 2 +- lib/protocoll_messages/logout_message.dart | 2 +- lib/protocoll_messages/pic_message.dart | 2 +- 9 files changed, 28 insertions(+), 22 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 428bbdd..39e0624 100644 --- a/android/app/build.gradle +++ b/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 - versionName 'A212' + versionCode 3 + versionName 'A213' minSdkVersion 28 } diff --git a/lib/content_views/assigned_jobs_page.dart b/lib/content_views/assigned_jobs_page.dart index 0b6a163..e91dbae 100644 --- a/lib/content_views/assigned_jobs_page.dart +++ b/lib/content_views/assigned_jobs_page.dart @@ -191,6 +191,8 @@ class _AssignedJobsPageState extends State { } _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 { message.reaction.item = item; message.reaction.track = Track(); message.reaction.track.time = DateTime.now().toUtc().toIso8601String(); - message.reaction.track.pos = FinTaskPos(); - message.reaction.track.pos.lat = 0; - message.reaction.track.pos.long = 0; - message.reaction.track.pos.acc = 1; + if (currentPosition != null) { + message.reaction.track.pos = FinTaskPos(); + message.reaction.track.pos!.lat = 0; + message.reaction.track.pos!.long = 0; + message.reaction.track.pos!.acc = 1; + } MqttCore.instance.publishPayloadMessage("job", message.toJson()); diff --git a/lib/content_views/task_list_page.dart b/lib/content_views/task_list_page.dart index 358b198..ac86b59 100644 --- a/lib/content_views/task_list_page.dart +++ b/lib/content_views/task_list_page.dart @@ -465,8 +465,8 @@ class _TaskListPageState extends State { 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.long = position.longitude; + finTourMessage.finTour.track.pos!.lat = position.latitude; + finTourMessage.finTour.track.pos!.long = position.longitude; } finTourMessage.finTour.tasks = []; @@ -504,8 +504,8 @@ class _TaskListPageState extends State { var position = MyApp.currentPosition; if (position != null) { message.pos = PicMessagePos(); - message.pos.lat = position.latitude; - message.pos.long = position.longitude; + message.pos!.lat = position.latitude; + message.pos!.long = position.longitude; } MqttCore.instance.publishPayloadMessage("job", message.toJson()); diff --git a/lib/popups/accept_jobs_popup.dart b/lib/popups/accept_jobs_popup.dart index a1d67cc..2f8bda4 100644 --- a/lib/popups/accept_jobs_popup.dart +++ b/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(); - message.reaction.track.pos = FinTaskPos(); - message.reaction.track.pos.lat = currentPosition != null ? currentPosition.latitude : 0.0; - message.reaction.track.pos.long = currentPosition != null ? currentPosition.longitude : 0.0; - message.reaction.track.pos.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0; + if (position != null) { + message.reaction.track.pos = FinTaskPos(); + message.reaction.track.pos!.lat = currentPosition!.latitude; + message.reaction.track.pos!.long = currentPosition.longitude; + message.reaction.track.pos!.acc = currentPosition.accuracy.toInt(); + } MqttCore.instance.publishPayloadMessage("job", message.toJson()); diff --git a/lib/protocoll_messages/accept_job_message.dart b/lib/protocoll_messages/accept_job_message.dart index 36fab25..79138f0 100644 --- a/lib/protocoll_messages/accept_job_message.dart +++ b/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(); diff --git a/lib/protocoll_messages/fin_task_message.dart b/lib/protocoll_messages/fin_task_message.dart index ef675e9..d74378b 100644 --- a/lib/protocoll_messages/fin_task_message.dart +++ b/lib/protocoll_messages/fin_task_message.dart @@ -35,7 +35,7 @@ class Task { late String time; - late FinTaskPos? pos; + FinTaskPos? pos; Task(); diff --git a/lib/protocoll_messages/fin_tour_message.dart b/lib/protocoll_messages/fin_tour_message.dart index 940e068..4c0c87a 100644 --- a/lib/protocoll_messages/fin_tour_message.dart +++ b/lib/protocoll_messages/fin_tour_message.dart @@ -49,7 +49,7 @@ class FinTourTask { List? codes; - late FinTaskPos? pos; + FinTaskPos? pos; FinTourTask(); diff --git a/lib/protocoll_messages/logout_message.dart b/lib/protocoll_messages/logout_message.dart index fd657b5..5eec9b7 100644 --- a/lib/protocoll_messages/logout_message.dart +++ b/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(); diff --git a/lib/protocoll_messages/pic_message.dart b/lib/protocoll_messages/pic_message.dart index 03b66ef..4058275 100644 --- a/lib/protocoll_messages/pic_message.dart +++ b/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();