From 67662b0603f64ae5d1f97e7af436c079ac8dde3e Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Fri, 9 Jun 2017 19:26:55 +0200 Subject: [PATCH] fix Umlaute Prblem in den Readings --- 73_AMADCommBridge.pm | 4 +- 74_AMADDevice.pm | 8 +- ....xml => 74_AMADautomagicFlowset_3.9.72.xml | 1276 ++++++++--------- 3 files changed, 644 insertions(+), 644 deletions(-) rename 74_AMADautomagicFlowset_3.9.71.xml => 74_AMADautomagicFlowset_3.9.72.xml (84%) diff --git a/73_AMADCommBridge.pm b/73_AMADCommBridge.pm index 54bce38..d5eba07 100644 --- a/73_AMADCommBridge.pm +++ b/73_AMADCommBridge.pm @@ -68,8 +68,8 @@ use TcpServerUtils; eval "use JSON;1" or $missingModul .= "JSON "; -my $modulversion = "3.9.68"; -my $flowsetversion = "3.9.71"; +my $modulversion = "3.9.72"; +my $flowsetversion = "3.9.72"; diff --git a/74_AMADDevice.pm b/74_AMADDevice.pm index 88d2f70..433b4c2 100644 --- a/74_AMADDevice.pm +++ b/74_AMADDevice.pm @@ -50,12 +50,12 @@ my $missingModul = ""; use strict; use warnings; -use Encode qw(encode); +eval "use Encode qw(encode;encode_utf8);1" or $missingModul .= "Encode "; eval "use JSON;1" or $missingModul .= "JSON "; -my $modulversion = "3.9.69"; -my $flowsetversion = "3.9.71"; +my $modulversion = "3.9.72"; +my $flowsetversion = "3.9.72"; @@ -762,7 +762,7 @@ sub AMADDevice_Parse($$) { my $name = $io_hash->{NAME}; - my $decode_json = eval{decode_json($json)}; + my $decode_json = eval{decode_json(encode_utf8($json))}; if($@){ Log3 $name, 3, "AMADDevice ($name) - error while request: $@"; #readingsSingleUpdate($hash, "state", "error", 1); diff --git a/74_AMADautomagicFlowset_3.9.71.xml b/74_AMADautomagicFlowset_3.9.72.xml similarity index 84% rename from 74_AMADautomagicFlowset_3.9.71.xml rename to 74_AMADautomagicFlowset_3.9.72.xml index 5e27d3b..3c92c6c 100644 --- a/74_AMADautomagicFlowset_3.9.71.xml +++ b/74_AMADautomagicFlowset_3.9.72.xml @@ -3,7 +3,7 @@ true Akku Ladestand: grösser als 0% - false + true 0 HIGHER_THAN true @@ -12,7 +12,7 @@ false App Task Beendet - false + true CLASSIC * @@ -26,7 +26,7 @@ true Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic - false + true ch.gridvision.ppam.androidautomagic TEXT CONTAINS_TEXT @@ -37,7 +37,7 @@ true Benachrichtigung in Statusbar angezeigt: com.whatsapp - false + true com.whatsapp TEXT CONTAINS_TEXT @@ -48,7 +48,7 @@ true Benachrichtigung in Statusbar angezeigt: org.telegram.messenger - false + true org.telegram.messenger TEXT CONTAINS_TEXT @@ -59,7 +59,7 @@ true Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic - false + true ch.gridvision.ppam.androidautomagic TEXT CONTAINS_TEXT @@ -70,7 +70,7 @@ true Bluetooth Gerät getrennt: Alle Geräte - false + true true @@ -78,7 +78,7 @@ true Bluetooth Gerät verbunden: Alle Geräte - false + true true @@ -86,7 +86,7 @@ true Bluetooth Status: Schaltet aus, Aus - false + true false false true @@ -95,7 +95,7 @@ true Bluetooth Status: Schaltet ein, Ein - false + true true true false @@ -104,55 +104,55 @@ true Daydream Status: Gestartet - false + true true true Daydream Status: Gestoppt - false + true false true Display Orientierung: Landscape - false + true false true Display Orientierung: Portrait - false + true true true Display Status: Aus - false + true false true Display Status: Ein - false + true true true Dock Event: Docked - false + true true true Dock Event: Undocked - false + true false true Eingehender Anruf. Status: Klingelt, Nummern: Alle - false + true true true @@ -164,13 +164,13 @@ true Flugmodus: Aus - false + true false true Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT - false + true com.android.deskclock.ALARM_ALERT @@ -185,7 +185,7 @@ true Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS - false + true com.android.deskclock.ALARM_DISMISS @@ -200,7 +200,7 @@ true Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE - false + true com.android.deskclock.ALARM_DONE @@ -215,7 +215,7 @@ true Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE - false + true com.android.deskclock.ALARM_SNOOZE @@ -230,7 +230,7 @@ true Genereller Broadcast: wenn org.smblott.intentradio.STATE - false + true org.smblott.intentradio.STATE @@ -254,7 +254,7 @@ irname=getString("name") false HTTP Request: /fhem-amad/deviceInfo/ - false + true /fhem-amad/deviceInfo/ 8090 true @@ -262,7 +262,7 @@ irname=getString("name") false HTTP Request: /fhem-amad/setCommands/* - false + true /fhem-amad/setCommands/* 8090 true @@ -270,13 +270,13 @@ irname=getString("name") false Medien Session verändert - false + true com.amazon.mp3,com.amazon.avod.thirdpartyclient,com.audible.application,com.rhapsody.alditalk,com.spotify.music,com.google.android.videos,com.google.android.music,org.smblott.intentradioio,de.maxdome.app.android,tunein.player,org.videolan.vlc,com.google.android.youtube false Periodischer Timer: alle 120s - false + true 120000 true false @@ -298,12 +298,12 @@ irname=getString("name") true Sprachbefehl angefordert - false + true true Stromversorgung: Angeschlossen - false + true true true true @@ -312,7 +312,7 @@ irname=getString("name") true Stromversorgung: Entfernt - false + true false true true @@ -321,7 +321,7 @@ irname=getString("name") false Systemeinstellung verändert: System next_alarm - false + true SYSTEM next_alarm_formatted setting @@ -329,7 +329,7 @@ irname=getString("name") true Systemeinstellung verändert: System screen_brightness - false + true SYSTEM screen_brightness screenBrightness @@ -337,7 +337,7 @@ irname=getString("name") true Systemeinstellung verändert: System volume_music_bt_a2dp - false + true SYSTEM volume_music_bt_a2dp volume @@ -345,7 +345,7 @@ irname=getString("name") true Systemeinstellung verändert: System volume_music_headphone - false + true SYSTEM volume_music_headphone volume @@ -353,7 +353,7 @@ irname=getString("name") false Systemeinstellung verändert: System volume_music_headset - false + true SYSTEM volume_music_headset volume @@ -361,7 +361,7 @@ irname=getString("name") true Systemeinstellung verändert: System volume_music_speaker - false + true SYSTEM volume_music_speaker volume @@ -369,7 +369,7 @@ irname=getString("name") true Systemeinstellung verändert: System volume_ring - false + true SYSTEM volume_ring volumeRingSound @@ -377,7 +377,7 @@ irname=getString("name") true Systemeinstellung verändert: System volume_ring_speaker - false + true SYSTEM volume_ring_speaker volumeNotification @@ -385,25 +385,25 @@ irname=getString("name") true Unterbrechnungen-Modus: Alle / Immer unterbrechen - false + true OFF true Unterbrechnungen-Modus: Keine / Nicht unterbrechen - false + true NO_INTERRUPTIONS true Unterbrechnungen-Modus: Nur Wecker (Android 6+) - false + true ALARMS_ONLY true Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen - false + true IMPORTANT_INTERRUPTIONS @@ -1761,10 +1761,10 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/plain + text/json {firstrundata} @@@@readingsNameXYZ@@readingsValueABC - 60000 + 5000 true Connection: close true @@ -1783,10 +1783,10 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/plain + text/json {fhemdata} @@@@readingsNameXYZ@@readingsValueABC - 60000 + 5000 true Connection: close true @@ -1805,10 +1805,10 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/plain + text/json {readingsvalcmd} @@@@readingsNameXYZ@@readingsValueABC - 60000 + 15000 true Connection: close true @@ -1827,10 +1827,10 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/plain + text/json {setcmd} @@@@readingsNameXYZ@@readingsValueABC - 60000 + 5000 true Connection: close true @@ -1849,10 +1849,10 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/plain + text/json {voiceinputdata} @@@@readingsNameXYZ@@readingsValueABC - 60000 + 5000 true FHEMDEVICE: {global_fhemdevice} FHEMCMD: voiceinputvalue @@ -2223,8 +2223,8 @@ fhemcmd = "setreading"; true - Script: automagicState = "\"automagicState\":" + " \"" + {content_title} + "\""; fhemcmd = "setreading"; - @@ -2506,14 +2506,14 @@ fhemcmd = "setreading"; true - Script: incommingTelegramMessage = "\"incommingTelegramMessageFrom\":" + " \"" + {notification_text} + "\""; fhemcmd = "setreading"; - true - Script: incommingWhatsAppMessage = "\"incommingWhatsAppMessageFrom\":" + " \"" + {notification_text} + "\""; fhemcmd = "setreading"; - @@ -2720,7 +2720,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA JSON -