Merge 64d9d54170 into ec833b6539

* feat: subscribe the proxy gateway child device up messages even though the device is offline (#1313)

* feat: do not subscribe proxy gateway child device online/offline state message

custom_components/xiaomi_home/climate.py

@@ -224,6 +224,15 @@ class FeatureFanMode(MIoTServiceEntity, ClimateEntity):
     _prop_fan_level: Optional[MIoTSpecProperty]
     _fan_mode_map: Optional[dict[int, str]]
 
+    # HomeKit Bridge: fan_modes must be "auto"、"low"、"medium"、"high" 
+    _fan_mode_translation_map = {
+        "自动": "auto",
+        "低风": "low",
+        "中风": "medium",
+        "高风": "high",
+    }
+    _fan_mode_translation_map_rev = {v: k for k, v in _fan_mode_translation_map.items()}
+
     def __init__(self, miot_device: MIoTDevice,
                  entity_data: MIoTEntityData) -> None:
         """Initialize the feature class."""
@@ -243,7 +252,13 @@ class FeatureFanMode(MIoTServiceEntity, ClimateEntity):
                                   self.entity_id)
                     continue
                 self._fan_mode_map = prop.value_list.to_map()
-                self._attr_fan_modes = prop.value_list.descriptions
+                # save org fan speed
+                self._raw_fan_modes = prop.value_list.descriptions             
+                self._attr_fan_modes = [
+                    self._fan_mode_translation_map.get(mode, mode)
+                    for mode in self._raw_fan_modes
+                ]
+
                 self._attr_supported_features |= ClimateEntityFeature.FAN_MODE
                 self._prop_fan_level = prop
             elif prop.name == 'on' and prop.service.name == 'fan-control':
@@ -264,7 +279,11 @@ class FeatureFanMode(MIoTServiceEntity, ClimateEntity):
         if fan_mode == FAN_ON:
             await self.set_property_async(prop=self._prop_fan_on, value=True)
             return
-        mode_value = self.get_map_key(map_=self._fan_mode_map, value=fan_mode)
+        
+        chinese_fan_mode = self._fan_mode_translation_map_rev.get(fan_mode, fan_mode)
+                
+        mode_value = self.get_map_key(map_=self._fan_mode_map, value=chinese_fan_mode)
+
         if mode_value is None or not await self.set_property_async(
                 prop=self._prop_fan_level, value=mode_value):
             raise RuntimeError(f'set climate prop.fan_mode failed, {fan_mode}, '
@@ -278,9 +297,15 @@ class FeatureFanMode(MIoTServiceEntity, ClimateEntity):
         if self._prop_fan_level is None and self._prop_fan_on:
             return (FAN_ON if self.get_prop_value(
                 prop=self._prop_fan_on) else FAN_OFF)
-        return self.get_map_value(
+
+        current_chinese_mode = self.get_map_value(
             map_=self._fan_mode_map,
             key=self.get_prop_value(prop=self._prop_fan_level))
+        
+        if current_chinese_mode is None:
+            return None
+
+        return self._fan_mode_translation_map.get(current_chinese_mode, current_chinese_mode)
 
 
 class FeatureSwingMode(MIoTServiceEntity, ClimateEntity):

custom_components/xiaomi_home/miot/miot_client.py

@@ -1374,10 +1374,13 @@ class MIoTClient:
         """Update cloud devices.
         NOTICE: This function will operate the cloud_list
         """
-        # MIoT cloud service may not publish the online state updating message
+        # MIoT cloud may not publish the online state updating message
         # for the BLE device. Assume that all BLE devices are online.
+        # MIoT cloud does not publish the online state updating message for the
+        # child device under the proxy gateway (eg, VRF air conditioner
+        # controller). Assume that all proxy gateway child devices are online.
         for did, info in cloud_list.items():
-            if did.startswith('blt.'):
+            if did.startswith('blt.') or did.startswith('proxy.'):
                 info['online'] = True
         for did, info in self._device_list_cache.items():
             if filter_dids and did not in filter_dids:

custom_components/xiaomi_home/miot/miot_mips.py

@@ -998,9 +998,11 @@ class MipsCloudClient(_MipsClient):
                     did, MIoTDeviceState.ONLINE if msg['event'] == 'online'
                     else MIoTDeviceState.OFFLINE, ctx)
 
-        if did.startswith('blt.'):
-        # MIoT cloud may not publish BLE device online/offline state message.
-        # Do not subscribe BLE device online/offline state.
+        if did.startswith('blt.') or did.startswith('proxy.'):
+        # MIoT cloud may not publish BLE device or proxy gateway child device
+        # online/offline state message.
+        # Do not subscribe BLE device or proxy gateway child device
+        # online/offline state.
             return True
         return self.__reg_broadcast_external(
             topic=topic, handler=on_state_msg, handler_ctx=handler_ctx)