pymammotion 0.4.0b3__tar.gz → 0.4.0b5__tar.gz

{pymammotion-0.4.0b3 → pymammotion-0.4.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.0b3
+Version: 0.4.0b5
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.4.0b3 → pymammotion-0.4.0b5}/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.0b3 → pymammotion-0.4.0b5}/pymammotion/proto/luba_mul.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 enum MUL_LANGUAGE {
   ENGLISH = 0;
   GERMAN = 1;
+  UNRECOGNIZED = -1;
 }
 
 enum MUL_CAMERA_POSITION {

{pymammotion-0.4.0b3 → pymammotion-0.4.0b5}/pymammotion/proto/luba_mul.py

@@ -9,6 +9,7 @@ import betterproto
 class MUL_LANGUAGE(betterproto.Enum):
     ENGLISH = 0
     GERMAN = 1
+    UNRECOGNIZED = -1
 
 
 class MUL_CAMERA_POSITION(betterproto.Enum):

{pymammotion-0.4.0b3 → pymammotion-0.4.0b5}/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,22 @@ 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.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.0b3 → pymammotion-0.4.0b5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.0-beta3"
+version     = "0.4.0-beta5"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -66,7 +66,7 @@ mypy = "^1.11.2"
 autotyping = "^24.3.0"
 
 [tool.bumpver]
-current_version = "0.4.0-beta3"
+current_version = "0.4.0-beta5"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true