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

Fehlerkorrekturen

Browse Source
This commit is contained in:
Sven committed 2024-03-12 14:52:35 +01:00
1 parent e862f0b7aa
commit e5c3a3ca22
9 files changed
+79 -83
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/content_views/approach_area_page.dart
+6 -8
View File
@@ -101,11 +101,9 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
List<Widget> entries = [];
entries.add(
GestureDetector(
onTap: ()=> {
onTap: () => {
if (i == 0) {
showZipPopup(context, 'ACHTUNG: Wenn Sie Ihre PLZ ändern, verlieren Sie Ihr Ranking!\n', 'Freimelden', (zip) => {_sendZip(rank, zip, ModeEnum.set)}),
} else {
showZipPopup(context, 'ACHTUNG: Wenn Sie Ihre PLZ ändern, verlieren Sie Ihr Ranking!\n', 'OK', (zip) => {_sendZip(rank, zip, ModeEnum.request)}),
}
},
child: Container(
@@ -189,11 +187,11 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
if (position != null) {
zipMessage.setPos!.track = ZipTrack();
zipMessage.setPos!.track.time = DateTime.now().toIso8601String();
zipMessage.setPos!.track.pos = ZipTrackPos();
zipMessage.setPos!.track.pos!.lat = position.latitude;
zipMessage.setPos!.track.pos!.long = position.longitude;
zipMessage.setPos!.track.pos!.acc = position.accuracy.toInt();
zipMessage.setPos!.track!.time = DateTime.now().toIso8601String();
zipMessage.setPos!.track!.pos = ZipTrackPos();
zipMessage.setPos!.track!.pos!.lat = position.latitude;
zipMessage.setPos!.track!.pos!.long = position.longitude;
zipMessage.setPos!.track!.pos!.acc = position.accuracy.toInt();
}
} else {
zipMessage.reqZip = ZipReqZip();
lib/content_views/task_list_page.dart
+24 -54
View File
@@ -67,14 +67,14 @@ class _TaskListPageState extends State<TaskListPage> {
List<Uint8List> _photos = [];
late String commisionNumber;
late String _commisionNumber;
@override
void initState() {
Future.delayed(const Duration(seconds: 0), () async {
_taskList = await _fetchTaskList();
commisionNumber = widget.tour.com;
_commisionNumber = widget.tour.com;
_initCompleted = true;
@@ -102,10 +102,10 @@ class _TaskListPageState extends State<TaskListPage> {
child: Column(
children: [
Visibility(
visible: commisionNumber.length > 0,
visible: _commisionNumber.length > 0,
child: Row(
children: [
Text('Komm-#: $commisionNumber', style: const TextStyle(fontSize: 20), textAlign: TextAlign.left),
Text('Komm-#: $_commisionNumber', style: const TextStyle(fontSize: 20), textAlign: TextAlign.left),
],
),
),
@@ -294,7 +294,7 @@ class _TaskListPageState extends State<TaskListPage> {
taskInfo.additionalText = comissionNumber;
taskInfo.completed = true;
commisionNumber = comissionNumber;
_commisionNumber = comissionNumber;
setState(() {});
@@ -477,7 +477,7 @@ class _TaskListPageState extends State<TaskListPage> {
var finTourMessage = FinTourMessage();
finTourMessage.finTour = FinTour();
finTourMessage.finTour.trId = widget.tour.id;
finTourMessage.finTour.com = "Mir doch egal!";
finTourMessage.finTour.com = _commisionNumber;
var position = MyApp.currentPosition;
if (position != null) {
@@ -504,7 +504,9 @@ class _TaskListPageState extends State<TaskListPage> {
await MyApp.isarInstance.jobs.put(widget.job);
});
_sendImages();
_sendImages();
await _checkJobFinished();
}
_sendImages() {
@@ -533,54 +535,22 @@ class _TaskListPageState extends State<TaskListPage> {
});
}
/*private void SendImages()
{
var tourId = _jobTour.Id;
Future<void> _checkJobFinished() async {
var jobFinished = true;
Task.Run(() =>
{
try
{
Thread.Sleep(1000);
for (var tour in widget.job.tours) {
if (tour.state == 0) {
jobFinished = false;
var index = 0;
var realm = Realm.GetInstance();
var tourImages = realm.All<TourImage>().Where(tourImage => tourImage.TourId == tourId);
if (tourImages.Any())
{
foreach (var tourImage in tourImages)
{
var payloadObject = new JObject();
var picObject = new JObject();
payloadObject.Add(new JProperty("pic", picObject));
picObject.Add(new JProperty("tr_id", tourImage.TourId));
picObject.Add(new JProperty("num", index));
picObject.Add(new JProperty("time", DateTime.Now.ToString("o")));
picObject.Add(new JProperty("data", tourImage.ImageData));
var location = App.CurrentLocation;
if (location != null)
{
var posObject = new JObject();
picObject.Add(new JProperty("pos", posObject));
posObject.Add(new JProperty("lat", location.Latitude));
posObject.Add(new JProperty("long", location.Longitude));
}
App.Core.SendJsonMessageAsync("job", payloadObject);
index++;
}
Thread.Sleep(500);
}
}
catch (Exception ex)
{
break;
}
}
});
}*/
if (jobFinished) {
widget.job.state = 2;
await MyApp.isarInstance.writeTxn(() async {
await MyApp.isarInstance.jobs.put(widget.job);
});
}
}
}
lib/protocoll_messages/accept_job_message.g.dart
+3 -1
View File
@@ -30,7 +30,9 @@ Map<String, dynamic> _$ReactionToJson(Reaction instance) => <String, dynamic>{
Track _$TrackFromJson(Map<String, dynamic> json) => Track()
..time = json['time'] as String
..pos = FinTaskPos.fromJson(json['pos'] as Map<String, dynamic>);
..pos = json['pos'] == null
? null
: FinTaskPos.fromJson(json['pos'] as Map<String, dynamic>);
Map<String, dynamic> _$TrackToJson(Track instance) => <String, dynamic>{
'time': instance.time,
lib/protocoll_messages/fin_tour_message.g.dart
+3 -1
View File
@@ -18,7 +18,9 @@ Map<String, dynamic> _$FinTourMessageToJson(FinTourMessage instance) =>
FinTour _$FinTourFromJson(Map<String, dynamic> json) => FinTour()
..trId = json['tr_id'] as int
..com = json['com'] as String
..track = Track.fromJson(json['track'] as Map<String, dynamic>)
..track = json['track'] == null
? null
: Track.fromJson(json['track'] as Map<String, dynamic>)
..tasks = (json['tasks'] as List<dynamic>)
.map((e) => FinTourTask.fromJson(e as Map<String, dynamic>))
.toList();
lib/protocoll_messages/pic_message.g.dart
+3 -1
View File
@@ -8,7 +8,9 @@ part of 'pic_message.dart';
PicMessage _$PicMessageFromJson(Map<String, dynamic> json) => PicMessage()
..pic = PicData.fromJson(json['pic'] as Map<String, dynamic>)
..pos = PicMessagePos.fromJson(json['pos'] as Map<String, dynamic>);
..pos = json['pos'] == null
? null
: PicMessagePos.fromJson(json['pos'] as Map<String, dynamic>);
Map<String, dynamic> _$PicMessageToJson(PicMessage instance) =>
<String, dynamic>{
lib/protocoll_messages/track_message.g.dart
+3 -1
View File
@@ -7,7 +7,9 @@ part of 'track_message.dart';
// **************************************************************************
TrackMessage _$TrackMessageFromJson(Map<String, dynamic> json) => TrackMessage()
..pos = TrackPosition.fromJson(json['pos'] as Map<String, dynamic>);
..pos = json['pos'] == null
? null
: TrackPosition.fromJson(json['pos'] as Map<String, dynamic>);
Map<String, dynamic> _$TrackMessageToJson(TrackMessage instance) =>
<String, dynamic>{
lib/protocoll_messages/zip_message.dart
+2 -2
View File
@@ -61,7 +61,7 @@ class ZipReqZip {
class ZipSetPos {
late String zip;
late ZipTrack track;
ZipTrack? track;
ZipSetPos();
@@ -75,7 +75,7 @@ class ZipSetPos {
class ZipTrack {
late String time;
late ZipTrackPos? pos;
ZipTrackPos? pos;
ZipTrack();
lib/protocoll_messages/zip_message.g.dart
+34 -14
View File
@@ -298,9 +298,13 @@ int _zipSetPosEstimateSize(
Map<Type, List<int>> allOffsets,
) {
var bytesCount = offsets.last;
bytesCount += 3 +
ZipTrackSchema.estimateSize(
object.track, allOffsets[ZipTrack]!, allOffsets);
{
final value = object.track;
if (value != null) {
bytesCount += 3 +
ZipTrackSchema.estimateSize(value, allOffsets[ZipTrack]!, allOffsets);
}
}
bytesCount += 3 + object.zip.length * 3;
return bytesCount;
}
@@ -328,11 +332,10 @@ ZipSetPos _zipSetPosDeserialize(
) {
final object = ZipSetPos();
object.track = reader.readObjectOrNull<ZipTrack>(
offsets[0],
ZipTrackSchema.deserialize,
allOffsets,
) ??
ZipTrack();
offsets[0],
ZipTrackSchema.deserialize,
allOffsets,
);
object.zip = reader.readString(offsets[1]);
return object;
}
@@ -346,11 +349,10 @@ P _zipSetPosDeserializeProp<P>(
switch (propertyId) {
case 0:
return (reader.readObjectOrNull<ZipTrack>(
offset,
ZipTrackSchema.deserialize,
allOffsets,
) ??
ZipTrack()) as P;
offset,
ZipTrackSchema.deserialize,
allOffsets,
)) as P;
case 1:
return (reader.readString(offset)) as P;
default:
@@ -360,6 +362,22 @@ P _zipSetPosDeserializeProp<P>(
extension ZipSetPosQueryFilter
on QueryBuilder<ZipSetPos, ZipSetPos, QFilterCondition> {
QueryBuilder<ZipSetPos, ZipSetPos, QAfterFilterCondition> trackIsNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNull(
property: r'track',
));
});
}
QueryBuilder<ZipSetPos, ZipSetPos, QAfterFilterCondition> trackIsNotNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNotNull(
property: r'track',
));
});
}
QueryBuilder<ZipSetPos, ZipSetPos, QAfterFilterCondition> zipEqualTo(
String value, {
bool caseSensitive = true,
@@ -1046,7 +1064,9 @@ Map<String, dynamic> _$ZipReqZipToJson(ZipReqZip instance) => <String, dynamic>{
ZipSetPos _$ZipSetPosFromJson(Map<String, dynamic> json) => ZipSetPos()
..zip = json['zip'] as String
..track = ZipTrack.fromJson(json['track'] as Map<String, dynamic>);
..track = json['track'] == null
? null
: ZipTrack.fromJson(json['track'] as Map<String, dynamic>);
Map<String, dynamic> _$ZipSetPosToJson(ZipSetPos instance) => <String, dynamic>{
'zip': instance.zip,
pubspec.yaml
+1 -1
View File
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 215.0.0+6
version: 217.0.0+8
environment:
sdk: '>=2.19.6 <3.0.0'