Assecutor/stadtbote-app
4
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erweiterungen und cleanup

Browse Source
This commit is contained in:
Sven committed 2024-11-14 17:38:14 +01:00
1 parent def0f3fc2f
commit 38f5d374b2
15 files changed
+9 -119
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/content_views/accepted_jobs_page.dart
-1
View File
@@ -5,7 +5,6 @@ import 'package:stadtbote/content_views/tour_list_page.dart';
import 'package:stadtbote/content_views/utils/content_view_widget.dart';
import 'package:intl/intl.dart';
import 'package:stadtbote/messages/pop_content_view_message.dart';
import 'package:stadtbote/tools/message_service.dart';
import '../main.dart';
import '../model/job.dart';
lib/content_views/approach_area_page.dart
+8 -16
View File
@@ -10,9 +10,7 @@ import 'package:stadtbote/model/rank.dart';
import 'package:stadtbote/popups/tasks_popups/zip_popup.dart';
import 'package:stadtbote/protocoll_messages/zip_message.dart';
import 'package:stadtbote/tools/constants.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/publish_payload_message.dart';
import 'package:stadtbote/tools/messages/ranking_updated.dart';
import 'package:badges/badges.dart' as badges;
import '../tools/util.dart';
@@ -31,7 +29,7 @@ class ApproachAreaPage extends ContentViewWidget {
}
}
class _ApproachAreaPageState extends State<ApproachAreaPage> with ProducerMixin{
class _ApproachAreaPageState extends State<ApproachAreaPage> with ProducerMixin, ConsumerMixin {
late Ranking? _ranking;
late bool _initCompleted = false;
@@ -51,14 +49,6 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> with ProducerMixin{
_initMessages();
}
@override
void deactivate() {
super.deactivate();
// TODO MESSAGING
//MessageService().unsubscribe(Constants.messageTopicRankingUpdated, this);
}
@override
Widget build(BuildContext context) {
if (!_initCompleted) {
@@ -213,12 +203,14 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> with ProducerMixin{
}
_initMessages() {
// TODO MESSAGING
sendMessage(
routingKey: Constants.messageTopicPopContentView,
payload: PopContentViewMessage(count: 1),
);
subscribe(
queueId: Constants.messageTopicRankingUpdated,
callback: (message) async {
_ranking = await MyApp.isarInstance.rankings.where().findFirst();
setState(() {});
},
);
/*MessageService().subscribe<RankingUpdated>(Constants.messageTopicRankingUpdated, this, (rankingUpdateMessage) async {
_ranking = await MyApp.isarInstance.rankings.where().findFirst();
lib/content_views/assigned_jobs_page.dart
-1
View File
@@ -10,7 +10,6 @@ import 'package:badges/badges.dart' as badges;
import 'package:stadtbote/messages/pop_content_view_message.dart';
import 'package:stadtbote/protocoll_messages/accept_job_message.dart';
import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/publish_payload_message.dart';
import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
lib/content_views/finished_jobs_page.dart
-1
View File
@@ -5,7 +5,6 @@ import 'package:stadtbote/content_views/tour_list_page.dart';
import 'package:stadtbote/content_views/utils/content_view_widget.dart';
import 'package:intl/intl.dart';
import 'package:stadtbote/messages/pop_content_view_message.dart';
import 'package:stadtbote/tools/message_service.dart';
import '../main.dart';
import '../model/job.dart';
lib/content_views/main_page.dart
-6
View File
@@ -16,17 +16,11 @@ import 'package:stadtbote/model/session_status.dart';
import 'package:stadtbote/popups/infos_popup.dart';
import 'package:stadtbote/protocoll_messages/logout_message.dart';
import 'package:stadtbote/tools/constants.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/job_deleted_message.dart';
import 'package:stadtbote/tools/messages/job_received_message.dart';
import 'package:stadtbote/tools/messages/message_message.dart';
import 'package:stadtbote/tools/messages/publish_payload_message.dart';
import 'package:stadtbote/tools/messages/connect_client_message.dart';
import 'package:stadtbote/tools/messages/disconnect_client_message.dart';
import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
import 'package:stadtbote/tools/messages/session_info_update.dart';
import 'package:badges/badges.dart' as badges;
import 'package:stadtbote/tools/messages/status_info_update.dart';
import 'package:stadtbote/tools/util.dart';
class MainPage extends ContentViewWidget {
lib/content_views/messages_page.dart
-1
View File
@@ -12,7 +12,6 @@ import 'package:stadtbote/model/chat_message.dart' as sbmessage;
import 'package:stadtbote/model/chat_message.dart';
import 'package:stadtbote/model/session_status.dart';
import 'package:stadtbote/tools/constants.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/publish_payload_message.dart';
import '../tools/util.dart';
lib/content_views/task_list_page.dart
-1
View File
@@ -24,7 +24,6 @@ import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
import 'package:stadtbote/protocoll_messages/fin_tour_message.dart';
import 'package:stadtbote/protocoll_messages/pic_message.dart';
import 'package:stadtbote/tools/constants.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/publish_payload_message.dart';
import '../main.dart';
lib/content_views/tour_details_page.dart
-1
View File
@@ -4,7 +4,6 @@ import 'package:stadtbote/content_views/task_list_page.dart';
import 'package:stadtbote/content_views/utils/content_view_widget.dart';
import 'package:stadtbote/messages/pop_content_view_message.dart';
import 'package:stadtbote/model/job_tour.dart';
import 'package:stadtbote/tools/message_service.dart';
import '../model/job.dart';
import '../popups/map_popup.dart';
lib/content_views/tour_list_page.dart
-1
View File
@@ -5,7 +5,6 @@ import 'package:stadtbote/content_views/utils/content_view_widget.dart';
import 'package:stadtbote/messages/pop_content_view_message.dart';
import 'package:stadtbote/model/job_tour.dart';
import 'package:stadtbote/popups/map_popup.dart';
import 'package:stadtbote/tools/message_service.dart';
import '../model/job.dart';
import '../tools/constants.dart';
lib/main.dart
-1
View File
@@ -18,7 +18,6 @@ import 'package:stadtbote/popups/accept_jobs_popup.dart';
import 'package:stadtbote/tools/colored_safe_area.dart';
import 'package:stadtbote/model/session_status.dart';
import 'package:stadtbote/tools/connection_status.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/job_deleted_message.dart';
import 'package:stadtbote/tools/messages/job_received_message.dart';
import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
lib/popups/accept_jobs_popup.dart
-1
View File
@@ -10,7 +10,6 @@ import 'package:stadtbote/protocoll_messages/accept_job_message.dart';
import 'package:stadtbote/model/job.dart';
import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
import 'package:stadtbote/tools/constants.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
import 'package:stadtbote/tools/messages/remove_job_message.dart';
import 'package:stadtbote/tools/util.dart';
lib/popups/infos_popup.dart
-5
View File
@@ -1,11 +1,6 @@
import 'package:flutter/material.dart';
import 'package:stadtbote/main.dart';
import 'package:stadtbote/model/session_status.dart';
import 'package:stadtbote/tools/connection_status.dart';
import 'package:stadtbote/tools/constants.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/current_connection_status_message.dart';
import 'package:stadtbote/tools/messages/request_connection_status_message.dart';
import 'package:stadtbote/tools/util.dart';
void showInfosPopup(SessionStatus? status) async {
lib/tools/message_service.dart
-78
View File
@@ -1,78 +0,0 @@
import 'dart:async';
//typedef EventHandler<T> = void Function(T args);
/*class _MapEntry {
late dynamic owner;
late dynamic handler;
}
class MessageService {
static final MessageService _singleton = MessageService._internal();
final Map<String, Set<_MapEntry>> _callbackMaps = <String, Set<_MapEntry>>{};
factory MessageService() {
return _singleton;
}
MessageService._internal();
subscribe<T>(String topic, dynamic owner, EventHandler<T>? handler) {
var entry = _MapEntry();
entry.owner = owner;
entry.handler = handler;
if (_callbackMaps.containsKey(topic)) {
_callbackMaps[topic]!.remove(entry);
_callbackMaps[topic]!.add(entry);
} else {
_callbackMaps[topic] = <_MapEntry>{};
_callbackMaps[topic]!.add(entry);
}
}
unsubscribe<T>(String topic, dynamic owner) {
if (_callbackMaps.containsKey(topic)) {
for (var entry in _callbackMaps[topic]!) {
if (entry.owner == owner) {
_callbackMaps[topic]!.remove(entry);
unsubscribe(topic, owner);
break;
}
}
}
}
unsubscribeAll<T>(dynamic owner) {
for (var callbackMapsEntry in _callbackMaps.entries) {
for (var entry in callbackMapsEntry.value.toList()) {
if (entry.owner == owner) {
_callbackMaps[callbackMapsEntry.key]!.remove(entry);
unsubscribeAll(owner);
break;
}
}
}
}
publish<T>(String topic, {T? arguments}) async {
Completer<void> completer = Completer();
var entries = _callbackMaps[topic];
if (entries != null) {
for (var entry in entries) {
entry.handler(arguments);
}
completer.complete();
}
await completer.future;
}
}*/
lib/tools/mqtt_core.dart
-4
View File
@@ -28,16 +28,12 @@ import 'package:stadtbote/protocoll_messages/status_info_update.dart';
import 'package:stadtbote/protocoll_messages/sync_jobs_message.dart';
import 'package:stadtbote/protocoll_messages/track_message.dart';
import 'package:stadtbote/tools/connection_status.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/publish_payload_message.dart';
import 'package:stadtbote/tools/messages/connect_client_message.dart';
import 'package:stadtbote/tools/messages/current_connection_status_message.dart';
import 'package:stadtbote/tools/messages/disconnect_client_message.dart';
import 'package:stadtbote/tools/messages/job_deleted_message.dart';
import 'package:stadtbote/tools/messages/job_received_message.dart';
import 'package:stadtbote/tools/messages/message_message.dart';
import 'package:stadtbote/tools/messages/ranking_updated.dart';
import 'package:stadtbote/tools/messages/request_connection_status_message.dart';
import 'package:stadtbote/tools/messages/session_info_update.dart';
import 'package:stadtbote/tools/messages/status_info_update.dart';