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 #355 disabled button in console app config for smartcity Fixed positions for button in iOS app
Michael Rademakerd4e561a47494
diff --git a/.gitignore b/.gitignoreindex 734210835..81964c226 100644--- a/.gitignore+++ b/.gitignore@@ -37,3 +37,4 @@ console/iOS/Podsmanager/.factorypath.sts4-cache/+Pods/diff --git a/console/android/GenericApp/app/src/main/res/values/styles.xml b/console/android/GenericApp/app/src/main/res/values/styles.xmlnew file mode 100644index 000000000..a6b3daec9--- /dev/null+++ b/console/android/GenericApp/app/src/main/res/values/styles.xml@@ -0,0 +1,2 @@+<?xml version="1.0" encoding="utf-8"?>+<resources></resources>\ No newline at end of filediff --git a/console/iOS/GenericApp/GenericApp/AppDelegate.swift b/console/iOS/GenericApp/GenericApp/AppDelegate.swiftindex ae6ec775b..9f052782b 100644--- a/console/iOS/GenericApp/GenericApp/AppDelegate.swift+++ b/console/iOS/GenericApp/GenericApp/AppDelegate.swift@@ -335,11 +335,15 @@ extension AppDelegate : MessagingDelegate {}}- func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String) {- print("Firebase registration token: \(fcmToken)")- if let defaults = UserDefaults(suiteName: DefaultsKey.groupEntitlement) {- defaults.set(fcmToken, forKey: DefaultsKey.fcmTokenKey)- defaults.synchronize()+ func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {+ if let token = fcmToken {+ print("Firebase registration token: \(token)")+ if let defaults = UserDefaults(suiteName: DefaultsKey.groupEntitlement) {+ defaults.set(token, forKey: DefaultsKey.fcmTokenKey)+ defaults.synchronize()+ }+ } else {+ print("No fcm token")}}}diff --git a/console/iOS/GenericApp/GenericApp/UI/ORViewController.swift b/console/iOS/GenericApp/GenericApp/UI/ORViewController.swiftindex 4ad6dd1de..48e1f10ec 100644--- a/console/iOS/GenericApp/GenericApp/UI/ORViewController.swift+++ b/console/iOS/GenericApp/GenericApp/UI/ORViewController.swift@@ -135,7 +135,7 @@ class ORViewcontroller : UIViewController {.arrowSize(.zero),]return [- menuButton!.rightAnchor.constraint(equalTo: self.view.rightAnchor, constant: 20),+ menuButton!.rightAnchor.constraint(equalTo: self.view.rightAnchor, constant: -20),menuButton!.bottomAnchor.constraint(equalTo: self.view.bottomAnchor, constant: -20)]} else if appConfig!.menuPosition == "TOP_RIGHT" {@@ -144,8 +144,8 @@ class ORViewcontroller : UIViewController {.arrowSize(.zero),]return [- menuButton!.rightAnchor.constraint(equalTo: self.view.rightAnchor, constant: 20),- menuButton!.topAnchor.constraint(equalTo: self.view.topAnchor, constant: 20)+ menuButton!.rightAnchor.constraint(equalTo: self.view.rightAnchor, constant: -20),+ menuButton!.topAnchor.constraint(equalTo: self.view.topAnchor, constant: sbHeight)]} else if appConfig!.menuPosition == "TOP_LEFT" {self.popoverOptions = [@@ -154,7 +154,7 @@ class ORViewcontroller : UIViewController {]return [menuButton!.leftAnchor.constraint(equalTo: self.view.leftAnchor, constant: 20),- menuButton!.topAnchor.constraint(equalTo: self.view.topAnchor, constant: 20)+ menuButton!.topAnchor.constraint(equalTo: self.view.topAnchor, constant: sbHeight)]}self.popoverOptions = [diff --git a/console/iOS/GenericApp/Podfile.lock b/console/iOS/GenericApp/Podfile.locknew file mode 100644index 000000000..005fb0de8--- /dev/null+++ b/console/iOS/GenericApp/Podfile.lock@@ -0,0 +1,200 @@+PODS:+ - Firebase/Analytics (7.5.0):+ - Firebase/Core+ - Firebase/Core (7.5.0):+ - Firebase/CoreOnly+ - FirebaseAnalytics (= 7.5.0)+ - Firebase/CoreOnly (7.5.0):+ - FirebaseCore (= 7.5.0)+ - Firebase/Crashlytics (7.5.0):+ - Firebase/CoreOnly+ - FirebaseCrashlytics (~> 7.5.0)+ - Firebase/Messaging (7.5.0):+ - Firebase/CoreOnly+ - FirebaseMessaging (~> 7.5.0)+ - FirebaseAnalytics (7.5.0):+ - FirebaseCore (~> 7.0)+ - FirebaseInstallations (~> 7.0)+ - GoogleAppMeasurement (= 7.5.0)+ - GoogleUtilities/AppDelegateSwizzler (~> 7.0)+ - GoogleUtilities/MethodSwizzler (~> 7.0)+ - GoogleUtilities/Network (~> 7.0)+ - "GoogleUtilities/NSData+zlib (~> 7.0)"+ - nanopb (~> 2.30907.0)+ - FirebaseCore (7.5.0):+ - FirebaseCoreDiagnostics (~> 7.4)+ - GoogleUtilities/Environment (~> 7.0)+ - GoogleUtilities/Logger (~> 7.0)+ - FirebaseCoreDiagnostics (7.5.0):+ - GoogleDataTransport (~> 8.0)+ - GoogleUtilities/Environment (~> 7.0)+ - GoogleUtilities/Logger (~> 7.0)+ - nanopb (~> 2.30907.0)+ - FirebaseCrashlytics (7.5.0):+ - FirebaseCore (~> 7.0)+ - FirebaseInstallations (~> 7.0)+ - GoogleDataTransport (~> 8.0)+ - nanopb (~> 2.30907.0)+ - PromisesObjC (~> 1.2)+ - FirebaseInstallations (7.5.0):+ - FirebaseCore (~> 7.0)+ - GoogleUtilities/Environment (~> 7.0)+ - GoogleUtilities/UserDefaults (~> 7.0)+ - PromisesObjC (~> 1.2)+ - FirebaseInstanceID (7.5.0):+ - FirebaseCore (~> 7.0)+ - FirebaseInstallations (~> 7.0)+ - GoogleUtilities/Environment (~> 7.0)+ - GoogleUtilities/UserDefaults (~> 7.0)+ - FirebaseMessaging (7.5.0):+ - FirebaseCore (~> 7.0)+ - FirebaseInstanceID (~> 7.0)+ - GoogleUtilities/AppDelegateSwizzler (~> 7.0)+ - GoogleUtilities/Environment (~> 7.0)+ - GoogleUtilities/Reachability (~> 7.0)+ - GoogleUtilities/UserDefaults (~> 7.0)+ - GoogleAppMeasurement (7.5.0):+ - GoogleUtilities/AppDelegateSwizzler (~> 7.0)+ - GoogleUtilities/MethodSwizzler (~> 7.0)+ - GoogleUtilities/Network (~> 7.0)+ - "GoogleUtilities/NSData+zlib (~> 7.0)"+ - nanopb (~> 2.30907.0)+ - GoogleDataTransport (8.2.0):+ - nanopb (~> 2.30907.0)+ - GoogleUtilities/AppDelegateSwizzler (7.2.2):+ - GoogleUtilities/Environment+ - GoogleUtilities/Logger+ - GoogleUtilities/Network+ - GoogleUtilities/Environment (7.2.2):+ - PromisesObjC (~> 1.2)+ - GoogleUtilities/Logger (7.2.2):+ - GoogleUtilities/Environment+ - GoogleUtilities/MethodSwizzler (7.2.2):+ - GoogleUtilities/Logger+ - GoogleUtilities/Network (7.2.2):+ - GoogleUtilities/Logger+ - "GoogleUtilities/NSData+zlib"+ - GoogleUtilities/Reachability+ - "GoogleUtilities/NSData+zlib (7.2.2)"+ - GoogleUtilities/Reachability (7.2.2):+ - GoogleUtilities/Logger+ - GoogleUtilities/UserDefaults (7.2.2):+ - GoogleUtilities/Logger+ - IQKeyboardManagerSwift (6.5.6)+ - MaterialComponents/AnimationTiming (121.0.1)+ - MaterialComponents/Availability (121.0.1)+ - MaterialComponents/Buttons (121.0.1):+ - MaterialComponents/Elevation+ - MaterialComponents/Ink+ - MaterialComponents/private/Math+ - MaterialComponents/Ripple+ - MaterialComponents/ShadowElevations+ - MaterialComponents/ShadowLayer+ - MaterialComponents/ShapeLibrary+ - MaterialComponents/Shapes+ - MaterialComponents/Typography+ - MDFInternationalization+ - MDFTextAccessibility+ - MaterialComponents/Elevation (121.0.1):+ - MaterialComponents/Availability+ - MaterialComponents/private/Color+ - MaterialComponents/private/Math+ - MaterialComponents/Ink (121.0.1):+ - MaterialComponents/Availability+ - MaterialComponents/private/Color+ - MaterialComponents/private/Math+ - MaterialComponents/Palettes (121.0.1)+ - MaterialComponents/private/Application (121.0.1)+ - MaterialComponents/private/Color (121.0.1):+ - MaterialComponents/Availability+ - MaterialComponents/private/Math (121.0.1)+ - MaterialComponents/Ripple (121.0.1):+ - MaterialComponents/AnimationTiming+ - MaterialComponents/Availability+ - MaterialComponents/private/Color+ - MaterialComponents/private/Math+ - MaterialComponents/ShadowElevations (121.0.1)+ - MaterialComponents/ShadowLayer (121.0.1):+ - MaterialComponents/ShadowElevations+ - MaterialComponents/ShapeLibrary (121.0.1):+ - MaterialComponents/private/Math+ - MaterialComponents/Shapes+ - MaterialComponents/Shapes (121.0.1):+ - MaterialComponents/private/Color+ - MaterialComponents/private/Math+ - MaterialComponents/ShadowLayer+ - MaterialComponents/TextFields (121.0.1):+ - MaterialComponents/AnimationTiming+ - MaterialComponents/Buttons+ - MaterialComponents/Elevation+ - MaterialComponents/Palettes+ - MaterialComponents/private/Math+ - MaterialComponents/Typography+ - MDFInternationalization+ - MaterialComponents/Typography (121.0.1):+ - MaterialComponents/private/Application+ - MaterialComponents/private/Math+ - MDFTextAccessibility+ - MDFInternationalization (2.0.0)+ - MDFTextAccessibility (2.0.0)+ - nanopb (2.30907.0):+ - nanopb/decode (= 2.30907.0)+ - nanopb/encode (= 2.30907.0)+ - nanopb/decode (2.30907.0)+ - nanopb/encode (2.30907.0)+ - Popover (1.3.0)+ - PromisesObjC (1.2.12)++DEPENDENCIES:+ - Firebase/Analytics+ - Firebase/Crashlytics+ - Firebase/Messaging+ - IQKeyboardManagerSwift+ - MaterialComponents/Buttons+ - MaterialComponents/TextFields+ - Popover++SPEC REPOS:+ trunk:+ - Firebase+ - FirebaseAnalytics+ - FirebaseCore+ - FirebaseCoreDiagnostics+ - FirebaseCrashlytics+ - FirebaseInstallations+ - FirebaseInstanceID+ - FirebaseMessaging+ - GoogleAppMeasurement+ - GoogleDataTransport+ - GoogleUtilities+ - IQKeyboardManagerSwift+ - MaterialComponents+ - MDFInternationalization+ - MDFTextAccessibility+ - nanopb+ - Popover+ - PromisesObjC++SPEC CHECKSUMS:+ Firebase: fd5e4d2b756292c6e7ee6faac1eb320225d6e97e+ FirebaseAnalytics: 00b7f74571d346ee1ffb9bf0a2e6f2ffff222bcc+ FirebaseCore: 06a2b68af8901f2244eb989419eb89edc3789b4d+ FirebaseCoreDiagnostics: 35685db68b11fe7d19d2d8b557fd7e3a56ac81cc+ FirebaseCrashlytics: 4d77da03c81dedc92cccbefc758f968dccf64b30+ FirebaseInstallations: a46ae59915f0931e18814164849cd0354bea24ed+ FirebaseInstanceID: 47fcb3b70d6349cfd471f430b01bbd01a7698e8f+ FirebaseMessaging: a2a23671eb281b1eed38b155af8549b335a4a38b+ GoogleAppMeasurement: 65a1071e5f52f63ab03d0a4d814a54fd762d885a+ GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4+ GoogleUtilities: 31c5b01f978a70c6cff2afc6272b3f1921614b43+ IQKeyboardManagerSwift: c7df9d2deb356c04522f5c4b7b6e4ce4d8ed94fe+ MaterialComponents: afb3574c87696721741006fbb428d26c7565fc0f+ MDFInternationalization: 010097556d6b09d2c4ea38e0820ea6d37be6a314+ MDFTextAccessibility: 85c09a1bd9c321f494348e632a25063bcda35a53+ nanopb: 59221d7f958fb711001e6a449489542d92ae113e+ Popover: 10e1d9528f81d9504df984b7b3f491292bc1822d+ PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97++PODFILE CHECKSUM: 7b48d167316e7a8edd6cc4cfebe5494b9dbe1f4a++COCOAPODS: 1.10.1diff --git a/deployment/manager/provisioning/assets/windturbine.json b/deployment/manager/provisioning/assets/windturbine.jsonindex e6dfb7db3..11a85c3c8 100644--- a/deployment/manager/provisioning/assets/windturbine.json+++ b/deployment/manager/provisioning/assets/windturbine.json@@ -19,7 +19,7 @@},"powerExportMax": {"name": "powerExportMax",- "type": "negativeNumber",+ "type": "positiveNumber","value": "45.5"},"energyExportTotal": {diff --git a/deployment/manager/provisioning/consoleappconfig/smartcity.json b/deployment/manager/provisioning/consoleappconfig/smartcity.jsonindex 9534d6c2f..5da58f3e5 100644--- a/deployment/manager/provisioning/consoleappconfig/smartcity.json+++ b/deployment/manager/provisioning/consoleappconfig/smartcity.json@@ -2,11 +2,11 @@"realm": "smartcity","initialUrl": "https://demo.openremote.io/mobile/?realm=smartcity&consoleProviders=geofence push storage","url": "https://demo.openremote.io/main/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences",- "menuEnabled": true,+ "menuEnabled": false,"menuPosition": "BOTTOM_RIGHT","menuImage": null,"primaryColor": "#4D9D2A",- "secondaryColor": "#AFAFAF",+ "secondaryColor": "#CFCFCF","links": [{"displayText": "Map",