FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-28 11:01:59 +00:00
Code Issues Releases Wiki Activity

49_SSCam: refresh snapgallery device if snap was done by itself

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18460 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-01-30 20:22:19 +00:00
parent 72007ac19b
commit 405f8d2778
2 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 49_SSCam: refresh snapgallery device if snap was done by itself
- feature: 49_SSCam: V8.7.0, send recordings by email is possible now - feature: 49_SSCam: V8.7.0, send recordings by email is possible now
- bugfix: 10_MYSENSORS_DEVICE: fix enqueing method, Forum:#96518 - bugfix: 10_MYSENSORS_DEVICE: fix enqueing method, Forum:#96518
- new: 98_inotify: initial release - new: 98_inotify: initial release

17
fhem/FHEM/49_SSCam.pm
View File

@ -47,6 +47,7 @@ use Encode;
# Versions History intern # Versions History intern
our %SSCam_vNotesIntern = ( our %SSCam_vNotesIntern = (
"8.7.1" => "30.01.2019 fix refresh snapgallery device if snap was done by itself",
"8.7.0" => "27.01.2019 send recording by email ", "8.7.0" => "27.01.2019 send recording by email ",
"8.6.2" => "25.01.2019 fix version numbering ", "8.6.2" => "25.01.2019 fix version numbering ",
"8.6.1" => "21.01.2019 time format in readings and galleries depends from global language attribute, minor bug fixes ", "8.6.1" => "21.01.2019 time format in readings and galleries depends from global language attribute, minor bug fixes ",
@ -1626,7 +1627,7 @@ sub SSCam_FWsummaryFn ($$$$) {
my $imgrecendless = "<img src=\"$FW_ME/www/images/sscam/black_btn_RECSTART.png\">"; my $imgrecendless = "<img src=\"$FW_ME/www/images/sscam/black_btn_RECSTART.png\">";
my $cmdrecstop = "cmd=set $d off"; # Aufnahme Stop my $cmdrecstop = "cmd=set $d off"; # Aufnahme Stop
my $imgrecstop = "<img src=\"$FW_ME/www/images/sscam/black_btn_RECSTOP.png\">"; my $imgrecstop = "<img src=\"$FW_ME/www/images/sscam/black_btn_RECSTOP.png\">";
my $cmddosnap = "cmd=set $d snap STRM"; # Snapshot auslösen mit Kennzeichnung "by STRM-Device" my $cmddosnap = "cmd=set $d snap 1 2 STRM"; # Snapshot auslösen mit Kennzeichnung "by STRM-Device"
my $imgdosnap = "<img src=\"$FW_ME/www/images/sscam/black_btn_DOSNAP.png\">"; my $imgdosnap = "<img src=\"$FW_ME/www/images/sscam/black_btn_DOSNAP.png\">";
my $attr = AttrVal($d, "htmlattr", " "); my $attr = AttrVal($d, "htmlattr", " ");
@ -5208,6 +5209,16 @@ sub SSCam_camop_parse ($) {
$sendsnaps{$sn}{fileName} = $fileName; $sendsnaps{$sn}{fileName} = $fileName;
$sendsnaps{$sn}{".imageData"} = $imageData; $sendsnaps{$sn}{".imageData"} = $imageData;
Log3($name,4, "$name - Snap '$sn' added to send gallery hash: ID => $sendsnaps{$sn}{snapid}, File => $sendsnaps{$sn}{fileName}, Created => $sendsnaps{$sn}{createdTm}"); Log3($name,4, "$name - Snap '$sn' added to send gallery hash: ID => $sendsnaps{$sn}{snapid}, File => $sendsnaps{$sn}{fileName}, Created => $sendsnaps{$sn}{createdTm}");
# Snaphash um die neuen Snaps ergänzen wenn existent
if($hash->{HELPER}{".SNAPHASH"}{$sn}) {
$hash->{HELPER}{".SNAPHASH"}{$sn}{snapid} = $snapid;
$hash->{HELPER}{".SNAPHASH"}{$sn}{createdTm} = $createdTm;
$hash->{HELPER}{".SNAPHASH"}{$sn}{fileName} = $fileName;
$hash->{HELPER}{".SNAPHASH"}{$sn}{imageData} = $imageData;
Log3($name,4, "$name - Snap '$sn' added to gallery hash: ID => $snapid, File => $fileName, Created => $createdTm");
}
$sn += 1; $sn += 1;
$i += 1; $i += 1;
} }
@ -5234,7 +5245,6 @@ sub SSCam_camop_parse ($) {
my $fileName = $data->{data}{data}[$i]{fileName}; my $fileName = $data->{data}{data}[$i]{fileName};
my $imageData = $data->{data}{data}[$i]{imageData}; # Image data of snapshot in base64 format my $imageData = $data->{data}{data}[$i]{imageData}; # Image data of snapshot in base64 format
$allsnaps{$sn}{snapid} = $snapid;
my @t = split(" ", FmtDateTime($data->{data}{data}[$i]{createdTm})); my @t = split(" ", FmtDateTime($data->{data}{data}[$i]{createdTm}));
my @d = split("-", $t[0]); my @d = split("-", $t[0]);
if($lang eq "DE") { if($lang eq "DE") {
@ -5242,6 +5252,7 @@ sub SSCam_camop_parse ($) {
} else { } else {
$createdTm = "$d[0]-$d[1]-$d[2] / $t[1]"; $createdTm = "$d[0]-$d[1]-$d[2] / $t[1]";
} }
$allsnaps{$sn}{snapid} = $snapid;
$allsnaps{$sn}{createdTm} = $createdTm; $allsnaps{$sn}{createdTm} = $createdTm;
$allsnaps{$sn}{fileName} = $fileName; $allsnaps{$sn}{fileName} = $fileName;
$allsnaps{$sn}{imageData} = $imageData; $allsnaps{$sn}{imageData} = $imageData;
@ -7282,7 +7293,7 @@ sub SSCam_composegallery ($;$$) {
my $streamHash = $defs{$strmdev} if($strmdev); # Hash des SSCamSTRM-Devices my $streamHash = $defs{$strmdev} if($strmdev); # Hash des SSCamSTRM-Devices
delete $streamHash->{HELPER}{STREAM}; delete $streamHash->{HELPER}{STREAM};
my $cmddosnap = "cmd=set $name snap STRM"; # Snapshot auslösen mit Kennzeichnung "by STRM-Device" my $cmddosnap = "cmd=set $name snap 1 2 STRM"; # Snapshot auslösen mit Kennzeichnung "by STRM-Device"
my $imgdosnap = "<img src=\"$FW_ME/www/images/sscam/black_btn_DOSNAP.png\">"; my $imgdosnap = "<img src=\"$FW_ME/www/images/sscam/black_btn_DOSNAP.png\">";
my $ha = AttrVal($name, "snapGalleryHtmlAttr", AttrVal($name, "htmlattr", 'width="500" height="325"')); my $ha = AttrVal($name, "snapGalleryHtmlAttr", AttrVal($name, "htmlattr", 'width="500" height="325"'));