From 9a696739acf4e9f7a0335e6b7cdcb4255d5ab91d Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Thu, 19 Sep 2019 17:14:20 +0000 Subject: [PATCH] 49_SSCamSTRM: new attribute "noLink" - suppress link to detail view git-svn-id: https://svn.fhem.de/fhem/trunk@20198 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/49_SSCam.pm | 23 ++++++++++++++++++----- fhem/FHEM/49_SSCamSTRM.pm | 14 ++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 51af64ce8..6b18c9559 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - feature: 49_SSCamSTRM: new attribute "noLink" - suppress link to detail view - bugfix: 49_SSCam: fix warnings, Forum: 45671#msg975610 - change: 70_ZoneMinder: improved contents of state (thx Florian_GT) - change: 95_Dashboard: attr dashboard_activetab is now working as designed, diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index 7a00334e6..47651744a 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -48,6 +48,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; # Versions History intern our %SSCam_vNotesIntern = ( + "8.18.2" => "19.09.2019 sample streams changed in comref, support of attr noLink in Streaming-Device ", "8.18.1" => "18.09.2019 fix warnings, Forum: https://forum.fhem.de/index.php/topic,45671.msg975610.html#msg975610 ", "8.18.0" => "13.09.2019 change usage of own hashes to central %data hash, release unnecessary allocated memory ", "8.17.0" => "12.09.2019 fix warnings, support hide buttons in streaming device, change handle delete SNAPHASHOLD ", @@ -164,6 +165,7 @@ our %SSCam_vNotesIntern = ( # Versions History extern our %SSCam_vNotesExtern = ( + "8.18.2" => "19.09.2019 SSCam supports the new attribute \"noLink\" in streaming devices ", "8.15.0" => "09.07.2019 support of integrating Streaming-Devices in a SSCam FTUI widget ", "8.14.0" => "01.06.2019 In detailview are buttons provided to open the camera native setup screen or Synology Surveillance Station and the Synology Surveillance Station online help. ", "8.12.0" => "25.03.2019 Delay FHEM shutdown as long as sessions are not terminated, but not longer than global attribute \"maxShutdownDelay\". ", @@ -7250,6 +7252,7 @@ sub SSCam_StreamDev($$$;$) { my $alias = AttrVal($strmdev, "alias", $strmdev); # Linktext als Aliasname oder Devicename setzen my $dlink = "$alias"; + $dlink = $alias if(AttrVal($strmdev, "noLink", 0)); # keine Links im Stream-Dev generieren my $StmKey = ReadingsVal($camname,"StmKey",undef); @@ -7735,7 +7738,11 @@ sub SSCam_composegallery ($;$$$) { $uuid = $streamHash->{FUUID}; # eindeutige UUID des Streamingdevices delete $streamHash->{HELPER}{STREAM}; $alias = AttrVal($strmdev, "alias", $strmdev); # Linktext als Aliasname oder Devicename setzen - $dlink = "$alias"; + if(AttrVal($strmdev, "noLink", 0)) { + $dlink = $alias; # keine Links im Stream-Dev generieren + } else { + $dlink = "$alias"; + } } my $cmddosnap = "FW_cmd('$FW_ME$FW_subdir?XHR=1&cmd=set $name snap 1 2 STRM:$uuid')"; # Snapshot auslösen mit Kennzeichnung "by STRM-Device" @@ -10615,10 +10622,13 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR @@ -12431,10 +12441,13 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR diff --git a/fhem/FHEM/49_SSCamSTRM.pm b/fhem/FHEM/49_SSCamSTRM.pm index f8cf96612..7c22415ff 100644 --- a/fhem/FHEM/49_SSCamSTRM.pm +++ b/fhem/FHEM/49_SSCamSTRM.pm @@ -35,6 +35,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; # Versions History intern our %SSCamSTRM_vNotesIntern = ( + "2.9.0" => "19.09.2019 new attribute noLink ", "2.8.0" => "09.09.2019 new attribute hideFooter ", "2.7.0" => "15.07.2019 FTUI support, new attributes htmlattrFTUI, hideDisplayNameFTUI, ptzButtonSize, ptzButtonSizeFTUI ", "2.6.0" => "21.06.2019 GetFn -> get html ", @@ -87,6 +88,7 @@ sub SSCamSTRM_Initialize($) { "hideDisplayName:1,0 ". "hideDisplayNameFTUI:1,0 ". "hideButtons:1,0 ". + "noLink:1,0 ". "popupWindowSize ". "popupStreamFW:$fwd ". "popupStreamTo:OK,1,2,3,4,5,6,7,8,9,10,15,20,25,30,40,50,60 ". @@ -569,6 +571,12 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
+ +
  • noLink
    + The device name or alias doesn't contain a link to the detail device view. +
    • +
    +
  • popupStreamFW
    You can specify a particular FHEMWEB device whose active browser pages should open a popup window by the @@ -800,6 +808,12 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR

    • + +
  • noLink
    + Der Devicename oder Alias enthält keinen Link zur Detailansicht. +
    • +
    +
  • popupStreamFW
    Es kann mit diesem Attribut das FHEMWEB-Device bestimmt werden, auf dessen Browserseiten sich Popup-Fenster mit