From 8d2af9181ae76012899204144fb57156e39563ed Mon Sep 17 00:00:00 2001 From: JonatanRek Date: Sun, 3 May 2020 20:14:18 +0200 Subject: [PATCH] Fix --- app/api/GoogleHomeApi.php | 8 ++++---- app/models/types/GoogleHomeDeviceTypes.php | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/api/GoogleHomeApi.php b/app/api/GoogleHomeApi.php index 694ce73..10a82c4 100644 --- a/app/api/GoogleHomeApi.php +++ b/app/api/GoogleHomeApi.php @@ -38,9 +38,11 @@ class GoogleHomeApi { foreach ($subDevicesData as $subDeviceKey => $subDeviceData) { if ($subDeviceData['type'] != "on/off" && $subDeviceData['type'] != "temp_cont") continue; + //Google Compatibile Action Type + $actionType = GoogleHomeDeviceTypes::getAction($subDeviceData['type']); $tempDevice = [ 'id' => (string) $subDeviceData['subdevice_id'], - 'type' => GoogleHomeDeviceTypes::getAction($subDeviceData['type']), + 'type' => $actionType, 'name' => [ 'name' => $deviceData['name'], ], @@ -49,13 +51,11 @@ class GoogleHomeApi { ]; //traids & Attributes - $tempDevice = GoogleHomeDeviceTypes::getSyncObj($tempDevice, GoogleHomeDeviceTypes::getAction($subDeviceData['type'])); - $devices[] = $tempDevice; + $devices[] = GoogleHomeDeviceTypes::getSyncObj($tempDevice, $actionType); } } } - $response = [ 'requestId' => $requestId, 'payload' => [ diff --git a/app/models/types/GoogleHomeDeviceTypes.php b/app/models/types/GoogleHomeDeviceTypes.php index 40c7700..e38a19d 100644 --- a/app/models/types/GoogleHomeDeviceTypes.php +++ b/app/models/types/GoogleHomeDeviceTypes.php @@ -83,7 +83,9 @@ class GoogleHomeDeviceTypes { static function getSyncObj($deviceBaseObj, $deviceType){ switch ($deviceType) { case 'action.devices.types.OUTLET': - $deviceBaseObj['traits'] = 'action.devices.traits.OnOff'; + $deviceBaseObj['traits'] = [ + 'action.devices.traits.OnOff' + ]; break; case 'action.devices.types.THERMOSTAT': $deviceBaseObj['traits'] = [