100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Improved geofencing for generic app. Still working on FCM for generic app.
Michael Rademakerb1768a8464d6
diff --git a/console/generic_app/android/app/src/main/AndroidManifest.xml b/console/generic_app/android/app/src/main/AndroidManifest.xmlindex 8c9cad401..64e1831fa 100644--- a/console/generic_app/android/app/src/main/AndroidManifest.xml+++ b/console/generic_app/android/app/src/main/AndroidManifest.xml@@ -39,9 +39,9 @@android:name="flutterEmbedding"android:value="2" />- <receiver android:name="com.intivoto.geofence.GeofenceBroadcastReceiver"+ <receiver android:name="io.flutter.plugins.geofencing.GeofencingBroadcastReceiver"android:enabled="true" android:exported="true"/>- <service android:name="com.intivoto.geofence.GeofencePlugin"+ <service android:name="io.flutter.plugins.geofencing.GeofencingService"android:permission="android.permission.BIND_JOB_SERVICE" android:exported="true"/></application></manifest>diff --git a/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/Application.kt b/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/Application.ktindex a47d02bfb..8c3791a5d 100644--- a/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/Application.kt+++ b/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/Application.kt@@ -6,14 +6,17 @@ import io.flutter.plugin.common.PluginRegistryimport io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallbackimport io.flutter.plugins.GeneratedPluginRegistrantimport io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService+import io.flutter.plugins.geofencing.GeofencingServiceclass Application : FlutterApplication(), PluginRegistrantCallback {override fun onCreate() {super.onCreate()FlutterFirebaseMessagingService.setPluginRegistrant(this)+ GeofencingService.setPluginRegistrant(this)}override fun registerWith(registry: PluginRegistry) {- io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));+ io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"))+ registry?.registrarFor("io.flutter.plugins.geofencing.GeofencingPlugin")}-}\ No newline at end of file+}diff --git a/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/MainActivity.kt b/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/MainActivity.ktindex 0ae3f5622..5f9b2c30d 100644--- a/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/MainActivity.kt+++ b/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/MainActivity.kt@@ -12,10 +12,10 @@ class MainActivity: FlutterActivity() {GeneratedPluginRegistrant.registerWith(flutterEngine);}- override fun onDestroy() {- flutterEngine?.platformViewsController?.onFlutterViewDestroyed()- super.onDestroy()- }+// override fun onDestroy() {+// flutterEngine?.platformViewsController?.onFlutterViewDestroyed()+// super.onDestroy()+// }// companion object {// fun createIntent(context: Context, initialRoute: String = "/"): Intent {diff --git a/console/generic_app/ios/Podfile.lock b/console/generic_app/ios/Podfile.lockindex 930649a51..acce12839 100644--- a/console/generic_app/ios/Podfile.lock+++ b/console/generic_app/ios/Podfile.lock@@ -44,7 +44,7 @@ PODS:- GoogleUtilities/UserDefaults (~> 6.5)- Protobuf (>= 3.9.2, ~> 3.9)- Flutter (1.0.0)- - flutter_geofence (0.1.1):+ - geofencing (0.0.1):- Flutter- GoogleDataTransport (7.3.0):- nanopb (~> 1.30906.0)@@ -87,7 +87,7 @@ DEPENDENCIES:- firebase_core (from `.symlinks/plugins/firebase_core/ios`)- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)- Flutter (from `Flutter`)- - flutter_geofence (from `.symlinks/plugins/flutter_geofence/ios`)+ - geofencing (from `.symlinks/plugins/geofencing/ios`)- location (from `.symlinks/plugins/location/ios`)- permission_handler (from `.symlinks/plugins/permission_handler/ios`)- quick_actions (from `.symlinks/plugins/quick_actions/ios`)@@ -117,8 +117,8 @@ EXTERNAL SOURCES::path: ".symlinks/plugins/firebase_messaging/ios"Flutter::path: Flutter- flutter_geofence:- :path: ".symlinks/plugins/flutter_geofence/ios"+ geofencing:+ :path: ".symlinks/plugins/geofencing/ios"location::path: ".symlinks/plugins/location/ios"permission_handler:@@ -142,7 +142,7 @@ SPEC CHECKSUMS:FirebaseInstanceID: cef67c4967c7cecb56ea65d8acbb4834825c587bFirebaseMessaging: 29543feb343b09546ab3aa04d008ee8595b43c44Flutter: 0e3d915762c693b495b44d77113d4970485de6ec- flutter_geofence: 08e5427c56c540ffac97425b8e10dd598912fb3d+ geofencing: 98674d4c10508e8bbf7678623d48c2a4172559eeGoogleDataTransport: e85fb700c9b027079ce182c3d08e12e0f9618bb4GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740diff --git a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj b/console/generic_app/ios/Runner.xcodeproj/project.pbxprojindex 7fb923090..60ab80a63 100644--- a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj+++ b/console/generic_app/ios/Runner.xcodeproj/project.pbxproj@@ -273,7 +273,7 @@"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework","${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework","${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",- "${BUILT_PRODUCTS_DIR}/flutter_geofence/flutter_geofence.framework",+ "${BUILT_PRODUCTS_DIR}/geofencing/geofencing.framework","${BUILT_PRODUCTS_DIR}/location/location.framework","${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework","${BUILT_PRODUCTS_DIR}/quick_actions/quick_actions.framework",@@ -286,7 +286,7 @@"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_geofence.framework",+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geofencing.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/location.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/quick_actions.framework",diff --git a/console/generic_app/ios/Runner/AppDelegate.swift b/console/generic_app/ios/Runner/AppDelegate.swiftindex baee1e57c..1b2ee7708 100644--- a/console/generic_app/ios/Runner/AppDelegate.swift+++ b/console/generic_app/ios/Runner/AppDelegate.swift@@ -1,5 +1,6 @@import UIKitimport Flutter+import geofencing@UIApplicationMain@objc class AppDelegate: FlutterAppDelegate {@@ -8,6 +9,9 @@ import FlutterdidFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {GeneratedPluginRegistrant.register(with: self)++ GeofencingPlugin.setPluginRegistrantCallback({_ in+ })UNUserNotificationCenter.current().delegate = self;diff --git a/console/generic_app/ios/Runner/Info.plist b/console/generic_app/ios/Runner/Info.plistindex a60097a2c..8172b5d6e 100644--- a/console/generic_app/ios/Runner/Info.plist+++ b/console/generic_app/ios/Runner/Info.plist@@ -68,5 +68,10 @@<false/><key>io.flutter.embedded_views_preview</key><true/>+ <key>NSAppTransportSecurity</key>+ <dict>+ <key>NSAllowsArbitraryLoads</key>+ <true/>+ </dict></dict></plist>diff --git a/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart b/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dartindex 6ed2357fb..feeb184db 100644--- a/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart+++ b/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart@@ -1,18 +1,20 @@import 'dart:convert';import 'package:flutter/material.dart';-import 'package:flutter_geofence/geofence.dart';-import 'package:generic_app/config/CurrentConsoleAppConfig.dart';-import 'package:location/location.dart';import 'package:generic_app/ConsoleProviders/GeoLocation.dart';+import 'package:generic_app/config/CurrentConsoleAppConfig.dart';import 'package:generic_app/models/GeofenceDefinition.dart';import 'package:generic_app/network/ApiManager.dart';+import 'package:geofencing/geofencing.dart';+import 'package:location/location.dart' as lm;import 'package:permission_handler/permission_handler.dart';import 'package:shared_preferences/shared_preferences.dart';import 'ProviderConstants.dart';class GeofenceProvider {+ static GeofenceProvider _instance;+static const String baseUrlKey = "baseUrl";static const String consoleIdKey = "consoleId";static const String geofencesKey = "geofences";@@ -33,8 +35,38 @@ class GeofenceProvider {GeoLocation _enteredLocation;GeoLocation _exitedLocation;bool _sendQueued = false;+ final List<GeofenceEvent> triggers = <GeofenceEvent>[+ GeofenceEvent.enter,+ GeofenceEvent.exit+ ];++ static void geofenceTriggerCallback(+ List<String> ids, Location location, GeofenceEvent event) async {+ GeofenceProvider instance = await GeofenceProvider.getInstance();+ if (event == GeofenceEvent.enter) {+ ids.forEach((id) {+ GeofenceDefinition geofenceDefinition =+ instance.geofences.firstWhere((element) => element.id == id);+ if (geofenceDefinition != null) {+ instance._queueSendLocation(geofenceDefinition, {+ "type": "Point",+ "coordinates": [location.longitude, location.latitude]+ });+ }+ });+ }+ if (event == GeofenceEvent.exit) {+ ids.forEach((id) {+ GeofenceDefinition geofenceDefinition =+ instance.geofences.firstWhere((element) => element.id == id);+ if (geofenceDefinition != null) {+ instance._queueSendLocation(geofenceDefinition, null);+ }+ });+ }+ }- Location _locationManager;+ lm.Location _locationManager;GeofenceProvider._internal(this._baseURL, this._consoleId, this.geofences,this._sharedPreferences, this._apiManager, this._locationManager);@@ -56,11 +88,16 @@ class GeofenceProvider {geofences,sharedPreferences,ApiManager(sharedPreferences.getString(baseUrlKey), baseHeaders: {"Content-Type": "application/json", "Accept": "application/json"}),- new Location());+ new lm.Location());}static Future<GeofenceProvider> getInstance() async {- return GeofenceProvider(await SharedPreferences.getInstance());+ if (_instance == null) {+ // ignore: invalid_use_of_visible_for_testing_member+ SharedPreferences.setMockInitialValues({});+ _instance = GeofenceProvider(await SharedPreferences.getInstance());+ }+ return _instance;}Future<Map<String, dynamic>> initialize() async {@@ -124,10 +161,7 @@ class GeofenceProvider {Future<Map<String, dynamic>> disable() async {for (String geofenceId in geofences.map((e) => e.id)) {- Geofence.removeGeolocation(- new Geolocation(id: geofenceId), GeolocationEvent.exit);- Geofence.removeGeolocation(- new Geolocation(id: geofenceId), GeolocationEvent.entry);+ await GeofencingManager.removeGeofenceById(geofenceId);}await _sharedPreferences.setBool(geoDisabledKey, true);@@ -138,65 +172,52 @@ class GeofenceProvider {};}- addGeofence(GeofenceDefinition geofenceDefinition) {- Geolocation geolocation = new Geolocation(- id: geofenceDefinition.id,- latitude: geofenceDefinition.lat,- longitude: geofenceDefinition.lng,- radius: geofenceDefinition.radius);- Geofence.addGeolocation(geolocation, GeolocationEvent.entry);- Geofence.addGeolocation(geolocation, GeolocationEvent.exit);+ addGeofence(GeofenceDefinition geofenceDefinition) async {+ await GeofencingManager.registerGeofence(+ new GeofenceRegion(+ geofenceDefinition.id,+ geofenceDefinition.lat,+ geofenceDefinition.lng,+ geofenceDefinition.radius,+ triggers), geofenceTriggerCallback);}- _startGeofenceProvider() {- Geofence.initialize();- Geofence.startListening(GeolocationEvent.entry, (geolocation) {- _queueSendLocation(- geofences.firstWhere((element) => element.id == geolocation.id), {- "type": "Point",- "coordinates": [geolocation.longitude, geolocation.latitude]- });- });- Geofence.startListening(GeolocationEvent.exit, (geolocation) {- _queueSendLocation(- geofences.firstWhere((element) => element.id == geolocation.id),- null);- });- geofences.forEach((geofence) {- addGeofence(geofence);+ _startGeofenceProvider() async {+ await GeofencingManager.initialize();+ geofences.forEach((geofence) async {+ await addGeofence(geofence);});}- removeGeofence(String id) {- Geofence.removeGeolocation(new Geolocation(id: id), GeolocationEvent.exit);- Geofence.removeGeolocation(new Geolocation(id: id), GeolocationEvent.entry);+ removeGeofence(String id) async {+ await GeofencingManager.removeGeofenceById(id);}- refreshGeofences() {+ refreshGeofences() async {_apiManager.getAll<GeofenceDefinition>(["rules", "geofences", _consoleId],- GeofenceDefinition.fromJson).then((geofenceDefinitions) {+ GeofenceDefinition.fromJson).then((geofenceDefinitions) async {print("Fetched geofences=${geofenceDefinitions.length}");List<GeofenceDefinition> remainingGeofences =- new List<GeofenceDefinition>();- geofences.forEach((oldGeofence) {+ new List<GeofenceDefinition>();+ geofences.forEach((oldGeofence) async {if (!geofenceDefinitions.any((definition) => definition.id == oldGeofence.id)) {- removeGeofence(oldGeofence.id);+ await removeGeofence(oldGeofence.id);} else {remainingGeofences.add(oldGeofence);}});- remainingGeofences.forEach((definition) {+ remainingGeofences.forEach((definition) async {if (!geofences.any((element) => element.id == definition.id)) {- addGeofence(definition);+ await addGeofence(definition);}});- _sharedPreferences+ await _sharedPreferences.setString(geofencesKey,- json.encode(geofenceDefinitions.map((e) => e.toJson()).toList()))+ json.encode(geofenceDefinitions.map((e) => e.toJson()).toList())).then((value) => geofences = geofenceDefinitions);});}@@ -260,11 +281,11 @@ class GeofenceProvider {Map<String, dynamic> locationData) {return _apiManager.put(- overrideUrl:- "${CurrentConsoleAppConfig.instance.baseUrl}${geofenceDefinition.url}",- rawModel: locationData != null- ? jsonEncode(locationData)- : null.toString())+ overrideUrl:+ "${CurrentConsoleAppConfig.instance.baseUrl}${geofenceDefinition.url}",+ rawModel: locationData != null+ ? jsonEncode(locationData)+ : null.toString()).then((value) => true).catchError((error) {print(error);@@ -276,7 +297,7 @@ class GeofenceProvider {_getLocationCallback = callback;if (await Permission.locationAlways.isGranted) {- LocationData locationData = await _locationManager.getLocation();+ lm.LocationData locationData = await _locationManager.getLocation();_getLocationCallback({"action": "GET_LOCATION","provider": "geofence",diff --git a/console/generic_app/lib/main.dart b/console/generic_app/lib/main.dartindex e9ca03db9..fae82409c 100644--- a/console/generic_app/lib/main.dart+++ b/console/generic_app/lib/main.dart@@ -3,14 +3,18 @@ import 'package:flutter/services.dart';import 'package:flutter_localizations/flutter_localizations.dart';import 'package:generic_app/services/PushNotificationService.dart';import 'package:generic_app/ui/SplashPage.dart';+import 'package:shared_preferences/shared_preferences.dart';+import 'generated/l10n.dart';void main() {WidgetsFlutterBinding.ensureInitialized();SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]).then((_) async {- PushNotificationService pushNotificationService = new PushNotificationService();- await pushNotificationService.initialise();+ //ignore: invalid_use_of_visible_for_testing_member+ SharedPreferences.setMockInitialValues({});+ PushNotificationService pushNotificationService = new PushNotificationService();+ await pushNotificationService.initialise();runApp(new ORApp());});}diff --git a/console/generic_app/lib/models/AlertAction.dart b/console/generic_app/lib/models/AlertAction.dartnew file mode 100644index 000000000..5a1a6a6f0--- /dev/null+++ b/console/generic_app/lib/models/AlertAction.dart@@ -0,0 +1,26 @@++import 'package:generic_app/models/BaseModel.dart';+import 'package:json_annotation/json_annotation.dart';++part 'AlertAction.g.dart';++@JsonSerializable()+class AlertAction implements BaseModel {++ final String url;+ final String httpMethod;+ final Map<String, dynamic> data;+ final bool silent;+ final bool openInBrowser;++ AlertAction({+ this.url,+ this.httpMethod,+ this.data,+ this.silent,+ this.openInBrowser+ });++ static AlertAction fromJson(Map<String, dynamic> json) => _$AlertActionFromJson(json);+ Map<String, dynamic> toJson() => _$AlertActionToJson(this);+}diff --git a/console/generic_app/lib/models/AlertButton.dart b/console/generic_app/lib/models/AlertButton.dartnew file mode 100644index 000000000..200c4c0c4--- /dev/null+++ b/console/generic_app/lib/models/AlertButton.dart@@ -0,0 +1,22 @@++import 'package:generic_app/models/BaseModel.dart';+import 'package:json_annotation/json_annotation.dart';++import 'AlertAction.dart';++part 'AlertButton.g.dart';++@JsonSerializable()+class AlertButton implements BaseModel {++ final String title;+ final AlertAction action;++ AlertButton({+ this.title,+ this.action,+ });++ static AlertButton fromJson(Map<String, dynamic> json) => _$AlertButtonFromJson(json);+ Map<String, dynamic> toJson() => _$AlertButtonToJson(this);+}diff --git a/console/generic_app/lib/services/PushNotificationService.dart b/console/generic_app/lib/services/PushNotificationService.dartindex ae20eb61c..150175898 100644--- a/console/generic_app/lib/services/PushNotificationService.dart+++ b/console/generic_app/lib/services/PushNotificationService.dart@@ -1,19 +1,68 @@import 'dart:io';import 'package:firebase_messaging/firebase_messaging.dart';+import 'package:generic_app/ConsoleProviders/GeofenceProvider.dart';+import 'package:generic_app/ConsoleProviders/StorageProvider.dart';+import 'package:generic_app/models/AlertAction.dart';+import 'package:generic_app/models/AlertButton.dart';-Future<dynamic> myBackgroundMessageHandler(Map<String, dynamic> message) async {- if (message.containsKey('data')) {- // Handle data message- final dynamic data = message['data'];- }+Future<dynamic> myBackgroundMessageHandler(Map<String, dynamic> remoteMessage) async {+ await handleNotification(remoteMessage, false, false);+}- if (message.containsKey('notification')) {- // Handle notification message- final dynamic notification = message['notification'];- }+Future handleNotification(Map<String, dynamic> remoteMessage, bool onResume, bool onLaunch) async {+ Map<String, dynamic> messageData = remoteMessage["data"] ??+ remoteMessage;+ if (messageData != null) {+ bool isSilent = !messageData.containsKey("or-title");++ if (isSilent) {+ String action = messageData["action"];++ switch (action) {+ case "GEOFENCE_REFRESH":+ GeofenceProvider geofenceProvider = await GeofenceProvider+ .getInstance();+ geofenceProvider.refreshGeofences();+ break;+ case "STORE":+ StorageProvider storageProvider = await StorageProvider+ .getInstance();+ storageProvider.store(messageData["key"], messageData["value"]);+ break;+ }+ } else {+ String title = messageData["or-title"];+ String body = messageData["or-body"];++ List<AlertButton> buttons;+ AlertAction action;++ // Check for action (to be executed when notification is clicked)+ if (messageData.containsKey("action")) {+ Map<String, dynamic> actionJson = messageData["action"];++ if (actionJson != null && actionJson.isNotEmpty) {+ action = AlertAction.fromJson(actionJson);- // Or do other work.+ if(onResume || onLaunch) {+ if(action.openInBrowser) {++ }+ }+ }+ }++ // Check for buttons+ if (messageData.containsKey("buttons")) {+ List<Map<String, dynamic>> buttonsJson = messageData["buttons"];++ if (buttonsJson != null && buttonsJson.isNotEmpty) {+ buttons = buttonsJson.map((e) => AlertButton.fromJson(e));+ }+ }+ }+ }}class PushNotificationService {@@ -21,16 +70,23 @@ class PushNotificationService {Future initialise() async {_fcm.configure(- onMessage: (Map<String, dynamic> message) async {- print("onMessage: $message");+ onMessage: (Map<String, dynamic> remoteMessage) async {+ print("onMessage: $remoteMessage");+ await handleNotification(remoteMessage, false, false);},- onLaunch: (Map<String, dynamic> message) async {- print("onLaunch: $message");+ onLaunch: (Map<String, dynamic> remoteMessage) async {+ print("onLaunch: $remoteMessage");+ await handleNotification(remoteMessage, false, true);},- onResume: (Map<String, dynamic> message) async {- print("onResume: $message");+ onResume: (Map<String, dynamic> remoteMessage) async {+ print("onResume: $remoteMessage");+ await handleNotification(remoteMessage, true, false);},onBackgroundMessage: Platform.isIOS ? null : myBackgroundMessageHandler,);}}++++diff --git a/console/generic_app/pubspec.lock b/console/generic_app/pubspec.lockindex 5af8d8caa..0e26f2b97 100644--- a/console/generic_app/pubspec.lock+++ b/console/generic_app/pubspec.lock@@ -7,14 +7,14 @@ packages:name: _fe_analyzer_sharedurl: "https://pub.dartlang.org"source: hosted- version: "4.0.0"+ version: "7.0.0"analyzer:dependency: transitivedescription:name: analyzerurl: "https://pub.dartlang.org"source: hosted- version: "0.39.10"+ version: "0.39.17"archive:dependency: transitivedescription:@@ -120,6 +120,13 @@ packages:url: "https://pub.dartlang.org"source: hostedversion: "1.0.2"+ cli_util:+ dependency: transitive+ description:+ name: cli_util+ url: "https://pub.dartlang.org"+ source: hosted+ version: "0.2.0"clock:dependency: transitivedescription:@@ -133,7 +140,7 @@ packages:name: code_builderurl: "https://pub.dartlang.org"source: hosted- version: "3.3.0"+ version: "3.4.1"collection:dependency: transitivedescription:@@ -154,21 +161,21 @@ packages:name: cryptourl: "https://pub.dartlang.org"source: hosted- version: "2.1.4"+ version: "2.1.5"csslib:dependency: transitivedescription:name: cssliburl: "https://pub.dartlang.org"source: hosted- version: "0.16.1"+ version: "0.16.2"cupertino_icons:dependency: "direct main"description:name: cupertino_iconsurl: "https://pub.dartlang.org"source: hosted- version: "0.1.3"+ version: "1.0.0"dart_style:dependency: transitivedescription:@@ -183,6 +190,13 @@ packages:url: "https://pub.dartlang.org"source: hostedversion: "1.1.0"+ file:+ dependency: transitive+ description:+ name: file+ url: "https://pub.dartlang.org"+ source: hosted+ version: "5.2.1"firebase:dependency: transitivedescription:@@ -230,20 +244,13 @@ packages:description: fluttersource: sdkversion: "0.0.0"- flutter_geofence:- dependency: "direct main"- description:- name: flutter_geofence- url: "https://pub.dartlang.org"- source: hosted- version: "0.2.1"flutter_launcher_icons:dependency: "direct dev"description:name: flutter_launcher_iconsurl: "https://pub.dartlang.org"source: hosted- version: "0.7.5"+ version: "0.8.0"flutter_localizations:dependency: "direct main"description: flutter@@ -259,6 +266,13 @@ packages:description: fluttersource: sdkversion: "0.0.0"+ geofencing:+ dependency: "direct main"+ description:+ name: geofencing+ url: "https://pub.dartlang.org"+ source: hosted+ version: "0.1.0"glob:dependency: transitivedescription:@@ -286,7 +300,7 @@ packages:name: httpurl: "https://pub.dartlang.org"source: hosted- version: "0.12.1"+ version: "0.12.2"http_multi_server:dependency: transitivedescription:@@ -307,7 +321,7 @@ packages:name: imageurl: "https://pub.dartlang.org"source: hosted- version: "2.1.12"+ version: "2.1.14"intl:dependency: transitivedescription:@@ -342,7 +356,7 @@ packages:name: json_serializableurl: "https://pub.dartlang.org"source: hosted- version: "3.3.0"+ version: "3.4.1"location:dependency: "direct main"description:@@ -391,7 +405,7 @@ packages:name: mimeurl: "https://pub.dartlang.org"source: hosted- version: "0.9.6+3"+ version: "0.9.7"node_interop:dependency: transitivedescription:@@ -420,6 +434,20 @@ packages:url: "https://pub.dartlang.org"source: hostedversion: "1.7.0"+ path_provider_linux:+ dependency: transitive+ description:+ name: path_provider_linux+ url: "https://pub.dartlang.org"+ source: hosted+ version: "0.0.1+2"+ path_provider_platform_interface:+ dependency: transitive+ description:+ name: path_provider_platform_interface+ url: "https://pub.dartlang.org"+ source: hosted+ version: "1.0.3"pedantic:dependency: transitivedescription:@@ -447,7 +475,7 @@ packages:name: petitparserurl: "https://pub.dartlang.org"source: hosted- version: "2.4.0"+ version: "3.0.4"platform:dependency: transitivedescription:@@ -469,6 +497,13 @@ packages:url: "https://pub.dartlang.org"source: hostedversion: "1.4.0"+ process:+ dependency: transitive+ description:+ name: process+ url: "https://pub.dartlang.org"+ source: hosted+ version: "3.0.13"pub_semver:dependency: transitivedescription:@@ -489,7 +524,7 @@ packages:name: quick_actionsurl: "https://pub.dartlang.org"source: hosted- version: "0.4.0+6"+ version: "0.4.0+8"quiver:dependency: transitivedescription:@@ -503,7 +538,14 @@ packages:name: shared_preferencesurl: "https://pub.dartlang.org"source: hosted- version: "0.5.7+3"+ version: "0.5.10"+ shared_preferences_linux:+ dependency: transitive+ description:+ name: shared_preferences_linux+ url: "https://pub.dartlang.org"+ source: hosted+ version: "0.0.2+2"shared_preferences_macos:dependency: transitivedescription:@@ -531,7 +573,7 @@ packages:name: shelfurl: "https://pub.dartlang.org"source: hosted- version: "0.7.7"+ version: "0.7.9"shelf_web_socket:dependency: transitivedescription:@@ -545,7 +587,7 @@ packages:name: show_up_animationurl: "https://pub.dartlang.org"source: hosted- version: "1.0.2"+ version: "1.0.3"sky_engine:dependency: transitivedescription: flutter@@ -557,7 +599,7 @@ packages:name: source_genurl: "https://pub.dartlang.org"source: hosted- version: "0.9.5"+ version: "0.9.6"source_span:dependency: transitivedescription:@@ -649,13 +691,20 @@ packages:url: "https://pub.dartlang.org"source: hostedversion: "0.3.22+1"+ xdg_directories:+ dependency: transitive+ description:+ name: xdg_directories+ url: "https://pub.dartlang.org"+ source: hosted+ version: "0.1.0"xml:dependency: transitivedescription:name: xmlurl: "https://pub.dartlang.org"source: hosted- version: "3.6.1"+ version: "4.2.0"yaml:dependency: transitivedescription:diff --git a/console/generic_app/pubspec.yaml b/console/generic_app/pubspec.yamlindex 45769be7b..492537281 100644--- a/console/generic_app/pubspec.yaml+++ b/console/generic_app/pubspec.yaml@@ -24,18 +24,18 @@ dependencies:# The following adds the Cupertino Icons font to your application.# Use with the CupertinoIcons class for iOS style icons.- cupertino_icons: ^0.1.2+ cupertino_icons: ^1.0.0http: ^0.12.0+4json_annotation: ^3.0.1- flutter_geofence: ^0.2.0+ geofencing: ^0.1.0location: ^3.0.0webview_flutter: ^0.3.22+1- shared_preferences: ^0.5.7+3+ shared_preferences: ^0.5.10permission_handler: ^5.0.1+1firebase_messaging: ^7.0.0- quick_actions: 0.4.0+6+ quick_actions: 0.4.0+8show_up_animation: ^1.0.2dev_dependencies:@@ -43,8 +43,8 @@ dev_dependencies:sdk: flutterbuild_runner: 1.8.1- json_serializable: 3.3.0- flutter_launcher_icons: "^0.7.5"+ json_serializable: 3.4.1+ flutter_launcher_icons: ^0.8.0flutter_icons:android: "launcher_icon"