From e663f04789647179c9957f324fb04e66dd9fab28 Mon Sep 17 00:00:00 2001
From: justme-1968 <justme-1968@users.noreply.github.com>
Date: Mon, 5 Feb 2018 20:42:57 +0000
Subject: [PATCH] 37_NotifyAndroidTV.pm: added width, type and image params

git-svn-id: https://svn.fhem.de/fhem/trunk@16093 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/37_NotifyAndroidTV.pm | 43 ++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/fhem/FHEM/37_NotifyAndroidTV.pm b/fhem/FHEM/37_NotifyAndroidTV.pm
index 0b35ab3f3..a015b8f96 100644
--- a/fhem/FHEM/37_NotifyAndroidTV.pm
+++ b/fhem/FHEM/37_NotifyAndroidTV.pm
@@ -17,6 +17,12 @@ my $options = { position => { 'bottom-right' => 0,
                               'top-left' => 3,
                               'center' => 4,
                             },
+                width => { 'default' => 0,
+                          'narrow' => 1,
+                          'small' => 2,
+                          'wide' => 3,
+                          'extrawide' => 4,
+                        },
                 transparency => { 'default' => 0,
                                   '0%' => 1,
                                   '25%' => 2,
@@ -37,17 +43,18 @@ my $options = { position => { 'bottom-right' => 0,
                               'amber' => '#FFC107',
                               'pink' => '#E91E63',
                             },
-                type => { '0' => 0,
-                          '1' => 1,
-                          '2' => 2,
-                          '3' => 3,
-                          '4' => 4,
-                          '5' => 5,
+                type => { 'complete' => 0,
+                          'titleonly' => 1,
+                          'nameonly' => 2,
+                          'icononly' => 3,
+                          'noicon' => 4,
+                          'short' => 5,
                         },
                 duration => undef,
                 offset => undef,
                 offsety => undef,
                 icon => undef,
+                image => undef,
                 title => undef,
                 imageurl => undef,
              };
@@ -166,6 +173,7 @@ NotifyAndroidTV_Set($$@)
     $param_h->{offsety} = 0 if( !$param_h->{offsety} );
     $param_h->{transparency} = 0 if( !$param_h->{transparency} );
 
+
     $param_h->{icon} = 'fhemicon.png' if( !$param_h->{icon} );
     $param_h->{icon} .= ".png" if( $param_h->{icon} !~ '\.' );
     $param_h->{icon} = "$FW_icondir/default/$param_h->{icon}" if( $param_h->{icon} !~ '^/' );
@@ -180,6 +188,22 @@ NotifyAndroidTV_Set($$@)
     delete $param_h->{icon};
 
 
+    my $image;
+    if( $param_h->{image} ) {
+      $param_h->{image} .= ".jpg" if( $param_h->{image} !~ '\.' );
+      $param_h->{image} = "$FW_icondir/default/$param_h->{image}" if( $param_h->{image} !~ '^/' );
+
+      Log3 $name, 5, "$name: using image $param_h->{image}";
+
+      local( *FH ) ;
+      open( FH, $param_h->{image} );
+      my $image = do { local( $/ ) ; <FH> } ;
+
+      return "image not found: $param_h->{image}" if( !$image );
+      delete $param_h->{image};
+    }
+
+
     if( !$txt ) {
       my $usage = "usage: set $name msg";
       foreach my $option ( sort keys %{$options}) {
@@ -189,12 +213,6 @@ NotifyAndroidTV_Set($$@)
           $usage .= " [$option=<$option>]";
         }
       }
-      #$usage .= " [duration=<duration>]";
-      #$usage .= " [offset=<offset>]";
-      #$usage .= " [offsety=<offsety>]";
-      #$usage .= " [icon=<filename>]";
-      #$usage .= " [title=<title>]";
-      #$usage .= " [imageurl=<url>]";
       $usage .= " <message>";
 
       return $usage;
@@ -218,6 +236,7 @@ NotifyAndroidTV_Set($$@)
     Log3 $name, 5, $param->{data};
 
     $param->{data} .= NotifyAndroidTV_addFormField('filename', $icon, "filename=\"fhemicon.png\"\r\nContent-Type: application/octet-stream");
+    $param->{data} .= NotifyAndroidTV_addFormField('filename2', $image, "filename=\"fhemicon.png\"\r\nContent-Type: application/octet-stream") if( $image );
     $param->{data} .= "--boundary--";
 
     Log3 $name, 4, "NotifyAndroidTV ($name) - send notification ";