From f89ca690c880ae91183f0434d77410dcc6e73462 Mon Sep 17 00:00:00 2001 From: Sven Carstensen Date: Wed, 14 Aug 2024 08:55:43 +0200 Subject: [PATCH] Erweiterungen --- lib/main.dart | 4 +++ lib/tools/mqtt_core.dart | 6 ++++- pubspec.lock | 54 ++++++++++++++++++++++++++-------------- pubspec.yaml | 4 ++- 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 4551238..5929236 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,9 +1,11 @@ import 'dart:async'; +import 'dart:io'; import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; import 'package:isar/isar.dart'; import 'package:path_provider/path_provider.dart'; +import 'package:permission_handler/permission_handler.dart'; import 'package:shared_map/shared_map.dart'; import 'package:stadtbote/messages/pop_content_view_message.dart'; import 'package:stadtbote/model/enqueued_message.dart'; @@ -46,6 +48,8 @@ Future main() async { PictureSchema ], directory: dir.path, name: "database_v1"); + var status = await Permission.storage.request(); + await _clearLog(); runApp(const MyApp()); diff --git a/lib/tools/mqtt_core.dart b/lib/tools/mqtt_core.dart index cd5bcf4..0273e50 100644 --- a/lib/tools/mqtt_core.dart +++ b/lib/tools/mqtt_core.dart @@ -88,8 +88,10 @@ class MqttCore { _cancelTrackTimer(); - if (_mqttClient != null && _mqttClient!.connectionStatus == ConnectionStateEnum.connected) { + if (_mqttClient != null) { _mqttClient!.disconnect(); + + _mqttClient = null; } connectionState = ConnectionStateEnum.notConnected; @@ -459,6 +461,8 @@ class MqttCore { var brokerUriAndPortArray = bootstrapResponsePayload.broker.replaceFirst("mqtt://", "").split(":"); _brokerUri = brokerUriAndPortArray[0]; _brokerPort = int.parse(brokerUriAndPortArray[1]); + //_brokerUri = "192.168.180.27"; + //_brokerPort = 1883; _clientId = bootstrapResponsePayload.id; _fromServerTopic = bootstrapResponsePayload.fromServer; _toServerTopic = bootstrapResponsePayload.toServer; diff --git a/pubspec.lock b/pubspec.lock index b8ee1b6..a0e7c7a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -269,10 +269,10 @@ packages: dependency: transitive description: name: cross_file - sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e + sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" url: "https://pub.dev" source: hosted - version: "0.3.3+8" + version: "0.3.4+2" crypto: dependency: transitive description: @@ -349,10 +349,18 @@ packages: dependency: transitive description: name: dio - sha256: "0978e9a3e45305a80a7210dbeaf79d6ee8bee33f70c8e542dc654c952070217f" + sha256: e17f6b3097b8c51b72c74c9f071a605c47bcc8893839bd66732457a5ebe73714 url: "https://pub.dev" source: hosted - version: "5.4.2+1" + version: "5.5.0+1" + dio_web_adapter: + dependency: transitive + description: + name: dio_web_adapter + sha256: "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac" + url: "https://pub.dev" + source: hosted + version: "1.0.1" easy_stepper: dependency: "direct main" description: @@ -417,6 +425,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.5.0" + file_saver: + dependency: "direct main" + description: + name: file_saver + sha256: d375b351e3331663abbaf99747abd72f159260c58fbbdbca9f926f02c01bdc48 + url: "https://pub.dev" + source: hosted + version: "0.2.13" file_selector_linux: dependency: transitive description: @@ -1004,18 +1020,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" + sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "8.0.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" path: dependency: transitive description: @@ -1036,10 +1052,10 @@ packages: dependency: "direct main" description: name: path_provider - sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" path_provider_android: dependency: transitive description: @@ -1081,7 +1097,7 @@ packages: source: hosted version: "2.2.1" permission_handler: - dependency: transitive + dependency: "direct main" description: name: permission_handler sha256: bc56bfe9d3f44c3c612d8d393bd9b174eb796d706759f9b495ac254e4294baa5 @@ -1260,10 +1276,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.0" shared_preferences_windows: dependency: transitive description: @@ -1505,10 +1521,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.3" url_launcher_windows: dependency: transitive description: @@ -1585,18 +1601,18 @@ packages: dependency: transitive description: name: web - sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.5.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" + sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.5" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 64c2558..642e370 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -68,13 +68,15 @@ dependencies: url_launcher: ^6.2.4 audioplayers: ^5.2.1 flutter_launcher_icons: ^0.13.1 - package_info_plus: ^5.0.1 + package_info_plus: ^8.0.2 device_info_plus: ^9.1.2 is_lock_screen: ^2.0.0 flutter_local_notifications: ^17.1.2 shared_map: ^1.1.9 image: ^4.2.0 archive: ^3.6.1 + permission_handler: ^10.2.0 + file_saver: ^0.2.13 dev_dependencies: flutter_test: