From 273ff9905c5492067cf353b33acac02b64364fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=96=B5?= Date: Wed, 1 Jul 2026 09:48:13 +0800 Subject: [PATCH] =?UTF-8?q?2026.7.1=E5=B0=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- drone_controller/mission_manager.py | 3 ++- infer_camera_modular.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drone_controller/mission_manager.py b/drone_controller/mission_manager.py index ee61ff6..006830f 100644 --- a/drone_controller/mission_manager.py +++ b/drone_controller/mission_manager.py @@ -329,7 +329,7 @@ class MissionManager: def _throttle_log_on_change(self, key, current_value, msg, *args, level=logging.INFO): """状态变化日志：仅当 current_value 与上次记录不同时输出一次""" - last = self._last_throttle_state.get(key, object()) + last = self._last_throttle_state.get(key) if last != current_value: self._last_throttle_state[key] = current_value logger.log(level, msg, *args) @@ -695,6 +695,7 @@ class MissionManager: if not target_detected: if self._target_lost_start is None: self._target_lost_start = time.time() + lost_elapsed = 0.0 else: lost_elapsed = time.time() - self._target_lost_start if lost_elapsed >= self.target_lost_timeout: diff --git a/infer_camera_modular.py b/infer_camera_modular.py index f2c6f72..7f9863f 100644 --- a/infer_camera_modular.py +++ b/infer_camera_modular.py @@ -166,8 +166,8 @@ class VideoStreaming: self.cap.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc('H', '2', '6', '4')) except Exception: pass # 编码设置失败不影响连接 - if "?" not in self.video_source: - self.video_source += "?tcp" + # if "?" not in self.video_source: + # self.video_source += "?tcp" else: # USB 摄像头也可设置缓冲区 self.cap.set(cv2.CAP_PROP_BUFFERSIZE, 1)