Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Working on Push notifications and geofence. WIP

Michael Rademaker48e8990d188a
diff --git a/console/generic_app/android/app/build.gradle b/console/generic_app/android/app/build.gradle
index 6d92be6b6..7f3878575 100644
--- a/console/generic_app/android/app/build.gradle
+++ b/console/generic_app/android/app/build.gradle
@@ -73,7 +73,7 @@ flutter {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'com.google.firebase:firebase-messaging:20.2.4"
+ implementation 'com.google.firebase:firebase-messaging:20.2.4'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
diff --git a/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/Application.kts b/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/Application.kt
similarity index 61%
rename from console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/Application.kts
rename to console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/Application.kt
index 294fa22d7..a47d02bfb 100644
--- a/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/Application.kts
+++ b/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/Application.kt
@@ -1,20 +1,19 @@
package io.openremote.generic_app
import io.flutter.app.FlutterApplication
+import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.PluginRegistry
import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
import io.flutter.plugins.GeneratedPluginRegistrant
import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
class Application : FlutterApplication(), PluginRegistrantCallback {
- @Override
- fun onCreate() {
+ override fun onCreate() {
super.onCreate()
FlutterFirebaseMessagingService.setPluginRegistrant(this)
}
- @Override
- fun registerWith(registry: PluginRegistry?) {
- GeneratedPluginRegistrant.registerWith(registry)
+ override fun registerWith(registry: PluginRegistry) {
+ io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));
}
-}
+}
\ No newline at end of file
diff --git a/console/generic_app/android/build.gradle b/console/generic_app/android/build.gradle
index f925c0493..c60e855ee 100644
--- a/console/generic_app/android/build.gradle
+++ b/console/generic_app/android/build.gradle
@@ -1,14 +1,14 @@
buildscript {
- ext.kotlin_version = '1.3.72'
+ ext.kotlin_version = '1.4.10'
repositories {
google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.3'
+ classpath 'com.android.tools.build:gradle:3.5.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.google.gms:google-services:4.3.2'
+ classpath 'com.google.gms:google-services:4.3.3'
}
}
diff --git a/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart b/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart
index a6ec39ad1..6ed2357fb 100644
--- a/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart
+++ b/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart
@@ -1,8 +1,8 @@
import 'dart:convert';
import 'package:flutter/material.dart';
-import 'package:flutter_geofence/Geolocation.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/models/GeofenceDefinition.dart';
@@ -32,7 +32,7 @@ class GeofenceProvider {
GeoLocation _enteredLocation;
GeoLocation _exitedLocation;
- bool _sendQueued;
+ bool _sendQueued = false;
Location _locationManager;
@@ -43,7 +43,9 @@ class GeofenceProvider {
String geofenceString = sharedPreferences.getString(geofencesKey);
List<GeofenceDefinition> geofences;
if (geofenceString != null) {
- geofences = List<GeofenceDefinition>.from(json.decode(geofenceString).map((item) => GeofenceDefinition.fromJson(item)));
+ geofences = List<GeofenceDefinition>.from(json
+ .decode(geofenceString)
+ .map((item) => GeofenceDefinition.fromJson(item)));
} else {
geofences = new List<GeofenceDefinition>();
}
@@ -53,7 +55,7 @@ class GeofenceProvider {
sharedPreferences.getString(consoleIdKey),
geofences,
sharedPreferences,
- ApiManager(sharedPreferences.getString(baseUrlKey)),
+ ApiManager(sharedPreferences.getString(baseUrlKey), baseHeaders: {"Content-Type": "application/json", "Accept": "application/json"}),
new Location());
}
@@ -160,6 +162,9 @@ class GeofenceProvider {
geofences.firstWhere((element) => element.id == geolocation.id),
null);
});
+ geofences.forEach((geofence) {
+ addGeofence(geofence);
+ });
}
removeGeofence(String id) {
@@ -183,7 +188,7 @@ class GeofenceProvider {
}
});
- geofenceDefinitions.forEach((definition) {
+ remainingGeofences.forEach((definition) {
if (!geofences.any((element) => element.id == definition.id)) {
addGeofence(definition);
}
@@ -218,18 +223,18 @@ class GeofenceProvider {
}
}
- _doSendLocation() {
+ _doSendLocation() async {
print("Do send location");
bool success = false;
if (_exitedLocation != null) {
- if (_sendLocation(
+ if (await _sendLocation(
_exitedLocation.geofenceDefinition, _exitedLocation.data)) {
_exitedLocation = null;
success = true;
}
} else if (_enteredLocation != null) {
- if (_sendLocation(
+ if (await _sendLocation(
_enteredLocation.geofenceDefinition, _enteredLocation.data)) {
_enteredLocation = null;
success = true;
@@ -254,13 +259,17 @@ class GeofenceProvider {
_sendLocation(GeofenceDefinition geofenceDefinition,
Map<String, dynamic> locationData) {
return _apiManager
- .post(
- overrideUrl: geofenceDefinition.url,
+ .put(
+ overrideUrl:
+ "${CurrentConsoleAppConfig.instance.baseUrl}${geofenceDefinition.url}",
rawModel: locationData != null
? jsonEncode(locationData)
: null.toString())
.then((value) => true)
- .catchError((error) => false);
+ .catchError((error) {
+ print(error);
+ return false;
+ });
}
getLocation(ProviderCallback callback, BuildContext context) async {
diff --git a/console/generic_app/lib/network/ApiManager.dart b/console/generic_app/lib/network/ApiManager.dart
index 313774152..3eadbfd08 100644
--- a/console/generic_app/lib/network/ApiManager.dart
+++ b/console/generic_app/lib/network/ApiManager.dart
@@ -15,36 +15,15 @@ class ApiManager {
String responseBodyDataKey;
Map<String, String> baseHeaders;
- ApiManager(this.baseUrl);
+ ApiManager(this.baseUrl, {this.baseHeaders});
/*********************************Private functions*******************************/
Future<T> get<T>(List<String> pathComponents, ResponseParser responseParser,
{Map<String, dynamic> queryParameters,
Map<String, String> additionalHeaders}) async {
- StringBuffer urlBuffer = new StringBuffer(baseUrl);
-
- pathComponents
- .forEach((pathComponent) => urlBuffer.write("/" + pathComponent));
-
- if (queryParameters != null) {
- urlBuffer.write("?");
- List<MapEntry<String, dynamic>> params = queryParameters.entries.toList();
- for (var i = 0; i < params.length; i++) {
- if (i > 0) {
- urlBuffer.write("&");
- }
- urlBuffer.write("${params[i].key}=${params[i].value}");
- }
- }
-
- Map<String, String> headers =
- baseHeaders != null ? new HashMap.from(baseHeaders) : new HashMap();
- if (additionalHeaders != null) {
- headers.addAll(additionalHeaders);
- }
- return http.get(urlBuffer.toString(), headers: headers).then((response) {
+ return http.get(_prepareUrl(pathComponents, queryParameters: queryParameters), headers: _prepareHeaders(additionalHeaders)).then((response) {
if (response.statusCode == 200) {
try {
Map<String, dynamic> json = jsonDecode(response.body);
@@ -72,29 +51,8 @@ class ApiManager {
List<String> pathComponents, ResponseParser responseParser,
{Map<String, dynamic> queryParameters,
Map<String, String> additionalHeaders}) async {
- StringBuffer urlBuffer = new StringBuffer(baseUrl);
-
- pathComponents
- .forEach((pathComponent) => urlBuffer.write("/" + pathComponent));
- if (queryParameters != null) {
- urlBuffer.write("?");
- List<MapEntry<String, dynamic>> params = queryParameters.entries.toList();
- for (var i = 0; i < params.length; i++) {
- if (i > 0) {
- urlBuffer.write("&");
- }
- urlBuffer.write("${params[i].key}=${params[i].value}");
- }
- }
-
- Map<String, String> headers =
- baseHeaders != null ? new HashMap.from(baseHeaders) : new HashMap();
- if (additionalHeaders != null) {
- headers.addAll(additionalHeaders);
- }
-
- return http.get(urlBuffer.toString(), headers: headers).then((response) {
+ return http.get(_prepareUrl(pathComponents, queryParameters: queryParameters), headers: _prepareHeaders(additionalHeaders)).then((response) {
if (response.statusCode == 200) {
try {
var json = jsonDecode(response.body);
@@ -118,22 +76,46 @@ class ApiManager {
});
}
+
+
Future<T> post<T extends BaseModel>({ResponseParser responseParser,
List<String> pathComponents, T model, String rawModel,
Map<String, String> additionalHeaders, String overrideUrl}) async {
- StringBuffer urlBuffer = new StringBuffer(baseUrl);
- pathComponents?.forEach((pathComponent) => urlBuffer.write("/" + pathComponent));
+ return http
+ .post(overrideUrl ?? _prepareUrl(pathComponents), headers: _prepareHeaders(additionalHeaders), body: model?.toJson() ?? rawModel)
+ .then((response) {
+ if (response.statusCode == 201) {
+ try {
+ var json = jsonDecode(response.body);
+ var jsonData = json;
+ if (responseBodyDataKey != null && responseBodyDataKey != "") {
+ jsonData = json[responseBodyDataKey];
+ }
+ if (jsonData is List) {
+ throw new Exception("Expected json object");
+ } else {
+ return responseParser(jsonData) as T;
+ }
+ } catch (e) {
+ print(e);
+ rethrow;
+ }
+ } else if (response.statusCode >= 200 && response.statusCode <= 299) {
+ return null;
+ } else {
+ throw new Exception(
+ "Response error: ${response.statusCode} - ${response.body}");
+ }
+ });
+ }
- Map<String, String> headers =
- baseHeaders != null ? new HashMap.from(baseHeaders) : new HashMap();
- if (additionalHeaders != null) {
- headers.addAll(additionalHeaders);
- }
+ Future<T> put<T extends BaseModel>({ResponseParser responseParser,
+ List<String> pathComponents, T model, String rawModel,
+ Map<String, String> additionalHeaders, String overrideUrl}) async {
return http
- .post(overrideUrl ?? urlBuffer.toString(),
- headers: headers, body: model?.toJson() ?? rawModel)
+ .put(overrideUrl ?? _prepareUrl(pathComponents), headers: _prepareHeaders(additionalHeaders), body: model?.toJson() ?? rawModel)
.then((response) {
if (response.statusCode == 201) {
try {
@@ -159,4 +141,32 @@ class ApiManager {
}
});
}
+
+ String _prepareUrl(List<String> pathComponents, {Map<String, dynamic> queryParameters}) {
+ StringBuffer urlBuffer = new StringBuffer(baseUrl);
+
+ pathComponents
+ .forEach((pathComponent) => urlBuffer.write("/" + pathComponent));
+
+ if (queryParameters != null) {
+ urlBuffer.write("?");
+ List<MapEntry<String, dynamic>> params = queryParameters.entries.toList();
+ for (var i = 0; i < params.length; i++) {
+ if (i > 0) {
+ urlBuffer.write("&");
+ }
+ urlBuffer.write("${params[i].key}=${params[i].value}");
+ }
+ }
+ return urlBuffer.toString();
+ }
+
+ Map<String, String> _prepareHeaders(Map<String, String> additionalHeaders) {
+ Map<String, String> headers =
+ baseHeaders != null ? new HashMap.from(baseHeaders) : new HashMap();
+ if (additionalHeaders != null) {
+ headers.addAll(additionalHeaders);
+ }
+ return headers;
+ }
}
diff --git a/console/generic_app/lib/ui/WebViewPage.dart b/console/generic_app/lib/ui/WebViewPage.dart
index 97696b020..66413455c 100644
--- a/console/generic_app/lib/ui/WebViewPage.dart
+++ b/console/generic_app/lib/ui/WebViewPage.dart
@@ -1,6 +1,8 @@
import 'dart:async';
import 'dart:convert';
+import 'dart:io';
+import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart';
import 'package:generic_app/ConsoleProviders/GeofenceProvider.dart';
import 'package:generic_app/ConsoleProviders/PushProvider.dart';
@@ -26,6 +28,26 @@ class _WebViewPageState extends State<WebViewPage> {
StorageProvider _storageProvider;
WebView _webView;
+ final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
+
+ @override
+ void initState() {
+ super.initState();
+
+ _firebaseMessaging.configure(
+ onMessage: (Map<String, dynamic> message) async {
+ print("onMessage: $message");
+ },
+ onLaunch: (Map<String, dynamic> message) async {
+ print("onLaunch: $message");
+ },
+ onResume: (Map<String, dynamic> message) async {
+ print("onResume: $message");
+ },
+ onBackgroundMessage: Platform.isAndroid ? myBackgroundMessageHandler : null
+ );
+ }
+
@override
Widget build(BuildContext context) {
_webView = WebView(
@@ -232,3 +254,17 @@ class _WebViewPageState extends State<WebViewPage> {
}
}
}
+
+Future<dynamic> myBackgroundMessageHandler(Map<String, dynamic> message) async {
+ if (message.containsKey('data')) {
+ // Handle data message
+ final dynamic data = message['data'];
+ }
+
+ if (message.containsKey('notification')) {
+ // Handle notification message
+ final dynamic notification = message['notification'];
+ }
+
+ // Or do other work.
+}
diff --git a/console/generic_app/pubspec.lock b/console/generic_app/pubspec.lock
index e90ad15da..5af8d8caa 100644
--- a/console/generic_app/pubspec.lock
+++ b/console/generic_app/pubspec.lock
@@ -236,7 +236,7 @@ packages:
name: flutter_geofence
url: "https://pub.dartlang.org"
source: hosted
- version: "0.2.0"
+ version: "0.2.1"
flutter_launcher_icons:
dependency: "direct dev"
description: