Fehlerkorrekturen

lib/content_views/task_list_page.dart

@@ -517,21 +517,13 @@ class _TaskListPageState extends State<TaskListPage> {
         int photoIndex = 0;
 
         for (var photoData in _photos) {
-          var message = PicMessage();
+          var message = PicData();
-          message.pic = PicData();
+          message.trId = widget.tour.id;
-          message.pic.trId = widget.tour.id;
+          message.num = photoIndex;
-          message.pic.num = photoIndex;
+          message.time = DateTime.now().millisecondsSinceEpoch;
-          message.pic.time = DateTime.now().millisecondsSinceEpoch;
+          message.data = base64Encode(photoData);
-          message.pic.data = base64Encode(photoData);
 
-          var position = MyApp.currentPosition;
+          MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "pic", message: message.toJson()));
-          if (position != null) {
-            message.pos = PicMessagePos();
-            message.pos!.lat = position.latitude;
-            message.pos!.long = position.longitude;
-          }
-
-          MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "job", message: message.toJson()));
         }
       }
     });

lib/protocoll_messages/pic_message.dart

@@ -2,19 +2,6 @@ import 'package:json_annotation/json_annotation.dart';
 
 part 'pic_message.g.dart';
 
-@JsonSerializable()
-class PicMessage {
-  late PicData pic;
-
-  PicMessagePos? pos;
-
-  PicMessage();
-
-  factory PicMessage.fromJson(Map<String, dynamic> json) => _$PicMessageFromJson(json);
-
-  Map<String, dynamic> toJson() => _$PicMessageToJson(this);
-}
-
 @JsonSerializable()
 class PicData
 {
@@ -33,18 +20,3 @@ class PicData
 
   Map<String, dynamic> toJson() => _$PicDataToJson(this);
 }
-
-@JsonSerializable()
-class PicMessagePos {
-  late double lat;
-
-  late double long;
-
-  late int acc = 0;
-
-  PicMessagePos();
-
-  factory PicMessagePos.fromJson(Map<String, dynamic> json) => _$PicMessagePosFromJson(json);
-
-  Map<String, dynamic> toJson() => _$PicMessagePosToJson(this);
-}

lib/protocoll_messages/pic_message.g.dart

@@ -6,18 +6,6 @@ part of 'pic_message.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-PicMessage _$PicMessageFromJson(Map<String, dynamic> json) => PicMessage()
-  ..pic = PicData.fromJson(json['pic'] as Map<String, dynamic>)
-  ..pos = json['pos'] == null
-      ? null
-      : PicMessagePos.fromJson(json['pos'] as Map<String, dynamic>);
-
-Map<String, dynamic> _$PicMessageToJson(PicMessage instance) =>
-    <String, dynamic>{
-      'pic': instance.pic,
-      'pos': instance.pos,
-    };
-
 PicData _$PicDataFromJson(Map<String, dynamic> json) => PicData()
   ..trId = json['tr_id'] as int
   ..num = json['num'] as int
@@ -30,16 +18,3 @@ Map<String, dynamic> _$PicDataToJson(PicData instance) => <String, dynamic>{
       'time': instance.time,
       'data': instance.data,
     };
-
-PicMessagePos _$PicMessagePosFromJson(Map<String, dynamic> json) =>
-    PicMessagePos()
-      ..lat = (json['lat'] as num).toDouble()
-      ..long = (json['long'] as num).toDouble()
-      ..acc = json['acc'] as int;
-
-Map<String, dynamic> _$PicMessagePosToJson(PicMessagePos instance) =>
-    <String, dynamic>{
-      'lat': instance.lat,
-      'long': instance.long,
-      'acc': instance.acc,
-    };

lib/tools/mqtt_core.dart

@@ -535,14 +535,13 @@ class MqttCore {
   }
 
   void _acknowlegdeJob(Job job) {
-    var message = AcknowledgeJob();
+    var message = AcknowledgeJobReceived();
-    message.received = AcknowledgeJobReceived();
+    message.id = job.id;
-    message.received.id = job.id;
+    message.state = job.state;
-    message.received.state = job.state;
+    message.ver = job.ver;
-    message.received.ver = job.ver;
+    message.utc = DateTime.now().millisecondsSinceEpoch;
-    message.received.utc = DateTime.now().millisecondsSinceEpoch;
 
-    _publishText('job', jsonEncode(message.toJson()));
+    _publishText('job_received', jsonEncode(message.toJson()));
   }
 
   void initMessages() {