From 5f2038e6379d1a1dd943adeb0298e18528a60339 Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Thu, 8 Feb 2018 07:40:34 +0000 Subject: [PATCH] 37_NotifyAndroidTV.pm: better paramter check git-svn-id: https://svn.fhem.de/fhem/trunk@16113 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/37_NotifyAndroidTV.pm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fhem/FHEM/37_NotifyAndroidTV.pm b/fhem/FHEM/37_NotifyAndroidTV.pm index 75f42face..ff14624c8 100644 --- a/fhem/FHEM/37_NotifyAndroidTV.pm +++ b/fhem/FHEM/37_NotifyAndroidTV.pm @@ -188,7 +188,21 @@ NotifyAndroidTV_Set($$@) $param_h->{offsety} = 0 if( !$param_h->{offsety} ); $param_h->{transparency} = 0 if( !$param_h->{transparency} ); -return Dumper $param_h; + + if( !$txt && !$param_h->{icon} && !$param_h->{image} && !$param_h->{imageurl} ) { + my $usage = "usage: set $name msg"; + foreach my $option (sort keys %{$options}) { + if( $options->{$option} ) { + $usage .= " [$option=". join( '|', sort keys %{$options->{$option}} ). "]"; + } else { + $usage .= " [$option=<$option>]"; + } + } + $usage .= " "; + + return $usage; + } + $param_h->{icon} = 'fhemicon.png' if( !$param_h->{icon} ); $param_h->{icon} .= ".png" if( $param_h->{icon} !~ '\.' ); @@ -225,20 +239,6 @@ return Dumper $param_h; } - if( !$txt && !$image && !$param_h->{imageurl} ) { - my $usage = "usage: set $name msg"; - foreach my $option (sort keys %{$options}) { - if( $options->{$option} ) { - $usage .= " [$option=". join( '|', sort keys %{$options->{$option}} ). "]"; - } else { - $usage .= " [$option=<$option>]"; - } - } - $usage .= " "; - - return $usage; - } - my $param; $param->{url} = "http://$hash->{host}:7676/"; $param->{callback} = \&NotifyAndroidTV_parseHttpAnswer;