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

Changed device listener to be a list instead of single listener

Browse source
This commit is contained in:
Ziver Koc 2021-06-25 22:26:02 +02:00
parent 8d9896f8b4
commit 53d471c0aa
24 changed files with 120 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/hal-zigbee/src/se/hal/plugin/zigbee/HalZigbeeController.java
View file

@ -30,6 +30,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -58,7 +59,7 @@ public class HalZigbeeController implements HalSensorController,
protected ZigBeeNetworkManager networkManager;
private Timer permitJoinTimer;
private HalDeviceReportListener deviceListener;
private List<HalDeviceReportListener> deviceListeners = new CopyOnWriteArrayList<>();
private List<ZigbeeHalDeviceConfig> registeredDevices = new ArrayList<>();
@ -277,7 +278,7 @@ public class HalZigbeeController implements HalSensorController,
cluster.addAttributeListener(new ZclAttributeListener() {
@Override
public void attributeUpdated(ZclAttribute attribute, Object value) {
if (deviceListener != null) {
for (HalDeviceReportListener deviceListener : deviceListeners) {
logger.finer("[Node: " + endpoint.getIeeeAddress() + ", Endpoint: " + endpoint.getEndpointId() + ", Cluster: " + attribute.getCluster().getId() + "] Attribute updated: attribute_name=" + attribute.getName() + ", value=" + attribute.getLastValue());
deviceListener.reportReceived(config, config.getDeviceData(attribute));
}
@ -285,8 +286,9 @@ public class HalZigbeeController implements HalSensorController,
});
// // TODO: Notify listener that a device is online
if (deviceListener != null)
for (HalDeviceReportListener deviceListener : deviceListeners) {
deviceListener.reportReceived(config, null);
}
}
}
@ -325,8 +327,8 @@ public class HalZigbeeController implements HalSensorController,
}
@Override
public void setListener(HalDeviceReportListener listener) {
deviceListener = listener;
public void addListener(HalDeviceReportListener listener) {
deviceListeners.add(listener);
}
@Override