Erweiterungen

lib/content_views/task_list_page.dart

@@ -428,30 +428,29 @@ class _TaskListPageState extends State<TaskListPage> {
   }
 
   _sendFinTourMessage() async {
-    var finTourMessage = FinTourMessage();
+    var message = FinTour();
-    finTourMessage.finTour = FinTour();
+    message.trId = widget.tour.id;
-    finTourMessage.finTour.trId = widget.tour.id;
+    message.com = "Mir doch egal!";
-    finTourMessage.finTour.com = "Mir doch egal!";
 
     var position = MyApp.currentPosition;
     if (position != null) {
-      finTourMessage.finTour.track = Track();
+      message.track = Track();
-      finTourMessage.finTour.track.time = DateTime.now().toIso8601String();
+      message.track.time = DateTime.now().toIso8601String();
-      finTourMessage.finTour.track.pos = FinTaskPos();
+      message.track.pos = FinTaskPos();
-      finTourMessage.finTour.track.pos.lat = position.latitude;
+      message.track.pos.lat = position.latitude;
-      finTourMessage.finTour.track.pos.long = position.longitude;
+      message.track.pos.long = position.longitude;
     }
 
-    finTourMessage.finTour.tasks = [];
+    message.tasks = [];
     for(var taskInfo in _taskList) {
       if (taskInfo.answer != null) {
         var finTourTask = FinTourTask.fromJson(jsonDecode(taskInfo.answer!));
 
-        finTourMessage.finTour.tasks.add(finTourTask);
+        message.tasks.add(finTourTask);
       }
     }
 
-    MqttCore.instance.publishPayloadMessage("fin_tour", finTourMessage.toJson());
+    MqttCore.instance.publishText("/appserver/to_server/100/1/104400/fin_tour", jsonEncode(message.toJson()));
 
     widget.tour.state = Constants.stateFinishedNotConfirmed;
       await MyApp.isarInstance.writeTxn(() async {

lib/protocoll_messages/job_del_message.dart

@@ -4,7 +4,7 @@ part 'job_del_message.g.dart';
 
 @JsonSerializable()
 class JobDelMessage {
-  late List<int> jobDel;
+  late List<int> jobs;
 
   JobDelMessage();
 

lib/protocoll_messages/job_del_message.g.dart

@@ -8,10 +8,9 @@ part of 'job_del_message.dart';
 
 JobDelMessage _$JobDelMessageFromJson(Map<String, dynamic> json) =>
     JobDelMessage()
-      ..jobDel =
+      ..jobs = (json['jobs'] as List<dynamic>).map((e) => e as int).toList();
-          (json['jobDel'] as List<dynamic>).map((e) => e as int).toList();
 
 Map<String, dynamic> _$JobDelMessageToJson(JobDelMessage instance) =>
     <String, dynamic>{
-      'jobDel': instance.jobDel,
+      'jobs': instance.jobs,
     };

lib/tools/mqtt_core.dart

@@ -192,11 +192,11 @@ class MqttCore {
             break;
 
           case 'job_del':
-            //_jobDeleteReceived(payloadData);
+            _jobDeleteReceived(messageData);
             break;
 
           case 'sync_request':
-            //_syncRequestReceived(payloadData);
+            _syncRequestReceived(messageData);
             break;
 
           case "mssg":
@@ -215,6 +215,7 @@ class MqttCore {
     _mqttClient.subscribe(_fromServerTopic + "/session", MqttQos.exactlyOnce);
     _mqttClient.subscribe(_fromServerTopic + "/status", MqttQos.exactlyOnce);
     _mqttClient.subscribe(_fromServerTopic + "/job", MqttQos.exactlyOnce);
+    _mqttClient.subscribe(_fromServerTopic + "/job_del", MqttQos.exactlyOnce);
     Util.logInfo('subscribed to topic: $_fromServerTopic');
 
     MessageService().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.connected));
@@ -278,12 +279,10 @@ class MqttCore {
     MessageService().publish<JobReceivedMessage>(Constants.messageTopicJobReceived, arguments: JobReceivedMessage(job: newJob));
   }
 
-  void _jobDeleteReceived(List<dynamic> payloadData) async {
+  void _jobDeleteReceived(payloadData) async {
-    Map<String, dynamic> map = {};
+    var jobDelMessage = JobDelMessage.fromJson(payloadData);
-    map["jobDel"] = payloadData;
-    var jobDelMessage = JobDelMessage.fromJson(map);
 
-    for(var jobId in jobDelMessage.jobDel) {
+    for(var jobId in jobDelMessage.jobs) {
       await MyApp.isarInstance.writeTxn(() async {
         await MyApp.isarInstance.jobs.delete(jobId);
       });