mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-24 09:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/pr/785' into FeaturesfFor5.0

Browse Source 
# Conflicts:
#	src/main/resources/public/scripts/app.js
This commit is contained in:
Admin
2017-11-14 13:13:22 -06:00
parent 548da932ad 31fe05fe2b
commit feee22dbac
35 changed files with 1518 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/bwssystems/HABridge/BridgeSettings.java
View File

@@ -65,6 +65,7 @@ public class BridgeSettings extends BackupHandler {
public void buildSettings() {
String addressString = null;
String theVeraAddress = null;
String theFibaroAddress = null;
String theSomfyAddress = null;
String theHarmonyAddress = null;
String configFileProperty = System.getProperty("config.file");
@@ -108,6 +109,22 @@ public class BridgeSettings extends BackupHandler {
}
}
theBridgeSettings.setVeraAddress(theVeraList);
theFibaroAddress = System.getProperty("fibaro.address");
IpList theFibaroList = null;
if(theFibaroAddress != null) {
try {
theFibaroList = new Gson().fromJson(theFibaroAddress, IpList.class);
} catch (Exception e) {
try {
theFibaroList = new Gson().fromJson("{devices:[{name:default,ip:" + theFibaroAddress + "}]}", IpList.class);
} catch (Exception et) {
log.error("Cannot parse fibaro.address, not set with message: " + e.getMessage(), e);
theFibaroList = null;
}
}
}
theBridgeSettings.setFibaroAddress(theFibaroList);
theHarmonyAddress = System.getProperty("harmony.address");
IpList theHarmonyList = null;
@@ -182,6 +199,7 @@ public class BridgeSettings extends BackupHandler {
theBridgeSettings.setButtonsleep(Integer.parseInt(Configuration.DEFAULT_BUTTON_SLEEP));
theBridgeSettings.setVeraconfigured(theBridgeSettings.isValidVera());
theBridgeSettings.setFibaroconfigured(theBridgeSettings.isValidFibaro());
theBridgeSettings.setHarmonyconfigured(theBridgeSettings.isValidHarmony());
theBridgeSettings.setNestConfigured(theBridgeSettings.isValidNest());
theBridgeSettings.setHueconfigured(theBridgeSettings.isValidHue());