pymammotion 0.4.0b2__py3-none-any.whl → 0.4.0b4__py3-none-any.whl

pymammotion/data/model/report_info.py

@@ -8,7 +8,7 @@ class ConnectData(DataClassORJSONMixin):
     connect_type: int = 0
     ble_rssi: int = 0
     wifi_rssi: int = 0
-    used_net: str = ""
+    used_net: str = "None"
 
 
 @dataclass

pymammotion/mqtt/mammotion_mqtt.py

@@ -10,13 +10,13 @@ import logging
 from logging import getLogger
 
 import betterproto
+from linkkit.linkkit import LinkKit
 from paho.mqtt.client import MQTTMessage
 
 from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
 from pymammotion.data.mqtt.event import ThingEventMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
-from pymammotion.mqtt.linkkit.linkkit import LinkKit
 from pymammotion.proto.luba_msg import LubaMsg
 
 logger = getLogger(__name__)

pymammotion/utility/constant/device_constant.py

@@ -1,5 +1,7 @@
 from enum import IntEnum
 
+from pymammotion.data.model.report_info import ConnectData
+
 
 class bleOrderCmd:
     allpowerfullRW = 67
@@ -211,15 +213,26 @@ class WorkMode:
     MODE_CHARGING_PAUSE = 39
 
 
-def device_connection(value: int, mnet_type: str) -> str:
+def device_connection(connect: ConnectData) -> str:
     """Return string representation of device connection."""
-    if value == 1:
-        return "BLE"
 
-    if mnet_type == "NET_USED_TYPE_WIFI":
+    if (
+        connect.connect_type == 2
+        or connect.used_net == "NET_USED_TYPE_WIFI"
+        or (connect.wifi_rssi != 0 and connect.ble_rssi != 0)
+    ):
+        return "WIFI/BLE"
+
+    if connect.connect_type == 2 or connect.used_net == "NET_USED_TYPE_WIFI" or connect.wifi_rssi != 0:
         return "WIFI"
 
-    return "3G/4G"
+    if connect.connect_type == 1 or connect.used_net == "NET_USED_TYPE_MNET":
+        return "3G/4G"
+
+    if connect.ble_rssi != 0:
+        return "BLE"
+
+    return "None"
 
 
 def device_mode(value: int) -> str:

