From e3da2193b516f33499a0c068140fbddfdd7de214 Mon Sep 17 00:00:00 2001 From: Sven Carstensen Date: Mon, 6 May 2024 13:53:18 +0200 Subject: [PATCH] Fehlerkorrekturen --- lib/content_views/approach_area_page.dart | 2 -- lib/content_views/assigned_jobs_page.dart | 2 -- lib/content_views/messages_page.dart | 2 -- lib/popups/accept_jobs_popup.dart | 2 -- lib/protocoll_messages/track_message.dart | 11 ----------- lib/protocoll_messages/track_message.g.dart | 10 ---------- lib/tools/mqtt_core.dart | 12 ++++++------ 7 files changed, 6 insertions(+), 35 deletions(-) diff --git a/lib/content_views/approach_area_page.dart b/lib/content_views/approach_area_page.dart index c9a5e1e..36eee39 100644 --- a/lib/content_views/approach_area_page.dart +++ b/lib/content_views/approach_area_page.dart @@ -1,4 +1,3 @@ -import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:isar/isar.dart'; @@ -12,7 +11,6 @@ import 'package:stadtbote/tools/constants.dart'; import 'package:stadtbote/tools/message_service.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; import 'package:stadtbote/tools/messages/ranking_updated.dart'; -import 'package:stadtbote/tools/mqtt_core.dart'; import '../tools/util.dart'; diff --git a/lib/content_views/assigned_jobs_page.dart b/lib/content_views/assigned_jobs_page.dart index 4fb0c37..f367a5b 100644 --- a/lib/content_views/assigned_jobs_page.dart +++ b/lib/content_views/assigned_jobs_page.dart @@ -1,4 +1,3 @@ -import 'dart:convert'; import 'package:expandable/expandable.dart'; import 'package:flutter/material.dart'; @@ -12,7 +11,6 @@ import 'package:stadtbote/protocoll_messages/fin_task_message.dart'; import 'package:stadtbote/tools/message_service.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; import 'package:stadtbote/tools/messages/refresh_badges_message.dart'; -import 'package:stadtbote/tools/mqtt_core.dart'; import '../main.dart'; import '../model/job.dart'; diff --git a/lib/content_views/messages_page.dart b/lib/content_views/messages_page.dart index b299444..51b342b 100644 --- a/lib/content_views/messages_page.dart +++ b/lib/content_views/messages_page.dart @@ -1,4 +1,3 @@ -import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_chat_ui/flutter_chat_ui.dart'; @@ -13,7 +12,6 @@ import 'package:stadtbote/model/session_status.dart'; import 'package:stadtbote/tools/constants.dart'; import 'package:stadtbote/tools/message_service.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; -import 'package:stadtbote/tools/mqtt_core.dart'; import '../tools/util.dart'; diff --git a/lib/popups/accept_jobs_popup.dart b/lib/popups/accept_jobs_popup.dart index 9df5a10..631fe0a 100644 --- a/lib/popups/accept_jobs_popup.dart +++ b/lib/popups/accept_jobs_popup.dart @@ -1,4 +1,3 @@ -import 'dart:convert'; import 'package:expandable/expandable.dart'; import 'package:flutter/material.dart'; @@ -12,7 +11,6 @@ import 'package:stadtbote/tools/message_service.dart'; import 'package:stadtbote/tools/messages/job_deleted_message.dart'; import 'package:stadtbote/tools/messages/job_received_message.dart'; import 'package:stadtbote/tools/messages/refresh_badges_message.dart'; -import 'package:stadtbote/tools/mqtt_core.dart'; import 'package:stadtbote/tools/util.dart'; import 'package:badges/badges.dart' as badges; diff --git a/lib/protocoll_messages/track_message.dart b/lib/protocoll_messages/track_message.dart index 37552e1..ef465a3 100644 --- a/lib/protocoll_messages/track_message.dart +++ b/lib/protocoll_messages/track_message.dart @@ -2,17 +2,6 @@ import 'package:json_annotation/json_annotation.dart'; part 'track_message.g.dart'; -@JsonSerializable() -class TrackMessage { - TrackPosition? pos; - - TrackMessage(); - - factory TrackMessage.fromJson(Map json) => _$TrackMessageFromJson(json); - - Map toJson() => _$TrackMessageToJson(this); -} - @JsonSerializable() class TrackPosition { late String time; diff --git a/lib/protocoll_messages/track_message.g.dart b/lib/protocoll_messages/track_message.g.dart index bf02fad..642f153 100644 --- a/lib/protocoll_messages/track_message.g.dart +++ b/lib/protocoll_messages/track_message.g.dart @@ -6,16 +6,6 @@ part of 'track_message.dart'; // JsonSerializableGenerator // ************************************************************************** -TrackMessage _$TrackMessageFromJson(Map json) => TrackMessage() - ..pos = json['pos'] == null - ? null - : TrackPosition.fromJson(json['pos'] as Map); - -Map _$TrackMessageToJson(TrackMessage instance) => - { - 'pos': instance.pos, - }; - TrackPosition _$TrackPositionFromJson(Map json) => TrackPosition() ..time = json['time'] as String diff --git a/lib/tools/mqtt_core.dart b/lib/tools/mqtt_core.dart index cdf3982..8216b93 100644 --- a/lib/tools/mqtt_core.dart +++ b/lib/tools/mqtt_core.dart @@ -42,6 +42,7 @@ import 'package:stadtbote/tools/messages/status_info_update.dart'; // ignore: depend_on_referenced_packages import 'package:typed_data/typed_buffers.dart'; +// ignore: unused_import import 'package:uuid/uuid.dart'; import '../main.dart'; @@ -488,12 +489,11 @@ class MqttCore { _trackTimer ??= Timer.periodic(const Duration(seconds: 60), (Timer t) { var position = MyApp.currentPosition; if (position != null) { - var trackMessage = TrackMessage(); - trackMessage.pos = TrackPosition(); - trackMessage.pos!.time = position.timestamp.toIso8601String(); - trackMessage.pos!.lat = position.latitude; - trackMessage.pos!.long = position.longitude; - trackMessage.pos!.acc = position.accuracy.toInt(); + var trackMessage = TrackPosition(); + trackMessage.time = position.timestamp.toIso8601String(); + trackMessage.lat = position.latitude; + trackMessage.long = position.longitude; + trackMessage.acc = position.accuracy.toInt(); _publishText("track", jsonEncode(trackMessage.toJson())); }