Merge 30a78c7689 into f4d591b4d3

Update cover.py

custom_components/xiaomi_home/cover.py

@@ -107,6 +107,7 @@ class Cover(MIoTServiceEntity, CoverEntity):
     _prop_position_value_range: Optional[int]
     _prop_pos_closing: bool
     _prop_pos_opening: bool
+    _reverse_position: bool
 
     def __init__(self, miot_device: MIoTDevice,
                  entity_data: MIoTEntityData) -> None:
@@ -134,6 +135,8 @@ class Cover(MIoTServiceEntity, CoverEntity):
         self._prop_position_value_range = None
         self._prop_pos_closing = False
         self._prop_pos_opening = False
+        # 新增：针对airer类型设备反转位置
+        self._reverse_position = (entity_data.spec.device_class == CoverDeviceClass.BLIND)
 
         # properties
         for prop in entity_data.props:
@@ -143,6 +146,8 @@ class Cover(MIoTServiceEntity, CoverEntity):
                                   self.entity_id)
                     continue
                 for item in prop.value_list.items:
+                    item_str: str = item.name
+                    item_name: str = re.sub(r'[^a-z]', '', item_str)
                     if item.name in {'open', 'up'}:
                         self._attr_supported_features |= (
                             CoverEntityFeature.OPEN)
@@ -255,6 +260,10 @@ class Cover(MIoTServiceEntity, CoverEntity):
         if current is not None:
             self._prop_pos_opening = pos > current
             self._prop_pos_closing = pos < current
+            # 针对airer类型设备反转位置
+            if self._reverse_position:
+                pos = 100 - pos
+              
         pos = round(pos * self._prop_position_value_range / 100)
         await self.set_property_async(prop=self._prop_target_position,
                                       value=pos)
@@ -282,6 +291,9 @@ class Cover(MIoTServiceEntity, CoverEntity):
             pos = 0
         elif pos >= (100 - self._cover_dead_zone_width):
             pos = 100
+        # 针对airer类型设备反转位置
+        if self._reverse_position:
+            pos = 100 - pos
         return pos
 
     @property

custom_components/xiaomi_home/miot/miot_client.py

@@ -1256,7 +1256,15 @@ class MIoTClient:
     ) -> None:
         _LOGGER.info(
             'gateway devices list changed, %s, %s', mips.group_id, did_list)
-        payload: dict = {'filter': {'did': did_list}}
+        payload: dict = {
+            'filter': {
+                'did': did_list
+            },
+            'info': [
+                'name', 'model', 'urn',
+                'online', 'specV2Access', 'pushAvailable'
+            ]
+        }
         gw_list = await mips.get_dev_list_async(
             payload=json.dumps(payload))
         if gw_list is None:
@@ -1590,7 +1598,14 @@ class MIoTClient:
         if not mips.mips_state:
             _LOGGER.debug('local mips disconnect, skip refresh, %s', group_id)
             return
-        gw_list: dict = await mips.get_dev_list_async()
+        payload: dict = {
+            'info': [
+                'name', 'model', 'urn',
+                'online', 'specV2Access', 'pushAvailable'
+            ]
+        }
+        gw_list: dict = await mips.get_dev_list_async(
+            payload=json.dumps(payload))
         if gw_list is None:
             _LOGGER.error(
                 'refresh gw devices with group_id failed, %s, %s',

custom_components/xiaomi_home/miot/miot_cloud.py

@@ -601,15 +601,8 @@ class MIoTHttpClient:
                 'bssid': device.get('bssid', None),
                 'order_time': device.get('orderTime', 0),
                 'fw_version': device.get('extra', {}).get(
-                    'fw_version', 'unknown'),
-            }
-            if isinstance(device.get('extra', None), dict) and device['extra']:
-                device_infos[did]['fw_version'] = device['extra'].get(
                     'fw_version', None)
-                device_infos[did]['mcu_version'] = device['extra'].get(
+            }
-                    'mcu_version', None)
-                device_infos[did]['platform'] = device['extra'].get(
-                    'platform', None)
 
         next_start_did = res_obj.get('next_start_did', None)
         if res_obj.get('has_more', False) and next_start_did:

custom_components/xiaomi_home/miot/miot_mips.py

@@ -1394,19 +1394,9 @@ class MipsLocalClient(_MipsClient):
                 continue
             device_list[did] = {
                 'did': did,
-                'name': name,
-                'urn': urn,
-                'model': model,
                 'online': info.get('online', False),
-                'icon': info.get('icon', None),
-                'fw_version': None,
-                'home_id': '',
-                'home_name': '',
-                'room_id': info.get('roomId', ''),
-                'room_name': info.get('roomName', ''),
                 'specv2_access': info.get('specV2Access', False),
-                'push_available': info.get('pushAvailable', False),
+                'push_available': info.get('pushAvailable', False)
-                'manufacturer': model.split('.')[0],
             }
         return device_list