ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added duplicate listener logic to prevent duplicate reports.

Browse source
This commit is contained in:
Ziver Koc 2022-05-23 20:09:45 +02:00
parent 53e9f08272
commit 7cf6849e5d
1 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

50
plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeController.java
View file

@ -316,19 +316,10 @@ public class ZigbeeController implements HalSensorController,
config.setZigbeeNodeAddress(endpoint.getIeeeAddress()); config.setZigbeeNodeAddress(endpoint.getIeeeAddress());
config.initialize(cluster); config.initialize(cluster);
cluster.addAttributeListener(new ZclAttributeListener() { ZigbeeAttributeListener attributeListener = new ZigbeeAttributeListener(endpoint, config);
@Override
public void attributeUpdated(ZclAttribute attribute, Object value) {
logger.finer("[Node: " + endpoint.getIeeeAddress() + ", Endpoint: " + endpoint.getEndpointId() + ", Cluster: " + attribute.getCluster().getId() + "] Attribute " + config.getClass().getSimpleName() + " updated: id=" + attribute.getId() + ", attribute_name=" + attribute.getName() + ", value=" + attribute.getLastValue());
HalDeviceData data = config.getDeviceData(attribute); cluster.removeAttributeListener(attributeListener); // Make sure we do not have duplicates
if (data != null) { cluster.addAttributeListener(attributeListener);
for (HalDeviceReportListener deviceListener : deviceListeners) {
deviceListener.reportReceived(config, data);
}
}
}
});
// Notify listener that a device is online // Notify listener that a device is online
for (HalDeviceReportListener deviceListener : deviceListeners) { for (HalDeviceReportListener deviceListener : deviceListeners) {
@ -392,4 +383,39 @@ public class ZigbeeController implements HalSensorController,
public boolean isScanning() { public boolean isScanning() {
return permitJoinTimer != null && !permitJoinTimer.hasTimedOut(); return permitJoinTimer != null && !permitJoinTimer.hasTimedOut();
} }
// ------------------------------------------
// Helpers
// ------------------------------------------
private class ZigbeeAttributeListener implements ZclAttributeListener {
private ZigBeeEndpoint endpoint;
private ZigbeeHalDeviceConfig config;
public ZigbeeAttributeListener(ZigBeeEndpoint endpoint, ZigbeeHalDeviceConfig config) {
this.endpoint = endpoint;
this.config = config;
}
@Override
public void attributeUpdated(ZclAttribute attribute, Object value) {
logger.finer("[Node: " + endpoint.getIeeeAddress() + ", Endpoint: " + endpoint.getEndpointId() + ", Cluster: " + attribute.getCluster().getId() + "] Attribute " + config.getClass().getSimpleName() + " updated: id=" + attribute.getId() + ", attribute_name=" + attribute.getName() + ", value=" + attribute.getLastValue());
HalDeviceData data = config.getDeviceData(attribute);
if (data != null) {
for (HalDeviceReportListener deviceListener : deviceListeners) {
deviceListener.reportReceived(config, data);
}
}
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ZigbeeAttributeListener that = (ZigbeeAttributeListener) o;
return endpoint.equals(that.endpoint) && config.equals(that.config);
}
}
} }