chickliu/ha_xiaomi_home
1
0
Fork 0
mirror of https://github.com/XiaoMi/ha_xiaomi_home.git synced 2026-01-17 23:50:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

make better

Browse Source
This commit is contained in:
GavinIves 2025-07-24 06:18:54 +00:00
parent 0497ca0ff1
commit 4fd7a7272b
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
custom_components/xiaomi_home/light.py
View File

@ -260,8 +260,7 @@ class Light(MIoTServiceEntity, LightEntity):
device_id = list( device_id = list(
self.miot_device.device_info.get("identifiers"))[0][1] self.miot_device.device_info.get("identifiers"))[0][1]
self._command_send_mode_entity_id = entity_registry.async_get_entity_id( self._command_send_mode_entity_id = entity_registry.async_get_entity_id(
"select", DOMAIN, "select", DOMAIN, f"select.light_{device_id}_command_send_mode")
f"{DOMAIN}.light_{device_id}_command_send_mode")
if self._command_send_mode_entity_id is None: if self._command_send_mode_entity_id is None:
_LOGGER.error( _LOGGER.error(
"light command_send_mode not found, %s", "light command_send_mode not found, %s",
@ -270,6 +269,12 @@ class Light(MIoTServiceEntity, LightEntity):
return return
command_send_mode = self.hass.states.get( command_send_mode = self.hass.states.get(
self._command_send_mode_entity_id) self._command_send_mode_entity_id)
send_brightness_first = False
if ATTR_BRIGHTNESS in kwargs:
brightness_new = kwargs[ATTR_BRIGHTNESS]
brightness_old = self.brightness
if brightness_old and brightness_new <= brightness_old:
send_brightness_first = True
if command_send_mode and command_send_mode.state == "Send Together": if command_send_mode and command_send_mode.state == "Send Together":
set_properties_list: List[Dict[str, Any]] = [] set_properties_list: List[Dict[str, Any]] = []
# mode # mode
@ -281,6 +286,14 @@ class Light(MIoTServiceEntity, LightEntity):
self.get_map_key(map_=self._mode_map, self.get_map_key(map_=self._mode_map,
value=kwargs[ATTR_EFFECT]), value=kwargs[ATTR_EFFECT]),
}) })
# brightness
if send_brightness_first and ATTR_BRIGHTNESS in kwargs:
brightness = brightness_to_value(self._brightness_scale,
kwargs[ATTR_BRIGHTNESS])
set_properties_list.append({
"prop": self._prop_brightness,
"value": brightness
})
# color-temperature # color-temperature
if ATTR_COLOR_TEMP_KELVIN in kwargs: if ATTR_COLOR_TEMP_KELVIN in kwargs:
set_properties_list.append({ set_properties_list.append({
@ -300,7 +313,7 @@ class Light(MIoTServiceEntity, LightEntity):
}) })
self._attr_color_mode = ColorMode.RGB self._attr_color_mode = ColorMode.RGB
# brightness # brightness
if ATTR_BRIGHTNESS in kwargs: if not send_brightness_first and ATTR_BRIGHTNESS in kwargs:
brightness = brightness_to_value(self._brightness_scale, brightness = brightness_to_value(self._brightness_scale,
kwargs[ATTR_BRIGHTNESS]) kwargs[ATTR_BRIGHTNESS])
set_properties_list.append({ set_properties_list.append({
@ -333,6 +346,14 @@ class Light(MIoTServiceEntity, LightEntity):
self.get_map_key(map_=self._mode_map, self.get_map_key(map_=self._mode_map,
value=kwargs[ATTR_EFFECT]), value=kwargs[ATTR_EFFECT]),
}) })
# brightness
if send_brightness_first and ATTR_BRIGHTNESS in kwargs:
brightness = brightness_to_value(self._brightness_scale,
kwargs[ATTR_BRIGHTNESS])
set_properties_list.append({
"prop": self._prop_brightness,
"value": brightness
})
# color-temperature # color-temperature
if ATTR_COLOR_TEMP_KELVIN in kwargs: if ATTR_COLOR_TEMP_KELVIN in kwargs:
set_properties_list.append({ set_properties_list.append({
@ -352,7 +373,7 @@ class Light(MIoTServiceEntity, LightEntity):
}) })
self._attr_color_mode = ColorMode.RGB self._attr_color_mode = ColorMode.RGB
# brightness # brightness
if ATTR_BRIGHTNESS in kwargs: if not send_brightness_first and ATTR_BRIGHTNESS in kwargs:
brightness = brightness_to_value(self._brightness_scale, brightness = brightness_to_value(self._brightness_scale,
kwargs[ATTR_BRIGHTNESS]) kwargs[ATTR_BRIGHTNESS])
set_properties_list.append({ set_properties_list.append({