pymammotion 0.5.4__py3-none-any.whl → 0.5.5__py3-none-any.whl

pymammotion/data/mqtt/properties.py

@@ -125,13 +125,13 @@ ItemTypes = Union[
 
 
 @dataclass
-class Item:
+class Item(DataClassDictMixin):
     time: int
     value: int | float | str | dict[str, Any] | ItemTypes  # Depending on the type of value
 
 
 @dataclass
-class Items:
+class Items(DataClassDictMixin):
     iotState: Item | None = None
     extMod: Item | None = None
     deviceVersionInfo: Item | None = None
@@ -163,12 +163,12 @@ class Items:
 
 @dataclass
 class Params(DataClassORJSONMixin):
-    deviceType: Literal["LawnMower"]
+    deviceType: Literal["LawnMower", "Tracker"]
     checkFailedData: dict
     groupIdList: list[str]
     _tenantId: str
     groupId: str
-    categoryKey: Literal["LawnMower"]
+    categoryKey: Literal["LawnMower", "Tracker"]
     batchId: str
     gmtCreate: int
     productKey: str

pymammotion/mqtt/linkkit/linkkit.py

@@ -713,7 +713,7 @@ UxeCp6
         self.__on_ota_message_arrived = None
 
         if self.__just_for_pycharm_autocomplete:
-            self.__mqtt_client = mqtt.Client(CallbackAPIVersion.VERSION2)
+            self.__mqtt_client = mqtt.Client(CallbackAPIVersion.VERSION1)
 
         # device interface info
         self.__device_info_topic = "/sys/%s/%s/thing/deviceinfo/update" % (self.__product_key, self.__device_name)
@@ -1311,10 +1311,7 @@ UxeCp6
         elif self.__mqtt_protocol == "MQTTv31":
             mqtt_protocol_version = mqtt.MQTTv31
         self.__mqtt_client = mqtt.Client(
-            callback_api_version=CallbackAPIVersion.VERSION2,
-            client_id=client_id,
-            clean_session=self.__mqtt_clean_session,
-            protocol=mqtt_protocol_version,
+            client_id=client_id, clean_session=self.__mqtt_clean_session, protocol=mqtt_protocol_version
         )
 
         if self.__link_log.is_enabled():
@@ -1570,13 +1567,13 @@ UxeCp6
             else:
                 return 1, None
 
-    def __on_internal_connect_safe(self, client, userdata, flags, reason_code, properties) -> None:
-        if reason_code == 0:
+    def __on_internal_connect_safe(self, client, user_data, session_flag, rc) -> None:
+        if rc == 0:
             self.__reset_reconnect_wait()
             self.__force_reconnect = False
-        session_flag_internal = {"session present": flags}
+        session_flag_internal = {"session present": session_flag}
         self.__handler_task.post_message(
-            self.__handler_task_cmd_on_connect, (client, userdata, session_flag_internal, reason_code, properties)
+            self.__handler_task_cmd_on_connect, (client, user_data, session_flag_internal, rc)
         )
 
     def __loop_forever_internal(self):
@@ -1609,7 +1606,7 @@ UxeCp6
         except ssl.SSLError as e:
             self.__link_log.error("config mqtt raise exception:" + str(e))
             self.__linkkit_state = LinkKit.LinkKitState.INITIALIZED
-            self.__on_internal_connect_safe(None, None, 0, 6, {})
+            self.__on_internal_connect_safe(None, None, 0, 6)
             return
 
         try:
@@ -1619,7 +1616,7 @@ UxeCp6
         except Exception as e:
             self.__link_log.error("__loop_forever_internal connect raise exception:" + str(e))
             self.__linkkit_state = LinkKit.LinkKitState.INITIALIZED
-            self.__on_internal_connect_safe(None, None, 0, 7, {})
+            self.__on_internal_connect_safe(None, None, 0, 7)
             return
         while True:
             if self.__worker_loop_exit_req:
@@ -1642,7 +1639,7 @@ UxeCp6
                 #     return
                 if self.__linkkit_state == LinkKit.LinkKitState.CONNECTING:
                     self.__linkkit_state = LinkKit.LinkKitState.DISCONNECTED
-                self.__on_internal_connect_safe(None, None, 0, 9, {})
+                self.__on_internal_connect_safe(None, None, 0, 9)
                 if self.__linkkit_state == LinkKit.LinkKitState.DESTRUCTING:
                     self.__handler_task.stop()
                     self.__linkkit_state = LinkKit.LinkKitState.DESTRUCTED
@@ -1664,7 +1661,7 @@ UxeCp6
                     break
 
             if self.__linkkit_state == LinkKit.LinkKitState.CONNECTED:
-                self.__on_internal_disconnect(None, None, 1, {})
+                self.__on_internal_disconnect(None, None, 1)
             self.__link_log.info("loop return:%r" % rc)
 
             if self.__worker_loop_exit_req:
@@ -2539,25 +2536,23 @@ UxeCp6
         client, user_data, message = value
         self.__on_internal_async_message(message)
 
-    def __on_internal_connect(self, client, userdata, flags, reason_code, properties) -> None:
+    def __on_internal_connect(self, client, user_data, session_flag, rc) -> None:
         self.__link_log.info("__on_internal_connect")
-        if reason_code == 0:
+        if rc == 0:
             self.__reset_reconnect_wait()
             # self.__upload_device_interface_info()
-            self.__handler_task.post_message(
-                self.__handler_task_cmd_on_connect, (client, userdata, flags, reason_code, properties)
-            )
+            self.__handler_task.post_message(self.__handler_task_cmd_on_connect, (client, user_data, session_flag, rc))
 
     def __handler_task_on_connect_callback(self, value) -> None:
-        client, userdata, flags, reason_code = value
+        client, user_data, session_flag, rc = value
         self.__link_log.info("__on_internal_connect enter")
-        self.__link_log.debug("session:%d, return code:%d" % (flags["session present"], reason_code))
+        self.__link_log.debug("session:%d, return code:%d" % (session_flag["session present"], rc))
         if rc == 0:
             self.__linkkit_state = LinkKit.LinkKitState.CONNECTED
             # self.__worker_thread.start()
         if self.__on_connect is not None:
             try:
-                self.__on_connect(flags["session present"], reason_code, self.__user_data)
+                self.__on_connect(session_flag["session present"], rc, self.__user_data)
             except Exception as e:
                 self.__link_log.error("on_connect process raise exception:%r" % e)
         if self.__thing_setup_state:
@@ -2565,7 +2560,7 @@ UxeCp6
             if self.__on_thing_enable:
                 self.__on_thing_enable(self.__user_data)
 
-    def __on_internal_disconnect(self, client, userdata, flags, reason_code, properties) -> None:
+    def __on_internal_disconnect(self, client, user_data, rc) -> None:
         self.__link_log.info("__on_internal_disconnect enter")
         if self.__linkkit_state == LinkKit.LinkKitState.DESTRUCTING:
             self.__linkkit_state = LinkKit.LinkKitState.DESTRUCTED
@@ -2598,15 +2593,13 @@ UxeCp6
         self.__device_info_mid.clear()
         self.__thing_update_device_info_up_mid.clear()
         self.__thing_delete_device_info_up_mid.clear()
-        self.__handler_task.post_message(
-            self.__handler_task_cmd_on_disconnect, (client, userdata, reason_code, properties)
-        )
+        self.__handler_task.post_message(self.__handler_task_cmd_on_disconnect, (client, user_data, rc))
         if self.__linkkit_state == LinkKit.LinkKitState.DESTRUCTED:
             self.__handler_task.stop()
 
     def __handler_task_on_disconnect_callback(self, value) -> None:
         self.__link_log.info("__handler_task_on_disconnect_callback enter")
-        client, userdata, reason_code = value
+        client, user_data, rc = value
         if self.__thing_setup_state:
             if self.__thing_enable_state:
                 self.__thing_enable_state = False
@@ -2617,7 +2610,7 @@ UxeCp6
                         self.__link_log.error("on_thing_disable process raise exception:%r" % e)
         if self.__on_disconnect is not None:
             try:
-                self.__on_disconnect(reason_code, self.__user_data)
+                self.__on_disconnect(rc, self.__user_data)
             except Exception as e:
                 self.__link_log.error("on_disconnect process raise exception:%r" % e)
 

{pymammotion-0.5.4.dist-info → pymammotion-0.5.5.dist-info}/METADATA

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

{pymammotion-0.5.4.dist-info → pymammotion-0.5.5.dist-info}/RECORD

@@ -43,7 +43,7 @@ pymammotion/data/model/report_info.py,sha256=3nXBFRfdKWnZj4YfBcrPwhBRpq58ICMQlrE
 pymammotion/data/model/work.py,sha256=AfKMItFqnRtAlVHzKCfYY-BQy-WFDYZBzdj-9Yc03bo,655
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pymammotion/data/mqtt/event.py,sha256=C8TGRJs9wNxwg9FFmr9qcsweDnl5v5kcVcwiHxtYzJw,5384
-pymammotion/data/mqtt/properties.py,sha256=FMZHDwKO-vZeaMP0ewVZ22wgBVhi244l2ZAWb9wFANQ,4259
+pymammotion/data/mqtt/properties.py,sha256=laud9rE-JqBHWKZ44Dov2yMkp3Ld8ghpBwlZ4_3g9uQ,4321
 pymammotion/data/mqtt/status.py,sha256=SgdrpE1Uldb01hybO6hYhgU1Sp1eILghC0UhMZMHrdQ,1091
 pymammotion/data/state_manager.py,sha256=Q0WTI-ehXH50bQEroXibzGK5MLRx5OThGZ86NNCPJjc,11508
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
@@ -78,7 +78,7 @@ pymammotion/mammotion/devices/mammotion_cloud.py,sha256=Pd4aOIhcjVZznJfa0ANYTdG3
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0zFReUlkk,80
 pymammotion/mqtt/linkkit/h2client.py,sha256=w9Nvi_nY4CLD_fw-pHtYChwQf7e2TiAGeqkY_sF4cf0,19659
-pymammotion/mqtt/linkkit/linkkit.py,sha256=joaubTgYYRILEkDMfCPiauOLuiKqY0eCpS8L5Ni8GkY,133217
+pymammotion/mqtt/linkkit/linkkit.py,sha256=SGWny2_LKa8qg8RD0Bgd3a4S_fMqpYxJ7a9eFRvgcN0,132923
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
 pymammotion/mqtt/mammotion_mqtt.py,sha256=4jNNV5tx6CCryjLSmAQA6u19bhRSuVkZem32JCpOakE,10198
 pymammotion/proto/__init__.py,sha256=vUF-eieR8e4VfduqaQ3KfeCRhsMD56NTX2Kk6sS38IE,73466
@@ -124,7 +124,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.5.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.5.4.dist-info/METADATA,sha256=8ATEs2lmbEZbpK5GZO31VxAYMdSEuAiaV-d4lSjSIzk,3870
-pymammotion-0.5.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.5.4.dist-info/RECORD,,
+pymammotion-0.5.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.5.5.dist-info/METADATA,sha256=OoAgAEjBHXz8XRebg4rgZAUHx4nPIx4mXvUyLXwdHzI,3870
+pymammotion-0.5.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.5.5.dist-info/RECORD,,