SH/PHP_SMART_HOME_V3
SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

App Device Detail

Browse Source
This commit is contained in:
JonatanRek 2020-10-05 21:11:44 +02:00
parent 51f7ce9dbd
commit 94d6576070
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/api/WidgetApi.php
View File

@ -27,7 +27,6 @@ class WidgetApi extends ApiController{
$i++; $i++;
usleep(250000); usleep(250000);
} }
$this->response(['value' => $response]); $this->response(['value' => $response]);
} }
@ -37,7 +36,7 @@ class WidgetApi extends ApiController{
$connectionError = true; $connectionError = true;
$subDeviceData = SubDeviceManager::getSubDevice($subDeviceId); $subDeviceData = SubDeviceManager::getSubDevice($subDeviceId);
$deviceData = DeviceManager::getDeviceById($deviceId); $deviceData = DeviceManager::getDeviceById($subDeviceData['device_id']);
$events = RecordManager::getLastRecord($subDeviceId, 5); $events = RecordManager::getLastRecord($subDeviceId, 5);
$LastRecordTime = new DateTime($events[4]['time']); $LastRecordTime = new DateTime($events[4]['time']);
@ -51,17 +50,33 @@ class WidgetApi extends ApiController{
if ( if (
$lastSeen < $deviceData['sleep_time'] || $lastSeen < $deviceData['sleep_time'] ||
$subDeviceData['type'] == "on/off" || $subDeviceData['type'] == "on/off" ||
$subDeviceData['type'] == "door" $subDeviceData['type'] == "door" ||
) { $subDeviceData['type'] == "wather"
$connectionError = false; ) {
$connectionError = false;
}
$labels = [];
$values = [];
foreach ($events as $key => $event) {
$labels[] = $event['value'];
$values[] = $event['time'];
}
$response = [
'records'=> $events,
'graph'=> [
'labels' => $values,
'values' => $labels,
'min' => RANGES[$subDeviceData['type']]['min'],
'max' => RANGES[$subDeviceData['type']]['max'],
'scale' => RANGES[$subDeviceData['type']]['scale'],
'graph' => RANGES[$subDeviceData['type']]['graph'],
],
'comError' => $connectionError,
'lastConnectionTime' => (empty($niceTime) ? "00:00" : $niceTime),
];
$this->response($response);
} }
$response = [
'records'=> $events,
'comError' => $connectionError,
'lastConnectionTime' => (empty($niceTime) ? "00:00" : $niceTime),
];
$this->response($response);
} }
}