Merge branch 'main-v2' of ssh://120.27.199.238:222/Havoc420mac/mi-task into main-v2
This commit is contained in:
commit
e76ae395fb
3
.vscode/settings.json
vendored
Normal file
3
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"cmake.ignoreCMakeListsMissing": true
|
||||
}
|
8
main.py
8
main.py
@ -176,7 +176,6 @@ def main():
|
||||
print("\n程序被用户中断")
|
||||
except Exception as e:
|
||||
import traceback
|
||||
import sys
|
||||
exc_type, exc_value, exc_tb = sys.exc_info()
|
||||
tb = traceback.extract_tb(exc_tb)
|
||||
if tb:
|
||||
@ -311,7 +310,14 @@ class Robot_Ctrl(object):
|
||||
self.runing = 0
|
||||
self.rec_thread.join()
|
||||
self.send_thread.join()
|
||||
<<<<<<< HEAD
|
||||
self.image_processor.destroy()
|
||||
=======
|
||||
try:
|
||||
self.image_processor.destroy()
|
||||
except Exception as e:
|
||||
print(f"销毁图像处理器失败: {e}")
|
||||
>>>>>>> 4449dc62d19438a10391a305f4362fec92eb56ad
|
||||
# 销毁 MarkerRunner
|
||||
if hasattr(self, 'marker_runner') and self.marker_runner is not None:
|
||||
try:
|
||||
|
@ -277,6 +277,7 @@ class ImageProcessor:
|
||||
self.spin_thread = None
|
||||
self.running = True
|
||||
self.log = get_logger("图像处理器")
|
||||
self.log = get_logger("图像处理器")
|
||||
|
||||
# 异步 QR 码扫描相关
|
||||
self.scan_thread = None
|
||||
|
Loading…
x
Reference in New Issue
Block a user