pymammotion 0.2.36__py3-none-any.whl → 0.2.38__py3-none-any.whl

pymammotion/aliyun/dataclass/session_by_authcode_response.py

@@ -16,4 +16,4 @@ class SessionOauthToken(DataClassORJSONMixin):
 @dataclass
 class SessionByAuthCodeResponse(DataClassORJSONMixin):
     code: int
-    data: Optional[SessionOauthToken]
+    data: Optional[SessionOauthToken] = None

pymammotion/mammotion/devices/base.py

@@ -12,7 +12,6 @@ from pymammotion.data.state_manager import StateManager
 from pymammotion.proto import has_field
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import NavGetCommDataAck, NavGetHashListAck
-from pymammotion.utility.device_type import DeviceType
 from pymammotion.utility.movement import get_percent, transform_both_speeds
 
 _LOGGER = logging.getLogger(__name__)
@@ -205,13 +204,11 @@ class MammotionBaseDevice:
             # work out why this crashes sometimes for better proto
 
             if self._cloud_device:
-                if not DeviceType.is_luba1(self._cloud_device.deviceName, self._cloud_device.productKey):
-                    await self.queue_command("get_area_name_list", device_id=self._cloud_device.deviceName)
-            if has_field(self._mower.net.toapp_wifi_iot_status):
-                if not DeviceType.is_luba1(self._mower.net.toapp_wifi_iot_status.devicename):
-                    await self.queue_command(
-                        "get_area_name_list", device_id=self._mower.net.toapp_wifi_iot_status.devicename
-                    )
+                await self.queue_command("get_area_name_list", device_id=self._cloud_device.iotId)
+            elif has_field(self._mower.net.toapp_wifi_iot_status):
+                await self.queue_command(
+                    "get_area_name_list", device_id=self._mower.net.toapp_wifi_iot_status.devicename
+                )
         except Exception:
             """Do nothing for now."""
 

pymammotion/mammotion/devices/mammotion.py

@@ -151,7 +151,9 @@ class Mammotion:
         """Initialize MammotionDevice."""
         self._login_lock = asyncio.Lock()
 
-    def add_ble_device(self, ble_device: BLEDevice, preference: ConnectionPreference = ConnectionPreference.BLUETOOTH) -> None:
+    def add_ble_device(
+        self, ble_device: BLEDevice, preference: ConnectionPreference = ConnectionPreference.BLUETOOTH
+    ) -> None:
         if ble_device:
             self.devices.add_device(
                 MammotionMixedDeviceManager(name=ble_device.name, ble_device=ble_device, preference=preference)
@@ -187,7 +189,7 @@ class Mammotion:
             ),
             cloud_client,
         )
-
+        self.add_cloud_devices(self.mqtt_list.get(account))
         loop = asyncio.get_running_loop()
         await loop.run_in_executor(None, self.mqtt_list[account].connect_async)
 

{pymammotion-0.2.36.dist-info → pymammotion-0.2.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.2.36
+Version: 0.2.38
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

{pymammotion-0.2.36.dist-info → pymammotion-0.2.38.dist-info}/RECORD

@@ -7,7 +7,7 @@ pymammotion/aliyun/dataclass/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkS
 pymammotion/aliyun/dataclass/dev_by_account_response.py,sha256=gskum11h9HPf4lKjLJKVrsxRl5BHaHJP2TPrI09SUYs,1032
 pymammotion/aliyun/dataclass/login_by_oauth_response.py,sha256=IXSLZ6XnOliOnyXo5Bh0ErqFjA11puACh_9NH0sSJGQ,1262
 pymammotion/aliyun/dataclass/regions_response.py,sha256=CVPpdFhDD6_emWHyLRzOdp2j3HLPtP8tlNyzGnr8AcI,690
-pymammotion/aliyun/dataclass/session_by_authcode_response.py,sha256=FVqT2EmePt4ze83sndkw45GHtMsx12nsMU7Nljd35RM,412
+pymammotion/aliyun/dataclass/session_by_authcode_response.py,sha256=qW0pnnRXfyEuMbb9ORc013sYqZwO8z4i_h_SfSaA_bw,419
 pymammotion/aliyun/tmp_constant.py,sha256=M4Hq_lrGB3LZdX6R2XohRPFoK1NDnNV-pTJwJcJ9838,6650
 pymammotion/bluetooth/__init__.py,sha256=LAl8jqZ1fPh-3mLmViNQsP3s814C1vsocYUa6oSaXt0,36
 pymammotion/bluetooth/ble.py,sha256=YfkfEK3TLJ8BaidjAXfUVFv8reLCu6U_lYa3Bo0pddw,2449
@@ -59,8 +59,8 @@ pymammotion/mammotion/commands/messages/video.py,sha256=_8lJsU4sLm2CGnc7RDkueA0A
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
-pymammotion/mammotion/devices/base.py,sha256=5k82KHwW2JqZXW-MBYe8SkedZw_bQ2gqShX5RQd_Yio,11504
-pymammotion/mammotion/devices/mammotion.py,sha256=uiKtzLHfVPyk-cdm5gFraI9nkrIX3ZkdZPE7xEyuoTQ,11597
+pymammotion/mammotion/devices/base.py,sha256=gG7qWuNdUIlS87T_opaynd9BrhClQSxDD6MAsmoTZbE,11230
+pymammotion/mammotion/devices/mammotion.py,sha256=vMM9xqzxuvambPQC1mg7HLIaJksvZK7GLdG4oRAWt5Q,11670
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=sgGeyQeAeA3lQodcalRYS4nDNAzjfFs9SddIB1kadvw,17355
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=dk49VY9yHO3d-Nb17y-D4YIURs2FTLMzWHUYrxBYhtw,10116
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
@@ -117,7 +117,7 @@ pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,22
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.2.36.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.36.dist-info/METADATA,sha256=oKsEdniFXVqz9dbL-obKVKoZWsKWlS0xDGjaob8n3Lc,4052
-pymammotion-0.2.36.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.36.dist-info/RECORD,,
+pymammotion-0.2.38.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.38.dist-info/METADATA,sha256=KCTjSd0ig3-zmsFVNbeFk3lueozZoutxjAtBbaxOzQM,4052
+pymammotion-0.2.38.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.38.dist-info/RECORD,,