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

Debugging MOzilla IOT impl

Browse Source
This commit is contained in:
BWS Systems
2019-05-24 15:22:34 -05:00
parent 79d5b5da28
commit 5f6bfae41a
41 changed files with 1319 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java
View File

@@ -90,9 +90,9 @@ public class BridgeSettingsDescriptor {
@SerializedName("openhabaddress")
@Expose
private IpList openhabaddress;
@SerializedName("moziotgateway")
@SerializedName("moziotaddress")
@Expose
private IpList moziotgateway;
private IpList moziotaddress;
@SerializedName("hubversion")
@Expose
private String hubversion;
@@ -120,6 +120,9 @@ public class BridgeSettingsDescriptor {
@SerializedName("tracestate")
@Expose
private boolean tracestate;
@SerializedName("upnporiginal")
@Expose
private boolean upnporiginal;
// @SerializedName("activeloggers")
// @Expose
// private List<NameValue> activeloggers;
@@ -142,11 +145,11 @@ public class BridgeSettingsDescriptor {
// Deprecated settings
private String haltoken;
private boolean upnpstrict;
// private boolean upnpstrict;
public BridgeSettingsDescriptor() {
super();
this.upnpstrict = true;
// this.upnpstrict = true;
this.useupnpiface = false;
this.userooms = false;
this.traceupnp = false;
@@ -175,6 +178,7 @@ public class BridgeSettingsDescriptor {
this.upnpsenddelay = Configuration.UPNP_SEND_DELAY;
this.broadlinkconfigured = false;
this.tracestate = false;
this.upnporiginal = false;
}
public String getUpnpConfigAddress() {
@@ -280,7 +284,7 @@ public class BridgeSettingsDescriptor {
public void setHarmonyAddress(IpList harmonyaddress) {
this.harmonyaddress = harmonyaddress;
}
/*
public boolean isUpnpStrict() {
return upnpstrict;
}
@@ -288,7 +292,7 @@ public class BridgeSettingsDescriptor {
public void setUpnpStrict(boolean upnpStrict) {
this.upnpstrict = upnpStrict;
}
*/
public boolean isTraceupnp() {
return traceupnp;
}
@@ -753,19 +757,19 @@ public class BridgeSettingsDescriptor {
this.tracestate = tracestate;
}
public IpList getMoziotgateway() {
return moziotgateway;
public IpList getMoziotaddress() {
return moziotaddress;
}
public void setMoziotgateway(IpList moziotgateway) {
this.moziotgateway = moziotgateway;
public void setMoziotgaddress(IpList moziotgateway) {
this.moziotaddress = moziotgateway;
}
public Boolean isValidMozIot() {
if (this.getMoziotgateway() == null || this.getMoziotgateway().getDevices().size() <= 0)
if (this.getMoziotaddress() == null || this.getMoziotaddress().getDevices().size() <= 0)
return false;
List<NamedIP> devicesList = this.getMoziotgateway().getDevices();
List<NamedIP> devicesList = this.getMoziotaddress().getDevices();
if (devicesList.get(0).getIp().contains(Configuration.DEFAULT_ADDRESS))
return false;
@@ -779,4 +783,12 @@ public class BridgeSettingsDescriptor {
public void setMoziotconfigured(boolean moziotconfigured) {
this.moziotconfigured = moziotconfigured;
}
public boolean isUpnporiginal() {
return upnporiginal;
}
public void setUpnporiginal(boolean upnporiginal) {
this.upnporiginal = upnporiginal;
}
}