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

49_SSCam: contrib 7.7.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17943 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-12-09 21:04:11 +00:00
parent d487550f42
commit e759b6153f
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/contrib/DS_Starter/49_SSCam.pm
View File

@ -4229,9 +4229,9 @@ sub SSCam_camop ($) {
# öffnen streamwindow für die Instanz die "VIEWOPENROOM" oder Attr "room" aktuell geöffnet hat
if ($hash->{HELPER}{VIEWOPENROOM}) {
$room = $hash->{HELPER}{VIEWOPENROOM};
map {FW_directNotify("FILTER=room=$room", "#FHEMWEB:$_", "window.open ('$url','$winname','$attr')", "")} devspec2array("WEB.*");
map {FW_directNotify("FILTER=room=$room", "#FHEMWEB:$_", "window.open ('$url','$winname','$attr')", "")} devspec2array("TYPE=FHEMWEB");
} else {
map {FW_directNotify("#FHEMWEB:$_", "window.open ('$url','$winname','$attr')", "")} devspec2array("WEB.*");
map {FW_directNotify("#FHEMWEB:$_", "window.open ('$url','$winname','$attr')", "")} devspec2array("TYPE=FHEMWEB");
}
}

23
fhem/contrib/DS_Starter/49_SSCamSTRM.pm
View File

@ -73,6 +73,7 @@ sub SSCamSTRM_Initialize($) {
"htmlattr ".
"hideDisplayName:1,0 ".
"popupWindowSize ".
"popupStreamFW:$fwd ".
"popupStreamTo:OK,1,2,3,4,5,6,7,8,9,10,15,20,25,30,40,50,60 ".
$readingFnAttributes;
$hash->{FW_summaryFn} = "SSCamSTRM_FwFn";
@ -132,6 +133,8 @@ sub SSCamSTRM_Get($@) {
unless ($to =~ /^\d+$/ || lc($to) eq "ok") { $to = $todef; }
$to = ($to =~ /\d+/)?(1000 * $to):$to;
my $pd = AttrVal($name, "popupStreamFW", "TYPE=FHEMWEB");
my $parent = $hash->{PARENT};
my $parentHash = $defs{$parent};
@ -143,9 +146,9 @@ sub SSCamSTRM_Get($@) {
$out .= "</html>";
if($to =~ /\d+/) {
map {FW_directNotify("#FHEMWEB:$_", "FW_errmsg('$out', $to)", "")} devspec2array("TYPE=FHEMWEB");
map {FW_directNotify("#FHEMWEB:$_", "FW_errmsg('$out', $to)", "")} devspec2array("$pd");
} else {
map {FW_directNotify("#FHEMWEB:$_", "FW_okDialog('$out')", "")} devspec2array("TYPE=FHEMWEB");
map {FW_directNotify("#FHEMWEB:$_", "FW_okDialog('$out')", "")} devspec2array("$pd");
}
}
@ -299,7 +302,7 @@ Dependend of the Streaming-Device state, different buttons are provided to start
size of display can be adjusted. The attribute "popupStreamTo" determines the type of the popup window.
If "OK" is set, an OK-dialog window will be opened. A specified number in seconds closes the popup window after this
time automatically (default 5 seconds). <br>
Optionally you can append "OK" or &lt;Sekunden&gt; directly to override the adjustment by attribute "popupStreamTo".
Optionally you can append "OK" or &lt;seconds&gt; directly to override the adjustment by attribute "popupStreamTo".
</li>
</ul>
<br>
@ -362,6 +365,13 @@ Dependend of the Streaming-Device state, different buttons are provided to start
</li>
<br>
<a name="popupStreamFW"></a>
<li><b>popupStreamFW</b><br>
You can specify a particular FHEMWEB device whose active browser pages should open a popup window by the
"get &lt;name&gt; popupStream" command (default: all active FHEMWEB devices).
</li>
<br>
<a name="popupStreamTo"></a>
<li><b>popupStreamTo [OK | &lt;seconds&gt;]</b><br>
The attribute "popupStreamTo" determines the type of the popup window which is opend by get-function "popupStream".
@ -509,6 +519,13 @@ Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unters
</li>
<br>
<a name="popupStreamFW"></a>
<li><b>popupStreamFW</b><br>
Es kann mit diesem Attribut das FHEMWEB-Device bestimmt werden, auf dessen Browserseiten sich Popup-Fenster mit
"get &lt;name&gt; popupStream" öffnen sollen (default: alle aktiven FHEMWEB-Devices).
</li>
<br>
<a name="popupStreamTo"></a>
<li><b>popupStreamTo [OK | &lt;Sekunden&gt;]</b><br>
Das Attribut "popupStreamTo" legt die Art des Popup-Fensters fest welches mit der get-Funktion "popupStream" geöffnet wird.