NanjingForestryUniversity/supermachine-wood
3
0
Fork 0
mirror of https://github.com/NanjingForestryUniversity/supermachine-wood.git synced 2025-11-08 10:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

函数多次调用形式重构

Browse Source
This commit is contained in:
FEIJINTI 2022-10-03 12:55:09 +08:00
parent a0a06d8b8d
commit 389f841d3e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
socket_detector.py
View File

@ -14,7 +14,7 @@ from utils import PreSocket, receive_sock, parse_protocol, ack_sock, done_sock
import logging import logging
def try_connect(is_repeat: bool = False, max_reconnect_times: int = 50) -> (bool, socket.socket): def try_connect(connect_ip: str, port_number: int, is_repeat: bool = False, max_reconnect_times: int = 50) -> (bool, socket.socket):
""" """
尝试连接. 尝试连接.
@ -27,7 +27,7 @@ def try_connect(is_repeat: bool = False, max_reconnect_times: int = 50) -> (bool
logging.warning(f'尝试{"重新" if is_repeat else ""}发起第{reconnect_time+1}次连接...') logging.warning(f'尝试{"重新" if is_repeat else ""}发起第{reconnect_time+1}次连接...')
try: try:
connected_sock = PreSocket(socket.AF_INET, socket.SOCK_STREAM) connected_sock = PreSocket(socket.AF_INET, socket.SOCK_STREAM)
connected_sock.connect(('127.0.0.1', 23456)) connected_sock.connect((connect_ip, port_number))
except Exception as e: except Exception as e:
reconnect_time += 1 reconnect_time += 1
logging.error(f'第{reconnect_time}次连接失败\n {e}') logging.error(f'第{reconnect_time}次连接失败\n {e}')
@ -72,25 +72,28 @@ def main(is_debug=False):
logging.basicConfig(format='%(asctime)s %(filename)s[line:%(lineno)d] - %(levelname)s - %(message)s', logging.basicConfig(format='%(asctime)s %(filename)s[line:%(lineno)d] - %(levelname)s - %(message)s',
handlers=[file_handler, console_handler], level=logging.DEBUG) handlers=[file_handler, console_handler], level=logging.DEBUG)
status, connected_sock = False, None received_status, received_sock = False, None
while not status: send_status, send_sock = False, None
status, connected_sock = try_connect() while not (received_status or send_status):
received_status, received_sock = try_connect(connect_ip='127.0.0.1', port_number=21122)
send_status, send_sock = try_connect(connect_ip='127.0.0.1', port_number=21123)
# socket_send = PreSocket(socket.AF_INET, socket.SOCK_STREAM) # socket_send = PreSocket(socket.AF_INET, socket.SOCK_STREAM)
# socket_send.connect(('127.0.0.1', 21123)) # socket_send.connect(('127.0.0.1', 21123))
# a = b'\xaa\x00\x00\x00\x05\x20\x44\x54\x52\xff\xff\xff\xbb' # a = b'\xaa\x00\x00\x00\x05\x20\x44\x54\x52\xff\xff\xff\xbb'
# connected_sock.send(a) # received_sock.send(a)
model_path = os.path.join(ROOT_DIR, r"C:\Users\FEIJINTI\PycharmProjects\wood_color\models\model_2022-09-28_13-15.p") model_path = os.path.join(ROOT_DIR, r"C:\Users\FEIJINTI\PycharmProjects\wood_color\models\model_2022-09-28_13-15.p")
detector = WoodClass(w=4096, h=1200, n=3000, debug_mode=False) detector = WoodClass(w=4096, h=1200, n=3000, debug_mode=False)
detector.load(path=model_path) detector.load(path=model_path)
while True: while True:
pack, next_pack = receive_sock(connected_sock) pack, next_pack = receive_sock(received_sock)
if pack == b"": if pack == b"":
status, connected_sock = try_connect() received_status, received_sock = try_connect(connect_ip='127.0.0.1', port_number=21122)
send_status, send_sock = try_connect(connect_ip='127.0.0.1', port_number=21123)
continue continue
cmd, data = parse_protocol(pack) cmd, data = parse_protocol(pack)
ack_sock(connected_sock, cmd_type=cmd) # ack_sock(received_sock, cmd_type=cmd)
process_cmd(cmd=cmd, data=data, connected_sock=connected_sock, detector=detector) process_cmd(cmd=cmd, data=data, connected_sock=send_sock, detector=detector)
if __name__ == '__main__': if __name__ == '__main__':