Skip to content

armgit / core

Public Imported from GitHub
0

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

Fixed last issues with geofencing on ios and shared preferences

Michael Rademaker89ec27ab0370
diff --git a/console/generic_app/ios/Podfile.lock b/console/generic_app/ios/Podfile.lock
index acce12839..352bcf142 100644
--- a/console/generic_app/ios/Podfile.lock
+++ b/console/generic_app/ios/Podfile.lock
@@ -80,6 +80,8 @@ PODS:
- Flutter
- shared_preferences (0.0.1):
- Flutter
+ - url_launcher (0.0.1):
+ - Flutter
- webview_flutter (0.0.1):
- Flutter
@@ -92,6 +94,7 @@ DEPENDENCIES:
- permission_handler (from `.symlinks/plugins/permission_handler/ios`)
- quick_actions (from `.symlinks/plugins/quick_actions/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+ - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
SPEC REPOS:
@@ -127,6 +130,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/quick_actions/ios"
shared_preferences:
:path: ".symlinks/plugins/shared_preferences/ios"
+ url_launcher:
+ :path: ".symlinks/plugins/url_launcher/ios"
webview_flutter:
:path: ".symlinks/plugins/webview_flutter/ios"
@@ -152,6 +157,7 @@ SPEC CHECKSUMS:
Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
quick_actions: 6cb2390c4dab0e737c94573c27e18d9666710720
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
+ url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
PODFILE CHECKSUM: 0dbd5a87e0ace00c9610d2037ac22083a01f861d
diff --git a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj b/console/generic_app/ios/Runner.xcodeproj/project.pbxproj
index 60ab80a63..acac977a0 100644
--- a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj
+++ b/console/generic_app/ios/Runner.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
/* Begin PBXBuildFile section */
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+ 4C2C8B3B251B466B008F5DA5 /* mapstogpx20200923_085404.gpx in Resources */ = {isa = PBXBuildFile; fileRef = 4C2C8B3A251B466B008F5DA5 /* mapstogpx20200923_085404.gpx */; };
4CD7187324C9968C00692984 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4CD7187224C9968C00692984 /* GoogleService-Info.plist */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -36,6 +37,7 @@
1CFF1733714D5E6047310E9F /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
22F4AECA8DB2788DCE5E11F8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+ 4C2C8B3A251B466B008F5DA5 /* mapstogpx20200923_085404.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = mapstogpx20200923_085404.gpx; sourceTree = "<group>"; };
4CD7187224C9968C00692984 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
4CD7187424C996B000692984 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
584E2B9AD7744102DD3DFD0E /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
@@ -116,6 +118,7 @@
97C146F01CF9000F007C117D /* Runner */ = {
isa = PBXGroup;
children = (
+ 4C2C8B3A251B466B008F5DA5 /* mapstogpx20200923_085404.gpx */,
4CD7187424C996B000692984 /* Runner.entitlements */,
97C146FA1CF9000F007C117D /* Main.storyboard */,
97C146FD1CF9000F007C117D /* Assets.xcassets */,
@@ -203,6 +206,7 @@
files = (
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
+ 4C2C8B3B251B466B008F5DA5 /* mapstogpx20200923_085404.gpx in Resources */,
4CD7187324C9968C00692984 /* GoogleService-Info.plist in Resources */,
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
@@ -278,6 +282,7 @@
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
"${BUILT_PRODUCTS_DIR}/quick_actions/quick_actions.framework",
"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
+ "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
"${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework",
);
name = "[CP] Embed Pods Frameworks";
@@ -291,6 +296,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/quick_actions.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework",
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/console/generic_app/ios/Runner/AppDelegate.swift b/console/generic_app/ios/Runner/AppDelegate.swift
index 1b2ee7708..b13915c42 100644
--- a/console/generic_app/ios/Runner/AppDelegate.swift
+++ b/console/generic_app/ios/Runner/AppDelegate.swift
@@ -10,8 +10,7 @@ import geofencing
) -> Bool {
GeneratedPluginRegistrant.register(with: self)
- GeofencingPlugin.setPluginRegistrantCallback({_ in
- })
+ GeofencingPlugin.setPluginRegistrantCallback { (registry) in GeneratedPluginRegistrant.register(with: registry) }
UNUserNotificationCenter.current().delegate = self;
diff --git a/console/generic_app/ios/Runner/Runner-Bridging-Header.h b/console/generic_app/ios/Runner/Runner-Bridging-Header.h
index 7335fdf90..663565c8e 100644
--- a/console/generic_app/ios/Runner/Runner-Bridging-Header.h
+++ b/console/generic_app/ios/Runner/Runner-Bridging-Header.h
@@ -1 +1,2 @@
-#import "GeneratedPluginRegistrant.h"
\ No newline at end of file
+#import "GeneratedPluginRegistrant.h"
+#import <geofencing/GeofencingPlugin.h>
diff --git a/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart b/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart
index 5ea971555..fe1f248e3 100644
--- a/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart
+++ b/console/generic_app/lib/ConsoleProviders/GeofenceProvider.dart
@@ -280,7 +280,7 @@ class GeofenceProvider {
return _apiManager
.put(
overrideUrl:
- "${CurrentConsoleAppConfig.instance.baseUrl}${geofenceDefinition.url}",
+ "${_baseURL}${geofenceDefinition.url}",
rawModel: locationData != null
? jsonEncode(locationData)
: null.toString())
diff --git a/console/generic_app/pubspec.lock b/console/generic_app/pubspec.lock
index 646bfa759..5af2523ee 100644
--- a/console/generic_app/pubspec.lock
+++ b/console/generic_app/pubspec.lock
@@ -204,6 +204,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
+ ffi:
+ dependency: transitive
+ description:
+ name: ffi
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.1.3"
file:
dependency: transitive
description:
@@ -476,6 +483,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3"
+ path_provider_windows:
+ dependency: transitive
+ description:
+ name: path_provider_windows
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.0.4+1"
pedantic:
dependency: transitive
description:
@@ -601,7 +615,7 @@ packages:
name: shared_preferences
url: "https://pub.dartlang.org"
source: hosted
- version: "0.5.10"
+ version: "0.5.12"
shared_preferences_linux:
dependency: transitive
description:
@@ -630,6 +644,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2+7"
+ shared_preferences_windows:
+ dependency: transitive
+ description:
+ name: shared_preferences_windows
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.0.1+1"
shelf:
dependency: transitive
description:
@@ -817,6 +838,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.22+1"
+ win32:
+ dependency: transitive
+ description:
+ name: win32
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.7.3"
xdg_directories:
dependency: transitive
description:
diff --git a/console/generic_app/pubspec.yaml b/console/generic_app/pubspec.yaml
index 3b90885ae..0eaea0d47 100644
--- a/console/generic_app/pubspec.yaml
+++ b/console/generic_app/pubspec.yaml
@@ -11,7 +11,7 @@ description: Generic app of OpenRemote
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.1+13
+version: 1.0.1+14
environment:
sdk: ">=2.2.0 <3.0.0"
@@ -32,7 +32,7 @@ dependencies:
geofencing: ^0.1.0
location: ^3.0.0
webview_flutter: ^0.3.22+1
- shared_preferences: ^0.5.10
+ shared_preferences: ^0.5.12
permission_handler: ^5.0.1+1
firebase_messaging: ^7.0.0
quick_actions: 0.4.0+8