pymammotion 0.4.48__py3-none-any.whl → 0.4.49__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -732,7 +732,7 @@ class CloudIOTGateway:
         logger.debug(iot_id)
 
         response_body_str = response.body.decode("utf-8")
-        response_body_dict = json.loads(response_body_str)
+        response_body_dict = json.loads(response_body_str) if response_body_str is not None else {}
 
         if int(response_body_dict.get("code")) != 200:
             logger.error(

pymammotion/data/model/device.py

@@ -6,7 +6,7 @@ import betterproto
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 from pymammotion.data.model import HashList, RapidState
-from pymammotion.data.model.device_info import DeviceFirmwares, MowerInfo
+from pymammotion.data.model.device_info import DeviceFirmwares, DeviceNonWorkingHours, MowerInfo
 from pymammotion.data.model.location import Location
 from pymammotion.data.model.report_info import ReportData
 from pymammotion.data.model.work import CurrentTaskSettings
@@ -38,6 +38,7 @@ class MowingDevice(DataClassORJSONMixin):
     err_code_list: list = field(default_factory=list)
     err_code_list_time: list | None = field(default_factory=list)
     error_codes: dict[str, ErrorInfo] = field(default_factory=dict)
+    non_work_hours: DeviceNonWorkingHours = field(default_factory=DeviceNonWorkingHours)
 
     def buffer(self, buffer_list: SystemUpdateBufMsg) -> None:
         """Update the device based on which buffer we are reading from."""

pymammotion/data/model/device_info.py

@@ -14,6 +14,12 @@ class SideLight(DataClassORJSONMixin):
     action: int = 0
 
 
+@dataclass
+class DeviceNonWorkingHours(DataClassORJSONMixin):
+    start_time: str = ""
+    end_time: str = ""
+
+
 @dataclass
 class MowerInfo(DataClassORJSONMixin):
     blade_status: bool = False
@@ -27,6 +33,8 @@ class MowerInfo(DataClassORJSONMixin):
     product_key: str = ""
     model_id: str = ""
     sub_model_id: str = ""
+    ble_mac: str = ""
+    wifi_mac: str = ""
 
 
 @dataclass

pymammotion/data/state_manager.py

@@ -20,12 +20,14 @@ from pymammotion.proto import (
     DeviceProductTypeInfoT,
     DrvDevInfoResp,
     DrvDevInfoResult,
+    GetNetworkInfoRsp,
     LubaMsg,
     NavGetCommDataAck,
     NavGetHashListAck,
     NavPlanJobSet,
     NavReqCoverPath,
     NavSysParamMsg,
+    NavUnableTimeSet,
     SvgMessageAckT,
     TimeCtrlLight,
     WifiIotStatusReport,
@@ -183,6 +185,10 @@ class StateManager:
                         self._device.mower_state.turning_mode = settings.context
                     case 7:
                         self._device.mower_state.traversal_mode = settings.context
+            case "todev_unable_time_set":
+                nav_non_work_time: NavUnableTimeSet = nav_msg[1]
+                self._device.non_work_hours.start_time = nav_non_work_time.unable_start_time
+                self._device.non_work_hours.end_time = nav_non_work_time.unable_end_time
 
     def _update_sys_data(self, message) -> None:
         """Update system."""
@@ -225,6 +231,9 @@ class StateManager:
                     if resp.res == DrvDevInfoResult.DRV_RESULT_SUC and resp.id == 1 and resp.type == 6:
                         self._device.mower_state.swversion = resp.info
                         self._device.device_firmwares.device_version = resp.info
+            case "toapp_networkinfo_rsp":
+                get_network_info_resp: GetNetworkInfoRsp = net_msg[1]
+                self._device.mower_state.wifi_mac = get_network_info_resp.wifi_mac
 
     def _update_mul_data(self, message) -> None:
         pass

pymammotion/mammotion/commands/messages/network.py

@@ -192,11 +192,6 @@ class MessageNetwork(AbstractMessage, ABC):
         logger.debug("Send command - get Wifi connection information")
         return self.send_order_msg_net(build)
 
-    def wifi_connectinfo_update2(self) -> None:
-        hash_map = {"getMsgCmd": 1}
-        # self.post_custom_data(self.get_json_string(
-        #     68, hash_map))  # TODO: Fix this
-
     def get_record_wifi_list(self) -> bytes:
         build = DevNet(todev_ble_sync=1, todev_wifi_list_upload=DrvWifiList())
         logger.debug("Send command - get memorized WiFi list upload command")

pymammotion/mammotion/devices/mammotion.py

@@ -133,21 +133,22 @@ class MammotionDeviceManager:
         return self.devices.get(mammotion_device_name)
 
     async def remove_device(self, name: str) -> None:
-        device_for_removal = self.devices.pop(name)
-        loop = asyncio.get_running_loop()
-        if device_for_removal.has_cloud():
-            should_disconnect = {
-                device
-                for key, device in self.devices.items()
-                if device.cloud() is not None and device.cloud().mqtt == device_for_removal.cloud().mqtt
-            }
-            if len(should_disconnect) == 0:
-                await loop.run_in_executor(None, device_for_removal.cloud().mqtt.disconnect)
-            await device_for_removal.cloud().stop()
-        if device_for_removal.has_ble():
-            await device_for_removal.ble().stop()
-
-        del device_for_removal
+        if self.devices.get(name):
+            device_for_removal = self.devices.pop(name)
+            loop = asyncio.get_running_loop()
+            if device_for_removal.has_cloud():
+                should_disconnect = {
+                    device
+                    for key, device in self.devices.items()
+                    if device.cloud() is not None and device.cloud().mqtt == device_for_removal.cloud().mqtt
+                }
+                if len(should_disconnect) == 0:
+                    await loop.run_in_executor(None, device_for_removal.cloud().mqtt.disconnect)
+                await device_for_removal.cloud().stop()
+            if device_for_removal.has_ble():
+                await device_for_removal.ble().stop()
+
+            del device_for_removal
 
 
 class Mammotion:

{pymammotion-0.4.48.dist-info → pymammotion-0.4.49.dist-info}/METADATA

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

{pymammotion-0.4.48.dist-info → pymammotion-0.4.49.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pymammotion/__init__.py,sha256=H-U94bNLp0LPC6hkRopVEUlUsZSR97n7WfKGPjK1GMg,1638
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
 pymammotion/aliyun/client.py,sha256=DWHGBuRCMIHdm2AgIV8XsUCxc4kP7TAmhAlpxcrtz3s,9591
-pymammotion/aliyun/cloud_gateway.py,sha256=3CgBrXCKfPUZsuMGr7ElTDT7_riYWhmBhL8ecC5SOzc,28287
+pymammotion/aliyun/cloud_gateway.py,sha256=_qwntXZjj2VzX5x_9LSeq-lW0CRsBYdGO0Wn8e5kIHk,28328
 pymammotion/aliyun/model/aep_response.py,sha256=EY4uMTJ4F9rvbcXnAOc5YKi7q__9kIVgfDwfyr65Gk0,421
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
 pymammotion/aliyun/model/dev_by_account_response.py,sha256=P9yYy4Z2tLkJSqXA_5XGaCUliSSVa5ILl7VoMtL_tCA,977
@@ -25,9 +25,9 @@ pymammotion/const.py,sha256=lWRxvTVdXnNHuxqvRkjO5ziK0Ic-fZMM6J2dbe5M6Nc,385
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/data/model/__init__.py,sha256=UVRbSXGOjYnWv30ZEvzT5QRpdVqAbyeToo-t0QBWyi4,292
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
-pymammotion/data/model/device.py,sha256=tsOuapxFVp17Qwng62EcHGl53Xqfndnk4o6eEpkbq60,7509
+pymammotion/data/model/device.py,sha256=v6CRWzAfRrwRwN--_6DGl6nKDvqO_16ZvTXu8w7bpL0,7621
 pymammotion/data/model/device_config.py,sha256=DTnoePsMwJrKVXqGeKvbZQjs8Zab61U5T3b-c-w0WlM,2654
-pymammotion/data/model/device_info.py,sha256=R1vLBvAgST2sWTAYYKmZB7HcYXqq_LlobrhrGG0TKIc,991
+pymammotion/data/model/device_info.py,sha256=Q5PbPdTfd948ZWc8EHjN5zwU6pha5MCr47ZEXzCYKNY,1148
 pymammotion/data/model/device_limits.py,sha256=m8HdxD-RaAkPm7jHYb9GLxMEH9IfzBPz0ZypmsLnId4,1946
 pymammotion/data/model/enums.py,sha256=NLImBbeqwbwBLbABC_NbBzk4M8OxhUTcto6QcGZVNOc,1707
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
@@ -45,7 +45,7 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 pymammotion/data/mqtt/event.py,sha256=r14gzZVxmlGVAwFdZQ1CUsMZFHHwRKnbt2VHnjugP28,5123
 pymammotion/data/mqtt/properties.py,sha256=pX5JRVmmpVO04CSPm5xAGcSWA_OeLd0JnBagLsfiSEc,3755
 pymammotion/data/mqtt/status.py,sha256=SgdrpE1Uldb01hybO6hYhgU1Sp1eILghC0UhMZMHrdQ,1091
-pymammotion/data/state_manager.py,sha256=1LlkR1ghMHdxAfSR1OHmrz_X2-Da3f6xqNoxLSk-zT4,10313
+pymammotion/data/state_manager.py,sha256=aRpxgIxWwlMV-36YCbnIUwdcQbTrWM7p0YrQFem0wCs,10842
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,2143
 pymammotion/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -63,7 +63,7 @@ pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 pymammotion/mammotion/commands/messages/driver.py,sha256=LAYGvAcDDXwwliQ1OfRwNBk1VpIdpURo1TlA64zpLA4,3701
 pymammotion/mammotion/commands/messages/media.py,sha256=a6CY_1wEpepH9zg6-HfH1lt-jtC1sFy8hm7tFRgzlG4,1493
 pymammotion/mammotion/commands/messages/navigation.py,sha256=aEEpvDW5QukJ0QiWMhPjjz0eTTF1ndQuvv8a6hJlUg0,23257
-pymammotion/mammotion/commands/messages/network.py,sha256=oO3PK6TKY563Jw-ZRpNmIzGCgkuk2SQm0BhcDL5claM,7595
+pymammotion/mammotion/commands/messages/network.py,sha256=OrmW4-BP_o3piBjwXZ12WY0HqbXHQqeDXC0YaDPeBM8,7409
 pymammotion/mammotion/commands/messages/ota.py,sha256=ZHLQRE5ETvLEIu2Vbj3m2XidIWT8uorYSHxkZd3pkRc,1376
 pymammotion/mammotion/commands/messages/system.py,sha256=XOEeyUAz1iNtPk37dzCbLrxx1pljUlGy1IKuof_Pko0,14244
 pymammotion/mammotion/commands/messages/video.py,sha256=KN9Zj8h7EnVipVBOzHxWF4RXhU3MpueYe1GNErGHapg,1248
@@ -71,7 +71,7 @@ pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
 pymammotion/mammotion/devices/base.py,sha256=wM2c2vjfPjYPYmMTk77E833IN1ioearcU2pcLZUkP7I,12030
-pymammotion/mammotion/devices/mammotion.py,sha256=MNOoPNHjojnTUwKY3LmUe-vBxdmfwoRgEYNNueCpXC0,14472
+pymammotion/mammotion/devices/mammotion.py,sha256=c578d2i0dihHtrPtzyK4qWcYGPon-gJo0L0C4g7uzQ8,14563
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=sgfL4sz6WkIlr2bvYplzxsudmzATNE-z3UGe0K1Csng,18919
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=P352E-pcbG6wA-RXubI51EUJ3UUQcqJkxRDIqh3g-58,14217
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
@@ -123,7 +123,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.4.48.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.48.dist-info/METADATA,sha256=XUvVIzAkWDYWJvQAiyVDpmd2jB6q85tob7arz4nukrY,3878
-pymammotion-0.4.48.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.4.48.dist-info/RECORD,,
+pymammotion-0.4.49.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.49.dist-info/METADATA,sha256=utMSN3D4ZQ7UkAo1ZGa9RDQdW_uMI0BtbyVXQoTIMzY,3878
+pymammotion-0.4.49.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.4.49.dist-info/RECORD,,