pymammotion 0.0.37__py3-none-any.whl → 0.0.39__py3-none-any.whl

pymammotion/mammotion/commands/messages/network.py

@@ -1,236 +1,236 @@
-# === sendOrderMsg_Net  ===
-import json
-import time
-from typing import Dict
-
-from pyluba.aliyun.tmp_constant import tmp_constant
-from pyluba.mammotion.commands.messages.navigation import MessageNavigation
-from pyluba.proto import dev_net_pb2, luba_msg_pb2
-
-
-class MessageNetwork:
-    messageNavigation: MessageNavigation = MessageNavigation()
-
-    @staticmethod
-    def send_order_msg_net(build):
-        luba_msg = luba_msg_pb2.LubaMsg(
-            msgtype=luba_msg_pb2.MSG_CMD_TYPE_ESP,
-            sender=luba_msg_pb2.DEV_MOBILEAPP,
-            rcver=luba_msg_pb2.DEV_COMM_ESP,
-            msgattr=luba_msg_pb2.MSG_ATTR_REQ,
-            seqs=1,
-            version=1,
-            subtype=1,
-            net=build,
-        )
-
-        return luba_msg.SerializeToString()
-
-    def get_device_base_info(self):
-        net = dev_net_pb2.DevNet(todev_devinfo_req=dev_net_pb2.DrvDevInfoReq())
-        net.todev_devinfo_req.req_ids.add(id=1, type=6)
-
-        return self.send_order_msg_net(net)
-
-    def get_4g_module_info(self):
-        build = dev_net_pb2.DevNet(
-            todev_get_mnet_cfg_req=dev_net_pb2.DevNet().todev_get_mnet_cfg_req
-        )
-        print("Send command -- Get device 4G network module information")
-        return self.send_order_msg_net(build)
-
-    def get_4g_info(self):
-        build = dev_net_pb2.DevNet(
-            todev_mnet_info_req=dev_net_pb2.DevNet().todev_mnet_info_req
-        )
-        print("Send command -- Get device 4G network information")
-        return self.send_order_msg_net(build)
-
-    def set_zmq_enable(self):
-        build = dev_net_pb2.DevNet(
-            todev_set_dds2zmq=dev_net_pb2.DrvDebugDdsZmq(
-                is_enable=True,
-                rx_topic_name="perception_post_result",
-                tx_zmq_url="tcp://0.0.0.0:5555",
-            )
-        )
-        print("Send command -- Set vision ZMQ to enable")
-        return self.send_order_msg_net(build)
-
-    def set_iot_setting(self, iot_control_type: dev_net_pb2.iot_conctrl_type):
-        build = dev_net_pb2.DevNet(todev_set_iot_offline_req=iot_control_type)
-        print("Send command -- Device re-online")
-        return self.send_order_msg_net(build)
-
-    def set_device_log_upload(
-        self,
-        request_id: str,
-        operation: int,
-        server_ip: int,
-        server_port: int,
-        number: int,
-        type: int,
-    ):
-        build = dev_net_pb2.DrvUploadFileToAppReq(
-            bizId=request_id,
-            operation=operation,
-            serverIp=server_ip,
-            serverPort=server_port,
-            num=number,
-            type=type,
-        )
-        print(
-            f"Send log====Feedback====Command======requestID:{request_id} operation:{operation} serverIp:{server_ip} type:{type}"
-        )
-        return self.send_order_msg_net(
-            dev_net_pb2.DevNet(todev_ble_sync=1, todev_uploadfile_req=build)
-        )
-
-    def set_device_socket_request(
-        self,
-        request_id: str,
-        operation: int,
-        server_ip: int,
-        server_port: int,
-        number: int,
-        type: int,
-    ) -> bytes:
-        """Set device socket request (bluetooth only)."""
-        build = dev_net_pb2.DrvUploadFileToAppReq(
-            bizId=request_id,
-            operation=operation,
-            serverIp=server_ip,
-            serverPort=server_port,
-            num=number,
-            type=type,
-        )
-        print(
-            f"Send log====Feedback====Command======requestID:{request_id}  operation:{operation} serverIp:{server_ip}  type:{type}"
-        )
-        return self.send_order_msg_net(
-            dev_net_pb2.DevNet(todev_ble_sync=1, todev_uploadfile_req=build)
-        )
-
-    def get_device_log_info(self, biz_id: str, type: int, log_url: str) -> bytes:
-        """Get device log info (bluetooth only)."""
-        return self.send_order_msg_net(
-            dev_net_pb2.DevNet(
-                todev_ble_sync=1,
-                todev_req_log_info=dev_net_pb2.DrvUploadFileReq(
-                    bizId=biz_id,
-                    type=type,
-                    url=log_url,
-                    num=0,
-                    userId="",  # TODO supply user id
-                ),
-            )
-        )
-
-    def cancel_log_update(self, biz_id: str):
-        """Cancel log update (bluetooth only)."""
-        return self.send_order_msg_net(
-            dev_net_pb2.DevNet(
-                todev_log_data_cancel=dev_net_pb2.DrvUploadFileCancel(bizId=biz_id)
-            )
-        )
-
-    def get_device_network_info(self):
-        build = dev_net_pb2.DevNet(
-            todev_networkinfo_req=dev_net_pb2.GetNetworkInfoReq(req_ids=1)
-        )
-        print("Send command - get device network information")
-        return self.send_order_msg_net(build)
-
-    def set_device_4g_enable_status(self, new_4g_status: bool):
-        build = dev_net_pb2.DevNet(
-            todev_ble_sync=1,
-            todev_set_mnet_cfg_req=dev_net_pb2.SetMnetCfgReq(
-                cfg=dev_net_pb2.MnetCfg(
-                    type=dev_net_pb2.NET_TYPE_WIFI,
-                    inet_enable=new_4g_status,
-                    mnet_enable=new_4g_status,
-                )
-            ),
-        )
-
-        print(f"Send command - set 4G (on/off status). newWifiStatus={new_4g_status}")
-        return self.send_order_msg_net(build)
-
-    def set_device_wifi_enable_status(self, new_wifi_status: bool):
-        build = dev_net_pb2.DevNet(
-            todev_ble_sync=1,
-            todev_Wifi_Configuration=dev_net_pb2.DrvWifiSet(
-                configParam=4, wifi_enable=new_wifi_status
-            ),
-        )
-        print(
-            f"szNetwork: Send command - set network (on/off status). newWifiStatus={new_wifi_status}"
-        )
-        return self.send_order_msg_net(build)
-
-    def wifi_connectinfo_update(self, device_name: str, is_binary: bool):
-        print(
-            f"Send command - get Wifi connection information.wifiConnectinfoUpdate().deviceName={device_name}.isBinary={is_binary}"
-        )
-        if is_binary:
-            build = dev_net_pb2.DevNet(
-                todev_ble_sync=1,
-                todev_WifiMsgUpload=dev_net_pb2.DrvWifiUpload(Wifi_Msg_Upload=1),
-            )
-            print("Send command - get Wifi connection information")
-            return self.send_order_msg_net(build)
-        self.wifi_connectinfo_update2()
-
-    def wifi_connectinfo_update2(self):
-        hash_map = {"getMsgCmd": 1}
-        # self.post_custom_data(self.get_json_string(
-        #     68, hash_map))  # ToDo: Fix this
-
-    def get_record_wifi_list(self, is_binary: bool):
-        print(f"getRecordWifiList().isBinary={is_binary}")
-        if is_binary:
-            build = dev_net_pb2.DevNet(
-                todev_ble_sync=1, todev_WifiListUpload=dev_net_pb2.DrvWifiList()
-            )
-            print("Send command - get memorized WiFi list upload command")
-            return self.send_order_msg_net(build)
-        self.get_record_wifi_list2()
-
-    def get_record_wifi_list2(self):
-        pass
-        # self.messageNavigation.post_custom_data(
-        #     self.get_json_string(69))  # ToDo: Fix this
-
-    def close_clear_connect_current_wifi(self, ssid: str, status: int, is_binary: bool):
-        if is_binary:
-            build = dev_net_pb2.DevNet(
-                todev_ble_sync=1,
-                todev_Wifi_Configuration=dev_net_pb2.DrvWifiSet(
-                    configParam=status, Confssid=ssid
-                ),
-            )
-            print(
-                f"Send command - set network (disconnect, direct connect, forget, no operation reconnect) operation command (downlink ssid={ssid}, status={status})"
-            )
-            return self.send_order_msg_net(build)
-        self.close_clear_connect_current_wifi2(ssid, status)
-
-    def close_clear_connect_current_wifi2(self, ssid: str, get_msg_cmd: int):
-        data = {"ssid": ssid, "getMsgCmd": get_msg_cmd}
-        # self.messageNavigation.post_custom_data(
-        # ToDo: Fix this
-        # self.get_json_string(bleOrderCmd.close_clear_connect_current_wifi, data).encode())
-
-    def get_json_string(self, cmd: int, hash_map: Dict[str, object]) -> str:
-        jSONObject = {}
-        try:
-            jSONObject["cmd"] = cmd
-            jSONObject[tmp_constant.REQUEST_ID] = int(time.time())
-            jSONObject2 = {}
-            for key, value in hash_map.items():
-                jSONObject2[key] = value
-            jSONObject["params"] = jSONObject2
-            return json.dumps(jSONObject)
-        except Exception as e:
-            print(e)
-            return ""
+# === sendOrderMsg_Net  ===
+import json
+import time
+from typing import Dict
+
+from pymammotion.aliyun.tmp_constant import tmp_constant
+from pymammotion.mammotion.commands.messages.navigation import MessageNavigation
+from pymammotion.proto import dev_net_pb2, luba_msg_pb2
+
+
+class MessageNetwork:
+    messageNavigation: MessageNavigation = MessageNavigation()
+
+    @staticmethod
+    def send_order_msg_net(build):
+        luba_msg = luba_msg_pb2.LubaMsg(
+            msgtype=luba_msg_pb2.MSG_CMD_TYPE_ESP,
+            sender=luba_msg_pb2.DEV_MOBILEAPP,
+            rcver=luba_msg_pb2.DEV_COMM_ESP,
+            msgattr=luba_msg_pb2.MSG_ATTR_REQ,
+            seqs=1,
+            version=1,
+            subtype=1,
+            net=build,
+        )
+
+        return luba_msg.SerializeToString()
+
+    def get_device_base_info(self):
+        net = dev_net_pb2.DevNet(todev_devinfo_req=dev_net_pb2.DrvDevInfoReq())
+        net.todev_devinfo_req.req_ids.add(id=1, type=6)
+
+        return self.send_order_msg_net(net)
+
+    def get_4g_module_info(self):
+        build = dev_net_pb2.DevNet(
+            todev_get_mnet_cfg_req=dev_net_pb2.DevNet().todev_get_mnet_cfg_req
+        )
+        print("Send command -- Get device 4G network module information")
+        return self.send_order_msg_net(build)
+
+    def get_4g_info(self):
+        build = dev_net_pb2.DevNet(
+            todev_mnet_info_req=dev_net_pb2.DevNet().todev_mnet_info_req
+        )
+        print("Send command -- Get device 4G network information")
+        return self.send_order_msg_net(build)
+
+    def set_zmq_enable(self):
+        build = dev_net_pb2.DevNet(
+            todev_set_dds2zmq=dev_net_pb2.DrvDebugDdsZmq(
+                is_enable=True,
+                rx_topic_name="perception_post_result",
+                tx_zmq_url="tcp://0.0.0.0:5555",
+            )
+        )
+        print("Send command -- Set vision ZMQ to enable")
+        return self.send_order_msg_net(build)
+
+    def set_iot_setting(self, iot_control_type: dev_net_pb2.iot_conctrl_type):
+        build = dev_net_pb2.DevNet(todev_set_iot_offline_req=iot_control_type)
+        print("Send command -- Device re-online")
+        return self.send_order_msg_net(build)
+
+    def set_device_log_upload(
+        self,
+        request_id: str,
+        operation: int,
+        server_ip: int,
+        server_port: int,
+        number: int,
+        type: int,
+    ):
+        build = dev_net_pb2.DrvUploadFileToAppReq(
+            bizId=request_id,
+            operation=operation,
+            serverIp=server_ip,
+            serverPort=server_port,
+            num=number,
+            type=type,
+        )
+        print(
+            f"Send log====Feedback====Command======requestID:{request_id} operation:{operation} serverIp:{server_ip} type:{type}"
+        )
+        return self.send_order_msg_net(
+            dev_net_pb2.DevNet(todev_ble_sync=1, todev_uploadfile_req=build)
+        )
+
+    def set_device_socket_request(
+        self,
+        request_id: str,
+        operation: int,
+        server_ip: int,
+        server_port: int,
+        number: int,
+        type: int,
+    ) -> bytes:
+        """Set device socket request (bluetooth only)."""
+        build = dev_net_pb2.DrvUploadFileToAppReq(
+            bizId=request_id,
+            operation=operation,
+            serverIp=server_ip,
+            serverPort=server_port,
+            num=number,
+            type=type,
+        )
+        print(
+            f"Send log====Feedback====Command======requestID:{request_id}  operation:{operation} serverIp:{server_ip}  type:{type}"
+        )
+        return self.send_order_msg_net(
+            dev_net_pb2.DevNet(todev_ble_sync=1, todev_uploadfile_req=build)
+        )
+
+    def get_device_log_info(self, biz_id: str, type: int, log_url: str) -> bytes:
+        """Get device log info (bluetooth only)."""
+        return self.send_order_msg_net(
+            dev_net_pb2.DevNet(
+                todev_ble_sync=1,
+                todev_req_log_info=dev_net_pb2.DrvUploadFileReq(
+                    bizId=biz_id,
+                    type=type,
+                    url=log_url,
+                    num=0,
+                    userId="",  # TODO supply user id
+                ),
+            )
+        )
+
+    def cancel_log_update(self, biz_id: str):
+        """Cancel log update (bluetooth only)."""
+        return self.send_order_msg_net(
+            dev_net_pb2.DevNet(
+                todev_log_data_cancel=dev_net_pb2.DrvUploadFileCancel(bizId=biz_id)
+            )
+        )
+
+    def get_device_network_info(self):
+        build = dev_net_pb2.DevNet(
+            todev_networkinfo_req=dev_net_pb2.GetNetworkInfoReq(req_ids=1)
+        )
+        print("Send command - get device network information")
+        return self.send_order_msg_net(build)
+
+    def set_device_4g_enable_status(self, new_4g_status: bool):
+        build = dev_net_pb2.DevNet(
+            todev_ble_sync=1,
+            todev_set_mnet_cfg_req=dev_net_pb2.SetMnetCfgReq(
+                cfg=dev_net_pb2.MnetCfg(
+                    type=dev_net_pb2.NET_TYPE_WIFI,
+                    inet_enable=new_4g_status,
+                    mnet_enable=new_4g_status,
+                )
+            ),
+        )
+
+        print(f"Send command - set 4G (on/off status). newWifiStatus={new_4g_status}")
+        return self.send_order_msg_net(build)
+
+    def set_device_wifi_enable_status(self, new_wifi_status: bool):
+        build = dev_net_pb2.DevNet(
+            todev_ble_sync=1,
+            todev_Wifi_Configuration=dev_net_pb2.DrvWifiSet(
+                configParam=4, wifi_enable=new_wifi_status
+            ),
+        )
+        print(
+            f"szNetwork: Send command - set network (on/off status). newWifiStatus={new_wifi_status}"
+        )
+        return self.send_order_msg_net(build)
+
+    def wifi_connectinfo_update(self, device_name: str, is_binary: bool):
+        print(
+            f"Send command - get Wifi connection information.wifiConnectinfoUpdate().deviceName={device_name}.isBinary={is_binary}"
+        )
+        if is_binary:
+            build = dev_net_pb2.DevNet(
+                todev_ble_sync=1,
+                todev_WifiMsgUpload=dev_net_pb2.DrvWifiUpload(Wifi_Msg_Upload=1),
+            )
+            print("Send command - get Wifi connection information")
+            return self.send_order_msg_net(build)
+        self.wifi_connectinfo_update2()
+
+    def wifi_connectinfo_update2(self):
+        hash_map = {"getMsgCmd": 1}
+        # self.post_custom_data(self.get_json_string(
+        #     68, hash_map))  # ToDo: Fix this
+
+    def get_record_wifi_list(self, is_binary: bool):
+        print(f"getRecordWifiList().isBinary={is_binary}")
+        if is_binary:
+            build = dev_net_pb2.DevNet(
+                todev_ble_sync=1, todev_WifiListUpload=dev_net_pb2.DrvWifiList()
+            )
+            print("Send command - get memorized WiFi list upload command")
+            return self.send_order_msg_net(build)
+        self.get_record_wifi_list2()
+
+    def get_record_wifi_list2(self):
+        pass
+        # self.messageNavigation.post_custom_data(
+        #     self.get_json_string(69))  # ToDo: Fix this
+
+    def close_clear_connect_current_wifi(self, ssid: str, status: int, is_binary: bool):
+        if is_binary:
+            build = dev_net_pb2.DevNet(
+                todev_ble_sync=1,
+                todev_Wifi_Configuration=dev_net_pb2.DrvWifiSet(
+                    configParam=status, Confssid=ssid
+                ),
+            )
+            print(
+                f"Send command - set network (disconnect, direct connect, forget, no operation reconnect) operation command (downlink ssid={ssid}, status={status})"
+            )
+            return self.send_order_msg_net(build)
+        self.close_clear_connect_current_wifi2(ssid, status)
+
+    def close_clear_connect_current_wifi2(self, ssid: str, get_msg_cmd: int):
+        data = {"ssid": ssid, "getMsgCmd": get_msg_cmd}
+        # self.messageNavigation.post_custom_data(
+        # ToDo: Fix this
+        # self.get_json_string(bleOrderCmd.close_clear_connect_current_wifi, data).encode())
+
+    def get_json_string(self, cmd: int, hash_map: Dict[str, object]) -> str:
+        jSONObject = {}
+        try:
+            jSONObject["cmd"] = cmd
+            jSONObject[tmp_constant.REQUEST_ID] = int(time.time())
+            jSONObject2 = {}
+            for key, value in hash_map.items():
+                jSONObject2[key] = value
+            jSONObject["params"] = jSONObject2
+            return json.dumps(jSONObject)
+        except Exception as e:
+            print(e)
+            return ""

