Merge branch 'main' into fix-specs

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:
@@ -1519,6 +1527,8 @@ class MIoTClient:
             if did not in filter_dids:
                 continue
             device_old = self._device_list_gateway.get(did, None)
+            gw_state_old = device_old.get(
+                'online', False) if device_old else False
             gw_state_new: bool = False
             device_new = gw_list.pop(did, None)
             if device_new:
@@ -1532,7 +1542,7 @@ class MIoTClient:
                     device_old['online'] = False
             # Update cache group_id
             info['group_id'] = group_id
-            if not gw_state_new:
+            if (gw_state_old == gw_state_new) and (not gw_state_new):
                 continue
             self.__update_device_msg_sub(did=did)
             state_old: Optional[bool] = info.get('online', None)
@@ -1590,7 +1600,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),
-                'manufacturer': model.split('.')[0],
+                'push_available': info.get('pushAvailable', False)
             }
         return device_list
 

custom_components/xiaomi_home/miot/specs/spec_modify.yaml

@@ -577,6 +577,9 @@ urn:miot-spec-v2:device:thermostat:0000A031:suittc-wk168:1:
       description: '15'
     - value: 16
       description: '16'
+urn:miot-spec-v2:device:toothbrush:0000A07E:xiaomi-p001:1:
+  prop.4.1041:
+    unit: days
 urn:miot-spec-v2:device:water-purifier:0000A013:roswan-lte01:1:0000D05A:
   prop.4.1:
     unit: ppm