fix watcher image display bug

Author: chenwenhao

custom_components/sensecraft/core/sscma_local.py

@@ -71,17 +71,22 @@ def setMqtt(self):
                 self.sscmaClient
             )
             if mqtt.connect():
+                print('setMqtt connect success')
                 self.device.on_connect = self.on_device_connect
                 self.device.loop_start()
+                print('loop_start')
                 self.mqttClient = mqtt
                 self.mqttClient.subscribe(self.rx_topic)
                 self.mqttClient.message_received = self.on_message
+                print('on_message')
                 # 等待连接结果
                 if self.connectEvent.wait(timeout=30):
+                    print('connectEvent wait success')
                     self.device.on_monitor = self.on_monitor
                     self.connected = True
                     return True
                 else:
+                    print('connectEvent wait timeout')
                     self.connected = False
                     return False
         except Exception as e:

custom_components/sensecraft/core/watcher_local.py

@@ -1,4 +1,7 @@
 import logging
+import os
+from base64 import b64decode
+from datetime import datetime
 from aiohttp import web
 from homeassistant.core import HomeAssistant
 from ..const import (
@@ -34,6 +37,11 @@ async def _start_runner(self, runner):
         await runner.setup()
         site = web.TCPSite(runner, '0.0.0.0', 8887)
         await site.start()
+    
+    def save_image_to_file(self, image_base64, filename):
+        image_data = b64decode(image_base64)
+        with open(filename, 'wb') as file:
+            file.write(image_data)
 
     async def handle_request(self, request):
         """Handle incoming HTTP POST request."""
@@ -47,7 +55,6 @@ async def handle_request(self, request):
 
             text = events.get('text')
             image = events.get('img')
-
             if text is not None:
                 _event_type = ("{domain}_watcher_alarm_{eui}").format(
                     domain=DOMAIN,
@@ -60,7 +67,14 @@ async def handle_request(self, request):
                     domain=DOMAIN,
                     eui=eui
                 )
-                self.hass.bus.fire(_event_type, {"image": image})
+                timestamp = datetime.now().strftime('%Y%m%d_%H%M%S_%f')
+                filename = self.hass.config.path(f'images/watcher_{timestamp}.png')
+
+                # 确保目录存在
+                os.makedirs(os.path.dirname(filename), exist_ok=True)
+
+                self.save_image_to_file(image, filename)
+                self.hass.bus.fire(_event_type, {"image_path": filename})
 
             temperature = 'unavailable'
             humidity = 'unavailable'

custom_components/sensecraft/image.py

@@ -1,5 +1,5 @@
 import logging
-from base64 import b64decode
+import os
 from homeassistant import config_entries
 from homeassistant.util import dt as dt_util
 from homeassistant.core import HomeAssistant
@@ -53,7 +53,7 @@ def __init__(
         self._attr_name = "Alarm Image"
         self._attr_image_last_updated = None
         self._event = None
-        self._image_base64 = None
+        self._image_data = None
 
     async def async_added_to_hass(self) -> None:
         """Run when this Entity has been added to HA."""
@@ -67,9 +67,15 @@ async def async_will_remove_from_hass(self) -> None:
             self._event = None
 
     def handle_event(self, event):
-        self._image_base64 = event.data.get('image')
+        image_path = event.data.get('image_path')
         self._attr_image_last_updated = dt_util.utcnow()
-        self.async_write_ha_state()
+        if image_path and os.path.exists(image_path):
+            with open(image_path, 'rb') as file:
+                self._image_data = file.read()
+            image_size = len(self._image_data)
+        else:
+            self._image_data = None
+        self.hass.async_add_job(self.async_write_ha_state)
 
     @property
     def device_info(self) -> DeviceInfo:
@@ -86,6 +92,4 @@ def device_info(self) -> DeviceInfo:
 
     def image(self) -> bytes | None:
         """Return bytes of image."""
-        if self._image_base64:
-            return b64decode(self._image_base64)
-        return None
+        return self._image_data

custom_components/sensecraft/manifest.json

@@ -14,7 +14,7 @@
     "paho-mqtt==1.6.1",
     "python-sscma==0.0.3"
   ],
-  "version": "1.1.3",
+  "version": "1.1.4",
   "zeroconf": [
     "_sensecraft._tcp.local.",
     "_sscma._tcp.local."

custom_components/sensecraft/number.py

@@ -109,7 +109,7 @@ async def async_set_native_value(self, value: float) -> None:
         local: SScmaLocal = data[SSCMA_LOCAL]
         if local is not None:
             local.device.tscore = value
-            self.async_write_ha_state()
+            self.hass.async_add_job(self.async_write_ha_state)
 
 
 class IOU(ConfigNumber):
@@ -135,4 +135,4 @@ async def async_set_native_value(self, value: float) -> None:
         local: SScmaLocal = data[SSCMA_LOCAL]
         if local is not None:
             local.device.tiou = value
-            self.async_write_ha_state()
+            self.hass.async_add_job(self.async_write_ha_state)

custom_components/sensecraft/select.py

@@ -1,5 +1,3 @@
-"""Select platform for Advantage Air integration."""
-
 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -47,7 +45,7 @@ def received_stream_list(self, streams):
             data = self.hass.data[DOMAIN][self._entry_id]
             local: SenseCraftLocal = data[SENSECRAFT_LOCAL]
             local.updateStream(streams[0])
-        self.async_write_ha_state()
+        self.hass.async_add_job(self.async_write_ha_state)
 
 
     @property
@@ -80,7 +78,7 @@ async def async_select_option(self, option: str) -> None:
         data = self.hass.data[DOMAIN][self._entry_id]
         local: SenseCraftLocal = data[SENSECRAFT_LOCAL]
         local.updateStream(option)
-        self.async_write_ha_state()
+        self.hass.async_add_job(self.async_write_ha_state)
 
     def should_poll():
         return True

custom_components/sensecraft/sensor.py

@@ -203,7 +203,7 @@ async def async_will_remove_from_hass(self) -> None:
 
     def handle_event(self, event):
         self._state = event.data.get('value')
-        self.async_write_ha_state()
+        self.hass.async_add_job(self.async_write_ha_state)
 
     @property
     def device_info(self) -> DeviceInfo:
@@ -262,7 +262,7 @@ async def async_will_remove_from_hass(self) -> None:
 
     def handle_event(self, event):
         self._state = event.data.get('value')
-        self.async_write_ha_state()
+        self.hass.async_add_job(self.async_write_ha_state)
 
     @property
     def device_info(self) -> DeviceInfo:
@@ -316,7 +316,7 @@ async def async_will_remove_from_hass(self) -> None:
 
     def handle_event(self, event):
         self._state = event.data.get('value')
-        self.async_write_ha_state()
+        self.hass.async_add_job(self.async_write_ha_state)
 
     @property
     def device_info(self) -> DeviceInfo:
@@ -367,7 +367,7 @@ async def async_will_remove_from_hass(self) -> None:
 
     def handle_event(self, event):
         self._state = event.data.get('value')
-        self.async_write_ha_state()
+        self.hass.async_add_job(self.async_write_ha_state)
 
     @property
     def device_info(self) -> DeviceInfo:
@@ -416,7 +416,7 @@ async def async_will_remove_from_hass(self) -> None:
 
     def handle_event(self, event):
         self._state = event.data.get('text')
-        self.async_write_ha_state()
+        self.hass.async_add_job(self.async_write_ha_state)
 
     @property
     def device_info(self) -> DeviceInfo: