Merge pull request #4 from x2rr/main

多谢修复
WeiYang1982 · May 14, 2024 · 5dbf3b0 · 5dbf3b0
2 parents 2b41fa3 + 7bd86f6
commit 5dbf3b0
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/custom_components/bj_water/sensor.py b/custom_components/bj_water/sensor.py
@@ -244,14 +244,28 @@ def icon(self):
     def unit_of_measurement(self):
         return "m³"
 
+    # @property
+    # def extra_state_attributes(self):
+    #     attrs = {}
+    #     for k, v in self.sensor_attrs.items():
+    #         attrs[HISTORY_USAGE_SENSORS[k]["name"]] = v
+    #     LOGGER.info("BJWaterHistoryUsageSensor: " + str(attrs))
+    #     return attrs
+
     @property
     def extra_state_attributes(self):
         attrs = {}
         for k, v in self.sensor_attrs.items():
-            attrs[HISTORY_USAGE_SENSORS[k]["name"]] = v
-        LOGGER.info("BJWaterHistoryUsageSensor: " + str(attrs))
+            if k == "usage":
+                attrs[HISTORY_USAGE_SENSORS[k]["name"]] = v
+            elif k == "value":
+                if isinstance(v, list) and len(v) > 0:
+                    value_list = v[0]
+                    if isinstance(value_list, list) and len(value_list) > 0:
+                        attrs[HISTORY_USAGE_SENSORS[k]["name"]] = value_list[0]
         return attrs
 
+
     @property
     def device_class(self) -> str | None:
         return SensorDeviceClass.WATER