pymammotion 0.4.37__py3-none-any.whl → 0.4.39__py3-none-any.whl

pymammotion/http/http.py

@@ -98,7 +98,7 @@ class MammotionHTTP:
                 "/device-server/v1/stream/subscription",
                 json={"deviceId": iot_id},
                 headers={
-                    "Authorization": f"{self._headers.get('Authorization', "")}",
+                    "Authorization": f"Bearer {self.login_info.access_token}",
                     "Content-Type": "application/json",
                     "User-Agent": "okhttp/3.14.9",
                 },
@@ -127,7 +127,7 @@ class MammotionHTTP:
                 "/device-server/v1/stream/token",
                 json=payload,
                 headers={
-                    "Authorization": f"{self._headers.get('Authorization', "")}",
+                    "Authorization": f"Bearer {self.login_info.access_token}",
                     "Content-Type": "application/json",
                     "User-Agent": "okhttp/3.14.9",
                 },
@@ -143,7 +143,7 @@ class MammotionHTTP:
             async with session.get(
                 f"/device-server/v1/video-resource/{iot_id}",
                 headers={
-                    "Authorization": f"{self._headers.get('Authorization', '')}",
+                    "Authorization": f"Bearer {self.login_info.access_token}",
                     "Content-Type": "application/json",
                     "User-Agent": "okhttp/3.14.9",
                 },

pymammotion/mammotion/devices/mammotion.py

@@ -88,7 +88,7 @@ class MammotionMixedDeviceManager:
         self._state_manager.cloud_get_plan_callback = None
         self._state_manager.cloud_on_notification_callback = None
         self._state_manager.cloud_gethash_ack_callback = None
-        del self._cloud_device
+        self._cloud_device = None
 
     def replace_ble(self, ble_device: MammotionBaseBLEDevice) -> None:
         self._ble_device = ble_device
@@ -99,7 +99,7 @@ class MammotionMixedDeviceManager:
         self._state_manager.ble_get_plan_callback = None
         self._state_manager.ble_on_notification_callback = None
         self._state_manager.ble_gethash_ack_callback = None
-        del self._ble_device
+        self._ble_device = None
 
     def replace_mqtt(self, mqtt: MammotionCloud) -> None:
         device = self._cloud_device.device
@@ -240,7 +240,6 @@ class Mammotion:
         mammotion_http = MammotionHTTP()
         await mammotion_http.login(account, password)
         await self.connect_iot(mammotion_http, cloud_client)
-        await cloud_client.list_binding_by_account()
         return cloud_client
 
     @staticmethod
@@ -252,6 +251,7 @@ class Mammotion:
         await cloud_client.login_by_oauth(country_code, mammotion_http.login_info.authorization_code)
         await cloud_client.aep_handle()
         await cloud_client.session_by_auth_code()
+        await cloud_client.list_binding_by_account()
 
     async def remove_device(self, name: str) -> None:
         await self.device_manager.remove_device(name)

{pymammotion-0.4.37.dist-info → pymammotion-0.4.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.37
+Version: 0.4.39
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.4.37.dist-info → pymammotion-0.4.39.dist-info}/RECORD

@@ -51,7 +51,7 @@ pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,21
 pymammotion/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/encryption.py,sha256=lzXu3WwBdQlzjXxWnlJuRgkCrKdPbxx5drhMitVKIEk,8287
-pymammotion/http/http.py,sha256=rVTPyc5PQAsW6dILSfpp4hnnl6k3Tuy0bqC4lvnT0j8,9558
+pymammotion/http/http.py,sha256=VONAwhnniyCavu3S5sKv2pp1m8dv-x3Z9z5ueKVmqt8,9549
 pymammotion/http/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/model/camera_stream.py,sha256=ilxQNny_w9Frwt-m8kbHinvyjDv4Bx8C2swfZ2lTEDE,600
 pymammotion/http/model/http.py,sha256=tM5ikwVkWhRdXc2xi1NOLmWPH2mQEQelpaVgMlAEmlI,2333
@@ -71,7 +71,7 @@ pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 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=bL6aPx5o8sv3BrdgSIkpqaBYtW6yQPJ4rKd9JEr-u6c,11815
-pymammotion/mammotion/devices/mammotion.py,sha256=ugzmER_EvSzdZf_1OTYnNy3ynZo4NGX0eqN7SAR1hvM,14332
+pymammotion/mammotion/devices/mammotion.py,sha256=_Na2eG45zILalStfRyhlFSFKQ0neYwVSKok-K8P8jnM,14338
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=r-IoqiBsgEUOxcvU0Ryz8RkW1oUJ6LcXLQa710cYmZI,18862
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=sVw-McsTJ_8wlkToL5rkjAlN2d3ituvqLona5w5bd1o,14160
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
@@ -123,7 +123,7 @@ pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tp
 pymammotion/utility/mur_mur_hash.py,sha256=xEfOZVbqRawJj66eLgtnZ85OauDR47oIPr29OHelzPI,4468
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.4.37.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.37.dist-info/METADATA,sha256=8MqFqYhVRZVIlQg_NR7-yriZo9_1DoN1_zL2CHAsN0o,3878
-pymammotion-0.4.37.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.4.37.dist-info/RECORD,,
+pymammotion-0.4.39.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.39.dist-info/METADATA,sha256=SlLheoAkwXLT5qExwetHfnB7qkSeBPw2vVTQqNw-NlI,3878
+pymammotion-0.4.39.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.4.39.dist-info/RECORD,,