From a4ea62913e0cfa45a4b15259f20549f99664ea79 Mon Sep 17 00:00:00 2001 From: JEALG Date: Sat, 13 Jan 2024 11:12:39 +0100 Subject: [PATCH 1/4] Ajout lien community --- desktop/php/camera.php | 395 +++++++++++++++++++++-------------------- 1 file changed, 202 insertions(+), 193 deletions(-) diff --git a/desktop/php/camera.php b/desktop/php/camera.php index 14d74ba..9b476bf 100644 --- a/desktop/php/camera.php +++ b/desktop/php/camera.php @@ -31,6 +31,16 @@
{{Santé}} + ='); + if ($displayInfo) { + echo '
'; + echo '
'; + echo '{{Community}}'; + echo '
'; + } + ?> {{Mes caméras}} '; foreach ($eqLogics as $eqLogic) { $opacity = ($eqLogic->getIsEnable()) ? '' : 'disableCard'; - echo '
'; + echo '
'; if ($eqLogic->getConfiguration('device') != "" && camera::getImgFilePath($eqLogic->getConfiguration('device')) !== false) { - echo ''; - } - else { + echo ''; + } else { echo ''; } echo '
'; echo '' . $eqLogic->getHumanName(true, true) . ''; echo ''; @@ -237,208 +246,208 @@ -
+
-
- - {{Informations}} -
{{Si votre caméra n'est pas dans la liste vous pouvez trouver}} {{ici}} {{les informations de configuration pour pas mal de camera}}
-
- -
- + {{Informations}} +
{{Si votre caméra n'est pas dans la liste vous pouvez trouver}} {{ici}} {{les informations de configuration pour pas mal de camera}}
+
+ +
+ +
+
+
+
+ +
+ +
+
-
-
-
- -
- + + + +
+ +
+
+
+
+ {{Configuration}} +
+ +
+ +
-
-
- - - -
+
+ {{Miniature}} + + + + + + + + + + + + + + + + + + + + + + + + + +
{{Dashboard}}{{Mobile}}
+ {{Normal}} + + + + + + + + + + + + + + + + + + + + + + + + + +
{{Dashboard}}{{Mobile}}
+ + + -
-
-
-
- {{Configuration}} -
- -
- -
-
+

- {{Miniature}} - - - - - - - - - - - - - - - - - - - - - - - - - -
{{Dashboard}}{{Mobile}}
- {{Normal}} - + +
+ {{Vidéo}} +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ {{Supprimer}} +
+
+
+ + + +
+
+
+
+
+ +
+
+ + + + +
+
+
+
+ +
+
+ + + + +
+
+
+
+ +
+ + +
- - - + + + + + + - - - - - - - - - - - - - - -
{{Dashboard}}{{Mobile}}{{Id}}{{Nom}}{{Type}}{{Requête}}{{Options}}{{Action}}
-
- -
- -
-
-
-
- {{Vidéo}} -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- {{Supprimer}} -
-
-
-
-
- -
-
-
-
-
- -
-
- - - - -
-
-
-
- -
-
- - - - -
-
-
-
-
- - -
- {{Ajouter une commande}} -

- - - - - - - - - - - - - -
{{Id}}{{Nom}}{{Type}}{{Requête}}{{Options}}{{Action}}
-
- - + + - + \ No newline at end of file From 741d2cd8111246b3633a628375cd908e7c01978c Mon Sep 17 00:00:00 2001 From: JEALG Date: Sat, 13 Jan 2024 11:22:50 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Modale=20sant=C3=A9=20remplacement=20ic?= =?UTF-8?q?=C3=B4ne=20de=20l'=C3=A9quipement=20par=20image=20du=20device?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop/modal/health.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/desktop/modal/health.php b/desktop/modal/health.php index 93e1b6d..114c7a5 100644 --- a/desktop/modal/health.php +++ b/desktop/modal/health.php @@ -44,8 +44,8 @@ getIsEnable()) ? '' : 'disableCard'; - if (file_exists(dirname(__FILE__) . '/../../core/config/devices/' . $eqLogic->getConfiguration('device') . '.jpg')) { - $img = ''; + if ($eqLogic->getConfiguration('device') != "" && camera::getImgFilePath($eqLogic->getConfiguration('device')) !== false) { + $img = ''; } else { $img = ''; } @@ -75,12 +75,12 @@ } else { echo '' . $framerate . '/s'; } - - echo '' . $eqLogic->getConfiguration('refreshDelaySlow',1) . '/s'; - echo '' . $eqLogic->getConfiguration('refreshDelayFast',1) . '/s'; + + echo '' . $eqLogic->getConfiguration('refreshDelaySlow', 1) . '/s'; + echo '' . $eqLogic->getConfiguration('refreshDelayFast', 1) . '/s'; echo '' . $eqLogic->getConfiguration('maxReccordTime') . 's'; echo '' . $eqLogic->getConfiguration('createtime') . ''; } ?> - + \ No newline at end of file From 4e2ecea754fb89c9dbcd6cfaf8b3962cfc6d4910 Mon Sep 17 00:00:00 2001 From: JEALG Date: Sat, 13 Jan 2024 11:28:30 +0100 Subject: [PATCH 3/4] mise a jour config Freebox-freeboxcam --- core/config/devices/freebox/rocketcam.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/config/devices/freebox/rocketcam.json b/core/config/devices/freebox/rocketcam.json index 87f3a1d..520b648 100644 --- a/core/config/devices/freebox/rocketcam.json +++ b/core/config/devices/freebox/rocketcam.json @@ -2,8 +2,9 @@ "name" : "RocketCam", "manufacturer" : "Freebox", "configuration": { + "username" : "freeboxcam", "urlStream": "\/img\/snapshot.cgi?size=4&quality=1", - "cameraStreamAccessUrl" : "rtsp:\/\/#username#:#password#@#ip#\/img\/live", + "cameraStreamAccessUrl" : "http:\/\/#username#:#password#@#ip#\/img\/stream.m3u8", "protocole": "http" }, "commands": [] From 1a86c2e133fb1965e598a2e4b81a2dad6f1fa28e Mon Sep 17 00:00:00 2001 From: JEALG Date: Sun, 4 Feb 2024 08:28:37 +0100 Subject: [PATCH 4/4] Suppression lien community --- desktop/php/camera.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/desktop/php/camera.php b/desktop/php/camera.php index 9b476bf..d561de9 100644 --- a/desktop/php/camera.php +++ b/desktop/php/camera.php @@ -31,16 +31,6 @@
{{Santé}} - ='); - if ($displayInfo) { - echo '
'; - echo '
'; - echo '{{Community}}'; - echo '
'; - } - ?> {{Mes caméras}}