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

Notifications Icons Added

Browse Source
This commit is contained in:
JonatanRek
2019-12-31 23:05:19 +01:00
parent 2d7db196dd
commit 48fcd1a7c9
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api.php
View File

@@ -101,16 +101,26 @@ if ($token == null || $token == "") {
//Vstupní Checky //Vstupní Checky
if (!DeviceManager::registeret($token)) { if (!DeviceManager::registeret($token)) {
$notificationMng = new NotificationManager;
$notificationData = [];
$notificationData = [ $notificationData = [
'title' => 'Info', 'title' => 'Info',
'body' => 'New device Detected', 'body' => 'New device Detected Found',
'icon' => '', 'icon' => BASEDIR . '/app/templates/images/icon-192x192.png',
]; ];
$deviceId = DeviceManager::create($token, $token); $deviceId = DeviceManager::create($token, $token);
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
if (!SubDeviceManager::getSubDeviceByMaster($deviceId, $key)) { if (!SubDeviceManager::getSubDeviceByMaster($deviceId, $key)) {
SubDeviceManager::create($deviceId, $key, UNITS[$key]); SubDeviceManager::create($deviceId, $key, UNITS[$key]);
} }
if ($notificationData != []) {
$subscribers = $notificationMng::getSubscription();
foreach ($subscribers as $key => $subscriber) {
$logManager->write("[NOTIFICATION] SENDING TO" . $subscriber['id'] . " ");
$notificationMng::sendSimpleNotification(SERVERKEY, $subscriber['token'], $notificationData);
}
}
} }
//Notification for newly added Device //Notification for newly added Device
@@ -161,7 +171,7 @@ if ($values != null || $values != "") {
$notificationData = [ $notificationData = [
'title' => 'Info', 'title' => 'Info',
'body' => 'Someone just open up '.$device['name'], 'body' => 'Someone just open up '.$device['name'],
'icon' => '', 'icon' => BASEDIR . '/app/templates/images/icon-192x192.png',
]; ];
break; break;
@@ -169,7 +179,7 @@ if ($values != null || $values != "") {
$notificationData = [ $notificationData = [
'title' => 'Alert', 'title' => 'Alert',
'body' => 'Wather leak detected by '.$device['name'], 'body' => 'Wather leak detected by '.$device['name'],
'icon' => '', 'icon' => BASEDIR . '/app/templates/images/icon-192x192.png',
]; ];
break; break;
} }
@@ -225,7 +235,6 @@ if ($values != null || $values != "") {
echo json_encode(array( echo json_encode(array(
'device' => [ 'device' => [
'hostname' => $device['name'], 'hostname' => $device['name'],
'sleepTime' => $device['sleep_time'],
'ipAddress' => $device['ip_address'], 'ipAddress' => $device['ip_address'],
'subnet' => $device['subnet'], 'subnet' => $device['subnet'],
'gateway' => $device['gateway'], 'gateway' => $device['gateway'],

2
app/views/Ajax.php
View File

@@ -129,7 +129,7 @@ class Ajax extends Template
$notificationData = [ $notificationData = [
'title' => 'Alert', 'title' => 'Alert',
'body' => 'test notification', 'body' => 'test notification',
'icon' => '', 'icon' => BASEDIR . '/app/templates/images/icon-192x192.png',
]; ];
$notificationMng = new NotificationManager; $notificationMng = new NotificationManager;
$subscribers = $notificationMng::getSubscription(); $subscribers = $notificationMng::getSubscription();