From 40b91b6de25cccfd244746d1541c6f8e981430ab Mon Sep 17 00:00:00 2001
From: David <79108364+Phpvarious@users.noreply.github.com>
Date: Fri, 15 May 2026 00:38:20 +0200
Subject: [PATCH 6/9] Migrate logicalId for cmdForSpecificChannel
---
plugin_info/install.php | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/plugin_info/install.php b/plugin_info/install.php
index 30f5a7c0..30f330cd 100755
--- a/plugin_info/install.php
+++ b/plugin_info/install.php
@@ -43,6 +43,7 @@ function mobile_update()
}
$mobiles = eqLogic::byType('mobile');
+ $migrateLogicalId = array('phoneBattery'=>'battery::level', 'phoneCharging'=>'battery::isCharging');
foreach ($mobiles as $mobile) {
/* Delete mobile with bad logicalId */
if ($mobile->getLogicalId() == null || $mobile->getLogicalId() == "") {
@@ -60,6 +61,16 @@ function mobile_update()
$mobile->setConfiguration('menuCustomArray', $menuCustomArray);
}
$mobile->save();
+ /* Migrate logicalId for cmdForSpecificChannel */
+ if ($mobile->getConfiguration('appVersion', 1) == '1') continue;
+ foreach ($migrateLogicalId as $oldLogical => $newLogical) {
+ $cmd = cmd::byEqLogicIdAndLogicalId($mobile->getId(), $oldLogical);
+ if (is_object($cmd)) {
+ log::add('mobile', 'debug', '| Migrate logicalId ' . $oldLogical . ' to ' . $newLogical . ' for the command ' . $cmd->getHumanName());
+ $cmd->setLogicalId($newLogical);
+ $cmd->save();
+ }
+ }
}
/* Delete old "menuCustom_" and "NoCut" save into config of plugin */
From fcc07272d25a435d90a863d773b58f5423f56c01 Mon Sep 17 00:00:00 2001
From: David <79108364+Phpvarious@users.noreply.github.com>
Date: Fri, 15 May 2026 00:41:31 +0200
Subject: [PATCH 7/9] Update changelog.md
---
docs/fr_FR/changelog.md | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/docs/fr_FR/changelog.md b/docs/fr_FR/changelog.md
index 307e5c4e..d1d82c4d 100755
--- a/docs/fr_FR/changelog.md
+++ b/docs/fr_FR/changelog.md
@@ -6,8 +6,20 @@
# xx/07/2025
-- Intégration Application V1
+- Intégration Application V1
+- Exclusion du répertoire "data" des sauvegardes
+- Meilleure gestion des commandes spécifiques
+## Notifications
+
+## Notifications
+
+- Ajout d'un onglet pour manager les notifications
+
+## Géofencing
+
+- Correction : un même événement ENTER/EXIT n'est plus traité plusieurs fois en cas d'envoi dupliqué par l'app
+- Correction : les événements géofence trop anciens (> 30 min) sont ignorés pour éviter de déclencher des scénarios hors contexte
# 08/07/2025
@@ -21,26 +33,14 @@
- Ajout pour Max 8 Icones sur le menuCustom
-
# 24/04/2025
- Ajout Commande Notifications Silencieuses pour Builds : IOS 491 et Android 875
-
# 11/04/2025
- Ajout paramètre Envoi NFC Direct au plugin après lecture
-# xx/08/2024
-
-> **App V1**
->
-> Attention, à partir de cette version, l'appV1 n'est plus prise en charge.
-> Il sera toujours possible d'accéder à votre équipement, pour éventuellement, remplacer vos commandes de géolocalisation et de notification.
-
-- Suppression des fichiers concernant l'AppV1.
-- Nettoyage des infos stockées en BDD (config).
-
# 20/08/2024
- Déplacement des infos notifications dans l'onglet "Mobile"
From 90b5ab1b7d037d192da02748562e9a1cb51a0630 Mon Sep 17 00:00:00 2001
From: David <79108364+Phpvarious@users.noreply.github.com>
Date: Fri, 15 May 2026 00:42:22 +0200
Subject: [PATCH 8/9] Update changelog.md
---
docs/fr_FR/changelog.md | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/docs/fr_FR/changelog.md b/docs/fr_FR/changelog.md
index d1d82c4d..19012ee7 100755
--- a/docs/fr_FR/changelog.md
+++ b/docs/fr_FR/changelog.md
@@ -10,13 +10,11 @@
- Exclusion du répertoire "data" des sauvegardes
- Meilleure gestion des commandes spécifiques
-## Notifications
-
-## Notifications
+### Notifications
- Ajout d'un onglet pour manager les notifications
-## Géofencing
+### Géofencing
- Correction : un même événement ENTER/EXIT n'est plus traité plusieurs fois en cas d'envoi dupliqué par l'app
- Correction : les événements géofence trop anciens (> 30 min) sont ignorés pour éviter de déclencher des scénarios hors contexte
From 9f8d16c9f82c2fcc4f71021c1f1eea9c65fd8e43 Mon Sep 17 00:00:00 2001
From: David <79108364+Phpvarious@users.noreply.github.com>
Date: Fri, 15 May 2026 00:46:41 +0200
Subject: [PATCH 9/9] Update mobile.class.php
---
core/class/mobile.class.php | 317 +++++++++++++++++++-----------------
1 file changed, 172 insertions(+), 145 deletions(-)
diff --git a/core/class/mobile.class.php b/core/class/mobile.class.php
index ec5b8293..88d4aef2 100755
--- a/core/class/mobile.class.php
+++ b/core/class/mobile.class.php
@@ -145,7 +145,7 @@ public static function pluginToSend()
public static function makeTemplateJson()
{
- log::add(__CLASS__, 'debug', '┌─────▶︎ makeTemplateJson ───────────────');
+ log::add(__CLASS__, 'debug', '┌──────────▶︎ makeTemplateJson ──────────────');
$pluginToSend = mobile::pluginToSend();
$discover_eqLogic = mobile::discovery_eqLogic($pluginToSend);
$sync_new = mobile::change_cmdAndeqLogic(mobile::discovery_cmd($pluginToSend, $discover_eqLogic), $discover_eqLogic);
@@ -619,14 +619,14 @@ public static function SaveGeoloc($geoloc)
public static function delGeoloc($geoloc)
{
- log::add('mobile', 'debug', '|┌──:fg-success: Lancement DEL du mobile- V1 :/fg:──');
- log::add('mobile', 'debug', '| Mobile ' . $geoloc['Iq'] . ' pour ' . $geoloc['id']);
+ log::add('mobile', 'debug', '|┌──:fg-success: Lancement DEL du mobile - V1 :/fg:──');
+ log::add('mobile', 'debug', '|| Mobile ' . $geoloc['Iq'] . ' pour ' . $geoloc['id']);
$eqLogicMobile = eqLogic::byLogicalId($geoloc['Iq'], 'mobile');
$cmdgeoloc = cmd::byEqLogicIdAndLogicalId($eqLogicMobile->getId(), 'geoId_' . $geoloc['id']);
if (isset($cmdgeoloc)) {
$cmdgeoloc->remove();
}
- log::add('mobile', 'debug', '||└────────────────────');
+ log::add('mobile', 'debug', '|└──────────────────────────────────');
}
@@ -634,7 +634,7 @@ public static function EventGeoloc($geoloc)
{
/******************** APP V1 *************************/
log::add('mobile', 'debug', '|┌──:fg-success: jsonPublish :/fg:──');
- log::add('mobile', 'debug', '| Geoloc Event du mobile ─▶︎ ' . $geoloc['Iq'] . ' pour ' . $geoloc['id']);
+ log::add('mobile', 'debug', '|| Geoloc Event du mobile ─▶︎ ' . $geoloc['Iq'] . ' pour ' . $geoloc['id']);
$eqLogicMobile = eqLogic::byLogicalId($geoloc['Iq'], 'mobile');
$cmdgeoloc = cmd::byEqLogicIdAndLogicalId($eqLogicMobile->getId(), 'geoId_' . $geoloc['id']);
$cmdgeolocv2 = cmd::byEqLogicIdAndLogicalId($eqLogicMobile->getId(), 'geoloc_' . $geoloc['id']);
@@ -656,7 +656,7 @@ public static function EventGeoloc($geoloc)
log::add('mobile', 'debug', '| Valeur identique ─▶︎ ' . $geoloc['value'] . ' / ' . $cmdgeolocv2->execCmd());
}
}
- log::add('mobile', 'debug', '|└────────────────────');
+ log::add('mobile', 'debug', '|└─────────────────');
}
@@ -695,7 +695,7 @@ public static function jsonPublish($os, $titre, $message, $type, $idNotif, $answ
{
log::add('mobile', 'debug', '||┌──:fg-success: jsonPublish :/fg:──');
if ($silent) log::add('mobile', 'debug', '||| Silent notification');
- if (isset($Iq)) log::add('mobile', 'debug', '||| IQ for jsonPublish > ' . $Iq);
+ if (isset($Iq)) log::add('mobile', 'debug', '||| IQ for jsonPublish ─▶︎ ' . $Iq);
$dateNotif = date("Y-m-d H:i:s");
$newDate = date("Y-m-d");
@@ -934,8 +934,8 @@ public static function jsonPublish($os, $titre, $message, $type, $idNotif, $answ
}
}
}
- log::add('mobile', 'debug', '||| [INFO] JSON publish > ' . json_encode($publish));
- log::add('mobile', 'debug', '||└────────────────────');
+ log::add('mobile', 'debug', '||| [INFO] JSON publish ─▶︎ ' . json_encode($publish));
+ log::add('mobile', 'debug', '||└─────────────────');
return $publish;
}
@@ -1009,7 +1009,7 @@ public static function notification($arn, $os, $titre, $message, $type, $idNotif
//} else {
//log::add('mobile', 'error', __("Échec de l'envoi de notification : la version 1 de l'app n'est plus prise en charge !", __FILE__));
//}
- log::add('mobile', 'debug', '|└────────────────────');
+ log::add('mobile', 'debug', '|└─────────────────────────────');
}
/**
@@ -1060,20 +1060,42 @@ public static function removeNotificationV2($_iq, $_id)
*/
public static function createCmdGeoLocV2($Iq, $geolocs)
{
- log::add('mobile', 'debug', '|┌──:fg-success: GeoLocV2 :/fg:──');
+ log::add('mobile', 'debug', '|┌──:fg-success: createCmdGeoLocV2 :/fg:──');
$mobile = eqLogic::byLogicalId($Iq, 'mobile');
if (is_object($mobile)) {
- log::add('mobile', 'debug', '|| OK Mobile existant > ' . $mobile->getName());
- log::add('mobile', 'debug', '|| [INFO] GEOLOCS > ' . $geolocs);
+ log::add('mobile', 'debug', '|| OK Mobile existant ─▶︎ ' . $mobile->getName());
+ log::add('mobile', 'debug', '|| [INFO] GEOLOCS ─▶︎ ' . $geolocs);
$order = count($mobile->getCmd());
$noExistCmd = 0;
$decodedGeolocs = json_decode($geolocs, true);
foreach ($decodedGeolocs as $index => $geoloc) {
if (!isset($geoloc['name'])) continue;
- log::add('mobile', 'debug', '|| geoloc_' . $index . ' > ' . $geoloc['name']);
+ log::add('mobile', 'debug', '|| geoloc_' . $index . ' ─▶︎ ' . $geoloc['name']);
$cmd = cmd::byEqLogicIdAndLogicalId($mobile->getId(), 'geoloc_' . $index);
$logicalId = 'geoloc_' . $index;
+ /* PR Migrate geoloc logicalId by name
+ When creating geoloc_X commands, add a migration step to handle cases where the command UUID/logicalId changed:
+ if no command is found by the expected logicalId, iterate existing commands to find one with a geoloc_N pattern and the same name,
+ rename its logicalId to the expected value, save it and reuse it. This prevents duplicate geoloc commands after UUID/ID changes.
+ */
+ if (!is_object($cmd)) {
+ if (!preg_match('/^geoloc_\d+$/', $logicalId)) {
+ foreach ($mobile->getCmd() as $existing) {
+ if (
+ preg_match('/^geoloc_\d+$/', $existing->getLogicalId())
+ && $existing->getName() === $geoloc['name']
+ ) {
+ log::add('mobile', 'debug', '|| Migration UUID : renommage ' . $existing->getLogicalId() . ' ─▶︎ ' . $logicalId);
+ $existing->setLogicalId($logicalId);
+ $existing->save();
+ $cmd = $existing;
+ break;
+ }
+ }
+ }
+ }
+ /* End PR Migrate */
if (!is_object($cmd)) {
$noExistCmd = 1;
$cmd = new mobileCmd();
@@ -1088,7 +1110,7 @@ public static function createCmdGeoLocV2($Iq, $geolocs)
$cmd->setIsHistorized(1);
$cmd->setOrder($order);
$order++;
- log::add('mobile', 'debug', '|| Ajout geofencing > ' . $geoloc['name']);
+ log::add('mobile', 'debug', '|| Ajout geofencing ─▶︎ ' . $geoloc['name']);
}
$cmd->setName($geoloc['name']);
$cmd->setType('info');
@@ -1099,14 +1121,14 @@ public static function createCmdGeoLocV2($Iq, $geolocs)
if ($cmd->getChanged() === true) $cmd->save();
if ($noExistCmd == 1) {
$mobile->checkAndUpdateCmd($logicalId, $geoloc['value']);
- log::add('mobile', 'debug', '|| Valeur enregistrée > ' . $geoloc['value']);
+ log::add('mobile', 'debug', '|| Valeur enregistrée ─▶︎ ' . $geoloc['value']);
}
$noExistCmd = 0;
}
} else {
log::add('mobile', 'debug', '| [ERROR] Mobile inexistant !');
}
- log::add('mobile', 'debug', '|└────────────────────');
+ log::add('mobile', 'debug', '|└──────────────');
}
/**
@@ -1381,7 +1403,7 @@ public function configMenuCustom()
//$objectId = isset($menuCustomArray[$i]['selectNameMenu']) ? $menuCustomArray[$i]['selectNameMenu'] : '';
$isActive = true;
//$webviewUrl = 'd';
- //if (!empty($objectId)) log::add('mobile', 'debug', '|| - objectId > ' . $objectId);
+ //if (!empty($objectId)) log::add('mobile', 'debug', '|| - objectId ─▶︎ ' . $objectId);
// GENERATE URLS FOR MENU CUSTOM
//$result = self::generateTypeObject($objectId, $i, $webviewUrl, $pluginPanelMobile);
@@ -1414,7 +1436,7 @@ public function configMenuCustom()
$j++;
$count++;
}
- log::add('mobile', 'debug', '|| [INFO] arrayElements > ' . json_encode($arrayElements));
+ log::add('mobile', 'debug', '|| [INFO] arrayElements ─▶︎ ' . json_encode($arrayElements));
log::add('mobile', 'debug', '|└────────────────────');
return $arrayElements;
}
@@ -1505,129 +1527,135 @@ public function cmdForSpecificChannel($params = array(), $_trigger = 'location')
if (isset($params[$_trigger])) {
$order = count($this->getCmd());
$getDeviceInformations = (isset($params[$_trigger]['extras']) && isset($params[$_trigger]['extras']['method']) && $params[$_trigger]['extras']['method'] == 'getDeviceInformations');
- // Battery
- if (isset($params[$_trigger]['battery'])) {
- // level
- if (isset($params[$_trigger]['battery']['level'])) {
- if ($getDeviceInformations) {
- $cmd = $this->getCmd(null, 'phoneBattery');
- if (!is_object($cmd)) {
- $cmd = new mobileCmd();
- $cmd->setLogicalId('phoneBattery');
- $cmd->setName(__('Batterie du téléphone', __FILE__));
- $cmd->setDisplay('icon', '');
- $cmd->setDisplay('showIconAndNamedashboard', 1);
- $cmd->setDisplay('showIconAndNamemobile', 1);
- $cmd->setDisplay('forceReturnLineAfter', 1);
- $cmd->setConfiguration('historizeRound', 2);
- $cmd->setConfiguration('minValue', 0);
- $cmd->setConfiguration('maxValue', 100);
- $cmd->setUnite('%');
- $cmd->setIsVisible(0);
- $cmd->setOrder($order);
- $order++;
- log::add('mobile', 'debug', '| Création de la commande Batterie du téléphone'); //PR
- }
- $cmd->setEqLogic_id($this->getId());
- $cmd->setType('info');
- $cmd->setConfiguration('calculValueOffset', '#value# * 100');
- $cmd->setSubType('numeric');
- if ($cmd->getChanged() === true) $cmd->save();
- }
- if ($params[$_trigger]['battery']['level'] != -1) {
- if ($this->checkAndUpdateCmd('phoneBattery', $params[$_trigger]['battery']['level'])) {
- log::add('mobile', 'debug', '| ' . (__('Batterie du téléphone', __FILE__)) . ' = ' . $params[$_trigger]['battery']['level'] * 100 . '%');
+ $eventAge = time() - intval(strtotime($params[$_trigger]['timestamp']));
+ if ($eventAge > 1800) {
+ log::add('mobile', 'debug', '| SKIP stale specific event (' . round($eventAge / 60) . 'min) ');
+ } else {
+ log::add('mobile', 'debug', '| eventAge = ' . $eventAge . ' s');
+ // Battery
+ if (isset($params[$_trigger]['battery'])) {
+ // level
+ if (isset($params[$_trigger]['battery']['level'])) {
+ if ($getDeviceInformations) {
+ $cmd = $this->getCmd(null, 'battery::level');
+ if (!is_object($cmd)) {
+ $cmd = new mobileCmd();
+ $cmd->setLogicalId('battery::level');
+ $cmd->setName(__('Batterie du téléphone', __FILE__));
+ $cmd->setDisplay('icon', '');
+ $cmd->setDisplay('showIconAndNamedashboard', 1);
+ $cmd->setDisplay('showIconAndNamemobile', 1);
+ $cmd->setDisplay('forceReturnLineAfter', 1);
+ $cmd->setConfiguration('historizeRound', 2);
+ $cmd->setConfiguration('minValue', 0);
+ $cmd->setConfiguration('maxValue', 100);
+ $cmd->setUnite('%');
+ $cmd->setIsVisible(0);
+ $cmd->setOrder($order);
+ $order++;
+ log::add('mobile', 'debug', '| Création de la commande Batterie du téléphone');
+ }
+ $cmd->setEqLogic_id($this->getId());
+ $cmd->setType('info');
+ $cmd->setConfiguration('calculValueOffset', '#value# * 100');
+ $cmd->setSubType('numeric');
+ if ($cmd->getChanged() === true) $cmd->save();
+ }
+ if ($params[$_trigger]['battery']['level'] != -1) {
+ if ($this->checkAndUpdateCmd('battery::level', $params[$_trigger]['battery']['level'])) {
+ log::add('mobile', 'debug', '| ' . (__('Batterie du téléphone', __FILE__)) . ' = ' . $params[$_trigger]['battery']['level'] * 100 . '%');
+ }
+ } else {
+ log::add('mobile', 'debug', '| ' . (__('Batterie du téléphone', __FILE__)) . ' : ' . 'Absence de donnée ─▶︎ ' . $params[$_trigger]['battery']['level']);
}
- } else {
- log::add('mobile', 'debug', '| ' . (__('Batterie du téléphone', __FILE__)) . ' : ' . 'Absence de donnée ─▶︎ ' . $params[$_trigger]['battery']['level']);
}
- }
- // charging
- if (isset($params[$_trigger]['battery']['is_charging'])) {
- if ($getDeviceInformations) {
- $cmd = $this->getCmd(null, 'phoneCharging');
- if (!is_object($cmd)) {
- $cmd = new mobileCmd();
- $cmd->setLogicalId('phoneCharging');
- $cmd->setName(__('En charge', __FILE__));
- $cmd->setDisplay('icon', '');
- $cmd->setDisplay('showIconAndNamedashboard', 1);
- $cmd->setDisplay('showIconAndNamemobile', 1);
- $cmd->setDisplay('forceReturnLineAfter', 1);
- $cmd->setTemplate('dashboard', 'core::line');
- $cmd->setTemplate('mobile', 'core::line');
- $cmd->setIsVisible(0);
- $cmd->setOrder($order);
- $order++;
- log::add('mobile', 'debug', '| ' . __('Création de la commande', __FILE__) . ' > ' . __('En charge', __FILE__)); //PR
+ // charging
+ if (isset($params[$_trigger]['battery']['is_charging'])) {
+ if ($getDeviceInformations) {
+ $cmd = $this->getCmd(null, 'battery::isCharging');
+ if (!is_object($cmd)) {
+ $cmd = new mobileCmd();
+ $cmd->setLogicalId('battery::isCharging');
+ $cmd->setName(__('En charge', __FILE__));
+ $cmd->setDisplay('icon', '');
+ $cmd->setDisplay('showIconAndNamedashboard', 1);
+ $cmd->setDisplay('showIconAndNamemobile', 1);
+ $cmd->setDisplay('forceReturnLineAfter', 1);
+ $cmd->setTemplate('dashboard', 'core::line');
+ $cmd->setTemplate('mobile', 'core::line');
+ $cmd->setIsVisible(0);
+ $cmd->setOrder($order);
+ $order++;
+ log::add('mobile', 'debug', '| ' . __('Création de la commande', __FILE__) . ' > ' . __('En charge', __FILE__));
+ }
+ $cmd->setEqLogic_id($this->getId());
+ $cmd->setType('info');
+ $cmd->setSubType('binary');
+ if ($cmd->getChanged() === true) $cmd->save();
}
- $cmd->setEqLogic_id($this->getId());
- $cmd->setType('info');
- $cmd->setSubType('binary');
- if ($cmd->getChanged() === true) $cmd->save();
- }
- if ($this->checkAndUpdateCmd('phoneCharging', intval($params[$_trigger]['battery']['is_charging']))) {
- log::add('mobile', 'debug', '| ' . (__('En charge', __FILE__)) . ' = ' . intval($params[$_trigger]['battery']['is_charging']));
- }
- }
- }
- // coords
- if (isset($params[$_trigger]['coords'])) {
- if (isset($params[$_trigger]['coords']['latitude']) && isset($params[$_trigger]['coords']['longitude'])) {
- if ($getDeviceInformations) {
- $cmd = $this->getCmd(null, 'coords');
- if (!is_object($cmd)) {
- $cmd = new mobileCmd();
- $cmd->setLogicalId('coords');
- $cmd->setName(__('Coordonnées', __FILE__));
- $cmd->setDisplay('icon', '');
- $cmd->setDisplay('showIconAndNamedashboard', 1);
- $cmd->setDisplay('showIconAndNamemobile', 1);
- $cmd->setDisplay('forceReturnLineAfter', 1);
- $cmd->setTemplate('dashboard', 'core::line');
- $cmd->setTemplate('mobile', 'core::line');
- $cmd->setIsVisible(0);
- $cmd->setOrder($order);
- $order++;
- log::add('mobile', 'debug', '| ' . __('Création de la commande', __FILE__) . ' > ' . __('Coordonnées', __FILE__)); //PR
+ if ($this->checkAndUpdateCmd('battery::isCharging', intval($params[$_trigger]['battery']['is_charging']))) {
+ log::add('mobile', 'debug', '| ' . (__('En charge', __FILE__)) . ' = ' . intval($params[$_trigger]['battery']['is_charging']));
}
- $cmd->setEqLogic_id($this->getId());
- $cmd->setType('info');
- $cmd->setSubType('string');
- if ($cmd->getChanged() === true) $cmd->save();
- }
- $coord = $params[$_trigger]['coords']['latitude'] . ',' . $params[$_trigger]['coords']['longitude'];
- if ($this->checkAndUpdateCmd('coords', $coord)) {
- log::add('mobile', 'debug', '| ' . (__('Coordonnées', __FILE__)) . ' = ' . $coord);
}
-
}
- if (isset($params[$_trigger]['coords']['altitude'])) {
- if ($getDeviceInformations) {
- $cmd = $this->getCmd(null, 'altitude');
- if (!is_object($cmd)) {
- $cmd = new mobileCmd();
- $cmd->setLogicalId('altitude');
- $cmd->setName(__('Altitude', __FILE__));
- $cmd->setDisplay('icon', '');
- $cmd->setDisplay('showIconAndNamedashboard', 1);
- $cmd->setDisplay('showIconAndNamemobile', 1);
- $cmd->setDisplay('forceReturnLineAfter', 1);
- $cmd->setTemplate('dashboard', 'core::line');
- $cmd->setTemplate('mobile', 'core::line');
- $cmd->setIsVisible(0);
- $cmd->setUnite('m');
- $cmd->setOrder($order);
- $order++;
- log::add('mobile', 'debug', '| ' . __('Création de la commande', __FILE__) . ' > ' . __('Altitude', __FILE__)); //PR
+ // coords
+ if (isset($params[$_trigger]['coords'])) {
+ if (isset($params[$_trigger]['coords']['latitude']) && isset($params[$_trigger]['coords']['longitude'])) {
+ if ($getDeviceInformations) {
+ $cmd = $this->getCmd(null, 'coords');
+ if (!is_object($cmd)) {
+ $cmd = new mobileCmd();
+ $cmd->setLogicalId('coords');
+ $cmd->setName(__('Coordonnées', __FILE__));
+ $cmd->setDisplay('icon', '');
+ $cmd->setDisplay('showIconAndNamedashboard', 1);
+ $cmd->setDisplay('showIconAndNamemobile', 1);
+ $cmd->setDisplay('forceReturnLineAfter', 1);
+ $cmd->setTemplate('dashboard', 'core::line');
+ $cmd->setTemplate('mobile', 'core::line');
+ $cmd->setIsVisible(0);
+ $cmd->setOrder($order);
+ $order++;
+ log::add('mobile', 'debug', '| ' . __('Création de la commande', __FILE__) . ' > ' . __('Coordonnées', __FILE__));
+ }
+ $cmd->setEqLogic_id($this->getId());
+ $cmd->setType('info');
+ $cmd->setSubType('string');
+ if ($cmd->getChanged() === true) $cmd->save();
+ }
+ $coord = $params[$_trigger]['coords']['latitude'] . ',' . $params[$_trigger]['coords']['longitude'];
+ if ($this->checkAndUpdateCmd('coords', $coord)) {
+ log::add('mobile', 'debug', '| ' . (__('Coordonnées', __FILE__)) . ' = ' . $coord);
}
- $cmd->setEqLogic_id($this->getId());
- $cmd->setType('info');
- $cmd->setSubType('string');
- if ($cmd->getChanged() === true) $cmd->save();
+
}
- if ($this->checkAndUpdateCmd('altitude', $params[$_trigger]['coords']['altitude'])) {
- log::add('mobile', 'debug', '| ' . (__('Altitude', __FILE__)) . ' = ' . $params[$_trigger]['coords']['altitude'] . 'm');
+ if (isset($params[$_trigger]['coords']['altitude'])) {
+ if ($getDeviceInformations) {
+ $cmd = $this->getCmd(null, 'altitude');
+ if (!is_object($cmd)) {
+ $cmd = new mobileCmd();
+ $cmd->setLogicalId('altitude');
+ $cmd->setName(__('Altitude', __FILE__));
+ $cmd->setDisplay('icon', '');
+ $cmd->setDisplay('showIconAndNamedashboard', 1);
+ $cmd->setDisplay('showIconAndNamemobile', 1);
+ $cmd->setDisplay('forceReturnLineAfter', 1);
+ $cmd->setTemplate('dashboard', 'core::line');
+ $cmd->setTemplate('mobile', 'core::line');
+ $cmd->setIsVisible(0);
+ $cmd->setUnite('m');
+ $cmd->setOrder($order);
+ $order++;
+ log::add('mobile', 'debug', '| ' . __('Création de la commande', __FILE__) . ' > ' . __('Altitude', __FILE__));
+ }
+ $cmd->setEqLogic_id($this->getId());
+ $cmd->setType('info');
+ $cmd->setSubType('string');
+ if ($cmd->getChanged() === true) $cmd->save();
+ }
+ if ($this->checkAndUpdateCmd('altitude', $params[$_trigger]['coords']['altitude'])) {
+ log::add('mobile', 'debug', '| ' . (__('Altitude', __FILE__)) . ' = ' . $params[$_trigger]['coords']['altitude'] . 'm');
+ }
}
}
}
@@ -1657,7 +1685,7 @@ public function cleaningNotifications()
if (!unlink($image)) {
log::add('mobile', 'error', 'Erreur lors de la suppression de : ' . $image);
} else {
- log::add('mobile', 'debug', '| ─▶︎ :fg-danger:suppression image:/fg: > ' . $image);
+ log::add('mobile', 'debug', '| ─▶︎ :fg-danger:suppression image:/fg: ─▶︎ ' . $image);
}
}
}
@@ -1679,7 +1707,7 @@ public function cleaningNotifications()
foreach ($notifications as $id => $value) {
$notificationDate = strtotime($value['data']['date']);
if (($currentTime - $notificationDate) > $retentionSeconds) {
- log::add('mobile', 'debug', '| ─▶︎ :fg-danger:suppression notification:/fg: > N°' . $id);
+ log::add('mobile', 'debug', '| ─▶︎ :fg-danger:suppression notification:/fg: ─▶︎ N°' . $id);
unset($notifications[$id]);
$notificationsModified = true;
}
@@ -1901,10 +1929,10 @@ public static function fileInMessage($data)
if (json_last_error() === JSON_ERROR_NONE) {
log::add('mobile', 'DEBUG', '|| [INFO] Message : ' . $decodedMessage);
} else {
- log::add('mobile', 'DEBUG', '|| [INFO] Message : ' . $result['message']);
+ log::add('mobile', 'DEBUG', '|| [INFO] Message : ' . str_replace(["\r", "\n"], "", $result['message']));
}
if (array_key_exists('file', $result)) {
- log::add('mobile', 'debug', '|| file > ' . $result['file']);
+ log::add('mobile', 'debug', '|| file ─▶︎ ' . $result['file']);
log::add('mobile', 'debug', '|└────────────────────');
return $result;
} else {
@@ -1982,7 +2010,7 @@ public function execute($_options = array())
log::add('mobile', 'debug', '| file detected ' . json_encode($file));
}
log::add('mobile', 'DEBUG', '| [INFO] Title : ' . $_options['title']);
- log::add('mobile', 'DEBUG', '| [INFO] Message : ' . $_options['message']);
+ log::add('mobile', 'DEBUG', '| [INFO] Message : ' . str_replace(["\r", "\n"], "", $_options['message']));
if ($eqLogic->getConfiguration('type_mobile') == 'android') $_options['message'] = nl2br($_options['message']);
$answer = (isset($_options['answer']) && $_options['answer']) ? join(';', $_options['answer']) : null;
$askVariable = isset($_options['variable']) ? $_options['variable'] : null;
@@ -1990,7 +2018,6 @@ public function execute($_options = array())
if ($askType == 'ask_Text') $_options['title'] = $defaultName;
$timeout = isset($_options['timeout']) && $_options['timeout'] ? $_options['timeout'] : 'nok';
$optionsNotif['askVariable'] = $askVariable;
- //log::add('mobile', 'debug', '|-----------------------------------');
log::add('mobile', 'debug', '| Commande de notification : ' . $askType);
if (($eqLogic->getConfiguration('notificationArn', null) != null || $eqLogic->getConfiguration('notificationRegistrationToken', null) != null) && $eqLogic->getConfiguration('type_mobile', null) != null) {
$idNotif = $eqLogic->getConfiguration('idNotif', 0);
@@ -1998,8 +2025,8 @@ public function execute($_options = array())
$eqLogic->setConfiguration('idNotif', $idNotif);
$eqLogic->save();
- log::add('mobile', 'debug', '| [INFO] Notif > ' . json_encode($_options));
- log::add('mobile', 'debug', '| eqLogic > ' . $eqLogic->getId() . ' | LogicalId > ' . $this->getLogicalId() . ' | idNotif > ' . $idNotif);
+ log::add('mobile', 'debug', '| [INFO] Notif ─▶︎ ' . json_encode($_options));
+ log::add('mobile', 'debug', '| eqLogic ─▶︎ ' . $eqLogic->getId() . ' | LogicalId ─▶︎ ' . $this->getLogicalId() . ' | idNotif ─▶︎ ' . $idNotif);
if (isset($options['file'])) {
//log::add('mobile', 'debug', '| [NOTICE] FILE');
//unset($data['file']);
@@ -2013,7 +2040,7 @@ public function execute($_options = array())
continue;
}
$ext = pathinfo($file, PATHINFO_EXTENSION);
- log::add('mobile', 'debug', '| ' . $ext . ' pour > ' . $file);
+ log::add('mobile', 'debug', '| ' . $ext . ' pour ─▶︎ ' . $file);
if (in_array($ext, array('gif', 'jpeg', 'jpg', 'png'))) {
log::add('mobile', 'debug', '| type photo !');
if ($ext == "gif") {
@@ -2033,7 +2060,7 @@ public function execute($_options = array())
$nameFile = $Iq . '__' . base64_encode($file) . '.' . $ext;
$path = dirname(__FILE__) . '/../../data/images';
$newfile = $path . '/' . $nameFile;
- log::add('mobile', 'debug', '| copie sur > ' . $newfile);
+ log::add('mobile', 'debug', '| copie sur ─▶︎ ' . $newfile);
if (!file_exists($path)) {
mkdir($path);
}
@@ -2042,7 +2069,7 @@ public function execute($_options = array())
}
$keyFile = md5_file($newfile);
$url .= 'key=' . $keyFile . '&name=' . $nameFile;
- log::add('mobile', 'debug', '| url > ' . $url);
+ log::add('mobile', 'debug', '| url ─▶︎ ' . $url);
mobile::notification($eqLogic->getConfiguration('notificationArn', null), $eqLogic->getConfiguration('type_mobile', null), $_options['title'], $_options['message'], $askType, $idNotif, $answer, $timeout, $eqLogic->getConfiguration('notificationRegistrationToken', null), $url, $eqLogic->getConfiguration('appVersion', 1), $optionsNotif, $critical, $eqLogic->getLogicalId(), $specific, $silent);
} else {
mobile::notification($eqLogic->getConfiguration('notificationArn', null), $eqLogic->getConfiguration('type_mobile', null), $_options['title'], $_options['message'], $askType, $idNotif, $answer, $timeout, $eqLogic->getConfiguration('notificationRegistrationToken', null), null, $eqLogic->getConfiguration('appVersion', 1), $optionsNotif, $critical, $eqLogic->getLogicalId(), $specific, $silent);