pymammotion 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

pymammotion/data/model/report_info.py

@@ -1,4 +1,5 @@
-from dataclasses import dataclass, field
+from dataclasses import dataclass, field, asdict
+
 
 @dataclass
 class ConnectData:
@@ -72,6 +73,7 @@ class LocationData:
 
 @dataclass
 class WorkData:
+    path: int = 0
     path_hash: str = ""
     progress: int = 0
     area: int = 0
@@ -80,14 +82,22 @@ class WorkData:
     bp_pos_x: int = 0
     bp_pos_y: int = 0
     real_path_num: str = ""
+    path_pos_x: int = 0
+    path_pos_y: int = 0
     ub_zone_hash: str = ""
+    ub_path_hash: str = ""
     init_cfg_hash: str = ""
     ub_ecode_hash: str = ""
+    nav_run_mode: int = 0
+    test_mode_status: int = 0
+    man_run_speed: int = 0
+    nav_edit_status: int = 0
     knife_height: int = 0
 
     @classmethod
     def from_dict(cls, data: dict):
         return cls(
+            path=data.get('path', 0),
             path_hash=data.get('path_hash', ""),
             progress=data.get('progress', 0),
             area=data.get('area', 0),
@@ -96,9 +106,16 @@ class WorkData:
             bp_pos_x=data.get('bp_pos_x', 0),
             bp_pos_y=data.get('bp_pos_y', 0),
             real_path_num=data.get('real_path_num', ""),
+            path_pos_x=data.get('path_pos_x', 0),
+            path_pos_y=data.get('path_pos_y', 0),
             ub_zone_hash=data.get('ub_zone_hash', ""),
+            ub_path_hash=data.get('ub_path_hash', ""),
             init_cfg_hash=data.get('init_cfg_hash', ""),
             ub_ecode_hash=data.get('ub_ecode_hash', ""),
+            nav_run_mode=data.get('nav_run_mode', 0),
+            test_mode_status=data.get('test_mode_status', 0),
+            man_run_speed=data.get('man_run_speed', 0),
+            nav_edit_status=data.get('nav_edit_status', 0),
             knife_height=data.get('knife_height', 0)
         )
 
@@ -112,10 +129,14 @@ class ReportData:
 
     @classmethod
     def from_dict(cls, data: dict):
+        locations = cls.locations
+        if data.get('locations') is not None:
+            locations=[LocationData.from_dict(loc) for loc in data.get('locations', [])]
+
         return cls(
-            connect=ConnectData.from_dict(data.get('connect', {})),
-            dev=DeviceData.from_dict(data.get('dev', {})),
-            rtk=RTKData.from_dict(data.get('rtk', {})),
-            locations=[LocationData.from_dict(loc) for loc in data.get('locations', [])],
-            work=WorkData.from_dict(data.get('work', {}))
+            connect=ConnectData.from_dict(data.get('connect', asdict(cls.connect))),
+            dev=DeviceData.from_dict(data.get('dev', asdict(cls.dev))),
+            rtk=RTKData.from_dict(data.get('rtk', asdict(cls.rtk))),
+            locations=locations,
+            work=WorkData.from_dict(data.get('work', asdict(cls.work)))
         )

{pymammotion-0.1.6.dist-info → pymammotion-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.1.6
+Version: 0.1.8
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

{pymammotion-0.1.6.dist-info → pymammotion-0.1.8.dist-info}/RECORD

@@ -32,7 +32,7 @@ pymammotion/data/model/mowing_modes.py,sha256=121zhvouPKRbF7mynJIc7tJ0zO9bS-Nq4C
 pymammotion/data/model/plan.py,sha256=7JvqAo0a9Yg1Vtifd4J3Dx3StEppxrMOfmq2-877kYg,2891
 pymammotion/data/model/rapid_state.py,sha256=_e9M-65AbkvIqXyMYzLKBxbNvpso42qD8R-JSt66THY,986
 pymammotion/data/model/region_data.py,sha256=75xOTM1qeRbSROp53eIczw3yCmYM9DgMjMh8qE9xkKo,2880
-pymammotion/data/model/report_info.py,sha256=ISk_ZT-GoL9Os-2FmxuTnXr2-28DiDhQVo6YEaGhJrg,3639
+pymammotion/data/model/report_info.py,sha256=GAQH6VpsTxkrfFmbUk6mngajN2KcOFlvbFVchDPOCzw,4448
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pymammotion/data/mqtt/event.py,sha256=kEilMLmwZG2nbokLw7X28KF3b-te8G-MfNARYm4LG6I,2170
 pymammotion/data/mqtt/properties.py,sha256=HkBPghr26L9_b4QaOi1DtPgb0UoPIOGSe9wb3kgnM6Y,2815
@@ -109,7 +109,7 @@ pymammotion/utility/device_type.py,sha256=KYawu2glZMVlPmxRbA4kVFujXz3miHp3rJiOWR
 pymammotion/utility/map.py,sha256=GNDcA-YBIglRJjvQylNdJVefoVzlH16mFSxnojK_B_A,2175
 pymammotion/utility/periodic.py,sha256=9wJMfwXPlx6Mbp3Fws7LLTI34ZDKphH1bva_Ggyk32g,3281
 pymammotion/utility/rocker_util.py,sha256=syPL0QN4zMzHiTIkUKS7RXBBptjdbkfNlPddwUD5V3A,7171
-pymammotion-0.1.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.1.6.dist-info/METADATA,sha256=e3upvDI7cJZX1R99b6WpgoS07JnTbfoG5dUpd7oNum4,3922
-pymammotion-0.1.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.1.6.dist-info/RECORD,,
+pymammotion-0.1.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.1.8.dist-info/METADATA,sha256=BukZKRZVSNk69bgGkbJSD-2I9qSpDCQeVK8sboK5KjE,3922
+pymammotion-0.1.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.1.8.dist-info/RECORD,,