Erweiterungen

lib/content_views/assigned_jobs_page.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
@@ -181,19 +183,20 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
   }
 
   _sendAnswer(Job job, int item) async {
-    var message = AcceptJobMessage();
+    var currentPosition = 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 = 0;
-    message.reaction.track.pos.long = 0;
-    message.reaction.track.pos.acc = 1;
 
-    MqttCore.instance.publishPayloadMessage("job", message.toJson());
+    var message = Reaction();
+    message.id = job.id.toString();
+    message.ver = job.ver.toString();
+    message.item = item;
+    message.track = Track();
+    message.track.time = DateTime.now().toUtc().toIso8601String();
+    message.track.pos = FinTaskPos();
+    message.track.pos.lat = currentPosition != null ? currentPosition.latitude : 0.0;
+    message.track.pos.long = currentPosition != null ? currentPosition.longitude : 0.0;
+    message.track.pos.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0;
+
+    MqttCore.instance.publishText("/appserver/to_server/100/1/104400/reaction", jsonEncode(message.toJson()));
 
     job.state = 9;
     MyApp.isarInstance.writeTxnSync(() => {MyApp.isarInstance.jobs.putSync(job)});

lib/popups/accept_jobs_popup.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
@@ -160,19 +162,18 @@ Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs) async {
 _sendAnswer(Job job, int item) {
   var currentPosition = MyApp.currentPosition;
 
-  var message = AcceptJobMessage();
+  var message = Reaction();
-  message.reaction = Reaction();
+  message.id = job.id.toString();
-  message.reaction.id = job.id.toString();
+  message.ver = job.ver.toString();
-  message.reaction.ver = job.ver.toString();
+  message.item = item;
-  message.reaction.item = item;
+  message.track = Track();
-  message.reaction.track = Track();
+  message.track.time = DateTime.now().toUtc().toIso8601String();
-  message.reaction.track.time = DateTime.now().toUtc().toIso8601String();
+  message.track.pos = FinTaskPos();
-  message.reaction.track.pos = FinTaskPos();
+  message.track.pos.lat = currentPosition != null ? currentPosition.latitude : 0.0;
-  message.reaction.track.pos.lat = currentPosition != null ? currentPosition.latitude : 0.0;
+  message.track.pos.long = currentPosition != null ? currentPosition.longitude : 0.0;
-  message.reaction.track.pos.long = currentPosition != null ? currentPosition.longitude : 0.0;
+  message.track.pos.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0;
-  message.reaction.track.pos.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0;
 
-  MqttCore.instance.publishPayloadMessage("job", message.toJson());
+  MqttCore.instance.publishText("/appserver/to_server/100/1/104400/reaction", jsonEncode(message.toJson()));
 
   job.state = 9;
   MyApp.isarInstance.writeTxnSync(() => {MyApp.isarInstance.jobs.putSync(job)});

lib/protocoll_messages/accept_job_message.dart

@@ -3,17 +3,6 @@ import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
 
 part 'accept_job_message.g.dart';
 
-@JsonSerializable()
-class AcceptJobMessage {
-  late Reaction reaction;
-
-  AcceptJobMessage();
-
-  factory AcceptJobMessage.fromJson(Map<String, dynamic> json) => _$AcceptJobMessageFromJson(json);
-
-  Map<String, dynamic> toJson() => _$AcceptJobMessageToJson(this);
-}
-
 @JsonSerializable()
 class Reaction {
   late String id;

lib/protocoll_messages/accept_job_message.g.dart

@@ -6,15 +6,6 @@ part of 'accept_job_message.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-AcceptJobMessage _$AcceptJobMessageFromJson(Map<String, dynamic> json) =>
-    AcceptJobMessage()
-      ..reaction = Reaction.fromJson(json['reaction'] as Map<String, dynamic>);
-
-Map<String, dynamic> _$AcceptJobMessageToJson(AcceptJobMessage instance) =>
-    <String, dynamic>{
-      'reaction': instance.reaction,
-    };
-
 Reaction _$ReactionFromJson(Map<String, dynamic> json) => Reaction()
   ..id = json['id'] as String
   ..ver = json['ver'] as String