{pymammotion-0.4.0b2.dist-info → pymammotion-0.4.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.0b2
+Version: 0.4.0b4
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
@@ -15,6 +15,7 @@ Requires-Dist: aiohttp (>=3.9.1,<4.0.0)
 Requires-Dist: alibabacloud-apigateway-util (>=0.0.2,<0.0.3)
 Requires-Dist: alibabacloud-iot-api-gateway (>=0.0.4,<0.0.5)
 Requires-Dist: alicloud-gateway-iot (>=1.0.0,<2.0.0)
+Requires-Dist: aliyun-iot-linkkit (>=1.2.12,<2.0.0)
 Requires-Dist: async-timeout (>=4.0.3,<5.0.0)
 Requires-Dist: betterproto (>=1.2.5,<2.0.0)
 Requires-Dist: bleak (>=0.21.0)
@@ -25,7 +26,7 @@ Requires-Dist: jsonic (>=1.0.0,<2.0.0)
 Requires-Dist: mashumaro (>=3.13,<4.0)
 Requires-Dist: numpy (>=1.26.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0)
-Requires-Dist: paho-mqtt (>=2.1.0,<3.0.0)
+Requires-Dist: paho-mqtt (>=1.6.1,<2.0.0)
 Requires-Dist: protobuf (>=4.23.1)
 Requires-Dist: py-jsonic (>=0.0.2,<0.0.3)
 Description-Content-Type: text/markdown

{pymammotion-0.4.0b2.dist-info → pymammotion-0.4.0b4.dist-info}/RECORD

@@ -38,7 +38,7 @@ pymammotion/data/model/plan.py,sha256=wGlcJT-w0EdbWK9jI838TCOm_MABFg7WoR664VB8RW
 pymammotion/data/model/rapid_state.py,sha256=mIdhAG_LZXpVcybxqTLgLXkNOmVmDTn04B9PGIDA8Ls,1251
 pymammotion/data/model/raw_data.py,sha256=oO8JX4JP8YuWGj_-6XdooCQn8MnXuNYJ3S6e502NzpU,6754
 pymammotion/data/model/region_data.py,sha256=VokMRqB_o4OFL1TWAM90Fvm-1z4jcYrw3X2o760qpx4,2949
-pymammotion/data/model/report_info.py,sha256=9sPPfhBv8f0K-xuHRkKrbez-7nZ_oCND2vZYLuKvkBA,3436
+pymammotion/data/model/report_info.py,sha256=cWr0FC9B0M4ZHS2bY4V5nzjXSMd8qHq2NRhm6TzNXnw,3440
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pymammotion/data/mqtt/event.py,sha256=r14gzZVxmlGVAwFdZQ1CUsMZFHHwRKnbt2VHnjugP28,5123
 pymammotion/data/mqtt/properties.py,sha256=pX5JRVmmpVO04CSPm5xAGcSWA_OeLd0JnBagLsfiSEc,3755
@@ -70,11 +70,8 @@ pymammotion/mammotion/devices/mammotion.py,sha256=-x9hf_M-_3fp5srHGBuMmO5DBsSDnw
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=G7gprsdvKiBHr4S2myRuLL-PWldtsnlLIsiW8yWvpP0,19613
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=nd1Uj6rF8UKHJbHC6nlPRrNQPggPXxfpydT0o0cWbMM,13835
 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=NzFpdtfxNHQ6xNu-POyp45fTK7AWUAWV7RavFevX4m4,132772
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
-pymammotion/mqtt/mammotion_mqtt.py,sha256=csnKHAOqjmNYtk2uAly2_Qg7J6ZNtiULZO7q5Poua30,8876
+pymammotion/mqtt/mammotion_mqtt.py,sha256=Aec7xQGtTCVdVD-hH20ICm6-6YyWbtXc128yvYmtdWY,8859
 pymammotion/proto/__init__.py,sha256=v3_P1LOsYRBN9qCAhaWrWMX7GWHrox9XD3hdZQxcPZM,190
 pymammotion/proto/basestation.proto,sha256=_x5gAz3FkZXS1jtq4GgZgaDCuRU-UV-7HTFdsfQ3zbo,1034
 pymammotion/proto/basestation.py,sha256=js64_N2xQYRxWPRdVNEapO0qe7vBlfYnjW5sE8hi7hw,2026
@@ -118,7 +115,7 @@ pymammotion/proto/mctrl_sys_pb2.py,sha256=DYemb514mlC7c27t-k1YqqBif0xxhLmnIWk8rX
 pymammotion/proto/mctrl_sys_pb2.pyi,sha256=Dj_1UM86kZ5MfcVyNC76Z0gKrfl5YFsVWP2b-bKoZvk,38912
 pymammotion/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/utility/constant/__init__.py,sha256=tcY0LDeD-qDDHx2LKt55KOyv9ZI0UfCNM6fknLCmm8s,110
-pymammotion/utility/constant/device_constant.py,sha256=RQ0Yi6hQa9hfx4wVXypPaPozahQ8Y4EiU3RWZYDZeOY,7593
+pymammotion/utility/constant/device_constant.py,sha256=nOzNgXc1c1mr4dpuqG0QYToa1q6ocY-G7pLi3z67mEc,8013
 pymammotion/utility/conversions.py,sha256=v3YICy0zZwwBBzrUZgabI7GRfiDBnkiAX2qdtk3NxOY,89
 pymammotion/utility/datatype_converter.py,sha256=SPM_HuaaD_XOawlqEnA8qlRRZXGba3WjA8kGOZgeBlQ,4284
 pymammotion/utility/device_config.py,sha256=hHVyT8uSsHZB4_kuaN6K5wfsC2V5Ixevm1aFi2oYDFk,27956
@@ -127,7 +124,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.4.0b2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.0b2.dist-info/METADATA,sha256=_g95yCpcFO-w6GISykIZO69Jo-COe2h7-GD6dVTOkCk,3886
-pymammotion-0.4.0b2.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pymammotion-0.4.0b2.dist-info/RECORD,,
+pymammotion-0.4.0b4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.0b4.dist-info/METADATA,sha256=9iDEs7KoCvtDGuiAEGd5sPOQTj1PcCI6jeX4CLIFE0Y,3938
+pymammotion-0.4.0b4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pymammotion-0.4.0b4.dist-info/RECORD,,

pymammotion/mqtt/linkkit/__init__.py

@@ -1,5 +0,0 @@
-"""Package for linkkit."""
-
-from .linkkit import LinkKit
-
-__all__ = ["LinkKit"]