From 8456e3ee6f369351a8268e6de1ca264c937fd2f5 Mon Sep 17 00:00:00 2001 From: Sven Carstensen Date: Tue, 19 Mar 2024 15:08:28 +0100 Subject: [PATCH] Logging --- lib/protocoll_messages/tail.dart | 16 ++++++++++++++++ lib/protocoll_messages/tail.g.dart | 14 ++++++++++++++ lib/tools/mqtt_core.dart | 17 ++++++++++++++--- 3 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 lib/protocoll_messages/tail.dart create mode 100644 lib/protocoll_messages/tail.g.dart diff --git a/lib/protocoll_messages/tail.dart b/lib/protocoll_messages/tail.dart new file mode 100644 index 0000000..decba79 --- /dev/null +++ b/lib/protocoll_messages/tail.dart @@ -0,0 +1,16 @@ +import 'dart:core'; + +import 'package:json_annotation/json_annotation.dart'; + +part 'tail.g.dart'; + +@JsonSerializable() +class Tail { + late bool sendMessages; + + Tail(); + + Map toJson() => _$TailToJson(this); + + factory Tail.fromJson(Map json) => _$TailFromJson(json); +} diff --git a/lib/protocoll_messages/tail.g.dart b/lib/protocoll_messages/tail.g.dart new file mode 100644 index 0000000..1a60410 --- /dev/null +++ b/lib/protocoll_messages/tail.g.dart @@ -0,0 +1,14 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'tail.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +Tail _$TailFromJson(Map json) => + Tail()..sendMessages = json['sendMessages'] as bool; + +Map _$TailToJson(Tail instance) => { + 'sendMessages': instance.sendMessages, + }; diff --git a/lib/tools/mqtt_core.dart b/lib/tools/mqtt_core.dart index fe6c5fc..cacd027 100644 --- a/lib/tools/mqtt_core.dart +++ b/lib/tools/mqtt_core.dart @@ -23,6 +23,7 @@ import 'package:stadtbote/model/message.dart'; import 'package:stadtbote/protocoll_messages/payload_container.dart'; import 'package:stadtbote/protocoll_messages/start_session_message.dart'; import 'package:stadtbote/protocoll_messages/sync_jobs_message.dart'; +import 'package:stadtbote/protocoll_messages/tail.dart'; import 'package:stadtbote/protocoll_messages/track_message.dart'; import 'package:stadtbote/tools/connection_status.dart'; import 'package:stadtbote/tools/message_service.dart'; @@ -218,8 +219,12 @@ class MqttCore { _messageMessageReceived(payloadData); break; - case "device_log": - _messageDeviceLogReceived(payloadData); + case "upload_device_log": + _messageUploadDeviceLogReceived(payloadData); + break; + + case "tail": + _messageTailReceived(payloadData); break; default: @@ -336,7 +341,7 @@ class MqttCore { MessageService().publish(Constants.messageTopicMessageReceived, arguments: MessageReceivedMessage(message: newMessage)); } - void _messageDeviceLogReceived(payloadData) async { + void _messageUploadDeviceLogReceived(payloadData) async { var deviceLogRequest = DeviceLogRequest.fromJson(payloadData); var logEintries = await MyApp.isarInstance.logEntrys.filter().timeGreaterThan(deviceLogRequest.startDateTime).findAll(); @@ -354,6 +359,12 @@ class MqttCore { publishBinary(topic, gzipBytes!); } + void _messageTailReceived(payloadData) async { + var tailMessage = Tail.fromJson(payloadData); + + Util.logInfo('message'); + } + void _startReconnectTimer() { connectionState = ConnectionStateEnum.notConnected;