Finished implementation for multiple vera support. Tweaks to the UI.

Fixes #19
Fixes #21
Fixes #23
Fixes #26
Fixes #28
Fixes #30
Fixes #31
This commit is contained in:
Admin
2016-01-28 16:39:20 -06:00
parent a6bb1ae3aa
commit 2565183ee9
16 changed files with 236 additions and 147 deletions

View File

@@ -7,7 +7,7 @@ public class BridgeSettings {
private String serverport;
private String upnpresponseport;
private String upnpdevicedb;
private String veraaddress;
private IpList veraaddress;
private IpList harmonyaddress;
private String harmonyuser;
private String harmonypwd;
@@ -43,10 +43,10 @@ public class BridgeSettings {
public void setUpnpDeviceDb(String upnpDeviceDb) {
this.upnpdevicedb = upnpDeviceDb;
}
public String getVeraAddress() {
public IpList getVeraAddress() {
return veraaddress;
}
public void setVeraAddress(String veraAddress) {
public void setVeraAddress(IpList veraAddress) {
this.veraaddress = veraAddress;
}
public IpList getHarmonyAddress() {
@@ -110,7 +110,8 @@ public class BridgeSettings {
this.nestconfigured = isNestConfigured;
}
public Boolean isValidVera() {
if(this.veraaddress.contains(Configuration.DEFAULT_ADDRESS))
List<NamedIP> devicesList = this.veraaddress.getDevices();
if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_ADDRESS))
return false;
return true;
}