Fix Availability in ReceiveFilter & SetValue

Fix Array to String conversion in DecodeData
Schnittcher · Oct 20, 2024 · e8645ed · e8645ed
1 parent 418c15a
commit e8645ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/Device/locale.json b/Device/locale.json
@@ -74,6 +74,7 @@
             "Auto": "Automatisch",
             "Automatic": "Automatisch",
             "Autumn Gold": "Herbstgold",
+            "Availability": "Verfügbarkeit",
             "Away Mode": "Urlaubsmodus",
             "Away or Vacation": "Abwesend / Urlaub",
             "Away Preset Days": "Urlaubsmodus default Tage",
@@ -896,4 +897,4 @@
             "IEEE Address": "IEEE Adresse"
         }
     }
-}
+}
diff --git a/libs/ModulBase.php b/libs/ModulBase.php
@@ -154,7 +154,7 @@ public function ApplyChanges()
             return;
         }
         //Setze Filter für ReceiveData
-        $Filter1 = preg_quote('"Topic":"' . $BaseTopic . '/' . $MQTTTopic . '"');
+        $Filter1 = preg_quote('"Topic":"' . $BaseTopic . '/' . $MQTTTopic);
         $Filter2 = preg_quote('"Topic":"' . $BaseTopic . '/SymconExtension/response/' . static::$ExtensionTopic . $MQTTTopic);
         $this->SendDebug('Filter', '.*(' . $Filter1 . '|' . $Filter2 . ').*', 0);
         $this->SetReceiveDataFilter('.*(' . $Filter1 . '|' . $Filter2 . ').*');
@@ -312,8 +312,8 @@ public function ReceiveData($JSONString)
 
         // Separates Verarbeiten des Verfügbarkeitsstatus (online/offline)
         if (end($Topics) == 'availability') {
-            $this->RegisterVariableBoolean('Z2M_Status', $this->Translate('Status'), 'Z2M.DeviceStatus');
-            $this->SetValue('Z2M_Status', $Buffer['Payload'] == 'online');
+            $this->RegisterVariableBoolean('Z2M_Status', $this->Translate('Availability'), 'Z2M.DeviceStatus');
+            $this->SetValue('Z2M_Status', $Buffer['Payload'] == '{"state":"online"}');
             return '';
         }
 
@@ -540,7 +540,7 @@ protected function DecodeData($Payload)
             // Umrechnung von Mired in Kelvin für 'color_temp'
             if ($key === 'color_temp') {
                 $value = intval(1000000 / $value); // Umrechnung Mired nach Kelvin
-                $this->SendDebug(__FUNCTION__ . ' :: ' . __LINE__ . ' :: Converted color_temp to Kelvin: ', $value, 0);
+                $this->SendDebug(__FUNCTION__ . ' :: ' . __LINE__ . ' :: Converted color_temp to Kelvin: ', (string) $value, 0);
             }
             // Erstelle den Ident-Namen basierend auf dem Property-Namen
             $ident = self::convertPropertyToIdent($key);
@@ -625,7 +625,7 @@ protected function DecodeData($Payload)
                 }
             } else {
                 // Fallback: Wert ohne Typinformationen setzen
-                $this->SetValue($ident, $value);
+                $this->SetValue($ident, is_array($value) ? json_encode($value) : $value);
             }
         }
     }
@@ -666,7 +666,7 @@ protected function DecodeData($Payload)
      */
     protected function SetValue($Ident, $Value)
     {
-        $this->SendDebug(__FUNCTION__ . ' :: ' . __LINE__ . ' :: Incoming value for ' . $Ident, (is_array($Value) ? json_encode($Value) : $Value), 0);
+        $this->SendDebug(__FUNCTION__ . ' :: ' . __LINE__ . ' :: Incoming value for ' . $Ident, $Value, 0);
 
         // Standardwert für adjustedValue setzen
         $adjustedValue = $Value;
@@ -763,7 +763,7 @@ protected function SetValue($Ident, $Value)
                     $adjustedValue = (string) $Value;
                     break;
                 default:
-                    $adjustedValue = $Value; // Fallback, falls der Typ unbekannt ist
+                    $adjustedValue = (string) $Value; // Fallback, falls der Typ unbekannt ist
                     break;
             }
         }