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

Merge

Browse Source
This commit is contained in:
Sven committed 2024-03-26 13:35:20 +01:00
1 parent 880cdd65ff
commit 8586a23bfa
19 files changed
+179 -220
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/content_views/approach_area_page.dart
+9 -15
View File
@@ -1,16 +1,10 @@
import 'package:flutter/material.dart';
import 'package:isar/isar.dart';
import 'package:stadtbote/content_views/utils/content_view_widget.dart';
import 'package:stadtbote/content_views/utils/header_info.dart';
import 'package:stadtbote/model/ranking.dart';
import 'package:stadtbote/popups/tasks_popups/zip_popup.dart';
import 'package:stadtbote/protocoll_messages/zip_message.dart';
//import 'package:stadtbote/model/ranking.dart';
import 'package:stadtbote/tools/constants.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/ranking_updated.dart';
import 'package:stadtbote/tools/mqtt_core.dart';
import '../main.dart';
import '../tools/util.dart';
enum ModeEnum {
@@ -44,7 +38,7 @@ class ApproachAreaPage extends ContentViewWidget {
}
class _ApproachAreaPageState extends State<ApproachAreaPage> {
late Ranking? _ranking;
//late Ranking? _ranking;
late bool _initCompleted = false;
@@ -53,7 +47,7 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
super.initState();
Future.delayed(const Duration(seconds: 0), () async {
_ranking = await MyApp.isarInstance.rankings.where().findFirst();
//_ranking = await MyApp.isarInstance.rankings.where().findFirst();
_initCompleted = true;
@@ -94,7 +88,7 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
List<Widget> _fillColumns() {
List<Widget> columns = [];
if (_ranking != null) {
/*if (_ranking != null) {
for (int i = 0; i < _ranking!.ranks.length; i++) {
var rank = _ranking!.ranks[i];
@@ -171,12 +165,12 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
),
));
}
}
}*/
return columns;
}
_sendZip(Rank rank, String zip, ModeEnum mode) {
/*_sendZip(Rank rank, String zip, ModeEnum mode) {
var zipMessage = ZipMessage();
if (mode == ModeEnum.set) {
@@ -200,13 +194,13 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
}
MqttCore.instance.publishPayloadMessage("rank", zipMessage.toJson());
}
}*/
_initMessages() {
MessageService().subscribe<RankingUpdated>(Constants.messageTopicRankingUpdated, this, (rankingUpdateMessage) async {
/*MessageService().subscribe<RankingUpdated>(Constants.messageTopicRankingUpdated, this, (rankingUpdateMessage) async {
_ranking = await MyApp.isarInstance.rankings.where().findFirst();
setState(() {});
});
});*/
}
}
lib/content_views/assigned_jobs_page.dart
+8 -10
View File
@@ -1,3 +1,5 @@
import 'dart:convert';
import 'package:expandable/expandable.dart';
import 'package:flutter/material.dart';
import 'package:isar/isar.dart';
@@ -8,7 +10,7 @@ import 'package:badges/badges.dart' as badges;
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/job_deleted_message.dart';
import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
import 'package:stadtbote/tools/mqtt_core.dart';
import '../main.dart';
@@ -86,12 +88,6 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
var jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.stateAssigned).findAll();
for (var job in jobs) {
String remarkString = '';
for (var remark in job.rem) {
remarkString += '$remark\n';
}
remarkString = remarkString.trim();
entries.add(ExpandableNotifier(
child: ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
@@ -200,9 +196,9 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
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;
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("reaction", jsonEncode(message.toJson()));
@@ -216,4 +212,6 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
setState(() {});
}
void _initMessages() {}
}
lib/content_views/main_page.dart
+7 -13
View File
@@ -11,12 +11,10 @@ import 'package:stadtbote/content_views/messages_page.dart';
import 'package:stadtbote/content_views/utils/content_view_widget.dart';
import 'package:stadtbote/content_views/utils/header_info.dart';
import 'package:stadtbote/model/job.dart';
import 'package:stadtbote/model/log_entry.dart';
import 'package:stadtbote/model/message.dart';
import 'package:stadtbote/model/session_status.dart';
import 'package:stadtbote/model/status.dart';
import 'package:stadtbote/popups/infos_popup.dart';
import 'package:stadtbote/protocoll_messages/device_log_response.dart';
import 'package:stadtbote/protocoll_messages/logout_message.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/job_deleted_message.dart';
@@ -25,7 +23,7 @@ import 'package:stadtbote/tools/messages/message_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/messages/update_badges_message.dart';
import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
import 'package:stadtbote/tools/mqtt_core.dart';
import '../main.dart';
@@ -237,11 +235,7 @@ class _MainPageState extends State<MainPage> {
_loggedOut ? 'Anmelden' : 'Abmelden',
image: Image.asset(_loggedOut ? 'assets/anmelden.png' : 'assets/abmelden.png', width: 30, height: 30),
() async {
if (!kDebugMode) {
_logout(context);
} else {
_test();
}
_logout(context);
}),
Expanded(
child: Container(
@@ -287,7 +281,7 @@ class _MainPageState extends State<MainPage> {
_refreshBadges();
});
MessageService().subscribe<UpdateBadgesMessage>(Constants.messageTopicUpdateBadges, this, (UpdateBadgesMessage message) {
MessageService().subscribe<RefreshBadgesMessage>(Constants.messageTopicRefreshBadges, this, (RefreshBadgesMessage message) {
_refreshBadges();
});
}
@@ -380,10 +374,10 @@ class _MainPageState extends State<MainPage> {
var logoutMessage = LogoutMessage();
if (position != null) {
logoutMessage.time = position.timestamp.toIso8601String();
logoutMessage.lat = position.latitude;
logoutMessage.long = position.longitude;
logoutMessage.acc = position.accuracy.toInt();
logoutMessage.pos!.time = position.timestamp.toIso8601String();
logoutMessage.pos!.lat = position.latitude;
logoutMessage.pos!.long = position.longitude;
logoutMessage.pos!.acc = position.accuracy.toInt();
}
MqttCore.instance.publishText("session", jsonEncode(logoutMessage.toJson()));
lib/content_views/messages_page.dart
-2
View File
@@ -109,8 +109,6 @@ class _MessagesPageState extends State<MessagesPage> {
await MyApp.isarInstance.messages.put(message.mssg);
});
var json = jsonEncode(message.toJson());
MqttCore.instance.publishText('set_location', jsonEncode(message.toJson()));
_messages.insert(0, types.TextMessage(
lib/content_views/task_list_page.dart
+10 -11
View File
@@ -20,7 +20,6 @@ import 'package:stadtbote/popups/tasks_popups/take_photos_popup.dart';
import 'package:stadtbote/protocoll_messages/accept_job_message.dart';
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/mqtt_core.dart';
@@ -145,7 +144,7 @@ class _TaskListPageState extends State<TaskListPage> {
left: 16.5,
top: i == 0 ? 40 : 40,
child: Container(
height: i == widget.tour.tasks.length - 1 ? 0 : 20,
height: i == widget.tour.tasks!.length - 1 ? 0 : 20,
width: 6,
color: isTaskActive(i) ? Constants.colorPrimary : Constants.colorPrimaryOpaque,
),
@@ -211,7 +210,7 @@ class _TaskListPageState extends State<TaskListPage> {
Future<List<TaskInfo>> _fetchTaskList() async {
List<TaskInfo> taskList = [];
for(var task in widget.tour.tasks) {
for(var task in widget.tour.tasks!) {
var taskInfo = await MyApp.isarInstance.taskInfos.filter().sIdEqualTo(task.sId).findFirst();
if (taskInfo == null) {
taskInfo = TaskInfo();
@@ -445,7 +444,7 @@ class _TaskListPageState extends State<TaskListPage> {
message.task.pos!.long = position.longitude;
}
MqttCore.instance.publishPayloadMessage("job", finTaskMessage.toJson());
MqttCore.instance.publishText("job", jsonEncode(message.toJson()));
}
FinTourTask _createAnswerHeader(TaskInfo taskInfo) {
@@ -456,9 +455,9 @@ class _TaskListPageState extends State<TaskListPage> {
finTourTask.time = DateTime.now().toIso8601String();
finTourTask.pos = FinTaskPos();
if (position != null) {
finTourTask.pos.lat = position.latitude;
finTourTask.pos.long = position.longitude;
finTourTask.pos.acc = position.accuracy.toInt();
finTourTask.pos!.lat = position.latitude;
finTourTask.pos!.long = position.longitude;
finTourTask.pos!.acc = position.accuracy.toInt();
}
return finTourTask;
@@ -472,10 +471,10 @@ class _TaskListPageState extends State<TaskListPage> {
var position = MyApp.currentPosition;
if (position != null) {
message.track = Track();
message.track.time = DateTime.now().toIso8601String();
message.track.pos = FinTaskPos();
message.track.pos.lat = position.latitude;
message.track.pos.long = position.longitude;
message.track!.time = DateTime.now().toIso8601String();
message.track!.pos = FinTaskPos();
message.track!.pos!.lat = position.latitude;
message.track!.pos!.long = position.longitude;
}
message.tasks = [];