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

Some more bug fixes

Browse source
This commit is contained in:
Ziver Koc 2021-08-29 19:59:02 +02:00
parent fa80fbc114
commit 870d9cbbab
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
View file

@ -98,7 +98,7 @@ public class SmartHomeImpl extends SmartHomeApp implements TokenRegistrationList
SyncResponse.Payload.Device.Builder deviceBuilder = SyncResponse.Payload.Device.Builder deviceBuilder =
new SyncResponse.Payload.Device.Builder() new SyncResponse.Payload.Device.Builder()
.setId(device.getClass().getSimpleName() + "-" + device.getId()) .setId(device.getClass().getSimpleName() + "-" + device.getId())
.setType(type.toString()) .setType("" + type)
.setTraits(DeviceTraitFactory.getTraitIds(traits)) .setTraits(DeviceTraitFactory.getTraitIds(traits))
.setName( .setName(
DeviceProto.DeviceNames.newBuilder() DeviceProto.DeviceNames.newBuilder()

3
plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/type/DeviceType.java
View file

@ -148,6 +148,9 @@ public enum DeviceType {
public static DeviceType getType(HalAbstractDevice device) { public static DeviceType getType(HalAbstractDevice device) {
if (device == null || device.getDeviceData() == null)
return null;
switch (device.getDeviceData().getClass().getName()) { switch (device.getDeviceData().getClass().getName()) {
case "se.hal.struct.devicedata.DimmerEventData": case "se.hal.struct.devicedata.DimmerEventData":
case "se.hal.struct.devicedata.OnOffEventData": case "se.hal.struct.devicedata.OnOffEventData":