pymammotion 0.4.0b2__tar.gz → 0.4.0b4__tar.gz

{pymammotion-0.4.0b2 → pymammotion-0.4.0b4}/PKG-INFO

@@ -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 → pymammotion-0.4.0b4}/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-0.4.0b2 → pymammotion-0.4.0b4}/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-0.4.0b2 → pymammotion-0.4.0b4}/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 → pymammotion-0.4.0b4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.0-beta2"
+version     = "0.4.0-beta4"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -26,7 +26,8 @@ bleak = ">=0.21.0"
 protobuf = ">=4.23.1"
 py-jsonic = "^0.0.2"
 aiohttp = "^3.9.1"
-paho-mqtt = "^2.1.0"
+aliyun-iot-linkkit = "^1.2.12"
+paho-mqtt = "^1.6.1"
 alicloud-gateway-iot = "^1.0.0"
 alibabacloud-apigateway-util = "^0.0.2"
 alibabacloud-iot-api-gateway = "^0.0.4"
@@ -65,7 +66,7 @@ mypy = "^1.11.2"
 autotyping = "^24.3.0"
 
 [tool.bumpver]
-current_version = "0.4.0-beta2"
+current_version = "0.4.0-beta4"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true

pymammotion-0.4.0b2/pymammotion/mqtt/linkkit/__init__.py

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