diff --git a/lib/content_views/assigned_jobs_page.dart b/lib/content_views/assigned_jobs_page.dart index 9cac4b0..2950cf9 100644 --- a/lib/content_views/assigned_jobs_page.dart +++ b/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 { } _sendAnswer(Job job, int item) async { - var message = AcceptJobMessage(); - 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; + var currentPosition = MyApp.currentPosition; - 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)}); diff --git a/lib/popups/accept_jobs_popup.dart b/lib/popups/accept_jobs_popup.dart index 497deff..7dc7162 100644 --- a/lib/popups/accept_jobs_popup.dart +++ b/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 showAcceptJobsPopup(BuildContext context, List jobs) async { _sendAnswer(Job job, int item) { var currentPosition = MyApp.currentPosition; - var message = AcceptJobMessage(); - 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; + 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.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)}); diff --git a/lib/protocoll_messages/accept_job_message.dart b/lib/protocoll_messages/accept_job_message.dart index 36fab25..c0bcc3f 100644 --- a/lib/protocoll_messages/accept_job_message.dart +++ b/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 json) => _$AcceptJobMessageFromJson(json); - - Map toJson() => _$AcceptJobMessageToJson(this); -} - @JsonSerializable() class Reaction { late String id; diff --git a/lib/protocoll_messages/accept_job_message.g.dart b/lib/protocoll_messages/accept_job_message.g.dart index 4687734..5a0288b 100644 --- a/lib/protocoll_messages/accept_job_message.g.dart +++ b/lib/protocoll_messages/accept_job_message.g.dart @@ -6,15 +6,6 @@ part of 'accept_job_message.dart'; // JsonSerializableGenerator // ************************************************************************** -AcceptJobMessage _$AcceptJobMessageFromJson(Map json) => - AcceptJobMessage() - ..reaction = Reaction.fromJson(json['reaction'] as Map); - -Map _$AcceptJobMessageToJson(AcceptJobMessage instance) => - { - 'reaction': instance.reaction, - }; - Reaction _$ReactionFromJson(Map json) => Reaction() ..id = json['id'] as String ..ver = json['ver'] as String