pymammotion/mammotion/commands/messages/ota.py

@@ -1,34 +1,34 @@
-# === sendOrderMsg_Ota ===
-from pyluba.proto import luba_msg_pb2, mctrl_ota_pb2
-
-
-class MessageOta:
-    def send_order_msg_ota(self, ota):
-        luba_msg = luba_msg_pb2.LubaMsg(
-            msgtype=luba_msg_pb2.MSG_CMD_TYPE_EMBED_OTA,
-            sender=luba_msg_pb2.DEV_MOBILEAPP,
-            rcver=luba_msg_pb2.DEV_MAINCTL,
-            msgattr=luba_msg_pb2.MSG_ATTR_REQ,
-            seqs=1,
-            version=1,
-            subtype=1,
-            ota=ota,
-        )
-
-        return luba_msg.SerializeToString()
-
-    def get_device_ota_info(self, log_type: int):
-        todev_get_info_req = mctrl_ota_pb2.MctlOta(
-            todev_get_info_req=mctrl_ota_pb2.getInfoReq(type=mctrl_ota_pb2.IT_OTA)
-        )
-
-        print("===Send command to get upgrade details===logType:" + str(log_type))
-        return self.send_order_msg_ota(todev_get_info_req)
-
-    def get_device_info_new(self):
-        """New device call for OTA upgrade information."""
-        todev_get_info_req = mctrl_ota_pb2.MctlOta(
-            todev_get_info_req=mctrl_ota_pb2.getInfoReq(type=mctrl_ota_pb2.IT_BASE)
-        )
-        print("Send to get OTA upgrade information", "Get device information")
-        return self.send_order_msg_ota(todev_get_info_req)
+# === sendOrderMsg_Ota ===
+from pymammotion.proto import luba_msg_pb2, mctrl_ota_pb2
+
+
+class MessageOta:
+    def send_order_msg_ota(self, ota):
+        luba_msg = luba_msg_pb2.LubaMsg(
+            msgtype=luba_msg_pb2.MSG_CMD_TYPE_EMBED_OTA,
+            sender=luba_msg_pb2.DEV_MOBILEAPP,
+            rcver=luba_msg_pb2.DEV_MAINCTL,
+            msgattr=luba_msg_pb2.MSG_ATTR_REQ,
+            seqs=1,
+            version=1,
+            subtype=1,
+            ota=ota,
+        )
+
+        return luba_msg.SerializeToString()
+
+    def get_device_ota_info(self, log_type: int):
+        todev_get_info_req = mctrl_ota_pb2.MctlOta(
+            todev_get_info_req=mctrl_ota_pb2.getInfoReq(type=mctrl_ota_pb2.IT_OTA)
+        )
+
+        print("===Send command to get upgrade details===logType:" + str(log_type))
+        return self.send_order_msg_ota(todev_get_info_req)
+
+    def get_device_info_new(self):
+        """New device call for OTA upgrade information."""
+        todev_get_info_req = mctrl_ota_pb2.MctlOta(
+            todev_get_info_req=mctrl_ota_pb2.getInfoReq(type=mctrl_ota_pb2.IT_BASE)
+        )
+        print("Send to get OTA upgrade information", "Get device information")
+        return self.send_order_msg_ota(todev_get_info_req)