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

Filter lights in group and fixed handling of urls with trailing slash

Browse Source
This commit is contained in:
Florian Förderreuther
2017-07-30 10:10:04 +02:00
parent 8831fec6be
commit cb9312f6c3
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/bwssystems/HABridge/api/hue/GroupResponse.java
View File

@@ -3,6 +3,7 @@ package com.bwssystems.HABridge.api.hue;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.bwssystems.HABridge.dao.DeviceDescriptor;
@@ -90,19 +91,36 @@ public class GroupResponse {
GroupResponse response = new GroupResponse();
Boolean all_on = true;
Boolean any_on = false;
for (DeviceResponse light : lights.values()) {
String[] groupLights = null;
if (lights == null) {
all_on = false;
groupLights = group.getLights();
} else {
for (DeviceResponse light : lights.values()) {
Boolean is_on = light.getState().isOn();
if (is_on)
any_on = true;
else
all_on = false;
}
}
// group.getLights() is not filtered by requester, lights is
// we want the filtered version but keep the order from group.getLights()
groupLights = new String[lights.size()];
int i = 0;
for (String light : group.getLights()) {
if (lights.keySet().contains(light)) {
groupLights[i] = light;
i++;
}
}
}
response.setState(new GroupState(all_on, any_on));
response.setAction(group.getAction());
response.setName(group.getName());
response.setType(group.getGroupType());
response.setLights(group.getLights());
response.setLights(groupLights);
response.setClass_name(group.getGroupClass());
return response;