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
Fix for opening map from menu. Updated iOS
Michael Rademaker1d1a9f599dd4
diff --git a/console/generic_app/ios/Podfile.lock b/console/generic_app/ios/Podfile.lockindex 5da8d9659..3ebbb500c 100644--- a/console/generic_app/ios/Podfile.lock+++ b/console/generic_app/ios/Podfile.lock@@ -84,6 +84,10 @@ PODS:- GoogleUtilities/Logger- GoogleUtilities/UserDefaults (6.6.0):- GoogleUtilities/Logger+ - location (0.0.1):+ - Flutter+ - location_web (0.0.1):+ - Flutter- nanopb (1.30905.0):- nanopb/decode (= 1.30905.0)- nanopb/encode (= 1.30905.0)@@ -108,6 +112,8 @@ DEPENDENCIES:- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)- Flutter (from `Flutter`)- flutter_geofence (from `.symlinks/plugins/flutter_geofence/ios`)+ - location (from `.symlinks/plugins/location/ios`)+ - location_web (from `.symlinks/plugins/location_web/ios`)- permission_handler (from `.symlinks/plugins/permission_handler/ios`)- quick_actions (from `.symlinks/plugins/quick_actions/ios`)- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)@@ -141,6 +147,10 @@ EXTERNAL SOURCES::path: Flutterflutter_geofence::path: ".symlinks/plugins/flutter_geofence/ios"+ location:+ :path: ".symlinks/plugins/location/ios"+ location_web:+ :path: ".symlinks/plugins/location_web/ios"permission_handler::path: ".symlinks/plugins/permission_handler/ios"quick_actions:@@ -171,6 +181,8 @@ SPEC CHECKSUMS:GoogleDataTransport: f6f8eba931df03ebd2232ff4645aa85f8f47b5abGoogleDataTransportCCTSupport: d70a561f7d236af529fee598835caad5e25f6d3dGoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1+ location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740+ location_web: b94e7433cfe28c0f7c8923c2ee482824b32e55a7nanopb: c43f40fadfe79e8b8db116583945847910cbabc9permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6diff --git a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj b/console/generic_app/ios/Runner.xcodeproj/project.pbxprojindex 9b8735c80..00618c820 100644--- a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj+++ b/console/generic_app/ios/Runner.xcodeproj/project.pbxproj@@ -274,6 +274,7 @@"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework","${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework","${BUILT_PRODUCTS_DIR}/flutter_geofence/flutter_geofence.framework",+ "${BUILT_PRODUCTS_DIR}/location/location.framework","${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework","${BUILT_PRODUCTS_DIR}/quick_actions/quick_actions.framework","${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",@@ -286,6 +287,7 @@"${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}/location.framework","${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",diff --git a/console/generic_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/console/generic_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemeindex bf8bee601..925192aa7 100644--- a/console/generic_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme+++ b/console/generic_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme@@ -15,7 +15,7 @@<BuildableReferenceBuildableIdentifier = "primary"BlueprintIdentifier = "97C146ED1CF9000F007C117D"- BuildableName = "OR App.app"+ BuildableName = "OpenRemote.app"BlueprintName = "Runner"ReferencedContainer = "container:Runner.xcodeproj"></BuildableReference>@@ -31,7 +31,7 @@<BuildableReferenceBuildableIdentifier = "primary"BlueprintIdentifier = "97C146ED1CF9000F007C117D"- BuildableName = "OR App.app"+ BuildableName = "OpenRemote.app"BlueprintName = "Runner"ReferencedContainer = "container:Runner.xcodeproj"></BuildableReference>@@ -54,7 +54,7 @@<BuildableReferenceBuildableIdentifier = "primary"BlueprintIdentifier = "97C146ED1CF9000F007C117D"- BuildableName = "OR App.app"+ BuildableName = "OpenRemote.app"BlueprintName = "Runner"ReferencedContainer = "container:Runner.xcodeproj"></BuildableReference>@@ -71,7 +71,7 @@<BuildableReferenceBuildableIdentifier = "primary"BlueprintIdentifier = "97C146ED1CF9000F007C117D"- BuildableName = "OR App.app"+ BuildableName = "OpenRemote.app"BlueprintName = "Runner"ReferencedContainer = "container:Runner.xcodeproj"></BuildableReference>diff --git a/console/generic_app/lib/config/CurrentConsoleAppConfig.dart b/console/generic_app/lib/config/CurrentConsoleAppConfig.dartindex f9fad802e..99180e105 100644--- a/console/generic_app/lib/config/CurrentConsoleAppConfig.dart+++ b/console/generic_app/lib/config/CurrentConsoleAppConfig.dart@@ -19,7 +19,7 @@ class CurrentConsoleAppConfig {this._primaryColor = appConfig.primaryColor;this._secondaryColor = appConfig.secondaryColor;this._links = appConfig.links;- this._project = project;+ this._projectName = project;}String _realm;@@ -31,7 +31,7 @@ class CurrentConsoleAppConfig {String _primaryColor;String _secondaryColor;List<LinkConfig> _links;- String _project;+ String _projectName;String get realm {@@ -74,6 +74,6 @@ class CurrentConsoleAppConfig {}String get baseUrl {- return "http://192.168.100.9:8080/api/$_realm";+ return "https://$_projectName.openremote.io/api/$_realm";}}diff --git a/console/generic_app/lib/ui/ProjectPage.dart b/console/generic_app/lib/ui/ProjectPage.dartindex 06c652b66..693c865a0 100644--- a/console/generic_app/lib/ui/ProjectPage.dart+++ b/console/generic_app/lib/ui/ProjectPage.dart@@ -131,7 +131,7 @@ class _ProjectPageState extends State<ProjectPage> {}void _getConsoleAppConfig() {- var apiManager = new ApiManager("http://192.168.100.9:8080/api/$_realmName");+ var apiManager = new ApiManager("https://$_projectName.openremote.io/api/$_realmName");apiManager.get(["app", "config"], ConsoleAppConfig.fromJson).then((value) {_sharedPreferences.setString("project", _projectName);_sharedPreferences.setString("realm", _realmName);diff --git a/console/generic_app/lib/ui/SplashPage.dart b/console/generic_app/lib/ui/SplashPage.dartindex e230c2d2c..52ed0a80f 100644--- a/console/generic_app/lib/ui/SplashPage.dart+++ b/console/generic_app/lib/ui/SplashPage.dart@@ -93,7 +93,7 @@ class _SplashPageState extends State<SplashPage> {Future<bool> _getConsoleAppConfig() async {var apiManager =- new ApiManager("http://192.168.100.9:8080/api/$_realmName");+ new ApiManager("https://$_projectName.openremote.io/api/$_realmName");return apiManager.get(["app", "config"], ConsoleAppConfig.fromJson).then((value) {CurrentConsoleAppConfig.instance.updateConfig(value, _projectName);diff --git a/console/generic_app/lib/ui/WebViewPage.dart b/console/generic_app/lib/ui/WebViewPage.dartindex a17942982..aadf7a4b0 100644--- a/console/generic_app/lib/ui/WebViewPage.dart+++ b/console/generic_app/lib/ui/WebViewPage.dart@@ -220,7 +220,7 @@ class _WebViewPageState extends State<WebViewPage> {onSelected: (selectedValue) {LinkConfig linkConfig =CurrentConsoleAppConfig.instance.links[selectedValue];- _controller.loadUrl(linkConfig.pageLink);+ _controller.loadUrl(Uri.encodeFull(linkConfig.pageLink));},);