From cb52c09b01abd7157af341a65428a2cc26fd4c54 Mon Sep 17 00:00:00 2001 From: 123 <123@example.com> Date: Tue, 8 Jul 2025 15:24:31 +0800 Subject: [PATCH] 111 --- .promptx/memory/declarative.md | 30 + .promptx/pouch.json | 218 +- .promptx/resource/project.registry.json | 244 +- distance-judgement/.idea/.gitignore | 16 +- distance-judgement/.idea/modules.xml | 14 +- distance-judgement/.idea/pythonProject2.iml | 14 +- distance-judgement/CAMERA_ICON_OVERLAP_FIX.md | 272 +- .../CAMERA_ORIENTATION_GUIDE.md | 470 +-- distance-judgement/HTTPS_SETUP.md | 196 +- distance-judgement/MAP_USAGE_GUIDE.md | 328 +- distance-judgement/MOBILE_GUIDE.md | 490 +-- .../__pycache__/main_web.cpython-311.pyc | Bin 6118 -> 9589 bytes distance-judgement/create_simple_cert.py | 194 +- distance-judgement/demo_mobile.py | 410 +-- distance-judgement/drone_control.html | 1223 +++++++ distance-judgement/fix_firewall.bat | 1 + distance-judgement/get_ip.py | 72 +- distance-judgement/main.py | 520 +-- distance-judgement/main_web.py | 3 +- distance-judgement/main_web_simple_https.py | 138 +- .../mobile/baidu_browser_test.html | 2882 ++++++++--------- .../mobile/browser_compatibility_guide.html | 818 ++--- .../mobile/camera_permission_test.html | 1006 +++--- distance-judgement/mobile/gps_test.html | 622 ++-- .../mobile/legacy_browser_help.html | 492 +-- distance-judgement/mobile/mobile_client.html | 371 ++- .../mobile/permission_guide.html | 858 ++--- distance-judgement/requirements.txt | 43 +- distance-judgement/requirements_core.txt | 30 + distance-judgement/run.py | 192 +- distance-judgement/src/__init__.py | 100 +- .../src/__pycache__/__init__.cpython-313.pyc | Bin 1216 -> 1216 bytes .../src/__pycache__/__init__.cpython-39.pyc | Bin 1034 -> 1169 bytes .../src/__pycache__/config.cpython-311.pyc | Bin 1034 -> 1034 bytes .../src/__pycache__/config.cpython-313.pyc | Bin 1044 -> 1044 bytes .../src/__pycache__/config.cpython-39.pyc | Bin 901 -> 906 bytes .../distance_calculator.cpython-313.pyc | Bin 8610 -> 8610 bytes .../__pycache__/map_manager.cpython-313.pyc | Bin 11383 -> 11383 bytes .../mobile_connector.cpython-313.pyc | Bin 15453 -> 15453 bytes .../orientation_detector.cpython-313.pyc | Bin 11176 -> 11176 bytes .../person_detector.cpython-313.pyc | Bin 6044 -> 6044 bytes .../robomaster_connector.cpython-311.pyc | Bin 0 -> 21231 bytes .../web_orientation_detector.cpython-313.pyc | Bin 11798 -> 11798 bytes .../__pycache__/web_server.cpython-311.pyc | Bin 202230 -> 288868 bytes .../__pycache__/web_server.cpython-313.pyc | Bin 196534 -> 277628 bytes distance-judgement/src/config.py | 78 +- distance-judgement/src/distance_calculator.py | 410 +-- distance-judgement/src/drone/__init__.py | 67 + .../__pycache__/__init__.cpython-311.pyc | Bin 0 -> 2518 bytes .../__pycache__/__init__.cpython-313.pyc | Bin 0 -> 2217 bytes distance-judgement/src/drone/config.yaml | 131 + .../drone_controller/drone_controller.py | 1409 ++++++++ .../src/drone/drone_interface/__init__.py | 13 + .../__pycache__/__init__.cpython-311.pyc | Bin 0 -> 589 bytes .../__pycache__/__init__.cpython-313.pyc | Bin 0 -> 512 bytes .../__pycache__/drone_manager.cpython-311.pyc | Bin 0 -> 29605 bytes .../__pycache__/drone_manager.cpython-313.pyc | Bin 0 -> 27056 bytes .../video_receiver.cpython-311.pyc | Bin 0 -> 25513 bytes .../video_receiver.cpython-313.pyc | Bin 0 -> 24271 bytes .../drone/drone_interface/drone_manager.py | 655 ++++ .../drone/drone_interface/video_receiver.py | 639 ++++ .../src/drone/image_analyzer/__init__.py | 12 + .../__pycache__/__init__.cpython-311.pyc | Bin 0 -> 501 bytes .../__pycache__/__init__.cpython-313.pyc | Bin 0 -> 486 bytes .../__pycache__/analyzer.cpython-311.pyc | Bin 0 -> 24404 bytes .../__pycache__/analyzer.cpython-313.pyc | Bin 0 -> 22366 bytes .../src/drone/image_analyzer/analyzer.py | 538 +++ .../src/drone/utils/advanced_detector.py | 593 ++++ .../src/drone/utils/analyze_image.py | 283 ++ .../src/drone/utils/detector_fixed.py | 469 +++ .../src/drone/utils/part_detector_final.py | 1996 ++++++++++++ .../src/drone/utils/ship_analyzer.py | 508 +++ .../src/drone/web/templates/base.html | 138 + .../drone/web/templates/drone_control.html | 1480 +++++++++ distance-judgement/src/map_manager.py | 482 +-- distance-judgement/src/mobile_connector.py | 604 ++-- .../src/orientation_detector.py | 588 ++-- distance-judgement/src/person_detector.py | 198 +- .../src/web_orientation_detector.py | 668 ++-- distance-judgement/src/web_server.py | 1976 ++++++++++- distance-judgement/test_device_selector.html | 782 ++--- distance-judgement/test_network.py | 266 +- distance-judgement/tests/test_system.py | 502 +-- .../tools/auto_configure_camera.py | 314 +- distance-judgement/tools/generate_ssl_cert.py | 192 +- distance-judgement/tools/install.py | 526 +-- .../tools/setup_camera_location.py | 228 +- .../trajectory_simulation_test.html | 470 +++ 88 files changed, 21154 insertions(+), 8328 deletions(-) create mode 100644 distance-judgement/drone_control.html create mode 100644 distance-judgement/fix_firewall.bat create mode 100644 distance-judgement/requirements_core.txt create mode 100644 distance-judgement/src/__pycache__/robomaster_connector.cpython-311.pyc create mode 100644 distance-judgement/src/drone/__init__.py create mode 100644 distance-judgement/src/drone/__pycache__/__init__.cpython-311.pyc create mode 100644 distance-judgement/src/drone/__pycache__/__init__.cpython-313.pyc create mode 100644 distance-judgement/src/drone/config.yaml create mode 100644 distance-judgement/src/drone/drone_controller/drone_controller.py create mode 100644 distance-judgement/src/drone/drone_interface/__init__.py create mode 100644 distance-judgement/src/drone/drone_interface/__pycache__/__init__.cpython-311.pyc create mode 100644 distance-judgement/src/drone/drone_interface/__pycache__/__init__.cpython-313.pyc create mode 100644 distance-judgement/src/drone/drone_interface/__pycache__/drone_manager.cpython-311.pyc create mode 100644 distance-judgement/src/drone/drone_interface/__pycache__/drone_manager.cpython-313.pyc create mode 100644 distance-judgement/src/drone/drone_interface/__pycache__/video_receiver.cpython-311.pyc create mode 100644 distance-judgement/src/drone/drone_interface/__pycache__/video_receiver.cpython-313.pyc create mode 100644 distance-judgement/src/drone/drone_interface/drone_manager.py create mode 100644 distance-judgement/src/drone/drone_interface/video_receiver.py create mode 100644 distance-judgement/src/drone/image_analyzer/__init__.py create mode 100644 distance-judgement/src/drone/image_analyzer/__pycache__/__init__.cpython-311.pyc create mode 100644 distance-judgement/src/drone/image_analyzer/__pycache__/__init__.cpython-313.pyc create mode 100644 distance-judgement/src/drone/image_analyzer/__pycache__/analyzer.cpython-311.pyc create mode 100644 distance-judgement/src/drone/image_analyzer/__pycache__/analyzer.cpython-313.pyc create mode 100644 distance-judgement/src/drone/image_analyzer/analyzer.py create mode 100644 distance-judgement/src/drone/utils/advanced_detector.py create mode 100644 distance-judgement/src/drone/utils/analyze_image.py create mode 100644 distance-judgement/src/drone/utils/detector_fixed.py create mode 100644 distance-judgement/src/drone/utils/part_detector_final.py create mode 100644 distance-judgement/src/drone/utils/ship_analyzer.py create mode 100644 distance-judgement/src/drone/web/templates/base.html create mode 100644 distance-judgement/src/drone/web/templates/drone_control.html create mode 100644 distance-judgement/trajectory_simulation_test.html diff --git a/.promptx/memory/declarative.md b/.promptx/memory/declarative.md index c906ec1c..a727daed 100644 --- a/.promptx/memory/declarative.md +++ b/.promptx/memory/declarative.md @@ -258,4 +258,34 @@ - 2025/07/03 15:12 START BattlefieldExplorationSystem项目样式管理系统优化完成：1)完全消除48个CSS3兼容性错误，修复transition、transform、box-shadow等不支持属性；2)建立双管理器架构(ModernStyleManager统一管理+LeftPanelStyleManager专用管理)；3)统一样式文件到src/Client/styles/目录，清理旧的res/styles/目录；4)移除MainWindow内联样式，完全使用现代样式管理器；5)支持4种主题和演示模式，专为学术展示优化；6)创建完整文档体系(README.md、USAGE_GUIDE.md、StyleSystemStatus.md)；7)实现Qt 5.15完全兼容，零错误稳定运行 --tags Qt样式管理 CSS3兼容性 ModernStyleManager 学术项目优化 界面美化 --tags #其他 #评分:8 #有效期:长期 +- END + +- 2025/07/08 08:09 START +用户展示了BattlefieldExplorationSystem主界面右侧功能区域截图，包含人脸识别、战场探索(无人机控制/机器狗控制)、情报传输(远程控制/SSH连接)、数据统计(查询/AI分析/导出报告)四大模块，准备进行布局优化工作 --tags 界面截图 右侧功能区 布局优化 四大模块 +--tags #其他 #评分:8 #有效期:长期 +- END + +- 2025/07/08 08:20 START +成功优化BattlefieldExplorationSystem"情报传输"模块：1)删除冗余"远程控制系统"子标题；2)修复按钮重叠问题，统一高度55px并限制最大高度；3)删除功能说明文字，简化界面；4)统一按钮样式(字体16px，内边距12px 16px，间距16px)；5)移除Qt 5.15不支持的CSS3 transform属性；6)编译成功无错误，实现简洁专业的模块布局 --tags 情报传输模块优化 按钮布局修复 界面简化 Qt兼容性 编译成功 +--tags #其他 #评分:8 #有效期:长期 +- END + +- 2025/07/08 08:26 START +成功删除BattlefieldExplorationSystem主界面中的"人脸跟随"文字标签：1)定位到MainWindow.ui文件第817-862行的faceTracking按钮；2)完全删除QPushButton及相关QLabel和QHBoxLayout容器；3)验证MainWindow.cpp和.h文件中无相关功能代码，确保安全删除；4)编译成功无错误，不影响其他功能模块；5)实现界面简洁化，布局自然调整 --tags 人脸跟随删除 MainWindow.ui UI元素清理 界面简化 编译成功 +--tags #其他 #评分:8 #有效期:长期 +- END + +- 2025/07/08 08:35 START +成功删除BattlefieldExplorationSystem主界面中的"人脸识别"按钮：1)定位到MainWindow.ui文件第771-816行的faceRecognition按钮；2)完全删除QPushButton及相关QLabel和QHBoxLayout容器；3)验证MainWindow.cpp和.h文件中无相关功能代码，确保安全删除；4)编译成功无错误，不影响其他功能模块；5)实现界面简洁化，布局自然调整 --tags 人脸识别删除 MainWindow.ui UI元素清理 界面简化 编译成功 +--tags #其他 #评分:8 #有效期:长期 +- END + +- 2025/07/08 08:42 START +成功删除BattlefieldExplorationSystem右侧功能模块中的冗余按钮：1)删除"🧭 智能导航"和"🔊 情报传达"两个QPushButton；2)移除整个QGridLayout容器(第723-774行)；3)清理MainWindow.cpp中所有相关代码引用(信号连接、方法实现、布局检查、样式应用)；4)删除MainWindow.h中的方法声明；5)编译成功无错误，实现界面简洁化，保留右侧功能面板中的实际功能入口 --tags 冗余按钮删除 智能导航 情报传达 QGridLayout清理 代码引用清理 界面简化 编译成功 +--tags #其他 #评分:8 #有效期:长期 +- END + +- 2025/07/08 08:50 START +成功删除BattlefieldExplorationSystem主界面中的所有冗余主要功能按钮：1)删除"🚁 无人机视角"、"🐕 机器狗视角"、"🗺️ 机器狗建图"三个QPushButton；2)移除整个QVBoxLayout容器controlButtonsLayout(第580-725行)；3)清理MainWindow.cpp中所有相关代码引用(信号连接、方法实现、布局修复、样式应用)；4)删除MainWindow.h中的三个方法声明；5)编译成功无错误，实现界面极简化，功能由专门的RightFunctionPanel.cpp处理，架构更清晰 --tags 主要功能按钮删除 无人机视角 机器狗视角 机器狗建图 QVBoxLayout清理 代码引用清理 界面极简化 RightFunctionPanel 编译成功 +--tags #其他 #评分:8 #有效期:长期 - END \ No newline at end of file diff --git a/.promptx/pouch.json b/.promptx/pouch.json index 4c64fb77..6c813eb2 100644 --- a/.promptx/pouch.json +++ b/.promptx/pouch.json @@ -1,112 +1,6 @@ { - "currentState": "memory_saved", + "currentState": "role_activated_with_memory", "stateHistory": [ - { - "from": "memory_saved", - "command": "init", - "timestamp": "2025-07-01T00:06:01.444Z", - "args": [ - { - "workingDirectory": "/home/hzk/Software_Architecture" - } - ] - }, - { - "from": "initialized", - "command": "welcome", - "timestamp": "2025-07-01T00:06:20.379Z", - "args": [] - }, - { - "from": "role_discovery", - "command": "action", - "timestamp": "2025-07-01T00:07:11.585Z", - "args": [ - "nuwa" - ] - }, - { - "from": "role_activated_with_memory", - "command": "init", - "timestamp": "2025-07-01T00:14:14.861Z", - "args": [ - { - "workingDirectory": "/home/hzk/Software_Architecture" - } - ] - }, - { - "from": "initialized", - "command": "welcome", - "timestamp": "2025-07-01T00:14:20.084Z", - "args": [] - }, - { - "from": "role_discovery", - "command": "action", - "timestamp": "2025-07-01T00:14:38.053Z", - "args": [ - "nuwa" - ] - }, - { - "from": "role_activated_with_memory", - "command": "remember", - "timestamp": "2025-07-01T00:28:09.401Z", - "args": [ - "成功为用户创建了专业的\"课程项目总结助手\"(course-project-writer)角色，专门帮助写高质量的软件工程课程总结报告。\n\n## 角色设计特点\n- **专业专家模式**：结合学术写作和技术文档能力\n- **成绩导向策略**：针对评分标准优化内容\n- **全套支持文件**：包含思维模式、执行原则、知识体系的完整文件结构\n\n## 核心能力模块\n1. **学术写作思维**：结构化思维、证据支撑、价值体现\n2. **项目反思思维**：多维度分析、PDCA循环、成长轨迹梳理\n3. **学术报告写作流程**：3阶段标准流程，从材料准备到质量保证\n4. **成绩优化策略**：评分标准分析、差异化竞争、高分内容策划\n5. **软件工程教育知识**：课程理论、实践标准、技术趋势\n6. **技术文档写作规范**：表达技巧、格式标准、质量评估\n\n## 文件结构\n```\n.promptx/resource/domain/course-project-writer/\n├── course-project-writer.role.md (主角色文件)\n├── thought/\n│ ├── academic-writing.thought.md (学术写作思维)\n│ └── project-reflection.thought.md (项目反思思维)\n├── execution/\n│ ├── academic-report-writing.execution.md (学术报告写作流程)\n│ └── grade-optimization.execution.md (成绩优化策略)\n└── knowledge/\n ├── software-engineering-education.knowledge.md (软件工程教育)\n └── technical-documentation.knowledge.md (技术文档写作)\n```\n\n## 应用场景\n- 软件工程课程项目总结\n- 技术报告写作指导\n- 学术文档规范化\n- 项目经验梳理和总结\n\n这个角色特别适合需要写高质量课程总结、追求好成绩的学生使用。", - "--tags", - "角色创建 课程总结 学术写作 软件工程 成绩优化" - ] - }, - { - "from": "memory_saved", - "command": "init", - "timestamp": "2025-07-01T00:28:17.585Z", - "args": [ - { - "workingDirectory": "/home/hzk/Software_Architecture" - } - ] - }, - { - "from": "initialized", - "command": "action", - "timestamp": "2025-07-01T00:28:25.134Z", - "args": [ - "course-project-writer" - ] - }, - { - "from": "role_activated_with_memory", - "command": "remember", - "timestamp": "2025-07-01T00:31:07.310Z", - "args": [ - "用户确定了项目总结报告的暂定题目：\"从小米便签到战场环境探索系统——\"实践实践再实践\"\"。这个题目很有亮点：\n1. 体现了两个学期项目的完整学习轨迹（小米便签→战场探索系统）\n2. 用\"实践实践再实践\"作为副标题，呼应软件工程的核心理念\n3. 展现了从简单到复杂、从基础到高级的技术成长路径\n4. 符合软件工程课程\"理论+实践\"的教学特色\n\n这个题目为后续的报告写作提供了很好的主线框架。", - "--tags", - "项目总结 课程报告 题目确定 实践导向" - ] - }, - { - "from": "memory_saved", - "command": "remember", - "timestamp": "2025-07-01T00:40:25.427Z", - "args": [ - "用户提供了上学期软件工程课程总结和学长优秀范例。关键信息：\n\n**用户上学期总结特点：**\n- 核心理念：\"实践，实践，再实践\" \n- 技术提升：Git协同开发、Android软件开发、团队合作\n- 项目内容：小米便签代码阅读、标注、质量分析、功能维护\n- 挑战克服：项目部署困难、代码理解、文档撰写\n\n**学长优秀范例亮点：**\n- 情感表达更丰富（\"初次相遇\"等小标题）\n- 技术深度更广（UML建模、QT开发、开源软件重用）\n- 反思更深入（团队合作的具体问题和解决）\n- 结构更完整（从学习到成长到展望）\n- 引用名言增强感染力\n\n**对比差距分析：**\n用户总结偏重技术罗列，学长范例更注重思想深度和情感共鸣。这为用户本学期报告提升提供了明确方向。", - "--tags", - "上学期总结 学长范例 对比分析 提升方向" - ] - }, - { - "from": "memory_saved", - "command": "remember", - "timestamp": "2025-07-01T00:53:40.792Z", - "args": [ - "用户补充的关键信息（非常重要）：\n\n**评分标准：** \n- 根据总结认真程度和具体事情评价\n- 不能明显使用AI（需要人工化表达）\n\n**技术具体提升：**\n- 软件工程综合能力提升（主要成长部分）：需求设计→软件架构设计→UML绘图→大模型编码经验\n- 团队协作：4人小组（用户负责前端开发，2人机器狗开发，1人无人机开发）\n\n**\"实践实践再实践\"具体体现：**\n- 教员谆谆教诲，经常将此话挂在嘴边\n- 小组实际大量时间投入：文档撰写→UML绘画→编码实现→模块分工设计\n\n**报告要求：**\n- 图文并茂（需要指导配图方案）\n- 软件体系结构课程内容：QT界面前端开发\n\n**特色亮点：**\n- 大模型编码经验（创新点）\n- 完整的软件工程流程实践\n- 多技术栈团队协作（前端+机器狗+无人机）", - "--tags", - "评分标准 技术提升 团队协作 实践体现 报告要求" - ] - }, { "from": "memory_saved", "command": "remember", @@ -428,7 +322,115 @@ "--tags", "Qt调试 段错误修复 BattlefieldExplorationSystem 编译问题 信号槽 .pro文件" ] + }, + { + "from": "memory_saved", + "command": "init", + "timestamp": "2025-07-08T00:05:58.431Z", + "args": [ + { + "workingDirectory": "/home/hzk/Software_Architecture" + } + ] + }, + { + "from": "initialized", + "command": "welcome", + "timestamp": "2025-07-08T00:06:30.404Z", + "args": [] + }, + { + "from": "role_discovery", + "command": "action", + "timestamp": "2025-07-08T00:06:52.310Z", + "args": [ + "qt-ui-optimizer" + ] + }, + { + "from": "role_activated_with_memory", + "command": "remember", + "timestamp": "2025-07-08T00:09:18.117Z", + "args": [ + "用户展示了BattlefieldExplorationSystem主界面右侧功能区域截图，包含人脸识别、战场探索(无人机控制/机器狗控制)、情报传输(远程控制/SSH连接)、数据统计(查询/AI分析/导出报告)四大模块，准备进行布局优化工作", + "--tags", + "界面截图 右侧功能区 布局优化 四大模块" + ] + }, + { + "from": "memory_saved", + "command": "remember", + "timestamp": "2025-07-08T00:20:53.653Z", + "args": [ + "成功优化BattlefieldExplorationSystem\"情报传输\"模块：1)删除冗余\"远程控制系统\"子标题；2)修复按钮重叠问题，统一高度55px并限制最大高度；3)删除功能说明文字，简化界面；4)统一按钮样式(字体16px，内边距12px 16px，间距16px)；5)移除Qt 5.15不支持的CSS3 transform属性；6)编译成功无错误，实现简洁专业的模块布局", + "--tags", + "情报传输模块优化 按钮布局修复 界面简化 Qt兼容性 编译成功" + ] + }, + { + "from": "memory_saved", + "command": "remember", + "timestamp": "2025-07-08T00:26:32.510Z", + "args": [ + "成功删除BattlefieldExplorationSystem主界面中的\"人脸跟随\"文字标签：1)定位到MainWindow.ui文件第817-862行的faceTracking按钮；2)完全删除QPushButton及相关QLabel和QHBoxLayout容器；3)验证MainWindow.cpp和.h文件中无相关功能代码，确保安全删除；4)编译成功无错误，不影响其他功能模块；5)实现界面简洁化，布局自然调整", + "--tags", + "人脸跟随删除 MainWindow.ui UI元素清理 界面简化 编译成功" + ] + }, + { + "from": "memory_saved", + "command": "remember", + "timestamp": "2025-07-08T00:35:14.073Z", + "args": [ + "成功删除BattlefieldExplorationSystem主界面中的\"人脸识别\"按钮：1)定位到MainWindow.ui文件第771-816行的faceRecognition按钮；2)完全删除QPushButton及相关QLabel和QHBoxLayout容器；3)验证MainWindow.cpp和.h文件中无相关功能代码，确保安全删除；4)编译成功无错误，不影响其他功能模块；5)实现界面简洁化，布局自然调整", + "--tags", + "人脸识别删除 MainWindow.ui UI元素清理 界面简化 编译成功" + ] + }, + { + "from": "memory_saved", + "command": "remember", + "timestamp": "2025-07-08T00:42:09.048Z", + "args": [ + "成功删除BattlefieldExplorationSystem右侧功能模块中的冗余按钮：1)删除\"🧭 智能导航\"和\"🔊 情报传达\"两个QPushButton；2)移除整个QGridLayout容器(第723-774行)；3)清理MainWindow.cpp中所有相关代码引用(信号连接、方法实现、布局检查、样式应用)；4)删除MainWindow.h中的方法声明；5)编译成功无错误，实现界面简洁化，保留右侧功能面板中的实际功能入口", + "--tags", + "冗余按钮删除 智能导航 情报传达 QGridLayout清理 代码引用清理 界面简化 编译成功" + ] + }, + { + "from": "memory_saved", + "command": "remember", + "timestamp": "2025-07-08T00:50:18.937Z", + "args": [ + "成功删除BattlefieldExplorationSystem主界面中的所有冗余主要功能按钮：1)删除\"🚁 无人机视角\"、\"🐕 机器狗视角\"、\"🗺️ 机器狗建图\"三个QPushButton；2)移除整个QVBoxLayout容器controlButtonsLayout(第580-725行)；3)清理MainWindow.cpp中所有相关代码引用(信号连接、方法实现、布局修复、样式应用)；4)删除MainWindow.h中的三个方法声明；5)编译成功无错误，实现界面极简化，功能由专门的RightFunctionPanel.cpp处理，架构更清晰", + "--tags", + "主要功能按钮删除 无人机视角 机器狗视角 机器狗建图 QVBoxLayout清理 代码引用清理 界面极简化 RightFunctionPanel 编译成功" + ] + }, + { + "from": "memory_saved", + "command": "init", + "timestamp": "2025-07-08T00:53:52.952Z", + "args": [ + { + "workingDirectory": "/home/hzk/Software_Architecture" + } + ] + }, + { + "from": "initialized", + "command": "welcome", + "timestamp": "2025-07-08T00:53:59.020Z", + "args": [] + }, + { + "from": "role_discovery", + "command": "action", + "timestamp": "2025-07-08T00:56:53.444Z", + "args": [ + "qt-ui-optimizer" + ] } ], - "lastUpdated": "2025-07-04T01:50:21.085Z" + "lastUpdated": "2025-07-08T00:56:53.449Z" } diff --git a/.promptx/resource/project.registry.json b/.promptx/resource/project.registry.json index 8160ccb4..9f6951b6 100644 --- a/.promptx/resource/project.registry.json +++ b/.promptx/resource/project.registry.json @@ -4,8 +4,8 @@ "metadata": { "version": "2.0.0", "description": "project 级资源注册表", - "createdAt": "2025-07-04T01:25:08.606Z", - "updatedAt": "2025-07-04T01:25:08.615Z", + "createdAt": "2025-07-08T00:53:52.954Z", + "updatedAt": "2025-07-08T00:53:52.958Z", "resourceCount": 40 }, "resources": [ @@ -17,9 +17,9 @@ "description": "专业角色，提供特定领域的专业能力", "reference": "@project://.promptx/resource/domain/course-project-writer/course-project-writer.role.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.607Z", - "updatedAt": "2025-07-04T01:25:08.607Z", - "scannedAt": "2025-07-04T01:25:08.607Z" + "createdAt": "2025-07-08T00:53:52.955Z", + "updatedAt": "2025-07-08T00:53:52.955Z", + "scannedAt": "2025-07-08T00:53:52.955Z" } }, { @@ -30,9 +30,9 @@ "description": "思维模式，指导AI的思考方式", "reference": "@project://.promptx/resource/domain/course-project-writer/thought/academic-writing.thought.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.607Z", - "updatedAt": "2025-07-04T01:25:08.607Z", - "scannedAt": "2025-07-04T01:25:08.607Z" + "createdAt": "2025-07-08T00:53:52.955Z", + "updatedAt": "2025-07-08T00:53:52.955Z", + "scannedAt": "2025-07-08T00:53:52.955Z" } }, { @@ -43,9 +43,9 @@ "description": "思维模式，指导AI的思考方式", "reference": "@project://.promptx/resource/domain/course-project-writer/thought/project-reflection.thought.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.608Z", - "updatedAt": "2025-07-04T01:25:08.608Z", - "scannedAt": "2025-07-04T01:25:08.608Z" + "createdAt": "2025-07-08T00:53:52.955Z", + "updatedAt": "2025-07-08T00:53:52.955Z", + "scannedAt": "2025-07-08T00:53:52.955Z" } }, { @@ -56,9 +56,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/course-project-writer/execution/academic-report-writing.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.608Z", - "updatedAt": "2025-07-04T01:25:08.608Z", - "scannedAt": "2025-07-04T01:25:08.608Z" + "createdAt": "2025-07-08T00:53:52.955Z", + "updatedAt": "2025-07-08T00:53:52.955Z", + "scannedAt": "2025-07-08T00:53:52.955Z" } }, { @@ -69,9 +69,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/course-project-writer/execution/grade-optimization.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.608Z", - "updatedAt": "2025-07-04T01:25:08.608Z", - "scannedAt": "2025-07-04T01:25:08.608Z" + "createdAt": "2025-07-08T00:53:52.955Z", + "updatedAt": "2025-07-08T00:53:52.955Z", + "scannedAt": "2025-07-08T00:53:52.955Z" } }, { @@ -82,9 +82,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/course-project-writer/knowledge/software-engineering-education.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.608Z", - "updatedAt": "2025-07-04T01:25:08.608Z", - "scannedAt": "2025-07-04T01:25:08.608Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.955Z" } }, { @@ -95,9 +95,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/course-project-writer/knowledge/technical-documentation.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.608Z", - "updatedAt": "2025-07-04T01:25:08.608Z", - "scannedAt": "2025-07-04T01:25:08.608Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -108,9 +108,9 @@ "description": "专业角色，提供特定领域的专业能力", "reference": "@project://.promptx/resource/domain/project-explainer/project-explainer.role.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.608Z", - "updatedAt": "2025-07-04T01:25:08.608Z", - "scannedAt": "2025-07-04T01:25:08.608Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -121,9 +121,9 @@ "description": "思维模式，指导AI的思考方式", "reference": "@project://.promptx/resource/domain/project-explainer/thought/educational-guidance.thought.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.609Z", - "updatedAt": "2025-07-04T01:25:08.609Z", - "scannedAt": "2025-07-04T01:25:08.609Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -134,9 +134,9 @@ "description": "思维模式，指导AI的思考方式", "reference": "@project://.promptx/resource/domain/project-explainer/thought/project-analysis.thought.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.609Z", - "updatedAt": "2025-07-04T01:25:08.609Z", - "scannedAt": "2025-07-04T01:25:08.609Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -147,9 +147,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/project-explainer/execution/academic-presentation.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.609Z", - "updatedAt": "2025-07-04T01:25:08.609Z", - "scannedAt": "2025-07-04T01:25:08.609Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -160,9 +160,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/project-explainer/execution/project-explanation-workflow.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.609Z", - "updatedAt": "2025-07-04T01:25:08.609Z", - "scannedAt": "2025-07-04T01:25:08.609Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -173,9 +173,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/project-explainer/knowledge/academic-evaluation-standards.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.609Z", - "updatedAt": "2025-07-04T01:25:08.609Z", - "scannedAt": "2025-07-04T01:25:08.609Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -186,9 +186,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/project-explainer/knowledge/code-analysis-techniques.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.609Z", - "updatedAt": "2025-07-04T01:25:08.609Z", - "scannedAt": "2025-07-04T01:25:08.609Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -199,9 +199,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/project-explainer/knowledge/qt-architecture.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.609Z", - "updatedAt": "2025-07-04T01:25:08.609Z", - "scannedAt": "2025-07-04T01:25:08.609Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -212,9 +212,9 @@ "description": "专业角色，提供特定领域的专业能力", "reference": "@project://.promptx/resource/domain/project-poster-designer/project-poster-designer.role.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.609Z", - "updatedAt": "2025-07-04T01:25:08.609Z", - "scannedAt": "2025-07-04T01:25:08.609Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -225,9 +225,9 @@ "description": "思维模式，指导AI的思考方式", "reference": "@project://.promptx/resource/domain/project-poster-designer/thought/creative-thinking.thought.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.610Z", - "updatedAt": "2025-07-04T01:25:08.610Z", - "scannedAt": "2025-07-04T01:25:08.610Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -238,9 +238,9 @@ "description": "思维模式，指导AI的思考方式", "reference": "@project://.promptx/resource/domain/project-poster-designer/thought/visual-design.thought.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.610Z", - "updatedAt": "2025-07-04T01:25:08.610Z", - "scannedAt": "2025-07-04T01:25:08.610Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -251,9 +251,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/project-poster-designer/execution/poster-design-process.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.610Z", - "updatedAt": "2025-07-04T01:25:08.610Z", - "scannedAt": "2025-07-04T01:25:08.610Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -264,9 +264,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/project-poster-designer/execution/visual-communication.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.610Z", - "updatedAt": "2025-07-04T01:25:08.610Z", - "scannedAt": "2025-07-04T01:25:08.610Z" + "createdAt": "2025-07-08T00:53:52.956Z", + "updatedAt": "2025-07-08T00:53:52.956Z", + "scannedAt": "2025-07-08T00:53:52.956Z" } }, { @@ -277,9 +277,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/project-poster-designer/knowledge/graphic-design.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.611Z", - "updatedAt": "2025-07-04T01:25:08.611Z", - "scannedAt": "2025-07-04T01:25:08.611Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -290,9 +290,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/project-poster-designer/knowledge/military-tech-aesthetics.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.611Z", - "updatedAt": "2025-07-04T01:25:08.611Z", - "scannedAt": "2025-07-04T01:25:08.611Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -303,9 +303,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/project-poster-designer/knowledge/project-presentation.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.611Z", - "updatedAt": "2025-07-04T01:25:08.611Z", - "scannedAt": "2025-07-04T01:25:08.611Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -316,9 +316,9 @@ "description": "专业角色，提供特定领域的专业能力", "reference": "@project://.promptx/resource/domain/qt-code-optimizer/qt-code-optimizer.role.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.611Z", - "updatedAt": "2025-07-04T01:25:08.611Z", - "scannedAt": "2025-07-04T01:25:08.611Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -329,9 +329,9 @@ "description": "思维模式，指导AI的思考方式", "reference": "@project://.promptx/resource/domain/qt-code-optimizer/thought/qt-code-analysis.thought.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.612Z", - "updatedAt": "2025-07-04T01:25:08.612Z", - "scannedAt": "2025-07-04T01:25:08.612Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -342,9 +342,9 @@ "description": "思维模式，指导AI的思考方式", "reference": "@project://.promptx/resource/domain/qt-code-optimizer/thought/quality-assessment.thought.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.612Z", - "updatedAt": "2025-07-04T01:25:08.612Z", - "scannedAt": "2025-07-04T01:25:08.612Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -355,9 +355,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/qt-code-optimizer/execution/academic-standards.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.612Z", - "updatedAt": "2025-07-04T01:25:08.612Z", - "scannedAt": "2025-07-04T01:25:08.612Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -368,9 +368,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/qt-code-optimizer/execution/qt-code-optimization.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.612Z", - "updatedAt": "2025-07-04T01:25:08.612Z", - "scannedAt": "2025-07-04T01:25:08.612Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -381,9 +381,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/qt-code-optimizer/execution/quality-improvement.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.612Z", - "updatedAt": "2025-07-04T01:25:08.612Z", - "scannedAt": "2025-07-04T01:25:08.612Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -394,9 +394,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/qt-code-optimizer/knowledge/code-quality-standards.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.613Z", - "updatedAt": "2025-07-04T01:25:08.613Z", - "scannedAt": "2025-07-04T01:25:08.613Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -407,9 +407,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/qt-code-optimizer/knowledge/project-architecture.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.613Z", - "updatedAt": "2025-07-04T01:25:08.613Z", - "scannedAt": "2025-07-04T01:25:08.613Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -420,9 +420,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/qt-code-optimizer/knowledge/qt-cpp-expertise.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.613Z", - "updatedAt": "2025-07-04T01:25:08.613Z", - "scannedAt": "2025-07-04T01:25:08.613Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -433,9 +433,9 @@ "description": "专业角色，提供特定领域的专业能力", "reference": "@project://.promptx/resource/domain/qt-ui-optimizer/qt-ui-optimizer.role.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.613Z", - "updatedAt": "2025-07-04T01:25:08.613Z", - "scannedAt": "2025-07-04T01:25:08.613Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -446,9 +446,9 @@ "description": "思维模式，指导AI的思考方式", "reference": "@project://.promptx/resource/domain/qt-ui-optimizer/thought/academic-standards-awareness.thought.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.614Z", - "updatedAt": "2025-07-04T01:25:08.614Z", - "scannedAt": "2025-07-04T01:25:08.614Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -459,9 +459,9 @@ "description": "思维模式，指导AI的思考方式", "reference": "@project://.promptx/resource/domain/qt-ui-optimizer/thought/ui-design-thinking.thought.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.614Z", - "updatedAt": "2025-07-04T01:25:08.614Z", - "scannedAt": "2025-07-04T01:25:08.614Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -472,9 +472,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/qt-ui-optimizer/execution/academic-ui-standards.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.614Z", - "updatedAt": "2025-07-04T01:25:08.614Z", - "scannedAt": "2025-07-04T01:25:08.614Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -485,9 +485,9 @@ "description": "执行模式，定义具体的行为模式", "reference": "@project://.promptx/resource/domain/qt-ui-optimizer/execution/qt-optimization-workflow.execution.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.614Z", - "updatedAt": "2025-07-04T01:25:08.614Z", - "scannedAt": "2025-07-04T01:25:08.614Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -498,9 +498,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/qt-ui-optimizer/knowledge/academic-project-standards.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.615Z", - "updatedAt": "2025-07-04T01:25:08.615Z", - "scannedAt": "2025-07-04T01:25:08.615Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -511,9 +511,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/qt-ui-optimizer/knowledge/qt-ui-development.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.615Z", - "updatedAt": "2025-07-04T01:25:08.615Z", - "scannedAt": "2025-07-04T01:25:08.615Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } }, { @@ -524,9 +524,9 @@ "description": "知识库，提供专业知识和信息", "reference": "@project://.promptx/resource/domain/qt-ui-optimizer/knowledge/ui-ux-principles.knowledge.md", "metadata": { - "createdAt": "2025-07-04T01:25:08.615Z", - "updatedAt": "2025-07-04T01:25:08.615Z", - "scannedAt": "2025-07-04T01:25:08.615Z" + "createdAt": "2025-07-08T00:53:52.957Z", + "updatedAt": "2025-07-08T00:53:52.957Z", + "scannedAt": "2025-07-08T00:53:52.957Z" } } ], diff --git a/distance-judgement/.idea/.gitignore b/distance-judgement/.idea/.gitignore index f649f0f6..7ef297b7 100644 --- a/distance-judgement/.idea/.gitignore +++ b/distance-judgement/.idea/.gitignore @@ -1,8 +1,8 @@ -# Default ignored files -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml +# Default ignored files +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/distance-judgement/.idea/modules.xml b/distance-judgement/.idea/modules.xml index b7e21735..82e85d0c 100644 --- a/distance-judgement/.idea/modules.xml +++ b/distance-judgement/.idea/modules.xml @@ -1,8 +1,8 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/distance-judgement/.idea/pythonProject2.iml b/distance-judgement/.idea/pythonProject2.iml index d0876a78..d9e6024f 100644 --- a/distance-judgement/.idea/pythonProject2.iml +++ b/distance-judgement/.idea/pythonProject2.iml @@ -1,8 +1,8 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/distance-judgement/CAMERA_ICON_OVERLAP_FIX.md b/distance-judgement/CAMERA_ICON_OVERLAP_FIX.md index 20f9893f..b50a2a67 100644 --- a/distance-judgement/CAMERA_ICON_OVERLAP_FIX.md +++ b/distance-judgement/CAMERA_ICON_OVERLAP_FIX.md @@ -1,137 +1,137 @@ -# 摄像头图标重叠问题修复报告 🔧 - -## 问题描述 - -在摄像头图标更新时，没有清除之前的图标，导致地图上出现图标重叠的现象。 - -## 问题根源分析 - -### 1. 固定摄像头视野扇形重叠 -- **问题位置**: `src/web_server.py` 第3730行附近 -- **原因**: 摄像头位置更新时，只更新了`cameraMarker`的位置，但没有同步更新`fixedCameraFOV`视野扇形 -- **表现**: 旧的视野扇形仍然显示在原位置，新的视野扇形在新位置，造成重叠 - -### 2. 移动设备朝向标记重叠 -- **问题位置**: `src/web_server.py` 第2491行附近 -- **原因**: 移动设备朝向更新时，`orientationMarker`是复合对象（包含`deviceMarker`和`viewSector`），但只简单调用了`map.remove()` -- **表现**: 设备标记和视野扇形没有被完全清除，导致重叠 - -### 3. 变量作用域问题 -- **问题位置**: `src/web_server.py` 第1647行 -- **原因**: `fixedCameraFOV`使用`const`声明，无法在其他函数中重新赋值 -- **影响**: 摄像头位置更新函数无法更新全局视野扇形引用 - -## 修复内容 - -### ✅ 修复1：自动配置时的视野扇形同步更新 -```javascript -// 🔧 修复：同步更新视野扇形位置，避免图标重叠 -if (fixedCameraFOV) { - // 移除旧的视野扇形 - map.remove(fixedCameraFOV); - - // 重新创建视野扇形在新位置 - const newFOV = createGeographicSector( - lng, lat, - result.data.camera_heading || config.CAMERA_HEADING, - config.CAMERA_FOV, - 100, // 100米检测范围 - '#2196F3' // 蓝色，与固定摄像头标记颜色匹配 - ); - map.add(newFOV); - - // 更新全局变量引用 - fixedCameraFOV = newFOV; -} -``` - -### ✅ 修复2：手动配置时的视野扇形同步更新 -```javascript -// 🔧 修复：手动配置时也要同步更新视野扇形 -// 同步更新视野扇形 -if (fixedCameraFOV) { - map.remove(fixedCameraFOV); - - const newFOV = createGeographicSector( - lng, lat, heading, config.CAMERA_FOV, - 100, '#2196F3' - ); - map.add(newFOV); - fixedCameraFOV = newFOV; -} -``` - -### ✅ 修复3：移动设备朝向标记的正确清除 -```javascript -// 🔧 修复：正确移除旧的视野扇形标记，避免重叠 -if (mobileDeviceMarkers[deviceId].orientationMarker) { - // orientationMarker是一个复合对象，包含deviceMarker和viewSector - const oldOrientation = mobileDeviceMarkers[deviceId].orientationMarker; - if (oldOrientation.deviceMarker) { - map.remove(oldOrientation.deviceMarker); - } - if (oldOrientation.viewSector) { - map.remove(oldOrientation.viewSector); - } -} -``` - -### ✅ 修复4：变量作用域调整 -```javascript -// 将 const 改为 var，允许重新赋值 -var fixedCameraFOV = createGeographicSector(...); -``` - -## 测试验证 - -修复后，以下操作不再出现图标重叠： - -1. **自动配置摄像头位置** - 视野扇形会同步移动到新位置 -2. **手动配置摄像头位置** - 视野扇形会同步更新位置和朝向 -3. **移动设备朝向更新** - 旧的设备标记和视野扇形会被完全清除 -4. **摄像头朝向变更** - 视野扇形会反映新的朝向角度 - -## 影响范围 - -✅ **已修复的功能**: -- 固定摄像头位置更新 -- 固定摄像头朝向更新 -- 移动设备位置更新 -- 移动设备朝向更新 -- 手动配置摄像头 - -✅ **无影响的功能**: -- 人员检测标记更新（原本就有正确的清除逻辑） -- 远程设备标记更新（原本就有正确的清除逻辑） -- 其他地图功能 - -## 技术细节 - -- **修改文件**: `src/web_server.py` -- **修改行数**: 约15行代码修改 -- **兼容性**: 完全向后兼容，不影响现有功能 -- **性能影响**: 无负面影响，实际上减少了地图上的冗余元素 - -## 📝 补充修复：重复无人机图标问题 - -### 问题描述 -用户反映地图上出现了2个无人机图标，但应该只有1个无人机图标和1个电脑图标。 - -### 根源分析 -移动设备同时显示了两个独立的🚁标记： -- `locationMarker`：GPS位置标记 -- `orientationMarker`：朝向标记（包含视野扇形） - -### ✅ 修复方案 -1. **移除重复的位置标记**：删除独立的`locationMarker` -2. **合并功能到朝向标记**：朝向标记同时承担位置和朝向显示 -3. **更新清除逻辑**：移除对`locationMarker`的引用 -4. **添加数据缓存**：为点击事件提供设备数据支持 - -### 🎯 修复后的效果 -- **固定摄像头（电脑端）**：💻电脑图标 + 蓝色视野扇形 -- **移动设备（移动端）**：🚁无人机图标 + 朝向箭头 + 橙色视野扇形 - -## 总结 - +# 摄像头图标重叠问题修复报告 🔧 + +## 问题描述 + +在摄像头图标更新时，没有清除之前的图标，导致地图上出现图标重叠的现象。 + +## 问题根源分析 + +### 1. 固定摄像头视野扇形重叠 +- **问题位置**: `src/web_server.py` 第3730行附近 +- **原因**: 摄像头位置更新时，只更新了`cameraMarker`的位置，但没有同步更新`fixedCameraFOV`视野扇形 +- **表现**: 旧的视野扇形仍然显示在原位置，新的视野扇形在新位置，造成重叠 + +### 2. 移动设备朝向标记重叠 +- **问题位置**: `src/web_server.py` 第2491行附近 +- **原因**: 移动设备朝向更新时，`orientationMarker`是复合对象（包含`deviceMarker`和`viewSector`），但只简单调用了`map.remove()` +- **表现**: 设备标记和视野扇形没有被完全清除，导致重叠 + +### 3. 变量作用域问题 +- **问题位置**: `src/web_server.py` 第1647行 +- **原因**: `fixedCameraFOV`使用`const`声明，无法在其他函数中重新赋值 +- **影响**: 摄像头位置更新函数无法更新全局视野扇形引用 + +## 修复内容 + +### ✅ 修复1：自动配置时的视野扇形同步更新 +```javascript +// 🔧 修复：同步更新视野扇形位置，避免图标重叠 +if (fixedCameraFOV) { + // 移除旧的视野扇形 + map.remove(fixedCameraFOV); + + // 重新创建视野扇形在新位置 + const newFOV = createGeographicSector( + lng, lat, + result.data.camera_heading || config.CAMERA_HEADING, + config.CAMERA_FOV, + 100, // 100米检测范围 + '#2196F3' // 蓝色，与固定摄像头标记颜色匹配 + ); + map.add(newFOV); + + // 更新全局变量引用 + fixedCameraFOV = newFOV; +} +``` + +### ✅ 修复2：手动配置时的视野扇形同步更新 +```javascript +// 🔧 修复：手动配置时也要同步更新视野扇形 +// 同步更新视野扇形 +if (fixedCameraFOV) { + map.remove(fixedCameraFOV); + + const newFOV = createGeographicSector( + lng, lat, heading, config.CAMERA_FOV, + 100, '#2196F3' + ); + map.add(newFOV); + fixedCameraFOV = newFOV; +} +``` + +### ✅ 修复3：移动设备朝向标记的正确清除 +```javascript +// 🔧 修复：正确移除旧的视野扇形标记，避免重叠 +if (mobileDeviceMarkers[deviceId].orientationMarker) { + // orientationMarker是一个复合对象，包含deviceMarker和viewSector + const oldOrientation = mobileDeviceMarkers[deviceId].orientationMarker; + if (oldOrientation.deviceMarker) { + map.remove(oldOrientation.deviceMarker); + } + if (oldOrientation.viewSector) { + map.remove(oldOrientation.viewSector); + } +} +``` + +### ✅ 修复4：变量作用域调整 +```javascript +// 将 const 改为 var，允许重新赋值 +var fixedCameraFOV = createGeographicSector(...); +``` + +## 测试验证 + +修复后，以下操作不再出现图标重叠： + +1. **自动配置摄像头位置** - 视野扇形会同步移动到新位置 +2. **手动配置摄像头位置** - 视野扇形会同步更新位置和朝向 +3. **移动设备朝向更新** - 旧的设备标记和视野扇形会被完全清除 +4. **摄像头朝向变更** - 视野扇形会反映新的朝向角度 + +## 影响范围 + +✅ **已修复的功能**: +- 固定摄像头位置更新 +- 固定摄像头朝向更新 +- 移动设备位置更新 +- 移动设备朝向更新 +- 手动配置摄像头 + +✅ **无影响的功能**: +- 人员检测标记更新（原本就有正确的清除逻辑） +- 远程设备标记更新（原本就有正确的清除逻辑） +- 其他地图功能 + +## 技术细节 + +- **修改文件**: `src/web_server.py` +- **修改行数**: 约15行代码修改 +- **兼容性**: 完全向后兼容，不影响现有功能 +- **性能影响**: 无负面影响，实际上减少了地图上的冗余元素 + +## 📝 补充修复：重复无人机图标问题 + +### 问题描述 +用户反映地图上出现了2个无人机图标，但应该只有1个无人机图标和1个电脑图标。 + +### 根源分析 +移动设备同时显示了两个独立的🚁标记： +- `locationMarker`：GPS位置标记 +- `orientationMarker`：朝向标记（包含视野扇形） + +### ✅ 修复方案 +1. **移除重复的位置标记**：删除独立的`locationMarker` +2. **合并功能到朝向标记**：朝向标记同时承担位置和朝向显示 +3. **更新清除逻辑**：移除对`locationMarker`的引用 +4. **添加数据缓存**：为点击事件提供设备数据支持 + +### 🎯 修复后的效果 +- **固定摄像头（电脑端）**：💻电脑图标 + 蓝色视野扇形 +- **移动设备（移动端）**：🚁无人机图标 + 朝向箭头 + 橙色视野扇形 + +## 总结 + 通过这次修复，彻底解决了摄像头图标重叠的问题，确保地图上的标记状态与实际配置始终保持一致，提升了用户体验。同时解决了重复无人机图标的问题，让图标显示更加清晰和直观。 \ No newline at end of file diff --git a/distance-judgement/CAMERA_ORIENTATION_GUIDE.md b/distance-judgement/CAMERA_ORIENTATION_GUIDE.md index 4c628189..32af8183 100644 --- a/distance-judgement/CAMERA_ORIENTATION_GUIDE.md +++ b/distance-judgement/CAMERA_ORIENTATION_GUIDE.md @@ -1,236 +1,236 @@ -# 摄像头朝向自动配置功能指南 🧭 - -## 功能概述 - -本系统现在支持自动获取设备位置和朝向，将本地摄像头设置为面朝使用者，实现智能的摄像头配置。 - -## 🎯 主要功能 - -### 1. 自动GPS定位 -- **Windows系统**: 使用Windows Location API获取精确GPS位置 -- **其他系统**: 使用IP地理定位作为备选方案 -- **精度**: GPS可达10米内，IP定位约10公里 - -### 2. 设备朝向检测 -- **桌面设备**: 使用默认朝向算法（假设用户面向屏幕） -- **移动设备**: 支持陀螺仪和磁力计朝向检测 -- **智能计算**: 自动计算摄像头应该面向用户的角度 - -### 3. 自动配置应用 -- **实时更新**: 自动更新配置文件和运行时参数 -- **地图同步**: 自动更新地图上的摄像头位置标记 -- **即时生效**: 配置立即应用到距离计算和人员定位 - -## 🚀 使用方法 - -### 方法一：启动时自动配置 - -```bash -python main_web.py -``` - -系统会检测到默认配置并询问是否自动配置： -``` -🤖 检测到摄像头使用默认配置 - 是否要自动配置摄像头位置和朝向？ - • 输入 'y' - 立即自动配置 - • 输入 'n' - 跳过，使用Web界面配置 - • 直接回车 - 跳过自动配置 - -🔧 请选择 (y/n/回车): y -``` - -### 方法二：独立配置工具 - -```bash -# 完整自动配置 -python tools/auto_configure_camera.py - -# 仅测试GPS功能 -python tools/auto_configure_camera.py --test-gps - -# 仅测试朝向功能 -python tools/auto_configure_camera.py --test-heading -``` - -### 方法三：Web界面配置 - -1. 启动Web服务器：`python main_web.py` -2. 打开浏览器访问 `https://127.0.0.1:5000` -3. 在"🧭 自动位置配置"面板中： - - 点击"📍 获取位置"按钮 - - 点击"🧭 获取朝向"按钮 - - 点击"🤖 自动配置摄像头"按钮 - -## 📱 Web界面功能详解 - -### GPS位置获取 -```javascript -// 使用浏览器Geolocation API -navigator.geolocation.getCurrentPosition() -``` - -**支持的浏览器**： -- ✅ Chrome/Edge (推荐) -- ✅ Firefox -- ✅ Safari -- ❌ IE (不支持) - -**权限要求**： -- 首次使用需要授权位置权限 -- HTTPS环境下精度更高 -- 室外环境GPS信号更好 - -### 设备朝向检测 -```javascript -// 使用设备朝向API -window.addEventListener('deviceorientation', handleOrientation) -``` - -**支持情况**： -- 📱 **移动设备**: 完全支持（手机、平板） -- 💻 **桌面设备**: 有限支持（使用算法估算） -- 🍎 **iOS 13+**: 需要明确请求权限 - -## ⚙️ 技术实现 - -### 后端模块 - -#### 1. OrientationDetector (`src/orientation_detector.py`) -- GPS位置获取（多平台支持） -- 设备朝向检测 -- 摄像头朝向计算 -- 配置文件更新 - -#### 2. WebOrientationDetector (`src/web_orientation_detector.py`) -- Web API接口 -- 前后端数据同步 -- 实时状态管理 - -### 前端功能 - -#### JavaScript函数 -- `requestGPSPermission()` - GPS权限请求 -- `requestOrientationPermission()` - 朝向权限请求 -- `autoConfigureCamera()` - 自动配置执行 -- `manualConfiguration()` - 手动配置入口 - -#### API接口 -- `POST /api/orientation/auto_configure` - 自动配置 -- `POST /api/orientation/update_location` - 更新GPS -- `POST /api/orientation/update_heading` - 更新朝向 -- `GET /api/orientation/get_status` - 获取状态 - -## 🔧 配置原理 - -### 朝向计算逻辑 - -```python -def calculate_camera_heading_facing_user(self, user_heading: float) -> float: - """ - 计算摄像头朝向用户的角度 - 摄像头朝向 = (用户朝向 + 180°) % 360° - """ - camera_heading = (user_heading + 180) % 360 - return camera_heading -``` - -### 坐标转换 - -```python -def calculate_person_position(self, pixel_x, pixel_y, distance, frame_width, frame_height): - """ - 基于摄像头位置、朝向和距离计算人员GPS坐标 - 使用球面几何学进行精确计算 - """ - # 像素到角度转换 - horizontal_angle_per_pixel = self.camera_fov / frame_width - horizontal_offset_degrees = (pixel_x - center_x) * horizontal_angle_per_pixel - - # 计算实际方位角 - person_bearing = (self.camera_heading + horizontal_offset_degrees) % 360 - - # 球面坐标计算 - person_lat, person_lng = self._calculate_destination_point( - self.camera_lat, self.camera_lng, distance, person_bearing - ) -``` - -## 📋 系统要求 - -### 环境要求 -- Python 3.7+ -- 现代Web浏览器 -- 网络连接（GPS定位需要） - -### Windows特别要求 -```bash -# 安装Windows位置服务支持 -pip install winrt-runtime winrt-Windows.Devices.Geolocation -``` - -### 移动设备要求 -- HTTPS访问（GPS权限要求） -- 现代移动浏览器 -- 设备朝向传感器支持 - -## 🔍 故障排除 - -### GPS获取失败 -**常见原因**： -- 位置权限被拒绝 -- 网络连接问题 -- GPS信号不佳 - -**解决方案**： -1. 检查浏览器位置权限设置 -2. 移动到室外或窗边 -3. 使用IP定位作为备选 -4. 手动输入坐标 - -### 朝向检测失败 -**常见原因**： -- 设备不支持朝向传感器 -- 浏览器兼容性问题 -- 权限被拒绝 - -**解决方案**： -1. 使用支持的移动设备 -2. 更新到现代浏览器 -3. 允许设备朝向权限 -4. 使用手动配置 - -### 配置不生效 -**可能原因**： -- 配置文件写入失败 -- 权限不足 -- 模块导入错误 - -**解决方案**： -1. 检查文件写入权限 -2. 重启应用程序 -3. 查看控制台错误信息 - -## 💡 使用建议 - -### 最佳实践 -1. **首次配置**: 使用Web界面进行配置，可视化效果更好 -2. **定期更新**: 位置变化时重新配置 -3. **精度要求**: GPS环境下精度更高，室内可用IP定位 -4. **设备选择**: 移动设备朝向检测更准确 - -### 注意事项 -1. **隐私保护**: GPS数据仅用于本地配置，不会上传 -2. **网络要求**: 初次配置需要网络连接 -3. **兼容性**: 老旧浏览器可能不支持某些功能 -4. **精度限制**: 桌面设备朝向检测精度有限 - -## 📚 相关文档 - -- [MAP_USAGE_GUIDE.md](MAP_USAGE_GUIDE.md) - 地图功能使用指南 -- [MOBILE_GUIDE.md](MOBILE_GUIDE.md) - 移动端使用指南 -- [HTTPS_SETUP.md](HTTPS_SETUP.md) - HTTPS配置指南 - ---- - +# 摄像头朝向自动配置功能指南 🧭 + +## 功能概述 + +本系统现在支持自动获取设备位置和朝向，将本地摄像头设置为面朝使用者，实现智能的摄像头配置。 + +## 🎯 主要功能 + +### 1. 自动GPS定位 +- **Windows系统**: 使用Windows Location API获取精确GPS位置 +- **其他系统**: 使用IP地理定位作为备选方案 +- **精度**: GPS可达10米内，IP定位约10公里 + +### 2. 设备朝向检测 +- **桌面设备**: 使用默认朝向算法（假设用户面向屏幕） +- **移动设备**: 支持陀螺仪和磁力计朝向检测 +- **智能计算**: 自动计算摄像头应该面向用户的角度 + +### 3. 自动配置应用 +- **实时更新**: 自动更新配置文件和运行时参数 +- **地图同步**: 自动更新地图上的摄像头位置标记 +- **即时生效**: 配置立即应用到距离计算和人员定位 + +## 🚀 使用方法 + +### 方法一：启动时自动配置 + +```bash +python main_web.py +``` + +系统会检测到默认配置并询问是否自动配置： +``` +🤖 检测到摄像头使用默认配置 + 是否要自动配置摄像头位置和朝向？ + • 输入 'y' - 立即自动配置 + • 输入 'n' - 跳过，使用Web界面配置 + • 直接回车 - 跳过自动配置 + +🔧 请选择 (y/n/回车): y +``` + +### 方法二：独立配置工具 + +```bash +# 完整自动配置 +python tools/auto_configure_camera.py + +# 仅测试GPS功能 +python tools/auto_configure_camera.py --test-gps + +# 仅测试朝向功能 +python tools/auto_configure_camera.py --test-heading +``` + +### 方法三：Web界面配置 + +1. 启动Web服务器：`python main_web.py` +2. 打开浏览器访问 `https://127.0.0.1:5000` +3. 在"🧭 自动位置配置"面板中： + - 点击"📍 获取位置"按钮 + - 点击"🧭 获取朝向"按钮 + - 点击"🤖 自动配置摄像头"按钮 + +## 📱 Web界面功能详解 + +### GPS位置获取 +```javascript +// 使用浏览器Geolocation API +navigator.geolocation.getCurrentPosition() +``` + +**支持的浏览器**： +- ✅ Chrome/Edge (推荐) +- ✅ Firefox +- ✅ Safari +- ❌ IE (不支持) + +**权限要求**： +- 首次使用需要授权位置权限 +- HTTPS环境下精度更高 +- 室外环境GPS信号更好 + +### 设备朝向检测 +```javascript +// 使用设备朝向API +window.addEventListener('deviceorientation', handleOrientation) +``` + +**支持情况**： +- 📱 **移动设备**: 完全支持（手机、平板） +- 💻 **桌面设备**: 有限支持（使用算法估算） +- 🍎 **iOS 13+**: 需要明确请求权限 + +## ⚙️ 技术实现 + +### 后端模块 + +#### 1. OrientationDetector (`src/orientation_detector.py`) +- GPS位置获取（多平台支持） +- 设备朝向检测 +- 摄像头朝向计算 +- 配置文件更新 + +#### 2. WebOrientationDetector (`src/web_orientation_detector.py`) +- Web API接口 +- 前后端数据同步 +- 实时状态管理 + +### 前端功能 + +#### JavaScript函数 +- `requestGPSPermission()` - GPS权限请求 +- `requestOrientationPermission()` - 朝向权限请求 +- `autoConfigureCamera()` - 自动配置执行 +- `manualConfiguration()` - 手动配置入口 + +#### API接口 +- `POST /api/orientation/auto_configure` - 自动配置 +- `POST /api/orientation/update_location` - 更新GPS +- `POST /api/orientation/update_heading` - 更新朝向 +- `GET /api/orientation/get_status` - 获取状态 + +## 🔧 配置原理 + +### 朝向计算逻辑 + +```python +def calculate_camera_heading_facing_user(self, user_heading: float) -> float: + """ + 计算摄像头朝向用户的角度 + 摄像头朝向 = (用户朝向 + 180°) % 360° + """ + camera_heading = (user_heading + 180) % 360 + return camera_heading +``` + +### 坐标转换 + +```python +def calculate_person_position(self, pixel_x, pixel_y, distance, frame_width, frame_height): + """ + 基于摄像头位置、朝向和距离计算人员GPS坐标 + 使用球面几何学进行精确计算 + """ + # 像素到角度转换 + horizontal_angle_per_pixel = self.camera_fov / frame_width + horizontal_offset_degrees = (pixel_x - center_x) * horizontal_angle_per_pixel + + # 计算实际方位角 + person_bearing = (self.camera_heading + horizontal_offset_degrees) % 360 + + # 球面坐标计算 + person_lat, person_lng = self._calculate_destination_point( + self.camera_lat, self.camera_lng, distance, person_bearing + ) +``` + +## 📋 系统要求 + +### 环境要求 +- Python 3.7+ +- 现代Web浏览器 +- 网络连接（GPS定位需要） + +### Windows特别要求 +```bash +# 安装Windows位置服务支持 +pip install winrt-runtime winrt-Windows.Devices.Geolocation +``` + +### 移动设备要求 +- HTTPS访问（GPS权限要求） +- 现代移动浏览器 +- 设备朝向传感器支持 + +## 🔍 故障排除 + +### GPS获取失败 +**常见原因**： +- 位置权限被拒绝 +- 网络连接问题 +- GPS信号不佳 + +**解决方案**： +1. 检查浏览器位置权限设置 +2. 移动到室外或窗边 +3. 使用IP定位作为备选 +4. 手动输入坐标 + +### 朝向检测失败 +**常见原因**： +- 设备不支持朝向传感器 +- 浏览器兼容性问题 +- 权限被拒绝 + +**解决方案**： +1. 使用支持的移动设备 +2. 更新到现代浏览器 +3. 允许设备朝向权限 +4. 使用手动配置 + +### 配置不生效 +**可能原因**： +- 配置文件写入失败 +- 权限不足 +- 模块导入错误 + +**解决方案**： +1. 检查文件写入权限 +2. 重启应用程序 +3. 查看控制台错误信息 + +## 💡 使用建议 + +### 最佳实践 +1. **首次配置**: 使用Web界面进行配置，可视化效果更好 +2. **定期更新**: 位置变化时重新配置 +3. **精度要求**: GPS环境下精度更高，室内可用IP定位 +4. **设备选择**: 移动设备朝向检测更准确 + +### 注意事项 +1. **隐私保护**: GPS数据仅用于本地配置，不会上传 +2. **网络要求**: 初次配置需要网络连接 +3. **兼容性**: 老旧浏览器可能不支持某些功能 +4. **精度限制**: 桌面设备朝向检测精度有限 + +## 📚 相关文档 + +- [MAP_USAGE_GUIDE.md](MAP_USAGE_GUIDE.md) - 地图功能使用指南 +- [MOBILE_GUIDE.md](MOBILE_GUIDE.md) - 移动端使用指南 +- [HTTPS_SETUP.md](HTTPS_SETUP.md) - HTTPS配置指南 + +--- + 🎯 **快速开始**: 运行 `python main_web.py`，选择自动配置，享受智能的摄像头定位体验！ \ No newline at end of file diff --git a/distance-judgement/HTTPS_SETUP.md b/distance-judgement/HTTPS_SETUP.md index 9eca3614..46d6b7f4 100644 --- a/distance-judgement/HTTPS_SETUP.md +++ b/distance-judgement/HTTPS_SETUP.md @@ -1,99 +1,99 @@ -# 🔒 HTTPS设置指南 - -## 概述 -本系统已升级支持HTTPS，解决摄像头权限问题。现代浏览器要求HTTPS才能访问摄像头等敏感设备。 - -## 🚀 快速启动 - -### 方法一：自动设置（推荐） -1. 在PyCharm中打开项目 -2. 直接运行 `main_web.py` -3. 系统会自动生成SSL证书并启动HTTPS服务器 - -### 方法二：手动安装依赖 -如果遇到cryptography库缺失： -```bash -pip install cryptography -``` - -## 📱 访问地址 - -启动后访问地址已升级为HTTPS： -- **本地访问**: https://127.0.0.1:5000 -- **手机访问**: https://你的IP:5000/mobile/mobile_client.html - -## 🔑 浏览器安全警告处理 - -### 桌面浏览器 -1. 访问 https://127.0.0.1:5000 -2. 看到"您的连接不是私密连接"警告 -3. 点击 **"高级"** -4. 点击 **"继续访问localhost(不安全)"** -5. 正常使用 - -### 手机浏览器 -1. 访问 https://你的IP:5000/mobile/mobile_client.html -2. 出现安全警告时，点击 **"高级"** 或 **"详细信息"** -3. 选择 **"继续访问"** 或 **"继续前往此网站"** -4. 正常使用摄像头功能 - -## 📂 文件结构 - -新增文件： -``` -ssl/ -├── cert.pem # SSL证书文件 -└── key.pem # 私钥文件 -``` - -## 🔧 技术说明 - -### SSL证书特性 -- **类型**: 自签名证书 -- **有效期**: 365天 -- **支持域名**: localhost, 127.0.0.1 -- **算法**: RSA-2048, SHA-256 - -### 摄像头权限要求 -- ✅ HTTPS环境 - 支持摄像头访问 -- ❌ HTTP环境 - 浏览器阻止摄像头访问 -- ⚠️ localhost - HTTP也可以，但IP访问必须HTTPS - -## 🐛 故障排除 - -### 问题1: cryptography库安装失败 -```bash -# Windows -pip install --upgrade pip -pip install cryptography - -# 如果还是失败，尝试： -pip install --only-binary=cryptography cryptography -``` - -### 问题2: 证书生成失败 -1. 检查ssl目录权限 -2. 重新运行程序，会自动重新生成 - -### 问题3: 手机无法访问 -1. 确保手机和电脑在同一网络 -2. 检查防火墙设置 -3. 在手机浏览器中接受安全证书 - -### 问题4: 摄像头仍然无法访问 -1. 确认使用HTTPS访问 -2. 检查浏览器摄像头权限设置 -3. 尝试不同浏览器（Chrome、Firefox等） - -## 📋 更新日志 - -### v2.0 - HTTPS升级 -- ✅ 自动SSL证书生成 -- ✅ 完整HTTPS支持 -- ✅ 摄像头权限兼容 -- ✅ 手机端HTTPS支持 -- ✅ 浏览器安全警告处理指南 - -## 🎯 下一步 - +# 🔒 HTTPS设置指南 + +## 概述 +本系统已升级支持HTTPS，解决摄像头权限问题。现代浏览器要求HTTPS才能访问摄像头等敏感设备。 + +## 🚀 快速启动 + +### 方法一：自动设置（推荐） +1. 在PyCharm中打开项目 +2. 直接运行 `main_web.py` +3. 系统会自动生成SSL证书并启动HTTPS服务器 + +### 方法二：手动安装依赖 +如果遇到cryptography库缺失： +```bash +pip install cryptography +``` + +## 📱 访问地址 + +启动后访问地址已升级为HTTPS： +- **本地访问**: https://127.0.0.1:5000 +- **手机访问**: https://你的IP:5000/mobile/mobile_client.html + +## 🔑 浏览器安全警告处理 + +### 桌面浏览器 +1. 访问 https://127.0.0.1:5000 +2. 看到"您的连接不是私密连接"警告 +3. 点击 **"高级"** +4. 点击 **"继续访问localhost(不安全)"** +5. 正常使用 + +### 手机浏览器 +1. 访问 https://你的IP:5000/mobile/mobile_client.html +2. 出现安全警告时，点击 **"高级"** 或 **"详细信息"** +3. 选择 **"继续访问"** 或 **"继续前往此网站"** +4. 正常使用摄像头功能 + +## 📂 文件结构 + +新增文件： +``` +ssl/ +├── cert.pem # SSL证书文件 +└── key.pem # 私钥文件 +``` + +## 🔧 技术说明 + +### SSL证书特性 +- **类型**: 自签名证书 +- **有效期**: 365天 +- **支持域名**: localhost, 127.0.0.1 +- **算法**: RSA-2048, SHA-256 + +### 摄像头权限要求 +- ✅ HTTPS环境 - 支持摄像头访问 +- ❌ HTTP环境 - 浏览器阻止摄像头访问 +- ⚠️ localhost - HTTP也可以，但IP访问必须HTTPS + +## 🐛 故障排除 + +### 问题1: cryptography库安装失败 +```bash +# Windows +pip install --upgrade pip +pip install cryptography + +# 如果还是失败，尝试： +pip install --only-binary=cryptography cryptography +``` + +### 问题2: 证书生成失败 +1. 检查ssl目录权限 +2. 重新运行程序，会自动重新生成 + +### 问题3: 手机无法访问 +1. 确保手机和电脑在同一网络 +2. 检查防火墙设置 +3. 在手机浏览器中接受安全证书 + +### 问题4: 摄像头仍然无法访问 +1. 确认使用HTTPS访问 +2. 检查浏览器摄像头权限设置 +3. 尝试不同浏览器（Chrome、Firefox等） + +## 📋 更新日志 + +### v2.0 - HTTPS升级 +- ✅ 自动SSL证书生成 +- ✅ 完整HTTPS支持 +- ✅ 摄像头权限兼容 +- ✅ 手机端HTTPS支持 +- ✅ 浏览器安全警告处理指南 + +## 🎯 下一步 + 完成HTTPS升级后，您的移动端摄像头功能将完全正常工作，不再受到浏览器安全限制的影响。 \ No newline at end of file diff --git a/distance-judgement/MAP_USAGE_GUIDE.md b/distance-judgement/MAP_USAGE_GUIDE.md index bce1849f..f1da6b36 100644 --- a/distance-judgement/MAP_USAGE_GUIDE.md +++ b/distance-judgement/MAP_USAGE_GUIDE.md @@ -1,165 +1,165 @@ -# 地图功能使用指南 🗺️ - -## 功能概述 - -本系统集成了高德地图API，可以实时在地图上显示： -- 📷 摄像头位置（蓝色标记） -- 👥 检测到的人员位置（红色标记） -- 📏 每个人员距离摄像头的距离 - -## 快速开始 - -### 1. 配置摄像头位置 📍 - -首先需要设置摄像头的地理位置： - -```bash -python setup_camera_location.py -``` - -按提示输入： -- 摄像头纬度（例：39.9042） -- 摄像头经度（例：116.4074） -- 摄像头朝向角度（0-360°，0为正北） -- 高德API Key（可选，用于更好的地图体验） - -### 2. 启动系统 🚀 - -```bash -python main.py -``` - -### 3. 查看地图 🗺️ - -在检测界面按 `m` 键打开地图，系统会自动在浏览器中显示实时地图。 - -## 操作说明 - -### 键盘快捷键 - -- `q` - 退出程序 -- `c` - 距离校准模式 -- `r` - 重置为默认参数 -- `s` - 保存当前帧截图 -- `m` - 打开地图显示 🗺️ -- `h` - 设置摄像头朝向 🧭 - -### 地图界面说明 - -- 🔵 **蓝色标记** - 摄像头位置 -- 🔴 **红色标记** - 检测到的人员位置 -- 📊 **信息面板** - 显示系统状态和统计信息 -- ⚡ **实时更新** - 地图每3秒自动刷新一次 - -## 坐标计算原理 - -系统通过以下步骤计算人员的地理坐标： - -1. **像素坐标获取** - 从YOLO检测结果获取人体在画面中的位置 -2. **角度计算** - 根据摄像头视场角计算人相对于摄像头中心的角度偏移 -3. **方位角计算** - 结合摄像头朝向，计算人相对于正北的绝对角度 -4. **地理坐标转换** - 使用球面几何学公式，根据距离和角度计算地理坐标 - -### 关键参数 - -- `CAMERA_FOV` - 摄像头视场角（默认60°） -- `CAMERA_HEADING` - 摄像头朝向角度（0°为正北） -- 距离计算基于已校准的距离测量算法 - -## 高德地图API配置 - -### 获取API Key - -1. 访问 [高德开放平台](https://lbs.amap.com/) -2. 注册并创建应用 -3. 获取Web服务API Key -4. 在配置中替换 `your_gaode_api_key_here` - -### API使用限制 - -- 免费配额：每日10万次调用 -- 超出配额后可能影响地图加载 -- 建议使用自己的API Key以确保稳定服务 - -## 精度优化建议 - -### 距离校准 📏 - -使用 `c` 键进入校准模式： -1. 让一个人站在已知距离处 -2. 输入实际距离 -3. 系统自动调整计算参数 - -### 朝向校准 🧭 - -使用 `h` 键设置准确朝向： -1. 确定摄像头实际朝向（使用指南针） -2. 输入角度（0°为正北，90°为正东） - -### 位置校准 📍 - -确保摄像头GPS坐标准确： -1. 使用手机GPS应用获取精确坐标 -2. 运行 `setup_camera_location.py` 更新配置 - -## 故障排除 - -### 地图无法打开 - -1. 检查网络连接 -2. 确认高德API Key配置正确 -3. 尝试手动访问生成的HTML文件 - -### 人员位置不准确 - -1. 重新校准距离参数 -2. 检查摄像头朝向设置 -3. 确认摄像头GPS坐标准确 - -### 地图显示异常 - -1. 刷新浏览器页面 -2. 清除浏览器缓存 -3. 检查JavaScript控制台错误信息 - -## 技术细节 - -### 坐标转换公式 - -系统使用WGS84坐标系和球面几何学公式： - -```python -# 球面距离计算 -lat2 = asin(sin(lat1) * cos(d/R) + cos(lat1) * sin(d/R) * cos(bearing)) -lng2 = lng1 + atan2(sin(bearing) * sin(d/R) * cos(lat1), cos(d/R) - sin(lat1) * sin(lat2)) -``` - -### 视场角映射 - -```python -# 像素到角度的转换 -horizontal_angle_per_pixel = camera_fov / frame_width -horizontal_offset = (pixel_x - center_x) * horizontal_angle_per_pixel -``` - -## 系统要求 - -- Python 3.7+ -- OpenCV 4.0+ -- 网络连接（地图加载） -- 现代浏览器（Chrome/Firefox/Edge） - -## 注意事项 - -⚠️ **重要提醒**： -- 本系统仅供技术研究使用 -- 实际部署需要考虑隐私保护 -- GPS坐标精度影响最终定位准确性 -- 距离计算基于单目视觉，存在一定误差 - -## 更新日志 - -- v1.0.0 - 基础地图显示功能 -- v1.1.0 - 添加实时人员位置标记 -- v1.2.0 - 优化坐标计算精度 +# 地图功能使用指南 🗺️ + +## 功能概述 + +本系统集成了高德地图API，可以实时在地图上显示： +- 📷 摄像头位置（蓝色标记） +- 👥 检测到的人员位置（红色标记） +- 📏 每个人员距离摄像头的距离 + +## 快速开始 + +### 1. 配置摄像头位置 📍 + +首先需要设置摄像头的地理位置： + +```bash +python setup_camera_location.py +``` + +按提示输入： +- 摄像头纬度（例：39.9042） +- 摄像头经度（例：116.4074） +- 摄像头朝向角度（0-360°，0为正北） +- 高德API Key（可选，用于更好的地图体验） + +### 2. 启动系统 🚀 + +```bash +python main.py +``` + +### 3. 查看地图 🗺️ + +在检测界面按 `m` 键打开地图，系统会自动在浏览器中显示实时地图。 + +## 操作说明 + +### 键盘快捷键 + +- `q` - 退出程序 +- `c` - 距离校准模式 +- `r` - 重置为默认参数 +- `s` - 保存当前帧截图 +- `m` - 打开地图显示 🗺️ +- `h` - 设置摄像头朝向 🧭 + +### 地图界面说明 + +- 🔵 **蓝色标记** - 摄像头位置 +- 🔴 **红色标记** - 检测到的人员位置 +- 📊 **信息面板** - 显示系统状态和统计信息 +- ⚡ **实时更新** - 地图每3秒自动刷新一次 + +## 坐标计算原理 + +系统通过以下步骤计算人员的地理坐标： + +1. **像素坐标获取** - 从YOLO检测结果获取人体在画面中的位置 +2. **角度计算** - 根据摄像头视场角计算人相对于摄像头中心的角度偏移 +3. **方位角计算** - 结合摄像头朝向，计算人相对于正北的绝对角度 +4. **地理坐标转换** - 使用球面几何学公式，根据距离和角度计算地理坐标 + +### 关键参数 + +- `CAMERA_FOV` - 摄像头视场角（默认60°） +- `CAMERA_HEADING` - 摄像头朝向角度（0°为正北） +- 距离计算基于已校准的距离测量算法 + +## 高德地图API配置 + +### 获取API Key + +1. 访问 [高德开放平台](https://lbs.amap.com/) +2. 注册并创建应用 +3. 获取Web服务API Key +4. 在配置中替换 `your_gaode_api_key_here` + +### API使用限制 + +- 免费配额：每日10万次调用 +- 超出配额后可能影响地图加载 +- 建议使用自己的API Key以确保稳定服务 + +## 精度优化建议 + +### 距离校准 📏 + +使用 `c` 键进入校准模式： +1. 让一个人站在已知距离处 +2. 输入实际距离 +3. 系统自动调整计算参数 + +### 朝向校准 🧭 + +使用 `h` 键设置准确朝向： +1. 确定摄像头实际朝向（使用指南针） +2. 输入角度（0°为正北，90°为正东） + +### 位置校准 📍 + +确保摄像头GPS坐标准确： +1. 使用手机GPS应用获取精确坐标 +2. 运行 `setup_camera_location.py` 更新配置 + +## 故障排除 + +### 地图无法打开 + +1. 检查网络连接 +2. 确认高德API Key配置正确 +3. 尝试手动访问生成的HTML文件 + +### 人员位置不准确 + +1. 重新校准距离参数 +2. 检查摄像头朝向设置 +3. 确认摄像头GPS坐标准确 + +### 地图显示异常 + +1. 刷新浏览器页面 +2. 清除浏览器缓存 +3. 检查JavaScript控制台错误信息 + +## 技术细节 + +### 坐标转换公式 + +系统使用WGS84坐标系和球面几何学公式： + +```python +# 球面距离计算 +lat2 = asin(sin(lat1) * cos(d/R) + cos(lat1) * sin(d/R) * cos(bearing)) +lng2 = lng1 + atan2(sin(bearing) * sin(d/R) * cos(lat1), cos(d/R) - sin(lat1) * sin(lat2)) +``` + +### 视场角映射 + +```python +# 像素到角度的转换 +horizontal_angle_per_pixel = camera_fov / frame_width +horizontal_offset = (pixel_x - center_x) * horizontal_angle_per_pixel +``` + +## 系统要求 + +- Python 3.7+ +- OpenCV 4.0+ +- 网络连接（地图加载） +- 现代浏览器（Chrome/Firefox/Edge） + +## 注意事项 + +⚠️ **重要提醒**： +- 本系统仅供技术研究使用 +- 实际部署需要考虑隐私保护 +- GPS坐标精度影响最终定位准确性 +- 距离计算基于单目视觉，存在一定误差 + +## 更新日志 + +- v1.0.0 - 基础地图显示功能 +- v1.1.0 - 添加实时人员位置标记 +- v1.2.0 - 优化坐标计算精度 - v1.3.0 - 增加配置工具和用户指南 \ No newline at end of file diff --git a/distance-judgement/MOBILE_GUIDE.md b/distance-judgement/MOBILE_GUIDE.md index ec650d7c..9ff1baa9 100644 --- a/distance-judgement/MOBILE_GUIDE.md +++ b/distance-judgement/MOBILE_GUIDE.md @@ -1,246 +1,246 @@ -# 📱 手机连接功能使用指南 - -## 🚁 无人机战场态势感知系统 - 手机扩展功能 - -这个功能允许你使用手机作为移动侦察设备，将手机摄像头图像、GPS位置和设备信息实时传输到指挥中心，扩展战场态势感知能力。 - -## 🌟 功能特性 - -### 📡 数据传输 -- **实时视频流**: 传输手机摄像头画面到指挥中心 -- **GPS定位**: 自动获取和传输手机的精确位置 -- **设备状态**: 监控电池电量、信号强度等 -- **人体检测**: 在手机端进行AI人体检测 -- **地图集成**: 检测结果自动显示在指挥中心地图上 - -### 🛡️ 技术特点 -- **低延迟传输**: 优化的数据压缩和传输协议 -- **自动重连**: 网络中断后自动重新连接 -- **多设备支持**: 支持多台手机同时连接 -- **跨平台兼容**: 支持Android、iOS等主流移动设备 - -## 🚀 快速开始 - -### 1. 启动服务端 - -#### 方法一：使用Web模式（推荐） -```bash -python run.py -# 选择 "1. Web模式" -# 在Web界面中点击"启用手机模式" -``` - -#### 方法二：直接启动Web服务器 -```bash -python main_web.py -``` - -### 2. 配置网络连接 - -确保手机和电脑在同一网络环境下： -- **局域网连接**: 连接同一WiFi网络 -- **热点模式**: 电脑开启热点，手机连接 -- **有线网络**: 电脑有线连接，手机连WiFi - -### 3. 获取服务器IP地址 - -在电脑上查看IP地址： - -**Windows:** -```cmd -ipconfig -``` - -**Linux/Mac:** -```bash -ifconfig -# 或 -ip addr show -``` - -记下显示的IP地址（如 192.168.1.100） - -### 4. 手机端连接 - -#### 方法一：使用浏览器（推荐） -1. 打开手机浏览器 -2. 访问 `http://[服务器IP]:5000/mobile/mobile_client.html` -3. 例如：`http://192.168.1.100:5000/mobile/mobile_client.html` - -#### 方法二：直接访问HTML文件 -1. 将 `mobile/mobile_client.html` 复制到手机 -2. 在文件中修改服务器IP地址 -3. 用浏览器打开HTML文件 - -### 5. 开始传输 -1. 在手机页面中点击"开始传输" -2. 允许摄像头和位置权限 -3. 查看连接状态指示灯变绿 -4. 在指挥中心Web界面查看实时数据 - -## 📱 手机端界面说明 - -### 状态面板 -- **📍 GPS坐标**: 显示当前精确位置 -- **🔋 电池电量**: 实时电池状态 -- **🌐 连接状态**: 与服务器的连接状态 - -### 控制按钮 -- **📹 开始传输**: 启动数据传输 -- **⏹️ 停止传输**: 停止传输 -- **🔄 重连**: 重新连接服务器 - -### 统计信息 -- **📊 已发送帧数**: 传输的图像帧数量 -- **📈 数据量**: 累计传输的数据量 - -### 日志面板 -- 显示详细的操作日志和错误信息 -- 帮助诊断连接问题 - -## 🖥️ 服务端管理 - -### Web界面控制 -访问 `http://localhost:5000` 查看： -- **地图显示**: 实时显示手机位置和检测结果 -- **设备管理**: 查看连接的手机列表 -- **数据统计**: 查看传输统计信息 - -### API接口 -- `GET /api/mobile/devices` - 获取连接设备列表 -- `POST /api/mobile/toggle` - 切换手机模式开关 -- `POST /mobile/ping` - 手机连接测试 -- `POST /mobile/upload` - 接收手机数据 - -### 命令行监控 -服务器控制台会显示详细日志： -``` -📱 新设备连接: iPhone (mobile_12) -📍 设备 mobile_12 位置更新: (39.904200, 116.407400) -🎯 检测到 2 个人 -📍 手机检测人员 1: 距离5.2m, 坐标(39.904250, 116.407450) -``` - -## ⚙️ 高级配置 - -### 修改传输参数 - -在手机端HTML文件中可以调整： - -```javascript -// 修改服务器地址 -this.serverHost = '192.168.1.100'; -this.serverPort = 5000; - -// 修改传输频率（毫秒） -const interval = 1000; // 1秒传输一次 - -// 修改图像质量（0.1-1.0） -const frameData = this.canvas.toDataURL('image/jpeg', 0.5); -``` - -### 网络优化 - -**低带宽环境:** -- 降低图像质量 (0.3-0.5) -- 增加传输间隔 (2-5秒) -- 减小图像分辨率 - -**高质量需求:** -- 提高图像质量 (0.7-0.9) -- 减少传输间隔 (0.5-1秒) -- 使用更高分辨率 - -## 🔧 故障排除 - -### 常见问题 - -#### 1. 手机无法连接服务器 -- **检查网络**: 确保在同一网络 -- **检查IP地址**: 确认服务器IP正确 -- **检查防火墙**: 关闭防火墙或开放端口 -- **检查端口**: 确认5000端口未被占用 - -#### 2. 摄像头无法访问 -- **权限设置**: 在浏览器中允许摄像头权限 -- **HTTPS需求**: 某些浏览器需要HTTPS才能访问摄像头 -- **设备占用**: 关闭其他使用摄像头的应用 - -#### 3. GPS定位失败 -- **位置权限**: 允许浏览器访问位置信息 -- **网络连接**: 确保网络连接正常 -- **室内环境**: 移动到有GPS信号的位置 - -#### 4. 传输断开 -- **网络稳定性**: 检查WiFi信号强度 -- **服务器状态**: 确认服务器正常运行 -- **自动重连**: 等待自动重连或手动重连 - -### 调试方法 - -#### 手机端调试 -1. 打开浏览器开发者工具 (F12) -2. 查看Console面板的错误信息 -3. 检查Network面板的网络请求 - -#### 服务端调试 -1. 查看控制台输出的日志信息 -2. 使用 `python tests/test_system.py` 测试系统 -3. 检查网络连接和端口状态 - -## 🌐 网络配置示例 - -### 局域网配置 -``` -电脑 (192.168.1.100) ←→ 路由器 ←→ 手机 (192.168.1.101) -``` - -### 热点配置 -``` -电脑热点 (192.168.137.1) ←→ 手机 (192.168.137.2) -``` - -### 有线+WiFi配置 -``` -电脑 (有线: 192.168.1.100) ←→ 路由器 ←→ 手机 (WiFi: 192.168.1.101) -``` - -## 📊 性能建议 - -### 推荐配置 -- **网络**: WiFi 5GHz频段，带宽 ≥ 10Mbps -- **手机**: RAM ≥ 4GB，Android 8+ / iOS 12+ -- **服务器**: 双核CPU，RAM ≥ 4GB - -### 优化设置 -- **高质量模式**: 0.7质量，1秒间隔 -- **平衡模式**: 0.5质量，1秒间隔（推荐） -- **省流量模式**: 0.3质量，2秒间隔 - -## 🚁 实战应用场景 - -### 军用场景 -- **前线侦察**: 士兵携带手机进行前方侦察 -- **多点监控**: 多个观察点同时传输情报 -- **指挥决策**: 指挥部实时获取战场态势 - -### 民用场景 -- **安保监控**: 保安巡逻时实时传输画面 -- **应急救援**: 救援人员现场情况汇报 -- **活动监管**: 大型活动现场监控 - -### 技术演示 -- **远程教学**: 实地教学直播 -- **技术展示**: 产品演示和技术验证 - ---- - -## 📞 技术支持 - -如有问题，请： -1. 查看控制台日志信息 -2. 运行系统测试脚本 -3. 检查网络配置 -4. 参考故障排除指南 - +# 📱 手机连接功能使用指南 + +## 🚁 无人机战场态势感知系统 - 手机扩展功能 + +这个功能允许你使用手机作为移动侦察设备，将手机摄像头图像、GPS位置和设备信息实时传输到指挥中心，扩展战场态势感知能力。 + +## 🌟 功能特性 + +### 📡 数据传输 +- **实时视频流**: 传输手机摄像头画面到指挥中心 +- **GPS定位**: 自动获取和传输手机的精确位置 +- **设备状态**: 监控电池电量、信号强度等 +- **人体检测**: 在手机端进行AI人体检测 +- **地图集成**: 检测结果自动显示在指挥中心地图上 + +### 🛡️ 技术特点 +- **低延迟传输**: 优化的数据压缩和传输协议 +- **自动重连**: 网络中断后自动重新连接 +- **多设备支持**: 支持多台手机同时连接 +- **跨平台兼容**: 支持Android、iOS等主流移动设备 + +## 🚀 快速开始 + +### 1. 启动服务端 + +#### 方法一：使用Web模式（推荐） +```bash +python run.py +# 选择 "1. Web模式" +# 在Web界面中点击"启用手机模式" +``` + +#### 方法二：直接启动Web服务器 +```bash +python main_web.py +``` + +### 2. 配置网络连接 + +确保手机和电脑在同一网络环境下： +- **局域网连接**: 连接同一WiFi网络 +- **热点模式**: 电脑开启热点，手机连接 +- **有线网络**: 电脑有线连接，手机连WiFi + +### 3. 获取服务器IP地址 + +在电脑上查看IP地址： + +**Windows:** +```cmd +ipconfig +``` + +**Linux/Mac:** +```bash +ifconfig +# 或 +ip addr show +``` + +记下显示的IP地址（如 192.168.1.100） + +### 4. 手机端连接 + +#### 方法一：使用浏览器（推荐） +1. 打开手机浏览器 +2. 访问 `http://[服务器IP]:5000/mobile/mobile_client.html` +3. 例如：`http://192.168.1.100:5000/mobile/mobile_client.html` + +#### 方法二：直接访问HTML文件 +1. 将 `mobile/mobile_client.html` 复制到手机 +2. 在文件中修改服务器IP地址 +3. 用浏览器打开HTML文件 + +### 5. 开始传输 +1. 在手机页面中点击"开始传输" +2. 允许摄像头和位置权限 +3. 查看连接状态指示灯变绿 +4. 在指挥中心Web界面查看实时数据 + +## 📱 手机端界面说明 + +### 状态面板 +- **📍 GPS坐标**: 显示当前精确位置 +- **🔋 电池电量**: 实时电池状态 +- **🌐 连接状态**: 与服务器的连接状态 + +### 控制按钮 +- **📹 开始传输**: 启动数据传输 +- **⏹️ 停止传输**: 停止传输 +- **🔄 重连**: 重新连接服务器 + +### 统计信息 +- **📊 已发送帧数**: 传输的图像帧数量 +- **📈 数据量**: 累计传输的数据量 + +### 日志面板 +- 显示详细的操作日志和错误信息 +- 帮助诊断连接问题 + +## 🖥️ 服务端管理 + +### Web界面控制 +访问 `http://localhost:5000` 查看： +- **地图显示**: 实时显示手机位置和检测结果 +- **设备管理**: 查看连接的手机列表 +- **数据统计**: 查看传输统计信息 + +### API接口 +- `GET /api/mobile/devices` - 获取连接设备列表 +- `POST /api/mobile/toggle` - 切换手机模式开关 +- `POST /mobile/ping` - 手机连接测试 +- `POST /mobile/upload` - 接收手机数据 + +### 命令行监控 +服务器控制台会显示详细日志： +``` +📱 新设备连接: iPhone (mobile_12) +📍 设备 mobile_12 位置更新: (39.904200, 116.407400) +🎯 检测到 2 个人 +📍 手机检测人员 1: 距离5.2m, 坐标(39.904250, 116.407450) +``` + +## ⚙️ 高级配置 + +### 修改传输参数 + +在手机端HTML文件中可以调整： + +```javascript +// 修改服务器地址 +this.serverHost = '192.168.1.100'; +this.serverPort = 5000; + +// 修改传输频率（毫秒） +const interval = 1000; // 1秒传输一次 + +// 修改图像质量（0.1-1.0） +const frameData = this.canvas.toDataURL('image/jpeg', 0.5); +``` + +### 网络优化 + +**低带宽环境:** +- 降低图像质量 (0.3-0.5) +- 增加传输间隔 (2-5秒) +- 减小图像分辨率 + +**高质量需求:** +- 提高图像质量 (0.7-0.9) +- 减少传输间隔 (0.5-1秒) +- 使用更高分辨率 + +## 🔧 故障排除 + +### 常见问题 + +#### 1. 手机无法连接服务器 +- **检查网络**: 确保在同一网络 +- **检查IP地址**: 确认服务器IP正确 +- **检查防火墙**: 关闭防火墙或开放端口 +- **检查端口**: 确认5000端口未被占用 + +#### 2. 摄像头无法访问 +- **权限设置**: 在浏览器中允许摄像头权限 +- **HTTPS需求**: 某些浏览器需要HTTPS才能访问摄像头 +- **设备占用**: 关闭其他使用摄像头的应用 + +#### 3. GPS定位失败 +- **位置权限**: 允许浏览器访问位置信息 +- **网络连接**: 确保网络连接正常 +- **室内环境**: 移动到有GPS信号的位置 + +#### 4. 传输断开 +- **网络稳定性**: 检查WiFi信号强度 +- **服务器状态**: 确认服务器正常运行 +- **自动重连**: 等待自动重连或手动重连 + +### 调试方法 + +#### 手机端调试 +1. 打开浏览器开发者工具 (F12) +2. 查看Console面板的错误信息 +3. 检查Network面板的网络请求 + +#### 服务端调试 +1. 查看控制台输出的日志信息 +2. 使用 `python tests/test_system.py` 测试系统 +3. 检查网络连接和端口状态 + +## 🌐 网络配置示例 + +### 局域网配置 +``` +电脑 (192.168.1.100) ←→ 路由器 ←→ 手机 (192.168.1.101) +``` + +### 热点配置 +``` +电脑热点 (192.168.137.1) ←→ 手机 (192.168.137.2) +``` + +### 有线+WiFi配置 +``` +电脑 (有线: 192.168.1.100) ←→ 路由器 ←→ 手机 (WiFi: 192.168.1.101) +``` + +## 📊 性能建议 + +### 推荐配置 +- **网络**: WiFi 5GHz频段，带宽 ≥ 10Mbps +- **手机**: RAM ≥ 4GB，Android 8+ / iOS 12+ +- **服务器**: 双核CPU，RAM ≥ 4GB + +### 优化设置 +- **高质量模式**: 0.7质量，1秒间隔 +- **平衡模式**: 0.5质量，1秒间隔（推荐） +- **省流量模式**: 0.3质量，2秒间隔 + +## 🚁 实战应用场景 + +### 军用场景 +- **前线侦察**: 士兵携带手机进行前方侦察 +- **多点监控**: 多个观察点同时传输情报 +- **指挥决策**: 指挥部实时获取战场态势 + +### 民用场景 +- **安保监控**: 保安巡逻时实时传输画面 +- **应急救援**: 救援人员现场情况汇报 +- **活动监管**: 大型活动现场监控 + +### 技术演示 +- **远程教学**: 实地教学直播 +- **技术展示**: 产品演示和技术验证 + +--- + +## 📞 技术支持 + +如有问题，请： +1. 查看控制台日志信息 +2. 运行系统测试脚本 +3. 检查网络配置 +4. 参考故障排除指南 + 这个手机连接功能大大扩展了战场态势感知系统的应用场景，让移动侦察成为可能！ \ No newline at end of file diff --git a/distance-judgement/__pycache__/main_web.cpython-311.pyc b/distance-judgement/__pycache__/main_web.cpython-311.pyc index 44b68aa758260fe4692cd1d223178f6a72c505ea..1629e0df6339872b5c2bc6d6e875318036e3db89 100644 GIT binary patch delta 3717 zcma)9eNYqW8Q;z41_K0=NCFZUA_%CUlBh(BAb5TNqP184t0S}XOlbm>yG~QgT z2z~_D-q2G^di8@l_4E!qT0g3Pb=p7L?&3P&T4o%_4e&=tI@TG-xpw-#yW~sTPLp?@ z_j%su_k6#bk7&iK%^8={)6)>}`WyLCXJ+m|Mm6dfXnG=9o-tB}Dkao!C2DE{O>5SC zB!Q@~gyehz2PFjAClz-DA+q9#Kc*mLaYS|;af|Ac?xobSHPi!{7EPzBWx0}wlDZ`? zlteJNX@W=qA&j#IDCwknWG0-*Ci1#f`_qCbib#+EdJ(w39CMEZCDb8#F&>l#q{KX9 z{FwZw4~+{5kxxBP~EFg>3MeYtrBI<-?f=i7q#-ys{bE!@=(^-`2A4Nc0io4T;a$(O1 zDgyFIX2Ms33n=!*vwGV{vd)3J%BdcON#Zh5-zhdyxKxwj+6v}TCeDLgLaCKyRHxDe zRT5V|5N$e_%Z&K&M6?A6iBmmFoT3$Kh%0VITDS)b=GG#dB0VU{(DSK4NEdCK}=|;HmFh|0aZks$UDIWRQq%>3GjL_qMVAfKw4yO>@;~N ze(+Ay(;_+Wwr3~bzu+9;zyOXHVP_uo1AZqCpHTP4OFkvj5bnNlnX1H z-l+tO^+QLX;f>ZGkkj^X(|Us)X-- z`7xfr-^Tr)SEluCJEHh~1YF|TheQDb5UrF)Wkh$4^r>#6p^o0eyB^+sSy$8Xy}>({ zo%^F25`Gx^O97b~I{!Hy{q>>fZ~FP(>(POq@}HgL&);}{@BZZJ;psbrQ{SAQK74%g z-Z%bAfW~n=I(Ur_U!1!5>C}<0`MzOMnPdmC{HbHnv*-Bmz>B*>{^F2m`0UV^_|)$x z{_q8S;lYLY5`6M!OFe-5yJcJ?q1 z>_Uk)^@jPrp#p!FkO6fZkA8mr`90V%8(zYxJ3L-{x4T{NI1R_?*9gE%S0PaBD9A3O z-Lc$th$?)X)+qMusIdW(6&QRPvh@2euzeV$#fTOhk9SeRjJo_Rdv@AIZa9byb`}rfc zr%(T)3N$@Yb*ziYO@ZA?%_(}cA9Qr2dX82y(vp5enkS5HW@w-vhkkFL1f@^jp`z!8 zN=?+iG+RQPyvybB`#8DRM|OEQdAIw3ljICuvc24$xTkhv_M(#T*Ar)Q_;FCf%X0?Q*-h*CF=IrV6m8Nrw_D*+KyHm^vizNuXdHvl! zPVMk`x)0iCK{!lX3ZinTlS@0`+++7T$&W#lBB(&U90rr`ws(2RMc~8>f8l@+t;Fk1 zWxb7(WUtcMfCg&4pC}RJ5b_E`v0%(t zGit11jO$qAy0GG@);L(oY8T8PhO8YSbV6sOb1jU{%Id7N&MJuR;l0;CWXtOxY-7te z(7A4L{o!MJ2f;Qw>Af9nb7%Y*FpSQ_>O8d0BUm>L@1QO9?2`3#Zc}_Qx-G133$5G2 zn@i}@t&DjaYu+|y4z-M$TNraIYi=Dg+egiI#_V9tj&S36jyd8T%_*aE%Ek@&n87+~ zu#V3wj8wDpmV=!(SF-agf0s**x&J@_nSlgM)o7wk7RF#@4OZG)o1`BJj&;|=IC@eakJE#~`@P>Ta)W{f`SVI#nEFN}hGox!@ zbq%zxL8$cuMz@{SZKrkHd5wNRd0H6;@A0gh!OBzl;e26KRz|ae)vTa3D+F;jqiJI` zZM3Ehhy$Tn6JSlxO+kvzUccru@fk#-(j~}*I*ZP(WYiW`ZK2f`ARgUtY(uZ`p2#$S zRzP%&2x!~&AJf@3uo(4fR=t{5uNICQnNoEVt8SvzO(|YPU$4PyMhX0Y{gry8TKl0i zbOJm>zt7xI(XYQ9!pEM&>~l8yH`to}Zo=Q~tR`!z_MA=HT@ti-21%klGU|SgSyltU{|0xe@mv4^ delta 925 zcmZWmTTc@~6rS1HZMO^CvJ{lw3k9@j0Y!=lNCI!DkR}?nUa}(FM6k4ETPP;2s4qV7 zV90qfF} zAc_K_E3kFt=7f35+=(ww^?qQk^4SJ#WZ)Jq#bxlBxUi&SxrXqBguzQBO@&{i9WJnC z@ReAwO;_Ks66A@99gr_=ghfHLI_EJ$&!`m^MoAH7n5wc2Qe28VYRq60O5-^rV9pw# zY=|$WQf?~pd4^s>t*|monwb-{69kc@K5^NfsFoZ>DH?}iMgFc3z z#(>#WXi&_sX?D)6y-JXBRF}{262wF+ZiM^dp~|NJ8bEUvEx!aQ&B`(5xYF|c1bh@* zV96wb*IX%ae^nYxb1=hK0~VrU-F~xZ$ODeiN~ z2MdBnD2Dx~vezxkIJ;FLG6q$fd0+O^fd|C?V)TDQJadLb4;r5%?yKiA< zde&b7_w0Qz=C}x9hwEgHByJ~iY-D^e={MwrROE)7h^S)`Rn;!Y;Y5y)#s~VN^5BSS z*CUaHf$q@l>@KgTM5LBD&mwdeZL=nL$Vmy1JXGvt~YgwhgTXHDRqy>J`X3AE11_6^HC-J!lIV$cBZXd_yv6+}>3a!sLAi zM?;&KqoGX$(YRd-9U(bhmWTTXW3ue$;c2bV>7g~`n0SIVsSc=wdMYgxsaoAya;$$i tBFjr?kNQZ}{^SSWF&tM$qmfRv5x&*-STA8*pGSXSl7YTD9~+>_zX5_K;+X&d diff --git a/distance-judgement/create_simple_cert.py b/distance-judgement/create_simple_cert.py index d5dbd7a5..d5554ce2 100644 --- a/distance-judgement/create_simple_cert.py +++ b/distance-judgement/create_simple_cert.py @@ -1,98 +1,98 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -使用OpenSSL命令行工具创建简单的自签名证书 -不依赖Python的cryptography库 -""" - -import os -import subprocess -import sys - -def create_ssl_dir(): - """创建ssl目录""" - if not os.path.exists("ssl"): - os.makedirs("ssl") - print("✅ 创建ssl目录") - -def create_certificate_with_openssl(): - """使用OpenSSL命令创建证书""" - print("🔑 使用OpenSSL创建自签名证书...") - - # 检查OpenSSL是否可用 - try: - subprocess.run(["openssl", "version"], check=True, capture_output=True) - except (subprocess.CalledProcessError, FileNotFoundError): - print("❌ OpenSSL未安装或不在PATH中") - print("📝 请安装OpenSSL或使用其他方法") - return False - - # 创建私钥 - key_cmd = [ - "openssl", "genrsa", - "-out", "ssl/key.pem", - "2048" - ] - - # 创建证书 - cert_cmd = [ - "openssl", "req", "-new", "-x509", - "-key", "ssl/key.pem", - "-out", "ssl/cert.pem", - "-days", "365", - "-subj", "/C=CN/ST=Beijing/L=Beijing/O=Distance System/CN=localhost" - ] - - try: - print(" 生成私钥...") - subprocess.run(key_cmd, check=True, capture_output=True) - - print(" 生成证书...") - subprocess.run(cert_cmd, check=True, capture_output=True) - - print("✅ SSL证书创建成功!") - print(" 🔑 私钥: ssl/key.pem") - print(" 📜 证书: ssl/cert.pem") - return True - - except subprocess.CalledProcessError as e: - print(f"❌ OpenSSL命令执行失败: {e}") - return False - -def create_certificate_manual(): - """提供手动创建证书的说明""" - print("📝 手动创建SSL证书说明:") - print() - print("方法1 - 使用在线工具:") - print(" 访问: https://www.selfsignedcertificate.com/") - print(" 下载证书文件并重命名为 cert.pem 和 key.pem") - print() - print("方法2 - 使用Git Bash (Windows):") - print(" 打开Git Bash，进入项目目录，执行:") - print(" openssl genrsa -out ssl/key.pem 2048") - print(" openssl req -new -x509 -key ssl/key.pem -out ssl/cert.pem -days 365") - print() - print("方法3 - 暂时使用HTTP:") - print(" 运行: python main_web.py") - print(" 注意: HTTP模式下手机摄像头可能无法使用") - -def main(): - """主函数""" - create_ssl_dir() - - # 检查证书是否已存在 - if os.path.exists("ssl/cert.pem") and os.path.exists("ssl/key.pem"): - print("✅ SSL证书已存在") - return - - print("🔍 尝试创建SSL证书...") - - # 尝试使用OpenSSL - if create_certificate_with_openssl(): - return - - # 提供手动创建说明 - create_certificate_manual() - +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +使用OpenSSL命令行工具创建简单的自签名证书 +不依赖Python的cryptography库 +""" + +import os +import subprocess +import sys + +def create_ssl_dir(): + """创建ssl目录""" + if not os.path.exists("ssl"): + os.makedirs("ssl") + print("✅ 创建ssl目录") + +def create_certificate_with_openssl(): + """使用OpenSSL命令创建证书""" + print("🔑 使用OpenSSL创建自签名证书...") + + # 检查OpenSSL是否可用 + try: + subprocess.run(["openssl", "version"], check=True, capture_output=True) + except (subprocess.CalledProcessError, FileNotFoundError): + print("❌ OpenSSL未安装或不在PATH中") + print("📝 请安装OpenSSL或使用其他方法") + return False + + # 创建私钥 + key_cmd = [ + "openssl", "genrsa", + "-out", "ssl/key.pem", + "2048" + ] + + # 创建证书 + cert_cmd = [ + "openssl", "req", "-new", "-x509", + "-key", "ssl/key.pem", + "-out", "ssl/cert.pem", + "-days", "365", + "-subj", "/C=CN/ST=Beijing/L=Beijing/O=Distance System/CN=localhost" + ] + + try: + print(" 生成私钥...") + subprocess.run(key_cmd, check=True, capture_output=True) + + print(" 生成证书...") + subprocess.run(cert_cmd, check=True, capture_output=True) + + print("✅ SSL证书创建成功!") + print(" 🔑 私钥: ssl/key.pem") + print(" 📜 证书: ssl/cert.pem") + return True + + except subprocess.CalledProcessError as e: + print(f"❌ OpenSSL命令执行失败: {e}") + return False + +def create_certificate_manual(): + """提供手动创建证书的说明""" + print("📝 手动创建SSL证书说明:") + print() + print("方法1 - 使用在线工具:") + print(" 访问: https://www.selfsignedcertificate.com/") + print(" 下载证书文件并重命名为 cert.pem 和 key.pem") + print() + print("方法2 - 使用Git Bash (Windows):") + print(" 打开Git Bash，进入项目目录，执行:") + print(" openssl genrsa -out ssl/key.pem 2048") + print(" openssl req -new -x509 -key ssl/key.pem -out ssl/cert.pem -days 365") + print() + print("方法3 - 暂时使用HTTP:") + print(" 运行: python main_web.py") + print(" 注意: HTTP模式下手机摄像头可能无法使用") + +def main(): + """主函数""" + create_ssl_dir() + + # 检查证书是否已存在 + if os.path.exists("ssl/cert.pem") and os.path.exists("ssl/key.pem"): + print("✅ SSL证书已存在") + return + + print("🔍 尝试创建SSL证书...") + + # 尝试使用OpenSSL + if create_certificate_with_openssl(): + return + + # 提供手动创建说明 + create_certificate_manual() + \ No newline at end of file diff --git a/distance-judgement/demo_mobile.py b/distance-judgement/demo_mobile.py index 1e36a4ee..41f0849e 100644 --- a/distance-judgement/demo_mobile.py +++ b/distance-judgement/demo_mobile.py @@ -1,206 +1,206 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -手机连接功能演示脚本 -展示如何使用手机作为移动侦察设备 -""" - -import time -import json -import base64 -import requests -from src import MobileConnector, config - -def demo_mobile_functionality(): - """演示手机连接功能""" - print("📱 手机连接功能演示") - print("=" * 60) - - print("🎯 演示内容:") - print("1. 启动手机连接服务器") - print("2. 模拟手机客户端连接") - print("3. 发送模拟数据") - print("4. 展示数据处理流程") - print() - - # 创建手机连接器 - mobile_connector = MobileConnector(port=8080) - - print("📱 正在启动手机连接服务器...") - if mobile_connector.start_server(): - print("✅ 手机连接服务器启动成功") - print(f"🌐 等待手机客户端连接到端口 8080") - print() - - print("📖 使用说明:") - print("1. 确保手机和电脑在同一网络") - print("2. 在手机浏览器中访问:") - print(" http://[电脑IP]:5000/mobile/mobile_client.html") - print("3. 或者直接打开 mobile/mobile_client.html 文件") - print("4. 点击'开始传输'按钮") - print() - - print("🔧 获取电脑IP地址的方法:") - print("Windows: ipconfig") - print("Linux/Mac: ifconfig 或 ip addr show") - print() - - # 设置回调函数来显示接收的数据 - def on_frame_received(device_id, frame, device): - print(f"📷 收到设备 {device_id[:8]} 的图像帧") - print(f" 分辨率: {frame.shape[1]}x{frame.shape[0]}") - print(f" 设备: {device.device_name}") - - def on_location_received(device_id, location, device): - lat, lng, accuracy = location - print(f"📍 收到设备 {device_id[:8]} 的位置信息") - print(f" 坐标: ({lat:.6f}, {lng:.6f})") - print(f" 精度: {accuracy}m") - - def on_device_event(event_type, device): - if event_type == 'device_connected': - print(f"📱 设备连接: {device.device_name} ({device.device_id[:8]})") - print(f" 电池: {device.battery_level}%") - elif event_type == 'device_disconnected': - print(f"📱 设备断开: {device.device_name} ({device.device_id[:8]})") - - # 注册回调函数 - mobile_connector.add_frame_callback(on_frame_received) - mobile_connector.add_location_callback(on_location_received) - mobile_connector.add_device_callback(on_device_event) - - print("⏳ 等待手机连接... (按 Ctrl+C 退出)") - - try: - # 监控连接状态 - while True: - time.sleep(5) - - # 显示统计信息 - stats = mobile_connector.get_statistics() - online_devices = mobile_connector.get_online_devices() - - if stats['online_devices'] > 0: - print(f"\n📊 连接统计:") - print(f" 在线设备: {stats['online_devices']}") - print(f" 接收帧数: {stats['frames_received']}") - print(f" 数据量: {stats['data_received_mb']:.2f} MB") - print(f" 平均帧率: {stats['avg_frames_per_second']:.1f} FPS") - - print(f"\n📱 在线设备:") - for device in online_devices: - print(f" • {device.device_name} ({device.device_id[:8]})") - print(f" 电池: {device.battery_level}%") - if device.current_location: - lat, lng, acc = device.current_location - print(f" 位置: ({lat:.6f}, {lng:.6f})") - else: - print("⏳ 等待设备连接...") - - except KeyboardInterrupt: - print("\n🔴 用户中断") - - finally: - mobile_connector.stop_server() - print("📱 手机连接服务器已停止") - - else: - print("❌ 手机连接服务器启动失败") - print("💡 可能的原因:") - print(" - 端口 8080 已被占用") - print(" - 网络权限问题") - print(" - 防火墙阻止连接") - -def test_mobile_api(): - """测试手机相关API""" - print("\n🧪 测试手机API接口") - print("=" * 40) - - base_url = "http://127.0.0.1:5000" - - try: - # 测试ping接口 - test_data = {"device_id": "test_device_123"} - response = requests.post(f"{base_url}/mobile/ping", - json=test_data, timeout=5) - - if response.status_code == 200: - data = response.json() - print("✅ Ping API测试成功") - print(f" 服务器时间: {data.get('server_time')}") - else: - print(f"❌ Ping API测试失败: HTTP {response.status_code}") - - except requests.exceptions.ConnectionError: - print("⚠️ 无法连接到Web服务器") - print("💡 请先启动Web服务器: python main_web.py") - - except Exception as e: - print(f"❌ API测试出错: {e}") - -def show_mobile_guide(): - """显示手机连接指南""" - print("\n📖 手机连接步骤指南") - print("=" * 40) - - print("1️⃣ 启动服务端:") - print(" python main_web.py") - print(" 或 python run.py (选择Web模式)") - print() - - print("2️⃣ 获取电脑IP地址:") - print(" Windows: 打开CMD，输入 ipconfig") - print(" Mac/Linux: 打开终端，输入 ifconfig") - print(" 记下IP地址，如: 192.168.1.100") - print() - - print("3️⃣ 手机端连接:") - print(" 方法1: 浏览器访问 http://[IP]:5000/mobile/mobile_client.html") - print(" 方法2: 直接打开 mobile/mobile_client.html 文件") - print() - - print("4️⃣ 开始传输:") - print(" • 允许摄像头和位置权限") - print(" • 点击'开始传输'按钮") - print(" • 查看连接状态指示灯") - print() - - print("5️⃣ 查看结果:") - print(" • 在电脑Web界面查看地图") - print(" • 观察实时检测结果") - print(" • 监控设备状态") - -if __name__ == "__main__": - print("🚁 无人机战场态势感知系统 - 手机连接演示") - print("=" * 60) - - while True: - print("\n选择演示内容:") - print("1. 📱 启动手机连接服务器") - print("2. 🧪 测试手机API接口") - print("3. 📖 查看连接指南") - print("0. ❌ 退出") - - try: - choice = input("\n请输入选择 (0-3): ").strip() - - if choice == "1": - demo_mobile_functionality() - elif choice == "2": - test_mobile_api() - elif choice == "3": - show_mobile_guide() - elif choice == "0": - print("👋 再见!") - break - else: - print("❌ 无效选择，请重新输入") - - except KeyboardInterrupt: - print("\n👋 再见!") - break - except Exception as e: - print(f"❌ 出错: {e}") - +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +手机连接功能演示脚本 +展示如何使用手机作为移动侦察设备 +""" + +import time +import json +import base64 +import requests +from src import MobileConnector, config + +def demo_mobile_functionality(): + """演示手机连接功能""" + print("📱 手机连接功能演示") + print("=" * 60) + + print("🎯 演示内容:") + print("1. 启动手机连接服务器") + print("2. 模拟手机客户端连接") + print("3. 发送模拟数据") + print("4. 展示数据处理流程") + print() + + # 创建手机连接器 + mobile_connector = MobileConnector(port=8080) + + print("📱 正在启动手机连接服务器...") + if mobile_connector.start_server(): + print("✅ 手机连接服务器启动成功") + print(f"🌐 等待手机客户端连接到端口 8080") + print() + + print("📖 使用说明:") + print("1. 确保手机和电脑在同一网络") + print("2. 在手机浏览器中访问:") + print(" http://[电脑IP]:5000/mobile/mobile_client.html") + print("3. 或者直接打开 mobile/mobile_client.html 文件") + print("4. 点击'开始传输'按钮") + print() + + print("🔧 获取电脑IP地址的方法:") + print("Windows: ipconfig") + print("Linux/Mac: ifconfig 或 ip addr show") + print() + + # 设置回调函数来显示接收的数据 + def on_frame_received(device_id, frame, device): + print(f"📷 收到设备 {device_id[:8]} 的图像帧") + print(f" 分辨率: {frame.shape[1]}x{frame.shape[0]}") + print(f" 设备: {device.device_name}") + + def on_location_received(device_id, location, device): + lat, lng, accuracy = location + print(f"📍 收到设备 {device_id[:8]} 的位置信息") + print(f" 坐标: ({lat:.6f}, {lng:.6f})") + print(f" 精度: {accuracy}m") + + def on_device_event(event_type, device): + if event_type == 'device_connected': + print(f"📱 设备连接: {device.device_name} ({device.device_id[:8]})") + print(f" 电池: {device.battery_level}%") + elif event_type == 'device_disconnected': + print(f"📱 设备断开: {device.device_name} ({device.device_id[:8]})") + + # 注册回调函数 + mobile_connector.add_frame_callback(on_frame_received) + mobile_connector.add_location_callback(on_location_received) + mobile_connector.add_device_callback(on_device_event) + + print("⏳ 等待手机连接... (按 Ctrl+C 退出)") + + try: + # 监控连接状态 + while True: + time.sleep(5) + + # 显示统计信息 + stats = mobile_connector.get_statistics() + online_devices = mobile_connector.get_online_devices() + + if stats['online_devices'] > 0: + print(f"\n📊 连接统计:") + print(f" 在线设备: {stats['online_devices']}") + print(f" 接收帧数: {stats['frames_received']}") + print(f" 数据量: {stats['data_received_mb']:.2f} MB") + print(f" 平均帧率: {stats['avg_frames_per_second']:.1f} FPS") + + print(f"\n📱 在线设备:") + for device in online_devices: + print(f" • {device.device_name} ({device.device_id[:8]})") + print(f" 电池: {device.battery_level}%") + if device.current_location: + lat, lng, acc = device.current_location + print(f" 位置: ({lat:.6f}, {lng:.6f})") + else: + print("⏳ 等待设备连接...") + + except KeyboardInterrupt: + print("\n🔴 用户中断") + + finally: + mobile_connector.stop_server() + print("📱 手机连接服务器已停止") + + else: + print("❌ 手机连接服务器启动失败") + print("💡 可能的原因:") + print(" - 端口 8080 已被占用") + print(" - 网络权限问题") + print(" - 防火墙阻止连接") + +def test_mobile_api(): + """测试手机相关API""" + print("\n🧪 测试手机API接口") + print("=" * 40) + + base_url = "http://127.0.0.1:5000" + + try: + # 测试ping接口 + test_data = {"device_id": "test_device_123"} + response = requests.post(f"{base_url}/mobile/ping", + json=test_data, timeout=5) + + if response.status_code == 200: + data = response.json() + print("✅ Ping API测试成功") + print(f" 服务器时间: {data.get('server_time')}") + else: + print(f"❌ Ping API测试失败: HTTP {response.status_code}") + + except requests.exceptions.ConnectionError: + print("⚠️ 无法连接到Web服务器") + print("💡 请先启动Web服务器: python main_web.py") + + except Exception as e: + print(f"❌ API测试出错: {e}") + +def show_mobile_guide(): + """显示手机连接指南""" + print("\n📖 手机连接步骤指南") + print("=" * 40) + + print("1️⃣ 启动服务端:") + print(" python main_web.py") + print(" 或 python run.py (选择Web模式)") + print() + + print("2️⃣ 获取电脑IP地址:") + print(" Windows: 打开CMD，输入 ipconfig") + print(" Mac/Linux: 打开终端，输入 ifconfig") + print(" 记下IP地址，如: 192.168.1.100") + print() + + print("3️⃣ 手机端连接:") + print(" 方法1: 浏览器访问 http://[IP]:5000/mobile/mobile_client.html") + print(" 方法2: 直接打开 mobile/mobile_client.html 文件") + print() + + print("4️⃣ 开始传输:") + print(" • 允许摄像头和位置权限") + print(" • 点击'开始传输'按钮") + print(" • 查看连接状态指示灯") + print() + + print("5️⃣ 查看结果:") + print(" • 在电脑Web界面查看地图") + print(" • 观察实时检测结果") + print(" • 监控设备状态") + +if __name__ == "__main__": + print("🚁 无人机战场态势感知系统 - 手机连接演示") + print("=" * 60) + + while True: + print("\n选择演示内容:") + print("1. 📱 启动手机连接服务器") + print("2. 🧪 测试手机API接口") + print("3. 📖 查看连接指南") + print("0. ❌ 退出") + + try: + choice = input("\n请输入选择 (0-3): ").strip() + + if choice == "1": + demo_mobile_functionality() + elif choice == "2": + test_mobile_api() + elif choice == "3": + show_mobile_guide() + elif choice == "0": + print("👋 再见!") + break + else: + print("❌ 无效选择，请重新输入") + + except KeyboardInterrupt: + print("\n👋 再见!") + break + except Exception as e: + print(f"❌ 出错: {e}") + input("\n按回车键继续...") \ No newline at end of file diff --git a/distance-judgement/drone_control.html b/distance-judgement/drone_control.html new file mode 100644 index 00000000..f4cdc4d9 --- /dev/null +++ b/distance-judgement/drone_control.html @@ -0,0 +1,1223 @@ + + + + + + + 无人机控制 - 距离判断系统 + + + + + + +
+ +
+ 未连接 +
+ + +
+
+

🚁 RoboMaster TT 无人机控制系统

+

基于距离判断系统的无人机实时视频传输控制

+
+
+ +
+ +
+ +
+
连接控制
+
+ + + +
+ 电量: -- +
+
+
+ 未连接到无人机，请确保已连接到无人机WiFi (TELLO-xxxxxx) +
+
+ + +
+
飞行控制
+ + +
+ + +
+ + +
+
+ +
+ + + + + + + + + +
+ +
+
+ + +
+
+ + +
30 厘米
+
+
+ + +
90 度
+
+
+
+
+ + +
+ +
+
实时视频流
+ +
+ + + +
+ +
+ 无视频流 +
+ +
+ 视频流状态: 未启动 +
+
+ + +
+
无人机状态
+
+
+
--
+ 电量 +
+
+
--
+ 高度 +
+
+
--
+ 速度 +
+
+
--
+ 信号 +
+
+
+
+
+ + +
+
+
+ + 返回主页 + + + 设备测试 + +
+
+
+
+ + + + + \ No newline at end of file diff --git a/distance-judgement/fix_firewall.bat b/distance-judgement/fix_firewall.bat new file mode 100644 index 00000000..0519ecba --- /dev/null +++ b/distance-judgement/fix_firewall.bat @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/distance-judgement/get_ip.py b/distance-judgement/get_ip.py index cfc745f9..ff6e2132 100644 --- a/distance-judgement/get_ip.py +++ b/distance-judgement/get_ip.py @@ -1,37 +1,37 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -import socket - -def get_local_ip(): - """获取本机IP地址""" - try: - # 创建一个socket连接来获取本机IP - s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - s.connect(("8.8.8.8", 80)) - ip = s.getsockname()[0] - s.close() - return ip - except: - try: - # 备用方法 - import subprocess - result = subprocess.run(['ipconfig'], capture_output=True, text=True, shell=True) - lines = result.stdout.split('\n') - for line in lines: - if 'IPv4' in line and '192.168' in line: - return line.split(':')[-1].strip() - except: - return '127.0.0.1' - -if __name__ == "__main__": - ip = get_local_ip() - print(f"🌐 服务器地址信息") - print(f"="*50) - print(f"本机IP地址: {ip}") - print(f"主页面地址: http://{ip}:5000/") - print(f"移动客户端: http://{ip}:5000/mobile/mobile_client.html") - print(f"GPS测试页面: http://{ip}:5000/mobile/gps_test.html") - print(f"设备选择测试: http://{ip}:5000/test_device_selector.html") - print(f"="*50) +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import socket + +def get_local_ip(): + """获取本机IP地址""" + try: + # 创建一个socket连接来获取本机IP + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + s.connect(("8.8.8.8", 80)) + ip = s.getsockname()[0] + s.close() + return ip + except: + try: + # 备用方法 + import subprocess + result = subprocess.run(['ipconfig'], capture_output=True, text=True, shell=True) + lines = result.stdout.split('\n') + for line in lines: + if 'IPv4' in line and '192.168' in line: + return line.split(':')[-1].strip() + except: + return '127.0.0.1' + +if __name__ == "__main__": + ip = get_local_ip() + print(f"🌐 服务器地址信息") + print(f"="*50) + print(f"本机IP地址: {ip}") + print(f"主页面地址: http://{ip}:5000/") + print(f"移动客户端: http://{ip}:5000/mobile/mobile_client.html") + print(f"GPS测试页面: http://{ip}:5000/mobile/gps_test.html") + print(f"设备选择测试: http://{ip}:5000/test_device_selector.html") + print(f"="*50) print(f"�� 手机/平板请访问移动客户端地址！") \ No newline at end of file diff --git a/distance-judgement/main.py b/distance-judgement/main.py index c1429b85..2c5ffa89 100644 --- a/distance-judgement/main.py +++ b/distance-judgement/main.py @@ -1,261 +1,261 @@ -import cv2 -import time -import numpy as np -from src import PersonDetector, DistanceCalculator, MapManager, config - -class RealTimePersonDistanceDetector: - def __init__(self): - self.detector = PersonDetector() - self.distance_calculator = DistanceCalculator() - self.cap = None - self.fps_counter = 0 - self.fps_time = time.time() - self.current_fps = 0 - - # 初始化地图管理器 - if config.ENABLE_MAP_DISPLAY: - self.map_manager = MapManager( - api_key=config.GAODE_API_KEY, - camera_lat=config.CAMERA_LATITUDE, - camera_lng=config.CAMERA_LONGITUDE - ) - self.map_manager.set_camera_position( - config.CAMERA_LATITUDE, - config.CAMERA_LONGITUDE, - config.CAMERA_HEADING - ) - print("🗺️ 地图管理器已初始化") - else: - self.map_manager = None - - def initialize_camera(self): - """初始化摄像头""" - self.cap = cv2.VideoCapture(config.CAMERA_INDEX) - if not self.cap.isOpened(): - raise Exception(f"无法开启摄像头 {config.CAMERA_INDEX}") - - # 设置摄像头参数 - self.cap.set(cv2.CAP_PROP_FRAME_WIDTH, config.FRAME_WIDTH) - self.cap.set(cv2.CAP_PROP_FRAME_HEIGHT, config.FRAME_HEIGHT) - self.cap.set(cv2.CAP_PROP_FPS, config.FPS) - - # 获取实际设置的参数 - actual_width = int(self.cap.get(cv2.CAP_PROP_FRAME_WIDTH)) - actual_height = int(self.cap.get(cv2.CAP_PROP_FRAME_HEIGHT)) - actual_fps = int(self.cap.get(cv2.CAP_PROP_FPS)) - - print(f"摄像头初始化成功:") - print(f" 分辨率: {actual_width}x{actual_height}") - print(f" 帧率: {actual_fps} FPS") - - def calculate_fps(self): - """计算实际帧率""" - self.fps_counter += 1 - current_time = time.time() - if current_time - self.fps_time >= 1.0: - self.current_fps = self.fps_counter - self.fps_counter = 0 - self.fps_time = current_time - - def draw_info_panel(self, frame, person_count=0): - """绘制信息面板""" - height, width = frame.shape[:2] - - # 绘制顶部信息栏 - info_height = 60 - cv2.rectangle(frame, (0, 0), (width, info_height), (0, 0, 0), -1) - - # 显示FPS - fps_text = f"FPS: {self.current_fps}" - cv2.putText(frame, fps_text, (10, 25), config.FONT, 0.6, (0, 255, 0), 2) - - # 显示人员计数 - person_text = f"Persons: {person_count}" - cv2.putText(frame, person_text, (150, 25), config.FONT, 0.6, (0, 255, 255), 2) - - # 显示模型信息 - model_text = self.detector.get_model_info() - cv2.putText(frame, model_text, (10, 45), config.FONT, 0.5, (255, 255, 255), 1) - - # 显示操作提示 - help_text = "Press 'q' to quit | 'c' to calibrate | 'r' to reset | 'm' to open map" - text_size = cv2.getTextSize(help_text, config.FONT, 0.5, 1)[0] - cv2.putText(frame, help_text, (width - text_size[0] - 10, 25), - config.FONT, 0.5, (255, 255, 0), 1) - - # 显示地图状态 - if self.map_manager: - map_status = "Map: ON" - cv2.putText(frame, map_status, (10, height - 10), - config.FONT, 0.5, (0, 255, 255), 1) - - return frame - - def calibrate_distance(self, detections): - """距离校准模式""" - if len(detections) == 0: - print("未检测到人体，无法校准") - return - - print("\n=== 距离校准模式 ===") - print("请确保画面中有一个人，并输入该人距离摄像头的真实距离") - - try: - real_distance = float(input("请输入真实距离（厘米）: ")) - - # 使用第一个检测到的人进行校准 - detection = detections[0] - x1, y1, x2, y2, conf = detection - bbox_height = y2 - y1 - - # 更新参考参数 - config.REFERENCE_DISTANCE = real_distance - config.REFERENCE_HEIGHT_PIXELS = bbox_height - - # 重新初始化距离计算器 - self.distance_calculator = DistanceCalculator() - - print(f"校准完成！") - print(f"参考距离: {real_distance}cm") - print(f"参考像素高度: {bbox_height}px") - - except ValueError: - print("输入无效，校准取消") - except Exception as e: - print(f"校准失败: {e}") - - def process_frame(self, frame): - """处理单帧图像""" - # 检测人体 - detections = self.detector.detect_persons(frame) - - # 计算距离并更新地图位置 - distances = [] - if self.map_manager: - self.map_manager.clear_persons() - - for i, detection in enumerate(detections): - bbox = detection[:4] # [x1, y1, x2, y2] - x1, y1, x2, y2 = bbox - distance = self.distance_calculator.get_distance(bbox) - distance_str = self.distance_calculator.format_distance(distance) - distances.append(distance_str) - - # 更新地图上的人员位置 - if self.map_manager: - # 计算人体中心点 - center_x = (x1 + x2) / 2 - center_y = (y1 + y2) / 2 - - # 将距离从厘米转换为米 - distance_meters = distance / 100.0 - - # 添加到地图 - self.map_manager.add_person_position( - center_x, center_y, distance_meters, - frame.shape[1], frame.shape[0], # width, height - f"P{i+1}" - ) - - # 绘制检测结果 - frame = self.detector.draw_detections(frame, detections, distances) - - # 绘制信息面板 - frame = self.draw_info_panel(frame, len(detections)) - - # 计算FPS - self.calculate_fps() - - return frame, detections - - def run(self): - """运行主程序""" - try: - print("正在初始化...") - self.initialize_camera() - - print("系统启动成功!") - print("操作说明:") - print(" - 按 'q' 键退出程序") - print(" - 按 'c' 键进入距离校准模式") - print(" - 按 'r' 键重置为默认参数") - print(" - 按 's' 键保存当前帧") - if self.map_manager: - print(" - 按 'm' 键打开地图显示") - print(" - 按 'h' 键设置摄像头朝向") - print("\n开始实时检测...") - - frame_count = 0 - - while True: - ret, frame = self.cap.read() - if not ret: - print("无法读取摄像头画面") - break - - # 处理帧 - processed_frame, detections = self.process_frame(frame) - - # 显示结果 - cv2.imshow('Real-time Person Distance Detection', processed_frame) - - # 处理按键 - key = cv2.waitKey(1) & 0xFF - - if key == ord('q'): - print("用户退出程序") - break - elif key == ord('c'): - # 校准模式 - self.calibrate_distance(detections) - elif key == ord('r'): - # 重置参数 - print("重置为默认参数") - self.distance_calculator = DistanceCalculator() - elif key == ord('s'): - # 保存当前帧 - filename = f"capture_{int(time.time())}.jpg" - cv2.imwrite(filename, processed_frame) - print(f"已保存截图: {filename}") - elif key == ord('m') and self.map_manager: - # 打开地图显示 - print("正在打开地图...") - self.map_manager.open_map() - elif key == ord('h') and self.map_manager: - # 设置摄像头朝向 - try: - heading = float(input("请输入摄像头朝向角度 (0-360°, 0为正北): ")) - if 0 <= heading <= 360: - self.map_manager.update_camera_heading(heading) - else: - print("角度必须在0-360度之间") - except ValueError: - print("输入无效") - - frame_count += 1 - - except KeyboardInterrupt: - print("\n程序被用户中断") - except Exception as e: - print(f"程序运行出错: {e}") - finally: - self.cleanup() - - def cleanup(self): - """清理资源""" - if self.cap: - self.cap.release() - cv2.destroyAllWindows() - print("资源已清理，程序结束") - -def main(): - """主函数""" - print("=" * 50) - print("实时人体距离检测系统") - print("=" * 50) - - detector = RealTimePersonDistanceDetector() - detector.run() - -if __name__ == "__main__": +import cv2 +import time +import numpy as np +from src import PersonDetector, DistanceCalculator, MapManager, config + +class RealTimePersonDistanceDetector: + def __init__(self): + self.detector = PersonDetector() + self.distance_calculator = DistanceCalculator() + self.cap = None + self.fps_counter = 0 + self.fps_time = time.time() + self.current_fps = 0 + + # 初始化地图管理器 + if config.ENABLE_MAP_DISPLAY: + self.map_manager = MapManager( + api_key=config.GAODE_API_KEY, + camera_lat=config.CAMERA_LATITUDE, + camera_lng=config.CAMERA_LONGITUDE + ) + self.map_manager.set_camera_position( + config.CAMERA_LATITUDE, + config.CAMERA_LONGITUDE, + config.CAMERA_HEADING + ) + print("🗺️ 地图管理器已初始化") + else: + self.map_manager = None + + def initialize_camera(self): + """初始化摄像头""" + self.cap = cv2.VideoCapture(config.CAMERA_INDEX) + if not self.cap.isOpened(): + raise Exception(f"无法开启摄像头 {config.CAMERA_INDEX}") + + # 设置摄像头参数 + self.cap.set(cv2.CAP_PROP_FRAME_WIDTH, config.FRAME_WIDTH) + self.cap.set(cv2.CAP_PROP_FRAME_HEIGHT, config.FRAME_HEIGHT) + self.cap.set(cv2.CAP_PROP_FPS, config.FPS) + + # 获取实际设置的参数 + actual_width = int(self.cap.get(cv2.CAP_PROP_FRAME_WIDTH)) + actual_height = int(self.cap.get(cv2.CAP_PROP_FRAME_HEIGHT)) + actual_fps = int(self.cap.get(cv2.CAP_PROP_FPS)) + + print(f"摄像头初始化成功:") + print(f" 分辨率: {actual_width}x{actual_height}") + print(f" 帧率: {actual_fps} FPS") + + def calculate_fps(self): + """计算实际帧率""" + self.fps_counter += 1 + current_time = time.time() + if current_time - self.fps_time >= 1.0: + self.current_fps = self.fps_counter + self.fps_counter = 0 + self.fps_time = current_time + + def draw_info_panel(self, frame, person_count=0): + """绘制信息面板""" + height, width = frame.shape[:2] + + # 绘制顶部信息栏 + info_height = 60 + cv2.rectangle(frame, (0, 0), (width, info_height), (0, 0, 0), -1) + + # 显示FPS + fps_text = f"FPS: {self.current_fps}" + cv2.putText(frame, fps_text, (10, 25), config.FONT, 0.6, (0, 255, 0), 2) + + # 显示人员计数 + person_text = f"Persons: {person_count}" + cv2.putText(frame, person_text, (150, 25), config.FONT, 0.6, (0, 255, 255), 2) + + # 显示模型信息 + model_text = self.detector.get_model_info() + cv2.putText(frame, model_text, (10, 45), config.FONT, 0.5, (255, 255, 255), 1) + + # 显示操作提示 + help_text = "Press 'q' to quit | 'c' to calibrate | 'r' to reset | 'm' to open map" + text_size = cv2.getTextSize(help_text, config.FONT, 0.5, 1)[0] + cv2.putText(frame, help_text, (width - text_size[0] - 10, 25), + config.FONT, 0.5, (255, 255, 0), 1) + + # 显示地图状态 + if self.map_manager: + map_status = "Map: ON" + cv2.putText(frame, map_status, (10, height - 10), + config.FONT, 0.5, (0, 255, 255), 1) + + return frame + + def calibrate_distance(self, detections): + """距离校准模式""" + if len(detections) == 0: + print("未检测到人体，无法校准") + return + + print("\n=== 距离校准模式 ===") + print("请确保画面中有一个人，并输入该人距离摄像头的真实距离") + + try: + real_distance = float(input("请输入真实距离（厘米）: ")) + + # 使用第一个检测到的人进行校准 + detection = detections[0] + x1, y1, x2, y2, conf = detection + bbox_height = y2 - y1 + + # 更新参考参数 + config.REFERENCE_DISTANCE = real_distance + config.REFERENCE_HEIGHT_PIXELS = bbox_height + + # 重新初始化距离计算器 + self.distance_calculator = DistanceCalculator() + + print(f"校准完成！") + print(f"参考距离: {real_distance}cm") + print(f"参考像素高度: {bbox_height}px") + + except ValueError: + print("输入无效，校准取消") + except Exception as e: + print(f"校准失败: {e}") + + def process_frame(self, frame): + """处理单帧图像""" + # 检测人体 + detections = self.detector.detect_persons(frame) + + # 计算距离并更新地图位置 + distances = [] + if self.map_manager: + self.map_manager.clear_persons() + + for i, detection in enumerate(detections): + bbox = detection[:4] # [x1, y1, x2, y2] + x1, y1, x2, y2 = bbox + distance = self.distance_calculator.get_distance(bbox) + distance_str = self.distance_calculator.format_distance(distance) + distances.append(distance_str) + + # 更新地图上的人员位置 + if self.map_manager: + # 计算人体中心点 + center_x = (x1 + x2) / 2 + center_y = (y1 + y2) / 2 + + # 将距离从厘米转换为米 + distance_meters = distance / 100.0 + + # 添加到地图 + self.map_manager.add_person_position( + center_x, center_y, distance_meters, + frame.shape[1], frame.shape[0], # width, height + f"P{i+1}" + ) + + # 绘制检测结果 + frame = self.detector.draw_detections(frame, detections, distances) + + # 绘制信息面板 + frame = self.draw_info_panel(frame, len(detections)) + + # 计算FPS + self.calculate_fps() + + return frame, detections + + def run(self): + """运行主程序""" + try: + print("正在初始化...") + self.initialize_camera() + + print("系统启动成功!") + print("操作说明:") + print(" - 按 'q' 键退出程序") + print(" - 按 'c' 键进入距离校准模式") + print(" - 按 'r' 键重置为默认参数") + print(" - 按 's' 键保存当前帧") + if self.map_manager: + print(" - 按 'm' 键打开地图显示") + print(" - 按 'h' 键设置摄像头朝向") + print("\n开始实时检测...") + + frame_count = 0 + + while True: + ret, frame = self.cap.read() + if not ret: + print("无法读取摄像头画面") + break + + # 处理帧 + processed_frame, detections = self.process_frame(frame) + + # 显示结果 + cv2.imshow('Real-time Person Distance Detection', processed_frame) + + # 处理按键 + key = cv2.waitKey(1) & 0xFF + + if key == ord('q'): + print("用户退出程序") + break + elif key == ord('c'): + # 校准模式 + self.calibrate_distance(detections) + elif key == ord('r'): + # 重置参数 + print("重置为默认参数") + self.distance_calculator = DistanceCalculator() + elif key == ord('s'): + # 保存当前帧 + filename = f"capture_{int(time.time())}.jpg" + cv2.imwrite(filename, processed_frame) + print(f"已保存截图: {filename}") + elif key == ord('m') and self.map_manager: + # 打开地图显示 + print("正在打开地图...") + self.map_manager.open_map() + elif key == ord('h') and self.map_manager: + # 设置摄像头朝向 + try: + heading = float(input("请输入摄像头朝向角度 (0-360°, 0为正北): ")) + if 0 <= heading <= 360: + self.map_manager.update_camera_heading(heading) + else: + print("角度必须在0-360度之间") + except ValueError: + print("输入无效") + + frame_count += 1 + + except KeyboardInterrupt: + print("\n程序被用户中断") + except Exception as e: + print(f"程序运行出错: {e}") + finally: + self.cleanup() + + def cleanup(self): + """清理资源""" + if self.cap: + self.cap.release() + cv2.destroyAllWindows() + print("资源已清理，程序结束") + +def main(): + """主函数""" + print("=" * 50) + print("实时人体距离检测系统") + print("=" * 50) + + detector = RealTimePersonDistanceDetector() + detector.run() + +if __name__ == "__main__": main() \ No newline at end of file diff --git a/distance-judgement/main_web.py b/distance-judgement/main_web.py index e2b698c0..eb3422a2 100644 --- a/distance-judgement/main_web.py +++ b/distance-judgement/main_web.py @@ -18,7 +18,7 @@ def main(): print("🚁 无人机战场态势感知系统 - Web版本") print("=" * 60) print() - + # 检查配置 print("📋 系统配置检查...") print(f"📍 摄像头位置: ({config.CAMERA_LATITUDE:.6f}, {config.CAMERA_LONGITUDE:.6f})") @@ -133,6 +133,7 @@ def main(): print(f"🔒 本地访问: https://127.0.0.1:5000") print(f"🔒 手机/平板访问: https://{local_ip}:5000") print(f"📱 手机客户端: https://{local_ip}:5000/mobile/mobile_client.html") + print(f"🚁 无人机控制: https://127.0.0.1:5000/drone_control.html") print("🔴 按 Ctrl+C 停止服务器") print() print("🔑 HTTPS注意事项:") diff --git a/distance-judgement/main_web_simple_https.py b/distance-judgement/main_web_simple_https.py index 77b91833..abb0bbd8 100644 --- a/distance-judgement/main_web_simple_https.py +++ b/distance-judgement/main_web_simple_https.py @@ -1,70 +1,70 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -简化版HTTPS Web服务器 -使用Python内置ssl模块，无需额外依赖 -""" - -import ssl -import socket -from src.web_server import create_app -from get_ip import get_local_ip - -def create_simple_ssl_context(): - """创建简单的SSL上下文，使用自签名证书""" - context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) - - # 检查是否存在SSL证书文件 - import os - cert_file = "ssl/cert.pem" - key_file = "ssl/key.pem" - - if not os.path.exists(cert_file) or not os.path.exists(key_file): - print("❌ SSL证书文件不存在") - print("📝 为了使用HTTPS，请选择以下选项之一：") - print(" 1. 安装cryptography库: pip install cryptography") - print(" 2. 使用HTTP版本: python main_web.py") - print(" 3. 手动创建SSL证书") - return None - - try: - context.load_cert_chain(cert_file, key_file) - return context - except Exception as e: - print(f"❌ 加载SSL证书失败: {e}") - return None - -def main(): - """启动简化版HTTPS服务器""" - print("🚀 启动简化版HTTPS服务器...") - - # 创建Flask应用 - app = create_app() - - # 获取本地IP - local_ip = get_local_ip() - - print(f"🌐 本地IP地址: {local_ip}") - print() - print("📱 访问地址:") - print(f" 桌面端: https://127.0.0.1:5000") - print(f" 手机端: https://{local_ip}:5000/mobile/mobile_client.html") - print() - print("⚠️ 如果看到安全警告，请点击 '高级' -> '继续访问'") - print() - - # 创建SSL上下文 - ssl_context = create_simple_ssl_context() - - if ssl_context is None: - print("🔄 回退到HTTP模式...") - print(f" 桌面端: http://127.0.0.1:5000") - print(f" 手机端: http://{local_ip}:5000/mobile/mobile_client.html") - app.run(host='0.0.0.0', port=5000, debug=True) - else: - print("🔒 HTTPS模式启动成功!") - app.run(host='0.0.0.0', port=5000, debug=True, ssl_context=ssl_context) - -if __name__ == "__main__": +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +简化版HTTPS Web服务器 +使用Python内置ssl模块，无需额外依赖 +""" + +import ssl +import socket +from src.web_server import create_app +from get_ip import get_local_ip + +def create_simple_ssl_context(): + """创建简单的SSL上下文，使用自签名证书""" + context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) + + # 检查是否存在SSL证书文件 + import os + cert_file = "ssl/cert.pem" + key_file = "ssl/key.pem" + + if not os.path.exists(cert_file) or not os.path.exists(key_file): + print("❌ SSL证书文件不存在") + print("📝 为了使用HTTPS，请选择以下选项之一：") + print(" 1. 安装cryptography库: pip install cryptography") + print(" 2. 使用HTTP版本: python main_web.py") + print(" 3. 手动创建SSL证书") + return None + + try: + context.load_cert_chain(cert_file, key_file) + return context + except Exception as e: + print(f"❌ 加载SSL证书失败: {e}") + return None + +def main(): + """启动简化版HTTPS服务器""" + print("🚀 启动简化版HTTPS服务器...") + + # 创建Flask应用 + app = create_app() + + # 获取本地IP + local_ip = get_local_ip() + + print(f"🌐 本地IP地址: {local_ip}") + print() + print("📱 访问地址:") + print(f" 桌面端: https://127.0.0.1:5000") + print(f" 手机端: https://{local_ip}:5000/mobile/mobile_client.html") + print() + print("⚠️ 如果看到安全警告，请点击 '高级' -> '继续访问'") + print() + + # 创建SSL上下文 + ssl_context = create_simple_ssl_context() + + if ssl_context is None: + print("🔄 回退到HTTP模式...") + print(f" 桌面端: http://127.0.0.1:5000") + print(f" 手机端: http://{local_ip}:5000/mobile/mobile_client.html") + app.run(host='0.0.0.0', port=5000, debug=True) + else: + print("🔒 HTTPS模式启动成功!") + app.run(host='0.0.0.0', port=5000, debug=True, ssl_context=ssl_context) + +if __name__ == "__main__": main() \ No newline at end of file diff --git a/distance-judgement/mobile/baidu_browser_test.html b/distance-judgement/mobile/baidu_browser_test.html index 4dca59f5..001c8c46 100644 --- a/distance-judgement/mobile/baidu_browser_test.html +++ b/distance-judgement/mobile/baidu_browser_test.html @@ -1,1442 +1,1442 @@ - - - - - - - 📱 百度浏览器摄像头测试 - - - - -

📱 百度浏览器摄像头测试

-

专门针对百度浏览器的摄像头API兼容性测试

- - - - - - - - - - - -
- -
点击按钮测试摄像头
-
- -
- - - - - - + + + + + + + 📱 百度浏览器摄像头测试 + + + + +

📱 百度浏览器摄像头测试

+

专门针对百度浏览器的摄像头API兼容性测试

+ + + + + + + + + + + +
+ +
点击按钮测试摄像头
+
+ +
+ + + + + + \ No newline at end of file diff --git a/distance-judgement/mobile/browser_compatibility_guide.html b/distance-judgement/mobile/browser_compatibility_guide.html index 671aa68f..4ecaf2d8 100644 --- a/distance-judgement/mobile/browser_compatibility_guide.html +++ b/distance-judgement/mobile/browser_compatibility_guide.html @@ -1,410 +1,410 @@ - - - - - - - 🌐 浏览器兼容性指南 - - - - -
-
-

🌐 浏览器兼容性指南

-

移动侦察终端摄像头功能兼容性说明与解决方案

-
- -
-

📋 当前浏览器检测

-
-

正在检测您的浏览器兼容性...

-
-
- -
-

🔍 "设备扫描失败: 浏览器不支持设备枚举功能" 问题说明

- -
-

⚠️ 问题原因

-

这个错误表示您的浏览器不支持 navigator.mediaDevices.enumerateDevices() API，这个API用于列出可用的摄像头设备。

-
- -
-

✅ 系统自动解决方案

-

我们的系统已经自动启用了兼容模式，为您提供以下设备选项：

-
    -
  • 📱 默认摄像头 - 使用系统默认摄像头
    • -
  • 📹 后置摄像头 - 尝试使用后置摄像头
    • -
  • 🤳 前置摄像头 - 尝试使用前置摄像头
    • -
-

您可以通过设备选择器逐个测试这些选项，找到适合的摄像头配置。

-
-
- -
-

📱 浏览器兼容性列表

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
浏览器getUserMediaenumerateDevicesPermissions API总体支持
Chrome 53+✅ 完全支持✅ 完全支持✅ 完全支持推荐
Firefox 36+✅ 完全支持✅ 完全支持⚠️ 部分支持推荐
Safari 11+✅ 完全支持✅ 完全支持❌ 不支持⚠️ 基本可用
Edge 17+✅ 完全支持✅ 完全支持✅ 完全支持推荐
旧版浏览器⚠️ 需要前缀❌ 不支持❌ 不支持⚠️ 兼容模式
-
- -
-

🔧 解决方案与建议

- -

1. 最佳解决方案 - 升级浏览器

-
-

推荐使用以下现代浏览器：

-
    -
  • 🌐 Chrome 版本 53 或更高
    • -
  • 🦊 Firefox 版本 36 或更高
    • -
  • 🧭 Safari 版本 11 或更高（iOS/macOS）
    • -
  • ⭐ Edge 版本 17 或更高
    • -
-
- -

2. 兼容模式使用方法

-
-

如果无法升级浏览器，请按以下步骤操作：

-
    -
  1. 忽略"设备扫描失败"的提示
    2. -
  2. 点击"📷 选择设备"按钮
    3. -
  3. 在设备列表中选择"默认摄像头"、"后置摄像头"或"前置摄像头"
    4. -
  4. 点击"使用选中设备"测试摄像头功能
    5. -
  5. 如果某个选项不工作，尝试其他选项
    6. -
-
- -

3. 移动设备特别说明

-
-

移动设备用户请注意：

-
    -
  • 📱 Android：建议使用 Chrome 浏览器
    • -
  • 🍎 iOS：建议使用 Safari 浏览器
    • -
  • 🔒 确保在 HTTPS 环境下访问（已自动配置）
    • -
  • 🎥 允许摄像头权限访问
    • -
-
-
- -
-

🚨 常见问题排除

- -
-
  • - - 完全无法访问摄像头 -
    检查浏览器是否支持getUserMedia，尝试升级浏览器或使用HTTPS访问 -
    • -
  • - - 无法枚举设备但能使用摄像头 -
    正常现象，使用兼容模式的默认设备选项即可 -
    • -
  • - - 权限被拒绝 -
    检查浏览器权限设置，清除网站数据后重新允许权限 -
    • -
  • - - 摄像头被占用 -
    关闭其他使用摄像头的应用程序或浏览器标签页 -
    • -
    -
    - -
    -

    🧪 测试工具

    -

    使用以下工具测试您的浏览器兼容性和摄像头功能：

    -
    - 📷 摄像头权限测试 - 🚁 返回移动终端 - -
    -
    -
    - - - - + + + + + + + 🌐 浏览器兼容性指南 + + + + +
    +
    +

    🌐 浏览器兼容性指南

    +

    移动侦察终端摄像头功能兼容性说明与解决方案

    +
    + +
    +

    📋 当前浏览器检测

    +
    +

    正在检测您的浏览器兼容性...

    +
    +
    + +
    +

    🔍 "设备扫描失败: 浏览器不支持设备枚举功能" 问题说明

    + +
    +

    ⚠️ 问题原因

    +

    这个错误表示您的浏览器不支持 navigator.mediaDevices.enumerateDevices() API，这个API用于列出可用的摄像头设备。

    +
    + +
    +

    ✅ 系统自动解决方案

    +

    我们的系统已经自动启用了兼容模式，为您提供以下设备选项：

    +
      +
    • 📱 默认摄像头 - 使用系统默认摄像头
      • +
    • 📹 后置摄像头 - 尝试使用后置摄像头
      • +
    • 🤳 前置摄像头 - 尝试使用前置摄像头
      • +
    +

    您可以通过设备选择器逐个测试这些选项，找到适合的摄像头配置。

    +
    +
    + +
    +

    📱 浏览器兼容性列表

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    浏览器getUserMediaenumerateDevicesPermissions API总体支持
    Chrome 53+✅ 完全支持✅ 完全支持✅ 完全支持推荐
    Firefox 36+✅ 完全支持✅ 完全支持⚠️ 部分支持推荐
    Safari 11+✅ 完全支持✅ 完全支持❌ 不支持⚠️ 基本可用
    Edge 17+✅ 完全支持✅ 完全支持✅ 完全支持推荐
    旧版浏览器⚠️ 需要前缀❌ 不支持❌ 不支持⚠️ 兼容模式
    +
    + +
    +

    🔧 解决方案与建议

    + +

    1. 最佳解决方案 - 升级浏览器

    +
    +

    推荐使用以下现代浏览器：

    +
      +
    • 🌐 Chrome 版本 53 或更高
      • +
    • 🦊 Firefox 版本 36 或更高
      • +
    • 🧭 Safari 版本 11 或更高（iOS/macOS）
      • +
    • ⭐ Edge 版本 17 或更高
      • +
    +
    + +

    2. 兼容模式使用方法

    +
    +

    如果无法升级浏览器，请按以下步骤操作：

    +
      +
    1. 忽略"设备扫描失败"的提示
      2. +
    2. 点击"📷 选择设备"按钮
      3. +
    3. 在设备列表中选择"默认摄像头"、"后置摄像头"或"前置摄像头"
      4. +
    4. 点击"使用选中设备"测试摄像头功能
      5. +
    5. 如果某个选项不工作，尝试其他选项
      6. +
    +
    + +

    3. 移动设备特别说明

    +
    +

    移动设备用户请注意：

    +
      +
    • 📱 Android：建议使用 Chrome 浏览器
      • +
    • 🍎 iOS：建议使用 Safari 浏览器
      • +
    • 🔒 确保在 HTTPS 环境下访问（已自动配置）
      • +
    • 🎥 允许摄像头权限访问
      • +
    +
    +
    + +
    +

    🚨 常见问题排除

    + +
    +
  • + + 完全无法访问摄像头 +
    检查浏览器是否支持getUserMedia，尝试升级浏览器或使用HTTPS访问 +
    • +
  • + + 无法枚举设备但能使用摄像头 +
    正常现象，使用兼容模式的默认设备选项即可 +
    • +
  • + + 权限被拒绝 +
    检查浏览器权限设置，清除网站数据后重新允许权限 +
    • +
  • + + 摄像头被占用 +
    关闭其他使用摄像头的应用程序或浏览器标签页 +
    • +
    +
    + +
    +

    🧪 测试工具

    +

    使用以下工具测试您的浏览器兼容性和摄像头功能：

    +
    + 📷 摄像头权限测试 + 🚁 返回移动终端 + +
    +
    +
    + + + + \ No newline at end of file diff --git a/distance-judgement/mobile/camera_permission_test.html b/distance-judgement/mobile/camera_permission_test.html index b2995a9e..56e1b321 100644 --- a/distance-judgement/mobile/camera_permission_test.html +++ b/distance-judgement/mobile/camera_permission_test.html @@ -1,504 +1,504 @@ - - - - - - - 📷 摄像头权限测试 - - - - -
    -
    -

    📷 摄像头权限测试工具

    -

    全面测试摄像头权限获取方法的正确性

    -
    - -
    -

    🔍 1. 浏览器兼容性检查

    -
    等待测试...
    - -
    - -
    -

    🔐 2. 权限状态查询

    -
    等待测试...
    - -
    - -
    -

    📱 3. 设备枚举测试

    -
    等待测试...
    - -
    - -
    -

    🎥 4. 摄像头访问测试

    -
    等待测试...
    - - - -
    - -
    -

    📋 测试日志

    -
    - -
    -
    - - - - + + + + + + + 📷 摄像头权限测试 + + + + +
    +
    +

    📷 摄像头权限测试工具

    +

    全面测试摄像头权限获取方法的正确性

    +
    + +
    +

    🔍 1. 浏览器兼容性检查

    +
    等待测试...
    + +
    + +
    +

    🔐 2. 权限状态查询

    +
    等待测试...
    + +
    + +
    +

    📱 3. 设备枚举测试

    +
    等待测试...
    + +
    + +
    +

    🎥 4. 摄像头访问测试

    +
    等待测试...
    + + + +
    + +
    +

    📋 测试日志

    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/distance-judgement/mobile/gps_test.html b/distance-judgement/mobile/gps_test.html index b5ebcf08..bca40861 100644 --- a/distance-judgement/mobile/gps_test.html +++ b/distance-judgement/mobile/gps_test.html @@ -1,312 +1,312 @@ - - - - - - - GPS连接测试 - - - - -
    -

    📍 GPS连接测试工具

    - -
    - 当前状态： -
    初始化中...
    -
    - -
    - GPS坐标： -
    等待获取...
    -
    - -
    - 服务器连接： -
    未测试
    -
    - -
    - - - - -
    - -
    - ⚠️ 重要提示：
    - • 现代浏览器在HTTP模式下可能限制GPS访问
    - • 请确保允许浏览器访问位置信息
    - • 在室外或窗边可获得更好的GPS信号
    - • 首次访问需要用户授权位置权限 -
    - -

    📋 操作日志

    -
    -
    - - - - + + + + + + + GPS连接测试 + + + + +
    +

    📍 GPS连接测试工具

    + +
    + 当前状态： +
    初始化中...
    +
    + +
    + GPS坐标： +
    等待获取...
    +
    + +
    + 服务器连接： +
    未测试
    +
    + +
    + + + + +
    + +
    + ⚠️ 重要提示：
    + • 现代浏览器在HTTP模式下可能限制GPS访问
    + • 请确保允许浏览器访问位置信息
    + • 在室外或窗边可获得更好的GPS信号
    + • 首次访问需要用户授权位置权限 +
    + +

    📋 操作日志

    +
    +
    + + + + \ No newline at end of file diff --git a/distance-judgement/mobile/legacy_browser_help.html b/distance-judgement/mobile/legacy_browser_help.html index 59da0502..ee7e8447 100644 --- a/distance-judgement/mobile/legacy_browser_help.html +++ b/distance-judgement/mobile/legacy_browser_help.html @@ -1,247 +1,247 @@ - - - - - - - 📱 旧版浏览器使用指南 - - - - -
    -
    -

    📱 旧版浏览器使用指南

    -

    移动侦察终端兼容模式使用说明

    -
    - -
    -

    ⚠️ 检测结果

    -

    您的浏览器兼容性较低，但系统已自动启用兼容模式。请按照以下步骤操作：

    -
    - -
    -

    🔧 使用步骤

    - -
    - 1 - 返回主页面 -
    关闭此页面，返回移动侦察终端主界面 -
    - -
    - 2 - 查看系统状态 -
    确认页面显示"兼容模式：已为您的浏览器启用兼容支持" -
    - -
    - 3 - 选择摄像头设备 -
    点击页面中的"📷 选择设备"按钮 -
    - -
    - 4 - 测试设备选项 -
    在弹窗中选择以下任一设备进行测试： -
    -
    📱 默认摄像头 - 系统自动选择
    -
    📹 后置摄像头 - 优先使用后置
    -
    🤳 前置摄像头 - 优先使用前置
    -
    -
    - -
    - 5 - 启动摄像头 -
    选择设备后点击"✅ 使用选择的设备" -
    - -
    - 6 - 允许权限 -
    当浏览器弹出权限请求时，点击"允许" -
    - -
    - 7 - 开始使用 -
    摄像头启动成功后，点击"📹 开始传输" -
    -
    - -
    -

    🚨 常见问题

    - -

    Q: 权限被拒绝怎么办？

    -

    A: 清除浏览器数据，重新访问页面并允许权限

    - -

    Q: 某个设备选项不工作？

    -

    A: 尝试其他设备选项，通常至少有一个会工作

    - -

    Q: 完全无法使用摄像头？

    -

    A: 考虑升级浏览器或换用现代浏览器

    -
    - -
    -

    🌐 推荐浏览器

    -

    为获得最佳体验，建议升级到以下浏览器：

    -
      -
    • 🌐 Chrome 53+ - 完全支持所有功能
      • -
    • 🦊 Firefox 36+ - 良好的兼容性
      • -
    • 🧭 Safari 11+ - iOS/macOS用户推荐
      • -
    • ⭐ Edge 17+ - Windows用户推荐
      • -
    -
    - -
    -

    ✅ 重要提醒

    -

    兼容模式虽然功能有限，但基本的摄像头录制和GPS定位功能仍然可用。请耐心按步骤操作。

    -
    - - - -
    -

    技术说明：您的浏览器缺少现代Web API支持，但我们通过以下方式提供兼容：

    -
      -
    • 使用传统getUserMedia API (webkit/moz前缀)
      • -
    • 提供预定义设备配置代替设备枚举
      • -
    • 简化权限检查流程
      • -
    • 降级使用基础功能
      • -
    -
    -
    - - - - + + + + + + + 📱 旧版浏览器使用指南 + + + + +
    +
    +

    📱 旧版浏览器使用指南

    +

    移动侦察终端兼容模式使用说明

    +
    + +
    +

    ⚠️ 检测结果

    +

    您的浏览器兼容性较低，但系统已自动启用兼容模式。请按照以下步骤操作：

    +
    + +
    +

    🔧 使用步骤

    + +
    + 1 + 返回主页面 +
    关闭此页面，返回移动侦察终端主界面 +
    + +
    + 2 + 查看系统状态 +
    确认页面显示"兼容模式：已为您的浏览器启用兼容支持" +
    + +
    + 3 + 选择摄像头设备 +
    点击页面中的"📷 选择设备"按钮 +
    + +
    + 4 + 测试设备选项 +
    在弹窗中选择以下任一设备进行测试： +
    +
    📱 默认摄像头 - 系统自动选择
    +
    📹 后置摄像头 - 优先使用后置
    +
    🤳 前置摄像头 - 优先使用前置
    +
    +
    + +
    + 5 + 启动摄像头 +
    选择设备后点击"✅ 使用选择的设备" +
    + +
    + 6 + 允许权限 +
    当浏览器弹出权限请求时，点击"允许" +
    + +
    + 7 + 开始使用 +
    摄像头启动成功后，点击"📹 开始传输" +
    +
    + +
    +

    🚨 常见问题

    + +

    Q: 权限被拒绝怎么办？

    +

    A: 清除浏览器数据，重新访问页面并允许权限

    + +

    Q: 某个设备选项不工作？

    +

    A: 尝试其他设备选项，通常至少有一个会工作

    + +

    Q: 完全无法使用摄像头？

    +

    A: 考虑升级浏览器或换用现代浏览器

    +
    + +
    +

    🌐 推荐浏览器

    +

    为获得最佳体验，建议升级到以下浏览器：

    +
      +
    • 🌐 Chrome 53+ - 完全支持所有功能
      • +
    • 🦊 Firefox 36+ - 良好的兼容性
      • +
    • 🧭 Safari 11+ - iOS/macOS用户推荐
      • +
    • ⭐ Edge 17+ - Windows用户推荐
      • +
    +
    + +
    +

    ✅ 重要提醒

    +

    兼容模式虽然功能有限，但基本的摄像头录制和GPS定位功能仍然可用。请耐心按步骤操作。

    +
    + + + +
    +

    技术说明：您的浏览器缺少现代Web API支持，但我们通过以下方式提供兼容：

    +
      +
    • 使用传统getUserMedia API (webkit/moz前缀)
      • +
    • 提供预定义设备配置代替设备枚举
      • +
    • 简化权限检查流程
      • +
    • 降级使用基础功能
      • +
    +
    +
    + + + + \ No newline at end of file diff --git a/distance-judgement/mobile/mobile_client.html b/distance-judgement/mobile/mobile_client.html index b323ffbf..4543d36d 100644 --- a/distance-judgement/mobile/mobile_client.html +++ b/distance-judgement/mobile/mobile_client.html @@ -300,6 +300,8 @@ style="background: #9C27B0; display: none;">📋 摄像头信息 + +
    - + + +
    + + +
    + + +
    + +
    +
    - +
    + + +
    + + +
    @@ -343,15 +382,26 @@
    - +
    -

    🚀 性能优化建议

    + style="background: rgba(76, 175, 80, 0.1); border: 1px solid #4CAF50; border-radius: 8px; padding: 15px; margin: 20px 0;"> +

    🚀 智能性能优化

    -
    📶 网络良好: 可选择 5-10 FPS + 高质量(70-90%)
    -
    📱 网络一般: 建议 2-5 FPS + 中质量(50-70%)
    -
    🐌 网络较慢: 选择 1-2 FPS + 低质量(30-50%)
    -
    💡 系统会自动监控网络状况并给出调整建议
    +
    🚀 极致流畅模式: 320×240, 5FPS, 20%质量 - 最大化视频流畅度(默认)
    +
    ⚖️ 平衡模式: 480×360, 2FPS, 50%质量 - 流畅度与画质平衡
    +
    🎨 画质模式: 640×480, 2FPS, 70%质量 - 网络良好时使用
    +
    + ⚡ 系统将根据网络状况自动调整参数以保持最佳性能 +
    +
    + 💡 数据量对比：极致流畅模式约为画质模式的1/8，最大化传输效率 +
    +
    + 🧭 朝向优化：标准模式下朝向变化5°以上才发送，避免频繁更新 +
    +
    + 🎯 当前优化：已设为极致流畅模式，优先保障视频实时性能 +
    @@ -385,7 +435,14 @@ this.dataAmount = 0; this.currentPosition = null; this.currentOrientation = null; // 🌟 当前设备朝向 - this.lastDataSendTime = 0; // 数据发送节流 + this.lastLocationSendTime = 0; // GPS位置发送节流 + this.lastOrientationSendTime = 0; // 朝向数据发送节流 + + // 🧭 朝向数据平滑和过滤 + this.lastSentOrientation = null; // 上次发送的朝向 + this.orientationBuffer = []; // 朝向数据缓冲区，用于平滑处理 + this.ORIENTATION_CHANGE_THRESHOLD = 5; // 朝向变化阈值（度） + this.ORIENTATION_SEND_INTERVAL = 1500; // 朝向发送间隔（毫秒） // 🚀 性能监控 this.lastSendTime = 0; @@ -420,6 +477,13 @@ this.startOrientationTracking(); // 🌟 启动朝向追踪 this.updateBatteryStatus(); this.bindEvents(); + + // 🚀 初始化性能模式 + this.applyPerformanceMode(); + + // 🧭 初始化朝向设置 + this.updateOrientationSettings(); + this.log('移动终端初始化完成', 'success'); } @@ -761,9 +825,9 @@ const constraints = { video: { facingMode: 'environment', - width: { ideal: 640 }, - height: { ideal: 480 }, - // 添加帧率限制以提高性能 + width: { ideal: 800, min: 640 }, + height: { ideal: 600, min: 480 }, + // 提高清晰度以确保人员识别 frameRate: { ideal: 30, max: 30 } }, audio: false @@ -1070,6 +1134,7 @@ const gamma = event.gamma; // 围绕Y轴旋转（-90到90度） if (alpha !== null && alpha !== undefined) { + // 🧭 更新当前朝向数据 this.currentOrientation = { heading: alpha, tilt: beta, @@ -1083,20 +1148,106 @@ orientationElement.textContent = `${alpha.toFixed(1)}°`; } - // 🌟 实时传输朝向数据到服务器 - this.sendOrientationToServer(this.currentOrientation); + // 🚀 智能朝向数据发送（带阈值检测和平滑处理） + this.processOrientationForSending(this.currentOrientation); + } + } + + // 🧭 智能处理朝向数据发送 + processOrientationForSending(orientation) { + // 添加到缓冲区进行平滑处理 + this.orientationBuffer.push(orientation); + + // 保持缓冲区大小（最多保留5个数据点） + if (this.orientationBuffer.length > 5) { + this.orientationBuffer.shift(); + } + + // 计算平滑后的朝向（移动平均） + const smoothedOrientation = this.calculateSmoothedOrientation(); + + // 检查是否应该发送数据 + if (this.shouldSendOrientation(smoothedOrientation)) { + this.sendOrientationToServer(smoothedOrientation); + this.lastSentOrientation = smoothedOrientation; + } + } + + // 🧭 计算平滑后的朝向数据 + calculateSmoothedOrientation() { + if (this.orientationBuffer.length === 0) return null; + + let sumHeading = 0; + let sumTilt = 0; + let sumRoll = 0; + + // 处理角度平均（考虑360度边界） + this.orientationBuffer.forEach(orientation => { + sumHeading += orientation.heading; + sumTilt += orientation.tilt || 0; + sumRoll += orientation.roll || 0; + }); + + return { + heading: sumHeading / this.orientationBuffer.length, + tilt: sumTilt / this.orientationBuffer.length, + roll: sumRoll / this.orientationBuffer.length, + timestamp: Date.now() + }; + } + + // 🧭 检查是否应该发送朝向数据 + shouldSendOrientation(orientation) { + const now = Date.now(); + + // 1. 时间节流检查（最少间隔1.5秒） + if (now - this.lastOrientationSendTime < this.ORIENTATION_SEND_INTERVAL) { + return false; + } + + // 2. 如果是第一次发送，直接发送 + if (!this.lastSentOrientation) { + return true; + } + + // 3. 朝向变化阈值检查 + const headingDiff = this.calculateAngleDifference( + this.lastSentOrientation.heading, + orientation.heading + ); + + // 4. 倾斜角度变化检查（可选） + const tiltDiff = Math.abs( + (this.lastSentOrientation.tilt || 0) - (orientation.tilt || 0) + ); + + // 只有当朝向变化超过阈值或倾斜角度变化较大时才发送 + if (headingDiff >= this.ORIENTATION_CHANGE_THRESHOLD || tiltDiff >= 10) { + console.log(`🧭 朝向变化达到阈值，准备发送: ${headingDiff.toFixed(1)}°变化`); + return true; + } + + return false; // 变化太小，不发送 + } + + // 🧭 计算两个角度之间的最小差值（处理360度边界） + calculateAngleDifference(angle1, angle2) { + let diff = Math.abs(angle1 - angle2); + if (diff > 180) { + diff = 360 - diff; } + return diff; } // 🌟 发送GPS位置数据到服务器 async sendLocationToServer(position) { try { - // 节流：限制发送频率（每2秒最多一次） + // 节流：限制发送频率（每2秒最多一次）- GPS位置变化较慢，保持2秒间隔 const now = Date.now(); - if (now - this.lastDataSendTime < 2000) { + if (now - this.lastLocationSendTime < 2000) { return; } - this.lastDataSendTime = now; + this.lastLocationSendTime = now; const locationData = { device_id: this.deviceId, @@ -1136,11 +1287,8 @@ // 🌟 发送设备朝向数据到服务器 async sendOrientationToServer(orientation) { try { - // 节流：限制发送频率（每1秒最多一次） - const now = Date.now(); - if (now - this.lastDataSendTime < 1000) { - return; - } + // 📊 记录发送时间（由上层调用函数确保发送时机合适） + this.lastOrientationSendTime = Date.now(); const orientationData = { device_id: this.deviceId, @@ -1160,12 +1308,15 @@ }); if (response.ok) { - console.log('🧭 朝向数据已发送到服务器'); - console.log('🧭 发送的朝向数据详情:', { + const headingChange = this.lastSentOrientation && this.lastSentOrientation !== orientation ? + this.calculateAngleDifference(this.lastSentOrientation.heading, orientation.heading).toFixed(1) : 'N/A'; + + console.log(`🧭 朝向数据已发送: ${orientation.heading.toFixed(1)}° (变化${headingChange}°)`); + console.log('🧭 发送详情:', { device_id: this.deviceId.substr(0, 8), heading: orientation.heading.toFixed(1), tilt: orientation.tilt ? orientation.tilt.toFixed(1) : 'null', - roll: orientation.roll ? orientation.roll.toFixed(1) : 'null' + change: headingChange + '°' }); } else { console.warn('⚠️ 朝向数据发送失败:', response.status); @@ -1357,10 +1508,10 @@ async sendDataLoop() { // 🚀 优化：使用UI设置的帧率 - const frameRate = parseInt(document.getElementById('frameRate').value) || 2; + const frameRate = parseInt(document.getElementById('frameRate').value) || 5; const interval = 1000 / frameRate; // 根据设置的FPS计算间隔 - this.log(`📺 视频传输已优化: ${frameRate} FPS (间隔 ${interval}ms)`, 'success'); + this.log(`📺 视频传输已优化: ${frameRate} FPS (间隔 ${interval.toFixed(0)}ms)`, 'success'); while (this.isStreaming) { try { @@ -1375,12 +1526,19 @@ } async captureAndSend() { - this.canvas.width = this.videoElement.videoWidth || 640; - this.canvas.height = this.videoElement.videoHeight || 480; - this.ctx.drawImage(this.videoElement, 0, 0); + // 🚀 动态分辨率调整 + const resolution = document.getElementById('resolution').value || '320x240'; + const [targetWidth, targetHeight] = resolution.split('x').map(Number); + + // 设置画布尺寸为目标分辨率 + this.canvas.width = targetWidth; + this.canvas.height = targetHeight; + + // 将视频帧按比例缩放到目标分辨率 + this.ctx.drawImage(this.videoElement, 0, 0, targetWidth, targetHeight); // 🚀 优化：使用UI设置的图像质量 - const imageQuality = parseFloat(document.getElementById('imageQuality').value) || 0.7; + const imageQuality = parseFloat(document.getElementById('imageQuality').value) || 0.2; const frameData = this.canvas.toDataURL('image/jpeg', imageQuality).split(',')[1]; const data = { @@ -1439,11 +1597,101 @@ this.updateStats(); this.updateConnectionStatus(true); + + // 🚀 自适应性能优化 + this.autoOptimizePerformance(uploadTime); } else { throw new Error(`HTTP ${response.status}`); } } + // 🚀 性能模式切换 + applyPerformanceMode() { + const mode = document.getElementById('performanceMode').value; + const resolutionSelect = document.getElementById('resolution'); + const frameRateSelect = document.getElementById('frameRate'); + const qualitySelect = document.getElementById('imageQuality'); + + // 根据模式设置最优参数 + switch (mode) { + case 'smooth': // 流畅模式 - 极致流畅度优先 + resolutionSelect.value = '320x240'; + frameRateSelect.value = '5'; + qualitySelect.value = '0.2'; + this.log('🚀 已切换到极致流畅模式：320×240, 5FPS, 20%质量 - 最大化流畅度', 'success'); + break; + case 'balanced': // 平衡模式 - 流畅度与画质平衡 + resolutionSelect.value = '480x360'; + frameRateSelect.value = '2'; + qualitySelect.value = '0.5'; + this.log('⚖️ 已切换到平衡模式：480×360, 2FPS, 50%质量', 'info'); + break; + case 'quality': // 画质模式 - 优先画质 + resolutionSelect.value = '640x480'; + frameRateSelect.value = '2'; + qualitySelect.value = '0.7'; + this.log('🎨 已切换到画质模式：640×480, 2FPS, 70%质量', 'info'); + break; + case 'custom': // 自定义模式 + this.log('🔧 已切换到自定义模式，请手动调整参数', 'warning'); + break; + } + + // 禁用/启用控件 + const isCustom = mode === 'custom'; + resolutionSelect.disabled = !isCustom; + frameRateSelect.disabled = !isCustom; + qualitySelect.disabled = !isCustom; + } + + // 🚀 自适应性能优化 + autoOptimizePerformance(uploadTime) { + // 只在非自定义模式下自动优化 + const mode = document.getElementById('performanceMode').value; + if (mode === 'custom') return; + + const currentQuality = parseFloat(document.getElementById('imageQuality').value); + const currentFrameRate = parseInt(document.getElementById('frameRate').value); + const currentResolution = document.getElementById('resolution').value; + + // 网络太慢，自动降级（但保持足够清晰度进行人员识别） + if (this.averageUploadTime > 5000) { + if (currentQuality > 0.5) { + document.getElementById('imageQuality').value = Math.max(0.5, currentQuality - 0.1).toFixed(1); + this.log(`⚡ 网络较慢，自动降低图像质量到 ${Math.round(Math.max(0.5, currentQuality - 0.1) * 100)}%`, 'warning'); + } else if (currentFrameRate > 2) { + document.getElementById('frameRate').value = Math.max(2, currentFrameRate - 1); + this.log(`⚡ 网络较慢，自动降低帧率到 ${Math.max(2, currentFrameRate - 1)} FPS`, 'warning'); + } else if (currentResolution !== '640x480') { + document.getElementById('resolution').value = '640x480'; + this.log('⚡ 网络较慢，自动切换到标准分辨率 640×480', 'warning'); + } + } + // 网络很好，可以适当提升（流畅模式仍优先保证流畅度） + else if (this.averageUploadTime < 300 && mode === 'smooth') { + // 流畅模式：即使网络很好也优先提升帧率而不是画质 + if (currentFrameRate < 8) { + document.getElementById('frameRate').value = Math.min(8, currentFrameRate + 1); + this.log(`⚡ 网络极佳，自动提升帧率到 ${Math.min(8, currentFrameRate + 1)} FPS (保持流畅度优先)`, 'success'); + } else if (currentQuality < 0.3) { + document.getElementById('imageQuality').value = Math.min(0.3, currentQuality + 0.05).toFixed(2); + this.log(`⚡ 网络极佳，微调图像质量到 ${Math.round(Math.min(0.3, currentQuality + 0.05) * 100)}% (仍保持流畅优先)`, 'success'); + } + } + } + + // 🧭 更新朝向设置 + updateOrientationSettings() { + const sensitivity = parseFloat(document.getElementById('orientationSensitivity').value); + this.ORIENTATION_CHANGE_THRESHOLD = sensitivity; + + const sensText = sensitivity === 10 ? '低敏感' : + sensitivity === 5 ? '标准' : + sensitivity === 3 ? '敏感' : '高敏感'; + + this.log(`🧭 朝向敏感度已调整: ${sensText} (${sensitivity}°变化阈值)`, 'info'); + } + async getBatteryLevel() { try { if ('getBattery' in navigator) { @@ -1640,6 +1888,7 @@ document.getElementById('stopStreamBtn').style.display = 'inline-block'; document.getElementById('cameraInfoBtn').style.display = 'inline-block'; document.getElementById('qualityBtn').style.display = 'inline-block'; + document.getElementById('enhanceBtn').style.display = 'inline-block'; document.getElementById('startBtn').disabled = false; document.getElementById('videoPlaceholder').style.display = 'none'; @@ -1993,6 +2242,7 @@ document.getElementById('stopStreamBtn').style.display = 'none'; document.getElementById('cameraInfoBtn').style.display = 'none'; document.getElementById('qualityBtn').style.display = 'none'; + document.getElementById('enhanceBtn').style.display = 'none'; this.log('✅ 所有摄像头系统已停止', 'success'); } @@ -2055,6 +2305,38 @@ } } + // 增强视频清晰度 + async enhanceVideoQuality() { + this.log('✨ 正在增强视频清晰度...', 'info'); + + // 自动设置高清晰度参数 + document.getElementById('resolution').value = '1280x720'; + document.getElementById('imageQuality').value = '0.7'; + document.getElementById('frameRate').value = '5'; + + // 应用高清设置 + const success = await this.adjustVideoQuality(1280, 720, 30); + + if (success) { + this.log('✅ 清晰度增强成功！已切换到高清模式', 'success'); + + // 更新UI显示 + const enhanceBtn = document.getElementById('enhanceBtn'); + if (enhanceBtn) { + enhanceBtn.textContent = '✅ 已增强'; + enhanceBtn.style.background = '#4CAF50'; + setTimeout(() => { + enhanceBtn.textContent = '✨ 增强清晰度'; + enhanceBtn.style.background = '#FF9800'; + }, 3000); + } + } else { + this.log('❌ 清晰度增强失败，请手动调整设置', 'error'); + } + + return success; + } + // 重写原有的实时捕获方法 async tryRealTimeCapture() { this.log('🚀 启动底层实时摄像头系统...', 'info'); @@ -2125,11 +2407,14 @@ stats.appendChild(perfDiv); } - const frameRate = parseInt(document.getElementById('frameRate').value) || 2; - const quality = parseInt(parseFloat(document.getElementById('imageQuality').value) * 100) || 70; + const frameRate = parseInt(document.getElementById('frameRate').value) || 5; + const quality = parseInt(parseFloat(document.getElementById('imageQuality').value) * 100) || 20; + const resolution = document.getElementById('resolution').value || '320x240'; + const mode = document.getElementById('performanceMode').value; + const modeText = mode === 'smooth' ? '🚀流畅' : mode === 'balanced' ? '⚖️平衡' : mode === 'quality' ? '🎨画质' : '🔧自定义'; document.querySelector('.performance-info').innerHTML = ` -
    📊 当前设置: ${frameRate} FPS, ${quality}% 质量
    +
    📊 ${modeText}模式: ${resolution}, ${frameRate}FPS, ${quality}%质量
    ⏱️ 平均延迟: ${this.averageUploadTime.toFixed(0)}ms
    📈 网络状态: ${this.averageUploadTime < 500 ? '🟢 良好' : this.averageUploadTime < 2000 ? '🟡 一般' : '🔴 较慢'}
    `; @@ -2463,12 +2748,12 @@ this.currentStream = null; } - // 移动端默认使用后置摄像头 + // 移动端默认使用后置摄像头，高清配置确保人员识别 const constraints = { video: { facingMode: 'environment', // 优先使用后置摄像头 - width: { ideal: 640 }, - height: { ideal: 480 }, + width: { ideal: 800, min: 640 }, + height: { ideal: 600, min: 480 }, frameRate: { ideal: 30, max: 30 } }, audio: false @@ -2865,6 +3150,8 @@ let mobileClient; window.addEventListener('load', () => { mobileClient = new MobileClient(); + // 🌐 设置全局访问（供HTML事件调用） + window.mobileClient = mobileClient; }); // ========== 移动端专用功能（已简化） ========== diff --git a/distance-judgement/mobile/permission_guide.html b/distance-judgement/mobile/permission_guide.html index 7078d29a..2004daeb 100644 --- a/distance-judgement/mobile/permission_guide.html +++ b/distance-judgement/mobile/permission_guide.html @@ -1,430 +1,430 @@ - - - - - - - 📱 权限设置指南 - - - - -
    -

    📱 权限设置指南

    - -
    -

    📊 当前权限状态

    -
    - 📍 GPS定位权限 -
    -
    -
    - 📷 摄像头权限 -
    -
    -
    正在检查权限状态...
    -
    - -
    -

    🎯 第1步：GPS定位权限

    -

    为了在地图上显示您的位置，需要获取GPS定位权限：

    -
      -
    • 当浏览器弹出权限请求时，点击"允许"
      • -
    • 如果已经拒绝，点击地址栏的🔒图标重新设置
      • -
    • 确保设备的定位服务已开启
      • -
    -
    - -
    -
    - -
    -

    📷 第2步：摄像头权限

    -

    为了拍摄和传输视频，需要获取摄像头访问权限：

    -
      -
    • 当浏览器询问摄像头权限时，点击"允许"
      • -
    • 如果失败，检查其他应用是否占用摄像头
      • -
    • 建议使用后置摄像头以获得更好效果
      • -
    -
    - -
    -
    - -
    -

    🔧 不同浏览器的权限设置方法：

    - -
    - 📱 Safari (iOS): -
      -
    • 设置 → Safari → 摄像头/麦克风 → 允许
      • -
    • 设置 → 隐私与安全性 → 定位服务 → Safari → 使用App期间
      • -
    -
    - -
    - 🤖 Chrome (Android): -
      -
    • 点击地址栏左侧的🔒或ℹ️图标
      • -
    • 设置权限为"允许"
      • -
    • 或在设置 → 网站设置中调整
      • -
    -
    - -
    - 🖥️ 桌面浏览器: -
      -
    • 点击地址栏的🔒图标
      • -
    • 将摄像头和位置权限设为"允许"
      • -
    • 刷新页面使设置生效
      • -
    -
    -
    - -
    -

    ⚠️ 常见问题解决：

    -

    GPS获取失败：

    -
      -
    • 移动到窗边或室外获得更好信号
      • -
    • 检查设备的定位服务是否开启
      • -
    • 在浏览器设置中清除网站数据后重试
      • -
    -

    摄像头无法访问：

    -
      -
    • 关闭其他正在使用摄像头的应用
      • -
    • 重启浏览器或设备
      • -
    • 使用Chrome或Safari等现代浏览器
      • -
    -
    - -
    - 🧪 权限测试页面 - -
    - - -
    - - - - + + + + + + + 📱 权限设置指南 + + + + +
    +

    📱 权限设置指南

    + +
    +

    📊 当前权限状态

    +
    + 📍 GPS定位权限 +
    +
    +
    + 📷 摄像头权限 +
    +
    +
    正在检查权限状态...
    +
    + +
    +

    🎯 第1步：GPS定位权限

    +

    为了在地图上显示您的位置，需要获取GPS定位权限：

    +
      +
    • 当浏览器弹出权限请求时，点击"允许"
      • +
    • 如果已经拒绝，点击地址栏的🔒图标重新设置
      • +
    • 确保设备的定位服务已开启
      • +
    +
    + +
    +
    + +
    +

    📷 第2步：摄像头权限

    +

    为了拍摄和传输视频，需要获取摄像头访问权限：

    +
      +
    • 当浏览器询问摄像头权限时，点击"允许"
      • +
    • 如果失败，检查其他应用是否占用摄像头
      • +
    • 建议使用后置摄像头以获得更好效果
      • +
    +
    + +
    +
    + +
    +

    🔧 不同浏览器的权限设置方法：

    + +
    + 📱 Safari (iOS): +
      +
    • 设置 → Safari → 摄像头/麦克风 → 允许
      • +
    • 设置 → 隐私与安全性 → 定位服务 → Safari → 使用App期间
      • +
    +
    + +
    + 🤖 Chrome (Android): +
      +
    • 点击地址栏左侧的🔒或ℹ️图标
      • +
    • 设置权限为"允许"
      • +
    • 或在设置 → 网站设置中调整
      • +
    +
    + +
    + 🖥️ 桌面浏览器: +
      +
    • 点击地址栏的🔒图标
      • +
    • 将摄像头和位置权限设为"允许"
      • +
    • 刷新页面使设置生效
      • +
    +
    +
    + +
    +

    ⚠️ 常见问题解决：

    +

    GPS获取失败：

    +
      +
    • 移动到窗边或室外获得更好信号
      • +
    • 检查设备的定位服务是否开启
      • +
    • 在浏览器设置中清除网站数据后重试
      • +
    +

    摄像头无法访问：

    +
      +
    • 关闭其他正在使用摄像头的应用
      • +
    • 重启浏览器或设备
      • +
    • 使用Chrome或Safari等现代浏览器
      • +
    +
    + +
    + 🧪 权限测试页面 + +
    + + +
    + + + + \ No newline at end of file diff --git a/distance-judgement/requirements.txt b/distance-judgement/requirements.txt index ce615fd4..34da47b9 100644 --- a/distance-judgement/requirements.txt +++ b/distance-judgement/requirements.txt @@ -1,12 +1,37 @@ -opencv-python==4.8.1.78 -ultralytics==8.0.196 -numpy==1.24.3 -torch==2.0.1 -torchvision==0.15.2 -matplotlib==3.7.2 -pillow==10.0.0 -requests==2.31.0 -flask==2.3.3 +# 核心依赖 +numpy>=1.24.3 +opencv-python>=4.8.1 +Pillow>=10.0.0 +PyYAML>=5.4.0 + +# 机器学习和计算机视觉 +torch>=2.0.1 +torchvision>=0.15.2 +ultralytics>=8.0.196 + +# 无人机控制 +djitellopy>=2.4.0 + +# Web框架 +Flask>=2.3.3 +Flask-CORS>=3.0.0 + +# 图像处理 +scikit-image>=0.18.0 +matplotlib>=3.7.2 + +# 网络和通信 +requests>=2.31.0 +websocket-client>=1.0.0 + +# 数据处理 +pandas>=1.3.0 + +# 配置和环境 +python-dotenv>=0.19.0 + +# 系统工具 +psutil>=5.8.0 cryptography>=3.4.8 # Windows系统位置服务支持（仅Windows） diff --git a/distance-judgement/requirements_core.txt b/distance-judgement/requirements_core.txt new file mode 100644 index 00000000..e6034fc2 --- /dev/null +++ b/distance-judgement/requirements_core.txt @@ -0,0 +1,30 @@ +# 无人机视频传输核心依赖 +# 只包含必需的包，用于快速启动系统 + +# 核心依赖 +numpy>=1.24.3 +opencv-python>=4.8.1 +Pillow>=10.0.0 +PyYAML>=5.4.0 + +# 机器学习和计算机视觉 +torch>=2.0.1 +torchvision>=0.15.2 +ultralytics>=8.0.196 + +# 无人机控制 +djitellopy>=2.4.0 + +# Web框架 +Flask>=2.3.3 + +# 网络和通信 +requests>=2.31.0 + +# 系统工具 +psutil>=5.8.0 +cryptography>=3.4.8 + +# Windows系统位置服务支持（仅Windows） +winrt-runtime>=1.0.0; sys_platform == "win32" +winrt-Windows.Devices.Geolocation>=1.0.0; sys_platform == "win32" \ No newline at end of file diff --git a/distance-judgement/run.py b/distance-judgement/run.py index ae118b81..dff2d66a 100644 --- a/distance-judgement/run.py +++ b/distance-judgement/run.py @@ -1,97 +1,97 @@ -1#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -无人机战场态势感知系统 - 启动脚本 -让用户选择运行模式 -""" - -import sys -import os - -def show_menu(): - """显示菜单""" - print("=" * 60) - print("🚁 无人机战场态势感知系统") - print("=" * 60) - print() - print("请选择运行模式:") - print() - print("1. 🌐 Web模式 (推荐)") - print(" • 地图作为主界面") - print(" • 通过浏览器操作") - print(" • 可视化程度更高") - print(" • 支持远程访问") - print() - print("2. 🖥️ 传统模式") - print(" • 直接显示摄像头画面") - print(" • 键盘快捷键操作") - print(" • 性能更好") - print(" • 适合本地使用") - print() - print("3. ⚙️ 配置摄像头位置") - print(" • 设置GPS坐标") - print(" • 配置朝向角度") - print(" • 设置API Key") - print() - print("4. 🧪 运行系统测试") - print(" • 检查各模块状态") - print(" • 验证系统功能") - print() - print("0. ❌ 退出") - print() - -def main(): - """主函数""" - while True: - show_menu() - try: - choice = input("请输入选择 (0-4): ").strip() - - if choice == "1": - print("\n🌐 启动Web模式...") - import main_web - main_web.main() - break - - elif choice == "2": - print("\n🖥️ 启动传统模式...") - import main - main.main() - break - - elif choice == "3": - print("\n⚙️ 配置摄像头位置...") - import sys - sys.path.append('tools') - import setup_camera_location - setup_camera_location.main() - print("\n配置完成，请重新选择运行模式") - input("按回车键继续...") - - elif choice == "4": - print("\n🧪 运行系统测试...") - import sys - sys.path.append('tests') - import test_system - test_system.main() - print("\n测试完成") - input("按回车键继续...") - - elif choice == "0": - print("\n👋 再见!") - sys.exit(0) - - else: - print("\n❌ 无效选择，请重新输入") - input("按回车键继续...") - - except KeyboardInterrupt: - print("\n\n👋 再见!") - sys.exit(0) - except Exception as e: - print(f"\n❌ 运行出错: {e}") - input("按回车键继续...") - -if __name__ == "__main__": +1#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +无人机战场态势感知系统 - 启动脚本 +让用户选择运行模式 +""" + +import sys +import os + +def show_menu(): + """显示菜单""" + print("=" * 60) + print("🚁 无人机战场态势感知系统") + print("=" * 60) + print() + print("请选择运行模式:") + print() + print("1. 🌐 Web模式 (推荐)") + print(" • 地图作为主界面") + print(" • 通过浏览器操作") + print(" • 可视化程度更高") + print(" • 支持远程访问") + print() + print("2. 🖥️ 传统模式") + print(" • 直接显示摄像头画面") + print(" • 键盘快捷键操作") + print(" • 性能更好") + print(" • 适合本地使用") + print() + print("3. ⚙️ 配置摄像头位置") + print(" • 设置GPS坐标") + print(" • 配置朝向角度") + print(" • 设置API Key") + print() + print("4. 🧪 运行系统测试") + print(" • 检查各模块状态") + print(" • 验证系统功能") + print() + print("0. ❌ 退出") + print() + +def main(): + """主函数""" + while True: + show_menu() + try: + choice = input("请输入选择 (0-4): ").strip() + + if choice == "1": + print("\n🌐 启动Web模式...") + import main_web + main_web.main() + break + + elif choice == "2": + print("\n🖥️ 启动传统模式...") + import main + main.main() + break + + elif choice == "3": + print("\n⚙️ 配置摄像头位置...") + import sys + sys.path.append('tools') + import setup_camera_location + setup_camera_location.main() + print("\n配置完成，请重新选择运行模式") + input("按回车键继续...") + + elif choice == "4": + print("\n🧪 运行系统测试...") + import sys + sys.path.append('tests') + import test_system + test_system.main() + print("\n测试完成") + input("按回车键继续...") + + elif choice == "0": + print("\n👋 再见!") + sys.exit(0) + + else: + print("\n❌ 无效选择，请重新输入") + input("按回车键继续...") + + except KeyboardInterrupt: + print("\n\n👋 再见!") + sys.exit(0) + except Exception as e: + print(f"\n❌ 运行出错: {e}") + input("按回车键继续...") + +if __name__ == "__main__": main() \ No newline at end of file diff --git a/distance-judgement/src/__init__.py b/distance-judgement/src/__init__.py index 02675b6d..efd1fe4c 100644 --- a/distance-judgement/src/__init__.py +++ b/distance-judgement/src/__init__.py @@ -1,51 +1,51 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -实时人体距离检测系统 - 核心模块包 - -包含以下模块: -- config: 配置文件 -- person_detector: 人体检测模块 -- distance_calculator: 距离计算模块 -""" - -__version__ = "1.0.0" -__author__ = "Distance Detection System" - -# 导入核心模块 -from .config import * -from .person_detector import PersonDetector -from .distance_calculator import DistanceCalculator -from .map_manager import MapManager -from .web_server import WebServer -from .mobile_connector import MobileConnector, MobileDevice -from .orientation_detector import OrientationDetector -from .web_orientation_detector import WebOrientationDetector - -__all__ = [ - 'PersonDetector', - 'DistanceCalculator', - 'MapManager', - 'WebServer', - 'MobileConnector', - 'MobileDevice', - 'CAMERA_INDEX', - 'FRAME_WIDTH', - 'FRAME_HEIGHT', - 'FPS', - 'MODEL_PATH', - 'CONFIDENCE_THRESHOLD', - 'IOU_THRESHOLD', - 'KNOWN_PERSON_HEIGHT', - 'FOCAL_LENGTH', - 'REFERENCE_DISTANCE', - 'REFERENCE_HEIGHT_PIXELS', - 'FONT', - 'FONT_SCALE', - 'FONT_THICKNESS', - 'BOX_COLOR', - 'TEXT_COLOR', - 'TEXT_BG_COLOR', - 'PERSON_CLASS_ID' +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +实时人体距离检测系统 - 核心模块包 + +包含以下模块: +- config: 配置文件 +- person_detector: 人体检测模块 +- distance_calculator: 距离计算模块 +""" + +__version__ = "1.0.0" +__author__ = "Distance Detection System" + +# 导入核心模块 +from .config import * +from .person_detector import PersonDetector +from .distance_calculator import DistanceCalculator +from .map_manager import MapManager +from .web_server import WebServer +from .mobile_connector import MobileConnector, MobileDevice +from .orientation_detector import OrientationDetector +from .web_orientation_detector import WebOrientationDetector + +__all__ = [ + 'PersonDetector', + 'DistanceCalculator', + 'MapManager', + 'WebServer', + 'MobileConnector', + 'MobileDevice', + 'CAMERA_INDEX', + 'FRAME_WIDTH', + 'FRAME_HEIGHT', + 'FPS', + 'MODEL_PATH', + 'CONFIDENCE_THRESHOLD', + 'IOU_THRESHOLD', + 'KNOWN_PERSON_HEIGHT', + 'FOCAL_LENGTH', + 'REFERENCE_DISTANCE', + 'REFERENCE_HEIGHT_PIXELS', + 'FONT', + 'FONT_SCALE', + 'FONT_THICKNESS', + 'BOX_COLOR', + 'TEXT_COLOR', + 'TEXT_BG_COLOR', + 'PERSON_CLASS_ID' ] \ No newline at end of file diff --git a/distance-judgement/src/__pycache__/__init__.cpython-313.pyc b/distance-judgement/src/__pycache__/__init__.cpython-313.pyc index a6fbb81d335a612bf4179255054b63987fa73bef..a0a3c5ac12f3ab4b4453224fc1add91b8ff4a4b3 100644 GIT binary patch delta 22 ccmX@Wd4QAmGcPX}0}yz%C1u>$$h(;Z07#z(o&W#< delta 22 ccmX@Wd4QAmGcPX}0}woD$j(@{k#{o-08IJ^1poj5 diff --git a/distance-judgement/src/__pycache__/__init__.cpython-39.pyc b/distance-judgement/src/__pycache__/__init__.cpython-39.pyc index 8a3f9798f8c16983b693b260ea4fb1328c96631b..b66aa1a303af77f566c5203671e629815f7cff1e 100644 GIT binary patch delta 228 zcmeC;n8?YS$ji&c00drbNf|dL^2#z+Ow;!i90OER!Z9 qqrhZ$W+ld3le3sTf#eouoyk%xv0_3%{Vbd;j4aF?j66^%zytsUITDco diff --git a/distance-judgement/src/__pycache__/config.cpython-311.pyc b/distance-judgement/src/__pycache__/config.cpython-311.pyc index ec3f976d8fd7d6c36964f050b46dc024ba6019be..e40d2f2e436c2292cc85901da13bceebda069cb2 100644 GIT binary patch delta 54 zcmeC;=;GjA&dbZi00i8nIT@TAdEFTK_q@>dFm|$WNdI$hnf-64%}I=POl;B({5OPU JCqH9W0RWmp5XS%j delta 54 zcmeC;=;GjA&dbZi00f=KlQSeY^13ndv*tvs(r~tMNS`C=vWm-ja}r}66Pt1a{|#Z) I$DupqaK~sFCCS?R`ZseP#4FFWJ2Fm~d delta 23 dcmZ1xz9O9OGcPX}0}woD$j;E!*vL0a8vt1|2QUBt diff --git a/distance-judgement/src/__pycache__/person_detector.cpython-313.pyc b/distance-judgement/src/__pycache__/person_detector.cpython-313.pyc index 517f42a1b9bd46405e558f552deadb57fb58275a..b679ca88a3be06900fe739e4c5f049d9e787044e 100644 GIT binary patch delta 22 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 delta 23 dcmbOhGcAViGcPX}0}woD$j+!X-pI$H2LM;s2H*ey diff --git a/distance-judgement/src/__pycache__/web_server.cpython-311.pyc b/distance-judgement/src/__pycache__/web_server.cpython-311.pyc index 072b86323c9ce8ff8ad769e0d404c486e40d7897..96a00e053762c1ec3567bee18b633847c95e00f1 100644 GIT binary patch delta 71284 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 R=+?iL2jTj4y&(t%{}14mCKvz! delta 13117 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 diff --git a/distance-judgement/src/__pycache__/web_server.cpython-313.pyc b/distance-judgement/src/__pycache__/web_server.cpython-313.pyc index ce238327d46ea6ed06da93f4c7d881dbf59a4bae..6ab57e7e344122f4988030b3060875acb8176799 100644 GIT binary patch delta 68577 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 t5`UWMPw3MwfcMh9osLD~a max_distance: - return False - - # 计算人员方位角与摄像头朝向的角度差 - angle_diff = abs(bearing - camera_heading) - if angle_diff > 180: - angle_diff = 360 - angle_diff - - # 检查是否在视场角范围内 - return angle_diff <= camera_fov / 2 - - def _calculate_distance_and_bearing(self, lat1, lng1, lat2, lng2): - """ - 🧭 计算两点间距离和方位角 - - Returns: - (distance_meters, bearing_degrees): 距离(米)和方位角(度) - """ - # 转换为弧度 - lat1_rad = math.radians(lat1) - lng1_rad = math.radians(lng1) - lat2_rad = math.radians(lat2) - lng2_rad = math.radians(lng2) - - # 计算距离 (Haversine公式) - dlat = lat2_rad - lat1_rad - dlng = lng2_rad - lng1_rad - - a = (math.sin(dlat/2)**2 + - math.cos(lat1_rad) * math.cos(lat2_rad) * math.sin(dlng/2)**2) - c = 2 * math.atan2(math.sqrt(a), math.sqrt(1-a)) - distance = 6371000 * c # 地球半径6371km - - # 计算方位角 - y = math.sin(dlng) * math.cos(lat2_rad) - x = (math.cos(lat1_rad) * math.sin(lat2_rad) - - math.sin(lat1_rad) * math.cos(lat2_rad) * math.cos(dlng)) - bearing = math.atan2(y, x) - bearing_degrees = (math.degrees(bearing) + 360) % 360 - +import numpy as np +import math +from . import config + +class DistanceCalculator: + def __init__(self): + self.focal_length = config.FOCAL_LENGTH + self.known_height = config.KNOWN_PERSON_HEIGHT + self.reference_distance = config.REFERENCE_DISTANCE + self.reference_height_pixels = config.REFERENCE_HEIGHT_PIXELS + + def calculate_distance_by_height(self, bbox_height): + """ + 根据人体框高度计算距离 + 使用相似三角形原理：距离 = (已知高度 × 焦距) / 像素高度 + """ + if bbox_height <= 0: + return 0 + + # 使用参考距离和参考像素高度来校准 + distance = (self.reference_distance * self.reference_height_pixels) / bbox_height + return max(distance, 30) # 最小距离限制为30cm + + def calculate_distance_by_focal_length(self, bbox_height): + """ + 使用焦距公式计算距离 + 距离 = (真实高度 × 焦距) / 像素高度 + """ + if bbox_height <= 0: + return 0 + + distance = (self.known_height * self.focal_length) / bbox_height + return max(distance, 30) # 最小距离限制为30cm + + def calibrate_focal_length(self, known_distance, measured_height_pixels): + """ + 标定焦距 + 焦距 = (像素高度 × 真实距离) / 真实高度 + """ + self.focal_length = (measured_height_pixels * known_distance) / self.known_height + print(f"焦距已标定为: {self.focal_length:.2f}") + + def get_distance(self, bbox): + """ + 根据边界框计算距离 + bbox: [x1, y1, x2, y2] + """ + x1, y1, x2, y2 = bbox + bbox_height = y2 - y1 + bbox_width = x2 - x1 + + # 使用高度计算距离（更准确） + distance = self.calculate_distance_by_height(bbox_height) + + return distance + + def format_distance(self, distance): + """ + 格式化距离显示 + """ + if distance < 100: + return f"{distance:.1f}cm" + else: + return f"{distance/100:.1f}m" + + def calculate_person_gps_position(self, camera_lat, camera_lng, camera_heading, + bbox, distance_meters, frame_width, frame_height, + camera_fov=60): + """ + 🎯 核心算法：根据摄像头GPS位置、朝向、人体检测框计算人员真实GPS坐标 + + Args: + camera_lat: 摄像头纬度 + camera_lng: 摄像头经度 + camera_heading: 摄像头朝向角度 (0=正北, 90=正东) + bbox: 人体检测框 [x1, y1, x2, y2] + distance_meters: 人员距离摄像头的距离(米) + frame_width: 画面宽度(像素) + frame_height: 画面高度(像素) + camera_fov: 摄像头水平视场角(度) + + Returns: + (person_lat, person_lng): 人员GPS坐标 + """ + x1, y1, x2, y2 = bbox + + # 计算人体检测框中心点 + person_center_x = (x1 + x2) / 2 + person_center_y = (y1 + y2) / 2 + + # 计算人员相对于画面中心的偏移角度 + frame_center_x = frame_width / 2 + horizontal_offset_pixels = person_center_x - frame_center_x + + # 将像素偏移转换为角度偏移 + horizontal_angle_per_pixel = camera_fov / frame_width + horizontal_offset_degrees = horizontal_offset_pixels * horizontal_angle_per_pixel + + # 计算人员相对于正北的实际方位角 + person_bearing = (camera_heading + horizontal_offset_degrees) % 360 + + # 使用球面几何计算人员GPS坐标 + person_lat, person_lng = self._calculate_destination_point( + camera_lat, camera_lng, distance_meters, person_bearing + ) + + return person_lat, person_lng + + def _calculate_destination_point(self, lat, lng, distance, bearing): + """ + 🌍 球面几何计算：根据起点坐标、距离和方位角计算目标点坐标 + + Args: + lat: 起点纬度 + lng: 起点经度 + distance: 距离(米) + bearing: 方位角(度，0=正北) + + Returns: + (target_lat, target_lng): 目标点坐标 + """ + # 地球半径(米) + R = 6371000 + + # 转换为弧度 + lat1 = math.radians(lat) + lng1 = math.radians(lng) + bearing_rad = math.radians(bearing) + + # 球面几何计算目标点坐标 + lat2 = math.asin( + math.sin(lat1) * math.cos(distance / R) + + math.cos(lat1) * math.sin(distance / R) * math.cos(bearing_rad) + ) + + lng2 = lng1 + math.atan2( + math.sin(bearing_rad) * math.sin(distance / R) * math.cos(lat1), + math.cos(distance / R) - math.sin(lat1) * math.sin(lat2) + ) + + return math.degrees(lat2), math.degrees(lng2) + + def is_person_in_camera_fov(self, camera_lat, camera_lng, camera_heading, + person_lat, person_lng, camera_fov=60, max_distance=100): + """ + 🔍 检查人员是否在摄像头视野范围内 + + Args: + camera_lat: 摄像头纬度 + camera_lng: 摄像头经度 + camera_heading: 摄像头朝向角度 + person_lat: 人员纬度 + person_lng: 人员经度 + camera_fov: 摄像头视场角(度) + max_distance: 最大检测距离(米) + + Returns: + bool: 是否在视野内 + """ + # 计算人员相对于摄像头的距离和方位角 + distance, bearing = self._calculate_distance_and_bearing( + camera_lat, camera_lng, person_lat, person_lng + ) + + # 检查距离是否在范围内 + if distance > max_distance: + return False + + # 计算人员方位角与摄像头朝向的角度差 + angle_diff = abs(bearing - camera_heading) + if angle_diff > 180: + angle_diff = 360 - angle_diff + + # 检查是否在视场角范围内 + return angle_diff <= camera_fov / 2 + + def _calculate_distance_and_bearing(self, lat1, lng1, lat2, lng2): + """ + 🧭 计算两点间距离和方位角 + + Returns: + (distance_meters, bearing_degrees): 距离(米)和方位角(度) + """ + # 转换为弧度 + lat1_rad = math.radians(lat1) + lng1_rad = math.radians(lng1) + lat2_rad = math.radians(lat2) + lng2_rad = math.radians(lng2) + + # 计算距离 (Haversine公式) + dlat = lat2_rad - lat1_rad + dlng = lng2_rad - lng1_rad + + a = (math.sin(dlat/2)**2 + + math.cos(lat1_rad) * math.cos(lat2_rad) * math.sin(dlng/2)**2) + c = 2 * math.atan2(math.sqrt(a), math.sqrt(1-a)) + distance = 6371000 * c # 地球半径6371km + + # 计算方位角 + y = math.sin(dlng) * math.cos(lat2_rad) + x = (math.cos(lat1_rad) * math.sin(lat2_rad) - + math.sin(lat1_rad) * math.cos(lat2_rad) * math.cos(dlng)) + bearing = math.atan2(y, x) + bearing_degrees = (math.degrees(bearing) + 360) % 360 + return distance, bearing_degrees \ No newline at end of file diff --git a/distance-judgement/src/drone/__init__.py b/distance-judgement/src/drone/__init__.py new file mode 100644 index 00000000..c83acd81 --- /dev/null +++ b/distance-judgement/src/drone/__init__.py @@ -0,0 +1,67 @@ +""" +Drone - RoboMaster TT无人机视频传输模块 +===================================== + +基于RoboMaster TT（Tello TLW004）无人机的视频流接收、处理和分析模块。 +支持实时视频流处理、图像分析等功能。 + +主要功能： +- 无人机连接与控制 +- 实时视频流接收 +- 图像捕获与分析 +- Web界面控制 + +使用示例： + from src.drone import DroneManager, VideoReceiver + + # 创建无人机管理器 + drone_manager = DroneManager() + + # 连接无人机 + drone_manager.connect() + + # 创建视频接收器 + video_receiver = VideoReceiver() + video_receiver.start("udp://192.168.10.1:11111") +""" + +__version__ = "1.0.0" +__author__ = "Distance Judgement Team" +__description__ = "RoboMaster TT无人机视频传输模块" + +# 导入核心模块 +try: + from .drone_interface.drone_manager import DroneManager + from .drone_interface.video_receiver import VideoReceiver +except ImportError as e: + print(f"Warning: Failed to import drone interface modules: {e}") + DroneManager = None + VideoReceiver = None + +# 导入图像分析器（可选） +try: + from .image_analyzer.analyzer import ImageAnalyzer +except ImportError as e: + print(f"Info: Image analyzer not available (optional): {e}") + ImageAnalyzer = None + +# 导出的组件 +__all__ = [ + 'DroneManager', + 'VideoReceiver', + 'ImageAnalyzer' +] + +def get_version(): + """获取版本信息""" + return __version__ + +def get_info(): + """获取模块信息""" + return { + 'name': 'Drone', + 'version': __version__, + 'author': __author__, + 'description': __description__, + 'components': [comp for comp in __all__ if globals().get(comp) is not None] + } \ No newline at end of file diff --git a/distance-judgement/src/drone/__pycache__/__init__.cpython-311.pyc b/distance-judgement/src/drone/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..38dc0eed13e6012e89bced428048c19156a92337 GIT binary patch literal 2518 zcma(STW`}=_&9cMPD-Jmma>AZ!dN4%A*Bpoa?Y1?`|cNC ztEgZRz?sRf4=!;c^qg!8V7C_Y|G;7li713bDnyC4kWHjRv>Sh z#Hu23joegT^wd;#d}{96@fVY4($f=jkABKtznr-+#bx{nxe9I2C^f+W=HQnPYh(P4CYQB&-^%? z89JW5c-oZzJns)YBr{(Vvh$BJ$4;3vxtk|4Cojz%dq~LG^!*2O zR|m|4m(%CiMy{y9+~bQNH+_F3J8~^EbQiAPVsC0i&JFh2AI{E=+=KU~95~-6_2kYD zzql}IabVLAALmA|=dMhpAAL`xaR3Lf8s%a*>=zBUN1}Zy);J>uy9Gt)mGFn$=Mhm- z_exrfzSIWjTwa8{6wLh#X ziWJt$$xP{%yNwVPL?0pw^VrfDWS3cBaVdY~k7)wd8tUU>U(336O`F&In>K9nHwFAn zElmXKeQdwI$sh0s`fGv_c&vma?$fx~D@7$m~1*tUG3BP(DE6vzPql!>ZhT$W-j+#bTFBMPx=R|NS; zzl8hObtnha7S1^2AR@*or>Ghy90I;Vk1TNwYM&NS;m+5>`DjdoewZPM^r0}!A`sQd z_55N$V@NArAOvMh#jD@|axru2=iG^*?D+5L$CtAMw?Qip&qD^qKnl$YG^ zcSmqXd-rEY!UqK$?GCG=)Gb;rZv3j?;%-RNZo}qoo{uOIjpzM+M|4lGq!pNA4=~&a zGv)%6Kp9VUlBvdS*p%t-fCEGSJ+OerN|jomK@Tc`M(nphv<)JSP+AZ~S7CLdutg$0 zZU^g`66?+WU|O%+jX;Ns?H34%W0%65?*cT2deKqz<@?`KTFIMo851QpKw`mBs=Tq^ zT78r{V;f#eVzI|()1AGt+9Sv@od#dQ-sTVJOjwQf#fYgKhsh`CHQOqK&&l!D{yO5+ z2&9a^RaV15x)m0M+mGROtPxNGC96BlF~Qu~_{ZkIH{Wafv+c>UndY6d%{!CLdrxbC z%wa^qXV)1;h)TNCN(0>?#I=Je);*#W3*(59fjUdHfRBKp#e58g&mz)Uo;P3eyk5!k zC9mPY374|W^O%I)5M-F7y9#FDI=I*ZGZp}pKzRpRvi#Z7RnMyGp4F^P8CKkMf+;iA zowL=Qd5^>E$RiWk9j5Awi5O80gBYR_t|e#%Abq8gmEbR{63tdx=zK;Y>8sv;Q{H`y zLeo7RM)%!;F?fWMbbB8Lrg}|;)G}WvTYq6;6efO;=s^up6FZXZCr>CqFlLzGEE7yJ!PL^4#IDq`<%!*Iey;%XPM|0MUWUlskX$fKDK;Xd zfGjE7?zbn|Z7^n-?X%4GB(wd$1lWO!2w)kHEsqK);mmt&R1M*2A(xAS&@V)>55RXP ly)|gezKI^MYNr2!|7k}%jh@o>_ImoMYjOKZ`sqrt{ui(zLb(6{ literal 0 HcmV?d00001 diff --git a/distance-judgement/src/drone/__pycache__/__init__.cpython-313.pyc b/distance-judgement/src/drone/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6a1e371c9442615ef1b33e1f76a050708e0085e0 GIT binary patch literal 2217 zcma)7-ER{|5Z|-UXZvg?Kxjg$HXH%bSOq(23Y0)fEj|Q+pq2~p5Tw(^J|`~rU9@+m zB2P}CC{P-p5F)-mL`$ezP}LS96F%}Eq=JX^1W))QJYmR7TV6VQcXs2@hmN%Cxt*Ec z%+Ah?r+q#a0iC$Iw`Z;sp=acyNDhmcehkbI;t@tXg(=>KZM+@Z>kv=#j;(Z?13Ngv zGh3N9Cw6kkkhr&c+Pv7yp&;TtpHbMyd*4R5g7?8*+3i|{_PCr#tVIaB_ptSdckXdl zpk~_&%Jd3|F6@BiTu3` ztjH3#oZF#vDea=FNto;C$PHi4q|>?c>8b07o?ktY8M{1n|733DO7_Aq+xmZqWwV#k zne<>8>Wi^~4k;d2xQ=bR8yi1-F?P7*Cx7;!=_>bIe{S%*+^O5oQvKO$2lK}dWxqX| z9XOP`c--{=EcGRuJ9R5}v_E_EVs7|$$;{LyX6No_4;(XX@;@EU9=SAi;2tq!GoyE> zzV9~=UW}b(mvf~6rXE}bznRg&+~D=>z-PeyuMg2ATM9|W3KeiUeG3^cVg z5vupIeU7F;W1z9GWxHB_rKZLXtJELlP6o256SD`YK)N&8mG)I?GS#-kGU} zZ(mucea*W?EXU;T7H*Rmi%StsQ#k95tOt{!L82lAlTaebxTLml+X>8;1iW2H7UTQ- zB-|I=B1e@L&N$@YMT}EURy0oB2e@KaT;dv(UM;48%-_QKVWL2Mm?j&UJYiTRBB2xU zbOmffsIw$k0yj#|gHNc$?6K4N!vneVKV}|W$@SlYm^^|2^`n9hLAZgYiIu)N*rOz* zU{BxPAg@HVFGMT}Asp_BY4F@hECnN0u9tsa%ykf|HE3KuClNi(g~x;q)w6qgF2ZaSA}*V)fR+R zg*GojNJgCm+@KZK?+y~gEZT{R6EzI@?F$jwi9WTpFGk3NI6#vTZwok<0B3$hk>5Te zq2|Cb6RJCm%JDmNS{4(M?zD2NGh$NfQLyfbNNO0zj7QbkumYVeL#e8M2E%^~(pf<; zH3dPh6oeVtaNq=CJWiPIxY8xYRoxExg-4_bkV-0m!z6vWi{w29<%Qwj1FeCju7fRw z3JjXN;7L{8lX>qvsag88A^518|G{~g{&m$atM9b_-1>0-qvlP++70LL)%;5j<7Enn zaWH?qVo^;8r4sBjbs@%kmx0YcheQ-n!h&D~kE=k8=fkGIYm@>+VD*7H$cl5vC}X{D zwoZBP8)dG0wivT-BgT+CO41#@7(n%!80jRT*ffD6W3&Z+i^M@5+PFO?DK-U>K_QDZS 500: + print(f"移动失败：无效的移动距离 {distance}") + return jsonify(success=False, error="无效的移动距离") + + print(f"执行移动命令: {direction} {distance}cm") + + # 尝试使用自定义DroneManager + success = False + if drone_manager: + print("使用DroneManager执行移动") + result = drone_manager.move(direction, distance) + if result: + success = True + else: + print("DroneManager移动失败，尝试使用Tello SDK") + + if not success: + # 直接使用Tello SDK + print("使用Tello SDK执行移动") + try: + # 首先尝试使用方法调用 + move_method = getattr(tello, direction) + move_method(distance) + success = True + except (AttributeError, Exception) as method_error: + print(f"方法调用失败: {method_error}，尝试直接发送命令") + + # 如果方法调用失败，尝试直接发送命令 + command = f"{direction} {distance}" + try: + tello.send_command_without_return(command) + print(f"直接发送命令: {command}") + success = True + except Exception as cmd_error: + print(f"直接发送命令失败: {cmd_error}") + raise cmd_error + + if success: + print(f"无人机移动成功: {direction} {distance}cm") + return jsonify(success=True, message=f"无人机已移动: {direction} {distance}cm") + else: + error_msg = "移动命令执行失败，所有尝试均失败" + print(error_msg) + return jsonify(success=False, error=error_msg) + + except AttributeError as e: + error_msg = f"移动方法不存在: {str(e)}" + print(error_msg) + return jsonify(success=False, error=error_msg) + except Exception as e: + error_msg = f"无人机移动时出错: {str(e)}" + print(error_msg) + import traceback + traceback.print_exc() + return jsonify(success=False, error=error_msg) + +@drone_bp.route('/rotate', methods=['POST']) +def rotate(): + """控制无人机旋转""" + global tello, is_connected, drone_manager + + if not is_connected: + print("旋转失败：未连接到无人机") + return jsonify(success=False, error="未连接到无人机") + + try: + data = request.json + direction = data.get('direction') + angle = data.get('angle', 45) # 默认45度 + + print(f"收到旋转请求: 方向={direction}, 角度={angle}度") + + # 验证参数 + if not direction: + print("旋转失败：未指定旋转方向") + return jsonify(success=False, error="未指定旋转方向") + + if direction not in ['cw', 'ccw']: + print(f"旋转失败：无效的旋转方向 '{direction}'") + return jsonify(success=False, error="无效的旋转方向") + + if not isinstance(angle, int) or angle < 1 or angle > 360: + print(f"旋转失败：无效的旋转角度 {angle}") + return jsonify(success=False, error="无效的旋转角度") + + print(f"执行旋转命令: {direction} {angle}度") + + # 尝试使用自定义DroneManager + success = False + if drone_manager: + print("使用DroneManager执行旋转") + result = drone_manager.rotate(direction, angle) + if result: + success = True + else: + print("DroneManager旋转失败，尝试使用Tello SDK") + + if not success: + # 直接使用Tello SDK + print("使用Tello SDK执行旋转") + try: + # 首先尝试使用方法调用 + rotate_method = getattr(tello, direction) + rotate_method(angle) + success = True + except (AttributeError, Exception) as method_error: + print(f"方法调用失败: {method_error}，尝试直接发送命令") + + # 如果方法调用失败，尝试直接发送命令 + command = f"{direction} {angle}" + try: + tello.send_command_without_return(command) + print(f"直接发送命令: {command}") + success = True + except Exception as cmd_error: + print(f"直接发送命令失败: {cmd_error}") + raise cmd_error + + if success: + print(f"无人机旋转成功: {direction} {angle}度") + return jsonify(success=True, message=f"无人机已旋转: {direction} {angle}度") + else: + error_msg = "旋转命令执行失败，所有尝试均失败" + print(error_msg) + return jsonify(success=False, error=error_msg) + + except AttributeError as e: + error_msg = f"旋转方法不存在: {str(e)}" + print(error_msg) + return jsonify(success=False, error=error_msg) + except Exception as e: + error_msg = f"无人机旋转时出错: {str(e)}" + print(error_msg) + import traceback + traceback.print_exc() + return jsonify(success=False, error=error_msg) + +@drone_bp.route('/stream/start', methods=['POST']) +def start_stream(): + """开始视频流""" + global tello, is_connected, is_streaming, stream_thread, running, video_receiver + + if not is_connected: + return jsonify(success=False, error="未连接到无人机") + + if is_streaming: + return jsonify(success=True, message="视频流已经在运行") + + try: + # 获取请求中的流类型参数 + data = request.json or {} + stream_type = data.get('stream_type', 'udp') # 默认使用UDP + + print(f"开始视频流，类型: {stream_type}") + + # **关键修复**: 首先启动无人机的视频传输 + print("正在启动无人机视频传输...") + try: + # 确保先停止任何现有的视频流 + tello.streamoff() + time.sleep(1) + + # 启动无人机视频传输 + tello.streamon() + print("已发送streamon命令，等待无人机开始发送视频数据...") + time.sleep(3) # 给无人机时间开始发送数据 + + except Exception as e: + print(f"启动无人机视频传输失败: {e}") + return jsonify(success=False, error=f"无法启动无人机视频传输: {str(e)}") + + # 现在尝试接收视频流 + try: + if video_receiver is None: + video_receiver = VideoReceiver() + + # 根据流类型选择不同的视频流地址 + if stream_type == 'udp': + # 使用UDP流 + if hasattr(tello, 'get_udp_video_address'): + stream_url = tello.get_udp_video_address() + else: + stream_url = "udp://0.0.0.0:11111" # 默认UDP地址 + + print(f"获取到UDP视频流地址: {stream_url}") + + elif stream_type == 'rtsp': + # 尝试使用RTSP流（部分Tello型号支持） + stream_url = f"rtsp://192.168.10.1:554/live" + print(f"使用RTSP视频流地址: {stream_url}") + + elif stream_type == 'http': + # 启动HTTP流转发服务 + stream_url = start_http_stream_server() + if not stream_url: + raise Exception("无法启动HTTP流转发服务") + print(f"使用HTTP视频流地址: {stream_url}") + + else: + raise ValueError(f"不支持的视频流类型: {stream_type}") + + # 减少超时时间，因为现在应该有数据了 + video_receiver.stream_timeout = 15.0 + print(f"视频流超时时间已设置为: {video_receiver.stream_timeout}秒") + + # 启动视频接收器 + result = video_receiver.start(stream_url) + if not result: + # 如果自定义接收器失败，回退到Tello SDK方法 + print(f"自定义视频接收器启动失败: {video_receiver.last_error}") + print("回退到使用原生Tello SDK视频流处理...") + + # 确保帧读取器被初始化 + frame_reader = tello.get_frame_read() + if frame_reader is None: + print("错误：帧读取器初始化失败!") + return jsonify(success=False, error="视频流初始化失败") + + # 尝试获取第一帧以验证流是否正常 + try: + print("尝试获取第一帧...") + test_frame = frame_reader.frame + if test_frame is None: + print("警告：未能获取第一帧") + else: + height, width = test_frame.shape[:2] + print(f"成功获取第一帧，分辨率: {width}x{height}") + except Exception as e: + print(f"测试帧获取失败: {e}") + + is_streaming = True + + # 启动视频流线程 + running = True + stream_thread = threading.Thread(target=stream_video) + stream_thread.daemon = True + stream_thread.start() + print("使用Tello SDK启动视频流") + + return jsonify(success=True, message="视频流已启动（使用Tello SDK）", stream_type="tello_sdk") + else: + is_streaming = True + print(f"使用{stream_type.upper()}协议启动视频流: {stream_url}") + return jsonify(success=True, message="视频流已启动", stream_type=stream_type) + + except Exception as e: + # 如果所有方法都失败，作为最后的回退，使用原生Tello SDK + print(f"视频接收器启动失败: {e}") + print("使用原生Tello SDK作为最后回退...") + + # 确保帧读取器被初始化 + frame_reader = tello.get_frame_read() + if frame_reader is None: + print("错误：帧读取器初始化失败!") + return jsonify(success=False, error="视频流初始化失败") + + # 尝试获取第一帧以验证流是否正常 + try: + print("尝试获取第一帧...") + test_frame = frame_reader.frame + if test_frame is None: + print("警告：未能获取第一帧") + else: + height, width = test_frame.shape[:2] + print(f"成功获取第一帧，分辨率: {width}x{height}") + except Exception as e: + print(f"测试帧获取失败: {e}") + + is_streaming = True + + # 启动视频流线程 + running = True + stream_thread = threading.Thread(target=stream_video) + stream_thread.daemon = True + stream_thread.start() + print("使用Tello SDK启动视频流") + + return jsonify(success=True, message="视频流已启动（回退到Tello SDK）", stream_type="tello_sdk") + + except Exception as e: + print(f"启动视频流时出错: {e}") + import traceback + traceback.print_exc() + return jsonify(success=False, error=str(e)) + +def stream_video(): + """视频流处理线程""" + global tello, stream_frame, stream_lock, running + + print("视频流线程已启动") + frame_count = 0 + error_count = 0 + + while running: + try: + # 获取帧 + frame_reader = tello.get_frame_read() + if frame_reader is None: + print("错误: 帧读取器为空") + time.sleep(0.5) + continue + + frame = frame_reader.frame + + if frame is not None: + with stream_lock: + stream_frame = frame.copy() # 创建副本以防止引用问题 + frame_count += 1 + if frame_count % 30 == 0: # 每30帧打印一次日志 + height, width = frame.shape[:2] + print(f"视频流正常: 已接收{frame_count}帧, 分辨率: {width}x{height}") + error_count = 0 # 重置错误计数 + else: + error_count += 1 + print(f"警告: 收到空帧 (第{error_count}次)") + if error_count > 10: # 如果连续接收10个空帧，尝试重新初始化 + print("尝试重新初始化视频流...") + tello.streamoff() + time.sleep(1) + tello.streamon() + time.sleep(2) + error_count = 0 + + time.sleep(0.03) # 约30fps + + except Exception as e: + print(f"视频流处理出错: {e}") + error_count += 1 + if error_count > 10: # 如果连续出现10次错误，尝试重新初始化 + print("视频流出错过多，尝试重新初始化...") + try: + tello.streamoff() + time.sleep(1) + tello.streamon() + time.sleep(2) + error_count = 0 + except: + pass + time.sleep(0.1) + +# HTTP流服务器 +def start_http_stream_server(): + """启动HTTP视频流转发服务器""" + global http_server, http_server_port, http_stream_url + + try: + # 如果已经有服务器在运行，先停止它 + if http_server: + try: + http_server.shutdown() + http_server = None + except: + pass + + # 导入必要的库 + from http.server import HTTPServer, BaseHTTPRequestHandler + import threading + + class VideoStreamHandler(BaseHTTPRequestHandler): + """处理视频流请求的HTTP处理器""" + + def do_GET(self): + """处理GET请求，返回MJPEG流""" + if self.path == '/stream': + self.send_response(200) + self.send_header('Content-type', 'multipart/x-mixed-replace; boundary=frame') + self.send_header('Cache-Control', 'no-cache, no-store, must-revalidate') + self.send_header('Pragma', 'no-cache') + self.send_header('Expires', '0') + self.end_headers() + + try: + while is_streaming: + # 获取当前帧 + frame = None + if video_receiver: + frame = video_receiver.get_latest_frame() + elif stream_frame is not None: + with stream_lock: + frame = stream_frame.copy() + + if frame is not None: + # 将帧编码为JPEG + _, jpeg = cv2.imencode('.jpg', frame, [cv2.IMWRITE_JPEG_QUALITY, 70]) + + # 发送帧 + self.wfile.write(b'--frame\r\n') + self.wfile.write(b'Content-Type: image/jpeg\r\n') + self.wfile.write(f'Content-Length: {len(jpeg)}\r\n\r\n'.encode()) + self.wfile.write(jpeg.tobytes()) + self.wfile.write(b'\r\n') + + # 控制帧率 + time.sleep(0.05) # 约20fps + except: + pass + else: + # 返回简单的HTML页面，显示视频流 + self.send_response(200) + self.send_header('Content-type', 'text/html') + self.end_headers() + + html = f""" + + + Tello Video Stream + + + +

    Tello Video Stream

    + + + + """ + self.wfile.write(html.encode()) + + def log_message(self, format, *args): + """覆盖日志方法，减少控制台输出""" + return + + # 查找可用端口 + import socket + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.bind(('', 0)) + http_server_port = s.getsockname()[1] + s.close() + + # 创建HTTP服务器 + http_server = HTTPServer(('', http_server_port), VideoStreamHandler) + + # 在新线程中启动服务器 + server_thread = threading.Thread(target=http_server.serve_forever) + server_thread.daemon = True + server_thread.start() + + # 构建流URL + http_stream_url = f"http://localhost:{http_server_port}/stream" + print(f"HTTP流服务器已启动: {http_stream_url}") + + return http_stream_url + + except Exception as e: + print(f"启动HTTP流服务器失败: {e}") + import traceback + traceback.print_exc() + return None + +# 停止HTTP流服务器 +def stop_http_stream_server(): + """停止HTTP视频流转发服务器""" + global http_server + + if http_server: + try: + http_server.shutdown() + http_server = None + print("HTTP流服务器已停止") + except Exception as e: + print(f"停止HTTP流服务器出错: {e}") + +@drone_bp.route('/stream/stop', methods=['POST']) +def stop_stream(): + """停止视频流""" + global tello, is_connected, is_streaming, stream_thread, running, video_receiver + + if not is_connected or not is_streaming: + return jsonify(success=True, message="视频流未运行") + + try: + # 停止HTTP流服务器 + stop_http_stream_server() + + # 停止自定义视频接收器 + if video_receiver: + try: + video_receiver.stop() + except: + pass + + # 停止Tello SDK视频流 + try: + tello.streamoff() + except: + pass + + # 停止视频流线程 + running = False + if stream_thread and stream_thread.is_alive(): + stream_thread.join(timeout=2) + + is_streaming = False + print("视频流已停止") + return jsonify(success=True, message="视频流已停止") + + except Exception as e: + print(f"停止视频流时出错: {e}") + return jsonify(success=False, error=str(e)) + +@drone_bp.route('/stream/frame') +def get_stream_frame(): + """获取视频流当前帧""" + global stream_frame, stream_lock, is_streaming, video_receiver + + # 添加禁用缓存的响应头 + response_headers = { + 'Cache-Control': 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0, max-age=0', + 'Pragma': 'no-cache', + 'Expires': '-1', + 'Access-Control-Allow-Origin': '*' + } + + if not is_streaming: + # 如果视频流未启动，返回默认图像 + try: + default_img_path = os.path.join(script_dir, 'static', 'images', 'no-video.jpg') + if os.path.exists(default_img_path): + with open(default_img_path, 'rb') as f: + print("返回默认无视频图像") + return send_file( + io.BytesIO(f.read()), + mimetype='image/jpeg', + headers=response_headers + ) + else: + # 创建一个黑色图像 + img = np.zeros((300, 400, 3), dtype=np.uint8) + cv2.putText(img, "No Video Signal", (50, 150), cv2.FONT_HERSHEY_SIMPLEX, + 1, (255, 255, 255), 2) + _, buffer = cv2.imencode('.jpg', img) + print("返回生成的无视频图像") + return send_file( + io.BytesIO(buffer), + mimetype='image/jpeg', + headers=response_headers + ) + except Exception as e: + print(f"返回默认图像出错: {e}") + # 创建一个最简单的错误图像 + img = np.zeros((100, 100, 3), dtype=np.uint8) + _, buffer = cv2.imencode('.jpg', img) + return send_file( + io.BytesIO(buffer), + mimetype='image/jpeg', + headers=response_headers + ) + + try: + # 尝试使用自定义视频接收器 + if video_receiver: + frame = video_receiver.get_latest_frame() + if frame is not None: + # 将OpenCV BGR图像转换为JPEG + _, buffer = cv2.imencode('.jpg', frame, [cv2.IMWRITE_JPEG_QUALITY, 80]) + if buffer is not None and len(buffer) > 0: + print(f"使用VideoReceiver获取到有效帧，大小: {len(buffer)} 字节") + return send_file( + io.BytesIO(buffer), + mimetype='image/jpeg', + headers=response_headers + ) + else: + print("VideoReceiver帧编码失败") + + # 使用Tello SDK视频帧 + with stream_lock: + if stream_frame is not None: + # 将OpenCV BGR图像转换为JPEG + _, buffer = cv2.imencode('.jpg', stream_frame, [cv2.IMWRITE_JPEG_QUALITY, 80]) + if buffer is not None and len(buffer) > 0: + print(f"使用Tello SDK获取到有效帧，大小: {len(buffer)} 字节") + return send_file( + io.BytesIO(buffer), + mimetype='image/jpeg', + headers=response_headers + ) + else: + print("Tello SDK帧编码失败") + + # 如果无法获取帧，返回默认图像 + print("无法获取有效帧，返回默认图像") + with open(os.path.join(script_dir, 'static', 'images', 'no-video.jpg'), 'rb') as f: + return send_file( + io.BytesIO(f.read()), + mimetype='image/jpeg', + headers=response_headers + ) + + except Exception as e: + print(f"获取视频帧时出错: {e}") + import traceback + traceback.print_exc() + # 返回错误图像 + with open(os.path.join(script_dir, 'static', 'images', 'no-video.jpg'), 'rb') as f: + return send_file( + io.BytesIO(f.read()), + mimetype='image/jpeg', + headers=response_headers + ) + +@drone_bp.route('/capture', methods=['POST']) +def capture_image(): + """捕获无人机当前视图""" + global tello, is_connected, is_streaming, stream_frame, stream_lock, video_receiver + + if not is_connected: + return jsonify(success=False, error="未连接到无人机") + + if not is_streaming: + return jsonify(success=False, error="视频流未启动") + + try: + # 生成文件名 + timestamp = datetime.now().strftime('%Y%m%d_%H%M%S') + filename = f"drone_capture_{timestamp}.jpg" + filepath = os.path.join(captures_dir, filename) + + # 尝试使用自定义视频接收器 + frame = None + if video_receiver: + frame = video_receiver.get_latest_frame() + + # 如果自定义接收器没有帧，使用Tello SDK + if frame is None: + with stream_lock: + if stream_frame is not None: + frame = stream_frame.copy() + + if frame is not None: + # 保存图像 + cv2.imwrite(filepath, frame) + print(f"已捕获图像: {filepath}") + + # 返回图像URL和路径 + image_url = f"/uploads/drone_captures/{filename}" + return jsonify(success=True, message="图像已捕获", image_url=image_url, image_path=filepath) + else: + return jsonify(success=False, error="无法获取有效图像") + + except Exception as e: + print(f"捕获图像时出错: {e}") + return jsonify(success=False, error=str(e)) + +@drone_bp.route('/status') +def get_status(): + """获取无人机状态""" + global tello, is_connected + + if not is_connected: + return jsonify(success=False, error="未连接到无人机") + + try: + # 获取电池电量 + battery = tello.get_battery() + + # 获取其他状态 + height = tello.get_height() + temperature = tello.get_temperature() + + return jsonify( + success=True, + battery=battery, + height=height, + temperature=temperature + ) + + except Exception as e: + print(f"获取无人机状态时出错: {e}") + return jsonify(success=False, error=str(e)) + +@drone_bp.route('/analyze', methods=['POST']) +def analyze_image(): + """分析捕获的图像""" + global is_connected + + try: + data = request.json + image_path = data.get('image_path') + + if not image_path or not os.path.exists(image_path): + return jsonify(success=False, error="无效的图像路径") + + # 确保结果目录存在 + results_dir = os.path.join(os.path.dirname(image_path), 'results') + os.makedirs(results_dir, exist_ok=True) + + # 结果图像路径 + result_filename = f"analysis_{os.path.basename(image_path)}" + result_path = os.path.join(results_dir, result_filename) + + # 导入分析器 + from ship_analyzer import ShipAnalyzer + analyzer = ShipAnalyzer() + + # 分析图像 + print(f"正在分析图像: {image_path}") + result, result_img = analyzer.analyze_image( + image_path, + conf_threshold=0.05, # 低置信度阈值以提高检出率 + save_result=True, + output_path=result_path + ) + + # 处理结果 + if isinstance(result, dict) and 'ships' in result: + ships = result['ships'] + else: + ships = result if isinstance(result, list) else [] + + # 构建返回结果 + response = { + 'success': True, + 'message': f"分析完成，检测到 {len(ships)} 艘舰船", + 'ships': ships, + 'result_image_path': result_path, + 'result_image_url': f"/results/{os.path.basename(os.path.dirname(result_path))}/{result_filename}" + } + + return jsonify(response) + + except Exception as e: + print(f"分析图像时出错: {e}") + import traceback + traceback.print_exc() + return jsonify(success=False, error=str(e)) + +# 创建默认的图像 +def create_default_images(): + """创建默认的图像文件""" + try: + # 创建no-video.jpg + no_video_path = os.path.join(script_dir, 'static', 'images', 'no-video.jpg') + if not os.path.exists(no_video_path): + # 创建黑色图像 + img = np.zeros((300, 400, 3), dtype=np.uint8) + # 添加文本 + cv2.putText(img, "No Video Signal", (100, 150), cv2.FONT_HERSHEY_SIMPLEX, 0.7, (255, 255, 255), 2) + cv2.imwrite(no_video_path, img) + print(f"创建默认图像: {no_video_path}") + + # 创建video-test.jpg + test_video_path = os.path.join(script_dir, 'static', 'images', 'video-test.jpg') + if not os.path.exists(test_video_path): + # 创建测试图像 + img = np.zeros((300, 400, 3), dtype=np.uint8) + # 添加彩色元素 + cv2.rectangle(img, (50, 50), (350, 250), (0, 0, 255), -1) + cv2.rectangle(img, (100, 100), (300, 200), (0, 255, 0), -1) + cv2.rectangle(img, (150, 150), (250, 250), (255, 0, 0), -1) + # 添加文本 + cv2.putText(img, "Video Test", (130, 280), cv2.FONT_HERSHEY_SIMPLEX, 0.7, (255, 255, 255), 2) + cv2.imwrite(test_video_path, img) + print(f"创建测试图像: {test_video_path}") + + except Exception as e: + print(f"创建默认图像时出错: {e}") + +# 初始化创建默认图像 +create_default_images() + +# 添加测试路由 +@drone_bp.route('/ping') +def ping_drone(): + """测试无人机网络连接""" + try: + # 尝试 ping Tello 默认IP + import subprocess + import platform + + ip = "192.168.10.1" # Tello默认IP + + # 根据平台选择ping命令参数 + param = '-n' if platform.system().lower() == 'windows' else '-c' + command = ['ping', param, '1', ip] + + print(f"执行Ping测试: {' '.join(command)}") + result = subprocess.call(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0 + + if result: + print(f"Ping测试成功: {ip}") + return jsonify(success=True, message=f"成功连接到 {ip}") + else: + print(f"Ping测试失败: {ip}") + return jsonify(success=False, error=f"无法连接到 {ip}") + except Exception as e: + print(f"Ping测试异常: {e}") + return jsonify(success=False, error=str(e)) + +@drone_bp.route('/test_direct_video') +def test_direct_video(): + """测试直接UDP视频流""" + try: + # 创建一个临时的视频接收器 + from drone_interface.video_receiver import VideoReceiver + + print("创建临时视频接收器进行测试...") + test_receiver = VideoReceiver() + test_receiver.stream_timeout = 5.0 + + # 尝试打开UDP流 + stream_url = "udp://0.0.0.0:11111" + print(f"尝试打开UDP流: {stream_url}") + + success = test_receiver.start(stream_url) + if not success: + print(f"打开UDP流失败: {test_receiver.last_error}") + # 返回一个默认图片 + with open(os.path.join(script_dir, 'static', 'images', 'no-video.jpg'), 'rb') as f: + return send_file(io.BytesIO(f.read()), mimetype='image/jpeg') + + # 等待一帧 + print("等待视频帧...") + start_time = time.time() + frame = None + + # 最多等待3秒 + while time.time() - start_time < 3: + frame = test_receiver.get_latest_frame() + if frame is not None: + break + time.sleep(0.1) + + # 停止接收器 + test_receiver.stop() + + if frame is not None: + print("成功获取测试帧") + # 将OpenCV BGR图像转换为JPEG + _, buffer = cv2.imencode('.jpg', frame) + return send_file(io.BytesIO(buffer), mimetype='image/jpeg') + else: + print("未获取到测试帧") + # 返回一个默认图片 + with open(os.path.join(script_dir, 'static', 'images', 'no-video.jpg'), 'rb') as f: + return send_file(io.BytesIO(f.read()), mimetype='image/jpeg') + + except Exception as e: + print(f"测试直接视频出错: {e}") + import traceback + traceback.print_exc() + # 返回一个默认图片 + with open(os.path.join(script_dir, 'static', 'images', 'no-video.jpg'), 'rb') as f: + return send_file(io.BytesIO(f.read()), mimetype='image/jpeg') + +@drone_bp.route('/test_custom_video', methods=['POST']) +def test_custom_video(): + """测试自定义URL视频流""" + try: + data = request.json + url = data.get('url') + + if not url: + return jsonify(success=False, error="未提供URL") + + print(f"测试自定义视频URL: {url}") + + # 创建一个临时的视频接收器 + from drone_interface.video_receiver import VideoReceiver + + test_receiver = VideoReceiver() + test_receiver.stream_timeout = 5.0 + + # 尝试打开视频流 + success = test_receiver.start(url) + if not success: + return jsonify(success=False, error=f"打开视频流失败: {test_receiver.last_error}") + + # 等待一帧 + start_time = time.time() + has_frame = False + + # 最多等待3秒 + while time.time() - start_time < 3: + if test_receiver.get_latest_frame() is not None: + has_frame = True + break + time.sleep(0.1) + + # 停止接收器 + test_receiver.stop() + + if has_frame: + return jsonify(success=True, message="成功接收视频帧") + else: + return jsonify(success=False, error="未接收到视频帧") + + except Exception as e: + print(f"测试自定义视频URL出错: {e}") + import traceback + traceback.print_exc() + return jsonify(success=False, error=str(e)) + +@drone_bp.route('/test_stream', methods=['POST']) +def test_stream(): + """测试不同类型的视频流""" + try: + data = request.json + stream_type = data.get('stream_type', 'udp') + + print(f"测试{stream_type}视频流") + + # 根据流类型选择不同的测试方法 + if stream_type == 'udp': + return test_udp_stream() + elif stream_type == 'rtsp': + return test_rtsp_stream() + elif stream_type == 'http': + return test_http_stream() + else: + return jsonify(success=False, error=f"不支持的视频流类型: {stream_type}") + + except Exception as e: + print(f"测试视频流出错: {e}") + import traceback + traceback.print_exc() + return jsonify(success=False, error=str(e)) + +def test_udp_stream(): + """测试UDP视频流""" + try: + # 检查网络连接 + import subprocess + import platform + + ip = "192.168.10.1" # Tello默认IP + + # 根据平台选择ping命令参数 + param = '-n' if platform.system().lower() == 'windows' else '-c' + command = ['ping', param, '1', ip] + + print(f"执行Ping测试: {' '.join(command)}") + ping_success = subprocess.call(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0 + + if not ping_success: + print(f"Ping测试失败: {ip}") + return jsonify(success=False, error=f"无法连接到Tello ({ip})") + + # 创建一个临时的视频接收器 + from drone_interface.video_receiver import VideoReceiver + + print("创建临时视频接收器进行UDP测试...") + test_receiver = VideoReceiver() + test_receiver.stream_timeout = 5.0 + + # 尝试打开UDP流 + stream_url = "udp://0.0.0.0:11111" + print(f"尝试打开UDP流: {stream_url}") + + success = test_receiver.start(stream_url) + if not success: + print(f"打开UDP流失败: {test_receiver.last_error}") + return jsonify(success=False, error=f"打开UDP流失败: {test_receiver.last_error}") + + # 等待一帧 + print("等待视频帧...") + start_time = time.time() + frame = None + + # 最多等待3秒 + while time.time() - start_time < 3: + frame = test_receiver.get_latest_frame() + if frame is not None: + break + time.sleep(0.1) + + # 停止接收器 + test_receiver.stop() + + if frame is not None: + print("成功获取UDP测试帧") + # 保存帧为临时文件 + test_frame_path = os.path.join(script_dir, 'static', 'images', 'udp-test-frame.jpg') + cv2.imwrite(test_frame_path, frame) + + # 返回成功结果和帧URL + return jsonify( + success=True, + message="UDP视频流测试成功", + frame_url="/static/images/udp-test-frame.jpg" + ) + else: + print("未获取到UDP测试帧") + return jsonify(success=False, error="未能获取UDP视频帧，请检查无人机是否正常工作") + + except Exception as e: + print(f"测试UDP视频出错: {e}") + import traceback + traceback.print_exc() + return jsonify(success=False, error=str(e)) + +def test_rtsp_stream(): + """测试RTSP视频流""" + try: + # 创建一个临时的视频接收器 + from drone_interface.video_receiver import VideoReceiver + + print("创建临时视频接收器进行RTSP测试...") + test_receiver = VideoReceiver() + test_receiver.stream_timeout = 5.0 + + # 尝试打开RTSP流 + stream_url = "rtsp://192.168.10.1:554/live" + print(f"尝试打开RTSP流: {stream_url}") + + success = test_receiver.start(stream_url) + if not success: + print(f"打开RTSP流失败: {test_receiver.last_error}") + return jsonify(success=False, error=f"打开RTSP流失败: {test_receiver.last_error}") + + # 等待一帧 + print("等待视频帧...") + start_time = time.time() + frame = None + + # 最多等待3秒 + while time.time() - start_time < 3: + frame = test_receiver.get_latest_frame() + if frame is not None: + break + time.sleep(0.1) + + # 停止接收器 + test_receiver.stop() + + if frame is not None: + print("成功获取RTSP测试帧") + # 保存帧为临时文件 + test_frame_path = os.path.join(script_dir, 'static', 'images', 'rtsp-test-frame.jpg') + cv2.imwrite(test_frame_path, frame) + + # 返回成功结果和帧URL + return jsonify( + success=True, + message="RTSP视频流测试成功", + frame_url="/static/images/rtsp-test-frame.jpg" + ) + else: + print("未获取到RTSP测试帧") + return jsonify(success=False, error="未能获取RTSP视频帧，可能您的Tello型号不支持RTSP") + + except Exception as e: + print(f"测试RTSP视频出错: {e}") + import traceback + traceback.print_exc() + return jsonify(success=False, error=str(e)) + +def test_http_stream(): + """测试HTTP视频流""" + try: + # 启动HTTP流服务器 + stream_url = start_http_stream_server() + if not stream_url: + return jsonify(success=False, error="无法启动HTTP流服务器") + + print(f"HTTP流服务器已启动: {stream_url}") + + # 创建测试图像 + test_frame_path = os.path.join(script_dir, 'static', 'images', 'http-test-frame.jpg') + test_img = np.zeros((300, 400, 3), dtype=np.uint8) + cv2.rectangle(test_img, (50, 50), (350, 250), (0, 0, 255), -1) + cv2.putText(test_img, "HTTP Stream Test", (80, 150), cv2.FONT_HERSHEY_SIMPLEX, 0.8, (255, 255, 255), 2) + cv2.imwrite(test_frame_path, test_img) + + # 返回成功结果和HTTP流URL + return jsonify( + success=True, + message="HTTP流服务器已启动", + stream_url=stream_url, + frame_url="/static/images/http-test-frame.jpg" + ) + + except Exception as e: + print(f"测试HTTP视频出错: {e}") + import traceback + traceback.print_exc() + return jsonify(success=False, error=str(e)) + +@drone_bp.route('/stream/view') +def stream_view(): + """返回一个简单的HTML页面，直接显示视频帧""" + return """ + + + + + + + + + 视频流 + + + """ + +@drone_bp.route('/stream/mjpeg') +def stream_mjpeg(): + """提供MJPEG流""" + global stream_frame, stream_lock, is_streaming, video_receiver + + def generate_frames(): + while is_streaming: + try: + # 尝试使用自定义视频接收器 + frame = None + if video_receiver: + frame = video_receiver.get_latest_frame() + + # 如果自定义接收器没有帧，使用Tello SDK + if frame is None: + with stream_lock: + if stream_frame is not None: + frame = stream_frame.copy() + + if frame is not None: + # 将OpenCV BGR图像转换为JPEG + _, buffer = cv2.imencode('.jpg', frame, [cv2.IMWRITE_JPEG_QUALITY, 80]) + if buffer is not None: + frame_bytes = buffer.tobytes() + yield (b'--frame\r\n' + b'Content-Type: image/jpeg\r\n\r\n' + frame_bytes + b'\r\n') + + # 控制帧率 + time.sleep(0.05) # 20fps + + except Exception as e: + print(f"生成视频帧出错: {e}") + time.sleep(0.1) + + # 如果视频流未启动，返回默认图像 + if not is_streaming: + try: + default_img_path = os.path.join(script_dir, 'static', 'images', 'no-video.jpg') + if os.path.exists(default_img_path): + with open(default_img_path, 'rb') as f: + return send_file( + io.BytesIO(f.read()), + mimetype='image/jpeg' + ) + except Exception as e: + print(f"返回默认图像出错: {e}") + + # 返回多部分响应 + return Response(generate_frames(), + mimetype='multipart/x-mixed-replace; boundary=frame') \ No newline at end of file diff --git a/distance-judgement/src/drone/drone_interface/__init__.py b/distance-judgement/src/drone/drone_interface/__init__.py new file mode 100644 index 00000000..8859de16 --- /dev/null +++ b/distance-judgement/src/drone/drone_interface/__init__.py @@ -0,0 +1,13 @@ +""" +无人机接口子系统(DroneInterface) +------------- +与无人机建立通信连接 +接收无人机传回的视频流 +将视频流转发给图像分析子系统 +向无人机发送控制命令(如需要) +""" + +from .drone_manager import DroneManager +from .video_receiver import VideoReceiver + +__all__ = ['DroneManager', 'VideoReceiver'] \ No newline at end of file diff --git a/distance-judgement/src/drone/drone_interface/__pycache__/__init__.cpython-311.pyc b/distance-judgement/src/drone/drone_interface/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..13d7485992df5dd49b3dc21d274ee4c1713ddadb GIT binary patch literal 589 zcmZ3^%ge<81gqx#PfuiIV0aATzyK4J@mUMVn9h*G5XF$fn8K99n9CH!#0X+D=P>88 zM6m$bEGew%Oi`>UY{3kg?4{>`8n~WKU+`qtu4i+0J?mTgw14r_wG*Ci-u-;{d<~bP z{Jd1pypq(Sw8Z38O)gzz!1ZKDA6)0t-MgNz?ta-Y>&gCwFZRy^8pH*}&!%jHt9Y_! z!PD9Ep3iD|vApf&qKVJ8HgY}P&<5wc*t_Ow|HS9JXFi?1?`d=Y(~h=h^CrMu!u52* zM7T*nbuSwlpY<(&+Oh5F#Jx{;FVT3qtm);Ph8N2kHMw2_1BXGA@fHu*@xF<9iRr0D zKt69+W=d*)P-=2&W?5=c5i?L#5ety;(`38F9v`2QpBx{5i#G-2>NF0i6od}Sbw z@kKD5AWa}0i8(p(@hcfV1Gx;pd|j+!JY8HJV*)CZGZKq(W0LbzQe#pwi%Syol2diF zN>kEPb5rw5Vv38BW5AX`$oNcH=*GkY*_kEr@p=W7zc_4i^HWN5QtgU(fTn|dRO}2S wJ}@&fGJarUXJq-n03w7K7&R_1s3W5r44M~E(F1PD8TJ>rv>Vt#un3fj0BU#bdH?_b literal 0 HcmV?d00001 diff --git a/distance-judgement/src/drone/drone_interface/__pycache__/__init__.cpython-313.pyc b/distance-judgement/src/drone/drone_interface/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..5edfa7c777a4a57c81c04c57876523567e75f5b0 GIT binary patch literal 512 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 literal 0 HcmV?d00001 diff --git a/distance-judgement/src/drone/drone_interface/__pycache__/drone_manager.cpython-313.pyc b/distance-judgement/src/drone/drone_interface/__pycache__/drone_manager.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..120c7bdfd484a1662f6a79e25312b486c0ff0be3 GIT binary patch literal 27056 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 QO&U;%GC!u!C0+7=0M;(b$^ZZW literal 0 HcmV?d00001 diff --git a/distance-judgement/src/drone/drone_interface/__pycache__/video_receiver.cpython-311.pyc b/distance-judgement/src/drone/drone_interface/__pycache__/video_receiver.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8d49bfa0bab788771a2fbd3cdaa897652f5f6247 GIT binary patch literal 25513 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®FCsU2k8z<-`-qb*-^)QYA9^4WInA>p}*4D-lG1r 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 XU(k%|RnViU-M^6cf4xmCY5M;MP{+pQ literal 0 HcmV?d00001 diff --git a/distance-judgement/src/drone/drone_interface/__pycache__/video_receiver.cpython-313.pyc b/distance-judgement/src/drone/drone_interface/__pycache__/video_receiver.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e39d030b1e7110df9a6f3148c87fa3a4dbd80ae5 GIT binary patch literal 24271 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 R!hg#LR1)J?6#Asn{|~#znN|P* literal 0 HcmV?d00001 diff --git a/distance-judgement/src/drone/drone_interface/drone_manager.py b/distance-judgement/src/drone/drone_interface/drone_manager.py new file mode 100644 index 00000000..69e80da3 --- /dev/null +++ b/distance-judgement/src/drone/drone_interface/drone_manager.py @@ -0,0 +1,655 @@ +import os +import json +import time +import socket +import logging +import threading +import requests +from enum import Enum +from datetime import datetime +from pathlib import Path + +# 配置日志 +logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') +logger = logging.getLogger("DroneManager") + +class DroneType(Enum): + """支持的无人机类型""" + UNKNOWN = 0 + DJI = 1 # 大疆无人机 + AUTEL = 2 # 澎湃无人机 + CUSTOM = 3 # 自定义无人机 + SIMULATOR = 9 # 模拟器 + +class DroneConnectionStatus(Enum): + """无人机连接状态""" + DISCONNECTED = 0 + CONNECTING = 1 + CONNECTED = 2 + ERROR = 3 + +class DroneManager: + """ + 无人机管理器类 + 负责与无人机建立连接、发送命令和接收状态信息 + """ + def __init__(self, config_path=None, drone_type=DroneType.DJI): + """ + 初始化无人机管理器 + + Args: + config_path: 配置文件路径，默认使用内置配置 + drone_type: 无人机类型 + """ + # 项目根目录 + self.root_dir = Path(__file__).resolve().parents[2] + + # 无人机类型 + self.drone_type = drone_type + + # 连接状态 + self.connection_status = DroneConnectionStatus.DISCONNECTED + + # 通信地址 + self.ip = "192.168.10.1" # 默认IP地址 + self.cmd_port = 8889 # 默认命令端口 + self.state_port = 8890 # 默认状态端口 + self.video_port = 11111 # 默认视频端口 + + # 无人机状态 + self.drone_state = { + 'battery': 0, + 'height': 0, + 'speed': 0, + 'gps': {'latitude': 0, 'longitude': 0, 'altitude': 0}, + 'orientation': {'yaw': 0, 'pitch': 0, 'roll': 0}, + 'signal_strength': 0, + 'mode': 'UNKNOWN', + 'last_update': datetime.now().isoformat() + } + + # 通信套接字 + self.cmd_socket = None + self.state_socket = None + + # 状态接收线程 + self.state_receiver_thread = None + self.running = False + + # 视频流地址 + self.video_stream_url = None + + # 加载配置 + self.config = self._load_config(config_path) + self._apply_config() + + # 错误记录 + self.last_error = None + + # 命令响应回调 + self.command_callbacks = {} + + def _load_config(self, config_path): + """加载无人机配置""" + default_config = { + 'drone_type': self.drone_type.name, + 'connection': { + 'ip': self.ip, + 'cmd_port': self.cmd_port, + 'state_port': self.state_port, + 'video_port': self.video_port, + 'timeout': 5 + }, + 'commands': { + 'connect': 'command', + 'takeoff': 'takeoff', + 'land': 'land', + 'move': { + 'up': 'up {distance}', + 'down': 'down {distance}', + 'left': 'left {distance}', + 'right': 'right {distance}', + 'forward': 'forward {distance}', + 'back': 'back {distance}', + }, + 'rotate': { + 'cw': 'cw {angle}', + 'ccw': 'ccw {angle}' + }, + 'set': { + 'speed': 'speed {value}' + } + }, + 'video': { + 'stream_url': 'udp://{ip}:{port}', + 'rtsp_url': 'rtsp://{ip}:{port}/live', + 'snapshot_url': 'http://{ip}:{port}/snapshot' + }, + 'safety': { + 'max_height': 100, + 'max_distance': 500, + 'min_battery': 15, + 'return_home_battery': 30 + } + } + + if config_path: + try: + with open(config_path, 'r') as f: + user_config = json.load(f) + # 合并配置 + self._merge_configs(default_config, user_config) + except Exception as e: + logger.error(f"加载配置文件失败，使用默认配置: {e}") + + return default_config + + def _merge_configs(self, default_config, user_config): + """递归合并配置字典""" + for key, value in user_config.items(): + if key in default_config and isinstance(value, dict) and isinstance(default_config[key], dict): + self._merge_configs(default_config[key], value) + else: + default_config[key] = value + + def _apply_config(self): + """应用配置""" + try: + conn_config = self.config.get('connection', {}) + self.ip = conn_config.get('ip', self.ip) + self.cmd_port = conn_config.get('cmd_port', self.cmd_port) + self.state_port = conn_config.get('state_port', self.state_port) + self.video_port = conn_config.get('video_port', self.video_port) + + # 设置视频流URL + video_config = self.config.get('video', {}) + stream_url_template = video_config.get('stream_url') + if stream_url_template: + self.video_stream_url = stream_url_template.format( + ip=self.ip, + port=self.video_port + ) + except Exception as e: + logger.error(f"应用配置失败: {e}") + self.last_error = str(e) + + def connect(self): + """连接到无人机""" + if self.connection_status == DroneConnectionStatus.CONNECTED: + logger.info("已经连接到无人机") + return True + + self.connection_status = DroneConnectionStatus.CONNECTING + + try: + # 创建命令套接字 + self.cmd_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + self.cmd_socket.bind(('', 0)) + self.cmd_socket.settimeout(5) + + # 创建状态套接字 + self.state_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + self.state_socket.bind(('', self.state_port)) + self.state_socket.settimeout(5) + + # 发送连接命令 + connect_cmd = self.config['commands'].get('connect', 'command') + result = self._send_command(connect_cmd) + + if result: + self.connection_status = DroneConnectionStatus.CONNECTED + logger.info("成功连接到无人机") + + # 启动状态接收线程 + self.running = True + self.state_receiver_thread = threading.Thread(target=self._state_receiver) + self.state_receiver_thread.daemon = True + self.state_receiver_thread.start() + + return True + else: + self.connection_status = DroneConnectionStatus.ERROR + logger.error("连接无人机失败") + self.last_error = "连接命令没有响应" + return False + + except Exception as e: + self.connection_status = DroneConnectionStatus.ERROR + logger.error(f"连接无人机时出错: {e}") + self.last_error = str(e) + return False + + def disconnect(self): + """断开与无人机的连接""" + try: + # 停止状态接收线程 + self.running = False + if self.state_receiver_thread and self.state_receiver_thread.is_alive(): + self.state_receiver_thread.join(timeout=2) + + # 关闭套接字 + if self.cmd_socket: + self.cmd_socket.close() + self.cmd_socket = None + + if self.state_socket: + self.state_socket.close() + self.state_socket = None + + self.connection_status = DroneConnectionStatus.DISCONNECTED + logger.info("已断开与无人机的连接") + return True + + except Exception as e: + logger.error(f"断开连接时出错: {e}") + self.last_error = str(e) + return False + + def _send_command(self, command, timeout=5, callback=None): + """ + 发送命令到无人机 + + Args: + command: 命令字符串 + timeout: 超时时间（秒） + callback: 响应回调函数 + + Returns: + 成功返回True，失败返回False + """ + if not self.cmd_socket: + logger.error("命令套接字未初始化") + return False + + try: + # 记录命令ID用于回调 + cmd_id = time.time() + if callback: + self.command_callbacks[cmd_id] = callback + + logger.debug(f"发送命令: {command}") + self.cmd_socket.sendto(command.encode('utf-8'), (self.ip, self.cmd_port)) + + # 等待响应 + start_time = time.time() + while time.time() - start_time < timeout: + try: + data, _ = self.cmd_socket.recvfrom(1024) + response = data.decode('utf-8').strip() + logger.debug(f"收到响应: {response}") + + # 处理响应 + if callback: + callback(command, response) + del self.command_callbacks[cmd_id] + + return response == 'ok' + except socket.timeout: + continue + + logger.warning(f"命令超时: {command}") + return False + + except Exception as e: + logger.error(f"发送命令出错: {e}") + self.last_error = str(e) + return False + + def _state_receiver(self): + """状态接收线程函数""" + while self.running and self.state_socket: + try: + data, _ = self.state_socket.recvfrom(1024) + state_string = data.decode('utf-8').strip() + + # 解析状态数据 + self._parse_state_data(state_string) + + except socket.timeout: + # 超时是正常的，继续尝试 + continue + except Exception as e: + logger.error(f"接收状态数据时出错: {e}") + if self.running: # 只有在运行时才记录错误 + self.last_error = str(e) + + def _parse_state_data(self, state_string): + """ + 解析无人机状态数据 + + Args: + state_string: 状态数据字符串 + """ + try: + # 解析状态数据的格式取决于无人机型号 + # 这里以DJI Tello为例 + if self.drone_type == DroneType.DJI: + parts = state_string.split(';') + for part in parts: + if not part: + continue + + key_value = part.split(':') + if len(key_value) != 2: + continue + + key, value = key_value + + # 更新特定的状态字段 + if key == 'bat': + self.drone_state['battery'] = int(value) + elif key == 'h': + self.drone_state['height'] = int(value) + elif key == 'vgx': + self.drone_state['speed'] = int(value) + elif key == 'pitch': + self.drone_state['orientation']['pitch'] = int(value) + elif key == 'roll': + self.drone_state['orientation']['roll'] = int(value) + elif key == 'yaw': + self.drone_state['orientation']['yaw'] = int(value) + # 其他字段可以根据需要添加 + + # 更新最后更新时间 + self.drone_state['last_update'] = datetime.now().isoformat() + + except Exception as e: + logger.error(f"解析状态数据出错: {e}") + + def get_state(self): + """获取无人机当前状态""" + return self.drone_state + + def get_connection_status(self): + """获取连接状态""" + return self.connection_status + + def get_video_stream_url(self): + """获取视频流URL""" + return self.video_stream_url + + def takeoff(self, callback=None): + """起飞命令""" + if self.connection_status != DroneConnectionStatus.CONNECTED: + logger.error("无人机未连接") + return False + + # 检查电量是否足够 + min_battery = self.config.get('safety', {}).get('min_battery', 15) + if self.drone_state['battery'] < min_battery: + logger.error(f"电量不足，无法起飞。当前电量: {self.drone_state['battery']}%，最低要求: {min_battery}%") + return False + + takeoff_cmd = self.config['commands'].get('takeoff', 'takeoff') + return self._send_command(takeoff_cmd, callback=callback) + + def land(self, callback=None): + """降落命令""" + if self.connection_status != DroneConnectionStatus.CONNECTED: + logger.error("无人机未连接") + return False + + land_cmd = self.config['commands'].get('land', 'land') + return self._send_command(land_cmd, callback=callback) + + def move(self, direction, distance, callback=None): + """ + 移动命令 + + Args: + direction: 方向 ('up', 'down', 'left', 'right', 'forward', 'back') + distance: 距离（厘米） + callback: 响应回调函数 + + Returns: + 成功返回True，失败返回False + """ + if self.connection_status != DroneConnectionStatus.CONNECTED: + logger.error("无人机未连接") + return False + + # 检查最大距离限制 + max_distance = self.config.get('safety', {}).get('max_distance', 500) + if distance > max_distance: + logger.warning(f"移动距离超过安全限制，已调整为最大值 {max_distance}cm") + distance = max_distance + + # 获取移动命令模板 + move_cmds = self.config['commands'].get('move', {}) + cmd_template = move_cmds.get(direction) + + if not cmd_template: + logger.error(f"不支持的移动方向: {direction}") + return False + + # 填充命令参数 + command = cmd_template.format(distance=distance) + return self._send_command(command, callback=callback) + + def rotate(self, direction, angle, callback=None): + """ + 旋转命令 + + Args: + direction: 方向 ('cw': 顺时针, 'ccw': 逆时针) + angle: 角度 + callback: 响应回调函数 + + Returns: + 成功返回True，失败返回False + """ + if self.connection_status != DroneConnectionStatus.CONNECTED: + logger.error("无人机未连接") + return False + + # 获取旋转命令模板 + rotate_cmds = self.config['commands'].get('rotate', {}) + cmd_template = rotate_cmds.get(direction) + + if not cmd_template: + logger.error(f"不支持的旋转方向: {direction}") + return False + + # 确保角度在有效范围内 [1, 360] + angle = max(1, min(360, angle)) + + # 填充命令参数 + command = cmd_template.format(angle=angle) + return self._send_command(command, callback=callback) + + def set_speed(self, speed, callback=None): + """ + 设置速度命令 + + Args: + speed: 速度值（厘米/秒） + callback: 响应回调函数 + + Returns: + 成功返回True，失败返回False + """ + if self.connection_status != DroneConnectionStatus.CONNECTED: + logger.error("无人机未连接") + return False + + # 限制速度范围 [10, 100] + speed = max(10, min(100, speed)) + + # 获取速度命令模板 + set_cmds = self.config['commands'].get('set', {}) + cmd_template = set_cmds.get('speed') + + if not cmd_template: + logger.error("不支持设置速度命令") + return False + + # 填充命令参数 + command = cmd_template.format(value=speed) + return self._send_command(command, callback=callback) + + def get_snapshot(self): + """ + 获取无人机相机的快照 + + Returns: + 成功返回图像数据，失败返回None + """ + if self.connection_status != DroneConnectionStatus.CONNECTED: + logger.error("无人机未连接") + return None + + # 获取快照URL + snapshot_url = self.config.get('video', {}).get('snapshot_url') + if not snapshot_url: + logger.error("未配置快照URL") + return None + + # 填充URL参数 + snapshot_url = snapshot_url.format(ip=self.ip, port=self.video_port) + + try: + # 发送HTTP请求获取图像 + response = requests.get(snapshot_url, timeout=5) + if response.status_code == 200: + return response.content + else: + logger.error(f"获取快照失败，状态码: {response.status_code}") + return None + except Exception as e: + logger.error(f"获取快照出错: {e}") + self.last_error = str(e) + return None + + def create_mission(self, mission_name, waypoints, actions=None): + """ + 创建飞行任务 + + Args: + mission_name: 任务名称 + waypoints: 航点列表，每个航点包含位置和高度 + actions: 在航点处执行的动作 + + Returns: + mission_id: 任务ID或None（如果创建失败） + """ + if self.connection_status != DroneConnectionStatus.CONNECTED: + logger.error("无人机未连接") + return None + + try: + # 创建任务数据 + mission_data = { + 'name': mission_name, + 'created_at': datetime.now().isoformat(), + 'waypoints': waypoints, + 'actions': actions or {} + } + + # 生成任务ID + mission_id = f"mission_{int(time.time())}" + + # 保存任务数据 + missions_dir = os.path.join(self.root_dir, 'data', 'drone_missions') + os.makedirs(missions_dir, exist_ok=True) + + mission_file = os.path.join(missions_dir, f"{mission_id}.json") + with open(mission_file, 'w', encoding='utf-8') as f: + json.dump(mission_data, f, ensure_ascii=False, indent=2) + + logger.info(f"已创建飞行任务: {mission_name}, ID: {mission_id}") + return mission_id + + except Exception as e: + logger.error(f"创建飞行任务失败: {e}") + self.last_error = str(e) + return None + + def execute_mission(self, mission_id, callback=None): + """ + 执行飞行任务 + + Args: + mission_id: 任务ID + callback: 执行状态回调函数 + + Returns: + 成功返回True，失败返回False + """ + if self.connection_status != DroneConnectionStatus.CONNECTED: + logger.error("无人机未连接") + return False + + try: + # 加载任务数据 + mission_file = os.path.join(self.root_dir, 'data', 'drone_missions', f"{mission_id}.json") + if not os.path.exists(mission_file): + logger.error(f"任务文件不存在: {mission_file}") + return False + + with open(mission_file, 'r', encoding='utf-8') as f: + mission_data = json.load(f) + + # 执行任务逻辑 + # 注意：实际执行任务需要更复杂的逻辑和错误处理 + # 这里只是一个简化的示例 + + # 首先起飞 + if not self.takeoff(): + logger.error("任务执行失败: 无法起飞") + return False + + # 遍历航点 + waypoints = mission_data.get('waypoints', []) + for i, waypoint in enumerate(waypoints): + logger.info(f"执行任务: 前往航点 {i+1}/{len(waypoints)}") + + # 移动到航点 + # 注意：这里简化了导航逻辑 + # 实际应该基于GPS坐标或其他定位方式 + if 'x' in waypoint and 'y' in waypoint: + # 假设x和y表示相对距离 + self.move('forward', waypoint['x']) + self.move('right', waypoint['y']) + + # 调整高度 + if 'z' in waypoint: + current_height = self.drone_state['height'] + target_height = waypoint['z'] + + if target_height > current_height: + self.move('up', target_height - current_height) + elif target_height < current_height: + self.move('down', current_height - target_height) + + # 执行航点动作 + actions = mission_data.get('actions', {}).get(str(i), []) + for action in actions: + action_type = action.get('type') + if action_type == 'rotate': + self.rotate(action.get('direction', 'cw'), action.get('angle', 90)) + elif action_type == 'wait': + time.sleep(action.get('duration', 1)) + elif action_type == 'snapshot': + # 获取并保存快照 + snapshot_data = self.get_snapshot() + if snapshot_data: + snapshot_dir = os.path.join(self.root_dir, 'data', 'drone_snapshots') + os.makedirs(snapshot_dir, exist_ok=True) + + snapshot_file = os.path.join(snapshot_dir, f"mission_{mission_id}_wp{i}_{int(time.time())}.jpg") + with open(snapshot_file, 'wb') as f: + f.write(snapshot_data) + + # 回调报告进度 + if callback: + callback(mission_id, i+1, len(waypoints)) + + # 任务完成后降落 + return self.land() + + except Exception as e: + logger.error(f"执行飞行任务失败: {e}") + self.last_error = str(e) + # 发生错误时尝试降落 + self.land() + return False \ No newline at end of file diff --git a/distance-judgement/src/drone/drone_interface/video_receiver.py b/distance-judgement/src/drone/drone_interface/video_receiver.py new file mode 100644 index 00000000..cf4802dd --- /dev/null +++ b/distance-judgement/src/drone/drone_interface/video_receiver.py @@ -0,0 +1,639 @@ +import os +import cv2 +import time +import queue +import logging +import threading +import numpy as np +from datetime import datetime +from pathlib import Path + +# 配置日志 +logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') +logger = logging.getLogger("VideoReceiver") + +class VideoReceiver: + """ + 视频接收器类 + 负责接收无人机视频流并处理 + """ + def __init__(self, stream_url=None, buffer_size=10, save_path=None): + """ + 初始化视频接收器 + + Args: + stream_url: 视频流URL，例如 'udp://192.168.10.1:11111' + buffer_size: 帧缓冲区大小 + save_path: 视频保存路径 + """ + # 项目根目录 + self.root_dir = Path(__file__).resolve().parents[2] + + # 视频流URL + self.stream_url = stream_url + + # 视频捕获对象 + self.cap = None + + # 帧缓冲区 + self.frame_buffer = queue.Queue(maxsize=buffer_size) + self.latest_frame = None + + # 视频接收线程 + self.receiver_thread = None + self.running = False + + # 帧处理回调函数 + self.frame_callbacks = [] + + # 保存设置 + self.save_path = save_path + self.video_writer = None + self.recording = False + + # 帧统计信息 + self.stats = { + 'total_frames': 0, + 'dropped_frames': 0, + 'fps': 0, + 'resolution': (0, 0), + 'start_time': None, + 'last_frame_time': None + } + + # 错误记录 + self.last_error = None + + # 预处理设置 + self.preprocessing_enabled = False + self.preprocessing_params = { + 'resize': None, # (width, height) + 'rotate': 0, # 旋转角度 (0, 90, 180, 270) + 'flip': None, # 0: 水平翻转, 1: 垂直翻转, -1: 水平和垂直翻转 + 'crop': None, # (x, y, width, height) + 'denoise': False # 降噪 + } + + # 流超时设置，默认10秒 + self.stream_timeout = 10.0 + + def start(self, stream_url=None): + """ + 开始接收视频流 + + Args: + stream_url: 可选，覆盖初始化时设定的流地址 + + Returns: + 成功返回True，失败返回False + """ + if stream_url: + self.stream_url = stream_url + + if not self.stream_url: + logger.error("未设置视频流URL") + self.last_error = "未设置视频流URL" + return False + + if self.running: + logger.info("视频接收器已在运行") + return True + + try: + # 🔧 改进UDP端口处理和OpenCV配置 + logger.info(f"正在打开视频流: {self.stream_url}，超时: {self.stream_timeout}秒") + + # 设置OpenCV的视频流参数 - 针对UDP流优化 + os.environ["OPENCV_FFMPEG_READ_TIMEOUT"] = str(int(self.stream_timeout * 1000)) # 毫秒 + os.environ["OPENCV_FFMPEG_CAPTURE_OPTIONS"] = "protocol_whitelist;file,udp,rtp" + + # 🔧 对于UDP流，使用更宽松的缓冲区设置 + self.cap = cv2.VideoCapture(self.stream_url, cv2.CAP_FFMPEG) + + # 设置视频捕获参数 - 针对H.264 UDP流优化 + self.cap.set(cv2.CAP_PROP_BUFFERSIZE, 1) # 最小缓冲区，减少延迟 + self.cap.set(cv2.CAP_PROP_FPS, 30) # 设置期望FPS + + # 🔧 特别针对Tello的设置 + if "11111" in self.stream_url: + logger.info("检测到Tello UDP流，应用专用设置...") + # 针对Tello的UDP流设置更宽松的超时 + self.cap.set(cv2.CAP_PROP_OPEN_TIMEOUT_MSEC, int(self.stream_timeout * 1000)) + self.cap.set(cv2.CAP_PROP_READ_TIMEOUT_MSEC, 5000) # 5秒读取超时 + + # 检查打开状态并等待视频流建立 + open_start_time = time.time() + retry_count = 0 + max_retries = 5 + + while not self.cap.isOpened(): + if time.time() - open_start_time > self.stream_timeout: + logger.error(f"视频流打开超时: {self.stream_url}") + self.last_error = f"视频流打开超时: {self.stream_url}" + return False + + retry_count += 1 + if retry_count > max_retries: + logger.error(f"无法打开视频流: {self.stream_url}，已尝试 {max_retries} 次") + self.last_error = f"无法打开视频流: {self.stream_url}" + return False + + logger.info(f"等待视频流打开，重试 {retry_count}/{max_retries}") + time.sleep(1.0) # 等待1秒再次尝试 + self.cap.release() + self.cap = cv2.VideoCapture(self.stream_url, cv2.CAP_FFMPEG) + + # 获取视频属性 + width = int(self.cap.get(cv2.CAP_PROP_FRAME_WIDTH)) + height = int(self.cap.get(cv2.CAP_PROP_FRAME_HEIGHT)) + fps = int(self.cap.get(cv2.CAP_PROP_FPS)) + + # 如果宽度或高度为0，可能是视频流未准备好 + if width == 0 or height == 0: + # 尝试读取一帧来获取尺寸 + ret, test_frame = self.cap.read() + if ret and test_frame is not None: + height, width = test_frame.shape[:2] + logger.info(f"从第一帧获取分辨率: {width}x{height}") + else: + logger.warning("无法从第一帧获取分辨率，使用默认值") + width = 640 + height = 480 + + self.stats['resolution'] = (width, height) + self.stats['fps'] = fps if fps > 0 else 30 # 如果FPS为0，使用默认值30 + self.stats['start_time'] = datetime.now() + + logger.info(f"视频流已打开: {self.stream_url}，分辨率: {width}x{height}, FPS: {self.stats['fps']}") + + # 如果有保存路径，创建视频写入对象 + if self.save_path: + self._setup_video_writer() + + # 启动接收线程 + self.running = True + self.receiver_thread = threading.Thread(target=self._receive_frames) + self.receiver_thread.daemon = True + self.receiver_thread.start() + + logger.info(f"视频接收线程已启动") + return True + + except Exception as e: + logger.error(f"启动视频接收器失败: {e}") + import traceback + traceback.print_exc() + self.last_error = str(e) + return False + + def stop(self): + """ + 停止接收视频流 + + Returns: + 成功返回True，失败返回False + """ + if not self.running: + logger.info("视频接收器已经停止") + return True + + try: + # 停止接收线程 + self.running = False + if self.receiver_thread and self.receiver_thread.is_alive(): + self.receiver_thread.join(timeout=2) + + # 关闭视频写入 + if self.recording and self.video_writer: + self.stop_recording() + + # 释放视频捕获资源 + if self.cap: + self.cap.release() + self.cap = None + + # 清空帧缓冲区 + while not self.frame_buffer.empty(): + try: + self.frame_buffer.get_nowait() + except queue.Empty: + break + + logger.info("已停止视频接收器") + return True + + except Exception as e: + logger.error(f"停止视频接收器失败: {e}") + self.last_error = str(e) + return False + + def _receive_frames(self): + """视频帧接收线程函数""" + frame_count = 0 + drop_count = 0 + last_fps_time = time.time() + consecutive_failures = 0 # 连续失败计数 + last_warning_time = 0 # 上次警告时间 + + while self.running and self.cap: + try: + # 读取一帧 + ret, frame = self.cap.read() + + if not ret: + # 🔧 改进错误处理：减少垃圾日志，添加智能重试 + consecutive_failures += 1 + current_time = time.time() + + # 只在连续失败较多次或距离上次警告超过5秒时才记录警告 + if consecutive_failures >= 50 or (current_time - last_warning_time) >= 5: + if consecutive_failures < 100: + logger.debug(f"等待视频数据... (连续失败 {consecutive_failures} 次)") + else: + logger.warning(f"视频流可能中断，连续失败 {consecutive_failures} 次") + last_warning_time = current_time + + # 根据失败次数调整等待时间 + if consecutive_failures < 20: + time.sleep(0.05) # 前20次快速重试 + elif consecutive_failures < 100: + time.sleep(0.1) # 中等失败次数，稍微等待 + else: + time.sleep(0.2) # 大量失败，减少CPU占用 + + # 如果连续失败超过500次（约50秒），可能是严重问题 + if consecutive_failures >= 500: + logger.error("视频流长时间无数据，可能存在连接问题") + consecutive_failures = 0 # 重置计数器 + + continue + else: + # 🔧 成功读取到帧，重置失败计数器 + if consecutive_failures > 0: + logger.info(f"✅ 视频流恢复正常，之前连续失败 {consecutive_failures} 次") + consecutive_failures = 0 + + # 更新帧统计信息 + frame_count += 1 + self.stats['total_frames'] = frame_count + self.stats['last_frame_time'] = datetime.now() + + # 计算FPS + current_time = time.time() + if current_time - last_fps_time >= 1.0: # 每秒更新一次FPS + self.stats['fps'] = frame_count / (current_time - last_fps_time) + frame_count = 0 + last_fps_time = current_time + + # 预处理帧 + if self.preprocessing_enabled: + frame = self._preprocess_frame(frame) + + # 更新最新帧 + self.latest_frame = frame.copy() + + # 将帧放入缓冲区，如果缓冲区已满则丢弃最早的帧 + try: + if self.frame_buffer.full(): + self.frame_buffer.get_nowait() # 移除最早的帧 + drop_count += 1 + self.stats['dropped_frames'] = drop_count + + self.frame_buffer.put(frame) + except queue.Full: + drop_count += 1 + self.stats['dropped_frames'] = drop_count + + # 保存视频 + if self.recording and self.video_writer: + self.video_writer.write(frame) + + # 调用帧处理回调函数 + for callback in self.frame_callbacks: + try: + callback(frame) + except Exception as e: + logger.error(f"帧处理回调函数执行出错: {e}") + + except Exception as e: + logger.error(f"接收视频帧出错: {e}") + if self.running: # 只有在运行时才记录错误 + self.last_error = str(e) + time.sleep(0.1) # 出错后稍微等待一下 + + def _preprocess_frame(self, frame): + """ + 预处理视频帧 + + Args: + frame: 原始视频帧 + + Returns: + 处理后的视频帧 + """ + try: + # 裁剪 + if self.preprocessing_params['crop']: + x, y, w, h = self.preprocessing_params['crop'] + frame = frame[y:y+h, x:x+w] + + # 旋转 + rotate_angle = self.preprocessing_params['rotate'] + if rotate_angle: + if rotate_angle == 90: + frame = cv2.rotate(frame, cv2.ROTATE_90_CLOCKWISE) + elif rotate_angle == 180: + frame = cv2.rotate(frame, cv2.ROTATE_180) + elif rotate_angle == 270: + frame = cv2.rotate(frame, cv2.ROTATE_90_COUNTERCLOCKWISE) + + # 翻转 + flip_code = self.preprocessing_params['flip'] + if flip_code is not None: + frame = cv2.flip(frame, flip_code) + + # 调整大小 + if self.preprocessing_params['resize']: + width, height = self.preprocessing_params['resize'] + frame = cv2.resize(frame, (width, height)) + + # 降噪 + if self.preprocessing_params['denoise']: + frame = cv2.fastNlMeansDenoisingColored(frame, None, 10, 10, 7, 21) + + return frame + + except Exception as e: + logger.error(f"预处理视频帧出错: {e}") + return frame # 出错时返回原始帧 + + def _setup_video_writer(self): + """设置视频写入对象""" + try: + if not self.save_path: + logger.warning("未设置视频保存路径") + return False + + # 确保保存目录存在 + save_dir = os.path.dirname(self.save_path) + os.makedirs(save_dir, exist_ok=True) + + # 获取视频属性 + width = int(self.cap.get(cv2.CAP_PROP_FRAME_WIDTH)) + height = int(self.cap.get(cv2.CAP_PROP_FRAME_HEIGHT)) + fps = int(self.cap.get(cv2.CAP_PROP_FPS)) + + # 设置视频编码 + fourcc = cv2.VideoWriter_fourcc(*'XVID') + + # 创建视频写入对象 + self.video_writer = cv2.VideoWriter( + self.save_path, + fourcc, + fps, + (width, height) + ) + + logger.info(f"视频将保存到: {self.save_path}") + return True + + except Exception as e: + logger.error(f"设置视频写入器失败: {e}") + self.last_error = str(e) + return False + + def start_recording(self, save_path=None): + """ + 开始录制视频 + + Args: + save_path: 视频保存路径，如果未指定则使用默认路径 + + Returns: + 成功返回True，失败返回False + """ + if not self.running or not self.cap: + logger.error("视频接收器未运行") + return False + + if self.recording: + logger.info("已经在录制视频") + return True + + try: + # 设置保存路径 + if save_path: + self.save_path = save_path + + if not self.save_path: + # 如果未指定路径，创建默认路径 + timestamp = datetime.now().strftime("%Y%m%d_%H%M%S") + self.save_path = os.path.join( + self.root_dir, + 'data', + 'drone_videos', + f'drone_video_{timestamp}.avi' + ) + + # 设置视频写入器 + if self._setup_video_writer(): + self.recording = True + logger.info(f"开始录制视频: {self.save_path}") + return True + else: + return False + + except Exception as e: + logger.error(f"开始录制视频失败: {e}") + self.last_error = str(e) + return False + + def stop_recording(self): + """ + 停止录制视频 + + Returns: + 成功返回True，失败返回False + """ + if not self.recording: + logger.info("未在录制视频") + return True + + try: + if self.video_writer: + self.video_writer.release() + self.video_writer = None + + self.recording = False + logger.info(f"已停止录制视频: {self.save_path}") + + # 确保文件存在 + if os.path.exists(self.save_path): + return True + else: + logger.error(f"视频文件未正确保存: {self.save_path}") + return False + + except Exception as e: + logger.error(f"停止录制视频失败: {e}") + self.last_error = str(e) + return False + + def get_frame(self, wait=False, timeout=1.0): + """ + 获取视频帧 + + Args: + wait: 是否等待帧可用 + timeout: 等待超时时间（秒） + + Returns: + 成功返回视频帧，失败返回None + """ + if not self.running: + logger.error("视频接收器未运行") + return None + + try: + if self.frame_buffer.empty(): + if not wait: + return None + + # 等待帧可用 + try: + return self.frame_buffer.get(timeout=timeout) + except queue.Empty: + logger.warning("等待视频帧超时") + return None + else: + return self.frame_buffer.get_nowait() + + except Exception as e: + logger.error(f"获取视频帧失败: {e}") + self.last_error = str(e) + return None + + def get_latest_frame(self): + """ + 获取最新的视频帧（不从缓冲区移除） + + Returns: + 成功返回最新的视频帧，失败返回None + """ + return self.latest_frame + + def add_frame_callback(self, callback): + """ + 添加帧处理回调函数 + + Args: + callback: 回调函数，接受一个参数(frame) + + Returns: + 成功返回True + """ + if callback not in self.frame_callbacks: + self.frame_callbacks.append(callback) + return True + + def remove_frame_callback(self, callback): + """ + 移除帧处理回调函数 + + Args: + callback: 之前添加的回调函数 + + Returns: + 成功返回True + """ + if callback in self.frame_callbacks: + self.frame_callbacks.remove(callback) + return True + + def enable_preprocessing(self, enabled=True): + """ + 启用或禁用帧预处理 + + Args: + enabled: 是否启用预处理 + + Returns: + 成功返回True + """ + self.preprocessing_enabled = enabled + return True + + def set_preprocessing_params(self, params): + """ + 设置帧预处理参数 + + Args: + params: 预处理参数字典 + + Returns: + 成功返回True + """ + # 更新预处理参数 + for key, value in params.items(): + if key in self.preprocessing_params: + self.preprocessing_params[key] = value + + return True + + def get_stats(self): + """ + 获取视频接收器统计信息 + + Returns: + 统计信息字典 + """ + # 计算运行时间 + if self.stats['start_time']: + run_time = (datetime.now() - self.stats['start_time']).total_seconds() + self.stats['run_time'] = run_time + + return self.stats + + def take_snapshot(self, save_path=None): + """ + 拍摄当前帧的快照 + + Args: + save_path: 图像保存路径，如果未指定则使用默认路径 + + Returns: + 成功返回保存路径，失败返回None + """ + if not self.running: + logger.error("视频接收器未运行") + return None + + if self.latest_frame is None: + logger.error("没有可用的视频帧") + return None + + try: + # 设置保存路径 + if not save_path: + timestamp = datetime.now().strftime("%Y%m%d_%H%M%S") + save_path = os.path.join( + self.root_dir, + 'data', + 'drone_snapshots', + f'drone_snapshot_{timestamp}.jpg' + ) + + # 确保目录存在 + save_dir = os.path.dirname(save_path) + os.makedirs(save_dir, exist_ok=True) + + # 保存图像 + cv2.imwrite(save_path, self.latest_frame) + + logger.info(f"已保存快照: {save_path}") + return save_path + + except Exception as e: + logger.error(f"拍摄快照失败: {e}") + self.last_error = str(e) + return None \ No newline at end of file diff --git a/distance-judgement/src/drone/image_analyzer/__init__.py b/distance-judgement/src/drone/image_analyzer/__init__.py new file mode 100644 index 00000000..130edb2c --- /dev/null +++ b/distance-judgement/src/drone/image_analyzer/__init__.py @@ -0,0 +1,12 @@ +""" +图像分析子系统(ImageAnalyzer) +------------- +调用模型进行舰船检测、分类和部件识别 +处理图像预处理和后处理 +生成分析结果报告 +提供API接口供Web应用调用 +""" + +from .analyzer import ImageAnalyzer + +__all__ = ['ImageAnalyzer'] \ No newline at end of file diff --git a/distance-judgement/src/drone/image_analyzer/__pycache__/__init__.cpython-311.pyc b/distance-judgement/src/drone/image_analyzer/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..68fa354d57834fa55815f852a82c45025e073811 GIT binary patch literal 501 zcmZ3^%ge<81YUFhr^_%hFgylvV1NnA_$&itOlL@8h+;@#Okv7l%w>vVVq{2RPG^i_ zPGJdV&}1z=0aU{EboRcd&HYb1+Mdmu@O15j=bLvw-#uT$GdD3k)iEzIr?M)wNRvw! z8F0PW(ENPLif1bpKAqS7V*l(H3wvI4YHo~IM~AZ)JZQ|3SGm;iCh^WBr5&71SAYw6R8 zU0l!lCp_6V+cCiNS>Mv9{fmL@@YJNIyQTo00dWl1OJG1SXfod7MR9o%Gf>n|ljRnB ze0)lNa(w(Pjzp-Zz)~Rb#GIV?_>~Nwfhrk(`M6lcc)GYc#spL*XCxNo#w6#bq{gIV z7MCREC8z3Um8PVp=BDPA#1t1L$D|bH=cUGEf`Td@W^7D+d}dx|NqoFsLFF$Fo80`A z(wtPgB2a{ZTv)6RBt9@RGBSQ(VrOLezyKnI7#LM9FeoFV2i#H@xTG7{L9mDes0RR{ Cf6I9Q literal 0 HcmV?d00001 diff --git a/distance-judgement/src/drone/image_analyzer/__pycache__/__init__.cpython-313.pyc b/distance-judgement/src/drone/image_analyzer/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..701a0cde8f4112c413dae85683219a7c70cf4c98 GIT binary patch literal 486 zcmey&%ge<81YUFhr^_%hFgylvV1NnA_$&ovOl1gWC}Id^3}*6X^kOPvQeX&X)@LkY zPG`|%EjcR$}fU&AvuF+J5WFEOXGDz!+HOBWe% zz1YzFe9DSvD;7ST*ZpGu>=z4rUUY1D(XsQ{;)Z8iyB{|+0!@3qare_nJujPAJlVbN z#rn3V9jm#XE@^o_p$%f+%SA0v?xdcl6Z#-*uIE$cKkJwPam(}Flb_9-^Q>#>(}`VN z&-y1k**DuU!1Gz((x?54f$Z?qq^G;40G$DG4A)CwFfeE`-r_}Zc@Z;E)K8P;7JGbr zN`7*D{4I_|sHebEAo0YUocQ>a44;828E%E^XXNLm>St7C>j&qjm6RtIrN%oJC1+%o zq$Zb?7NzQ^WEPhs<|U`SmFO22CF`dY<>#g9XM#d49%h4ne0*kJW=VX! zUP0w84x8Nkl+v73yCP7`fgD>b4kSJ>Gcq!MWMXGz`6|S~sPceY>H?Q^BYP1CP!0eG CF32PR literal 0 HcmV?d00001 diff --git a/distance-judgement/src/drone/image_analyzer/__pycache__/analyzer.cpython-311.pyc b/distance-judgement/src/drone/image_analyzer/__pycache__/analyzer.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..db558fbab8f55ff0df76be1f61cf81431a3c683d GIT binary patch literal 24404 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 literal 0 HcmV?d00001 diff --git a/distance-judgement/src/drone/image_analyzer/__pycache__/analyzer.cpython-313.pyc b/distance-judgement/src/drone/image_analyzer/__pycache__/analyzer.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..1c6c79cefc7d87c334091e63044bc057c938b15e GIT binary patch literal 22366 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 2 else 1 + } + } + + # 保存结果 + if save_result: + if output_dir is None: + # 使用默认输出目录 + filename = os.path.basename(image_path) + output_dir = os.path.join(self.results_dir, os.path.splitext(filename)[0]) + + os.makedirs(output_dir, exist_ok=True) + + # 保存结果图像 + result_image_path = os.path.join(output_dir, f"analysis_{os.path.basename(image_path)}") + cv2.imwrite(result_image_path, result_image) + + # 保存结果JSON + result_json_path = os.path.join(output_dir, f"{os.path.splitext(os.path.basename(image_path))[0]}_result.json") + with open(result_json_path, 'w', encoding='utf-8') as f: + json.dump(result_data, f, ensure_ascii=False, indent=2) + + # 保存到数据库 + if self.data_manager: + self.data_manager.save_analysis_result( + image_path=image_path, + result_data=result_data, + result_image_path=result_image_path, + user_id=user_id + ) + + return result_data, result_image + + except Exception as e: + logger.error(f"分析图像时出错: {e}") + import traceback + traceback.print_exc() + + # 更新性能统计 + self.perf_stats['total_analyzed'] += 1 + self.perf_stats['failed_count'] += 1 + + return {'error': str(e)}, None + + def generate_report(self, analysis_result, include_images=True): + """ + 生成分析报告 + + Args: + analysis_result: 分析结果字典 + include_images: 是否包含图像 + + Returns: + report: 报告HTML字符串 + """ + if not analysis_result: + return "

    无效的分析结果

    " + + try: + ships = analysis_result.get('ships', []) + timestamp = analysis_result.get('timestamp', datetime.now().isoformat()) + image_path = analysis_result.get('image_path', '未知') + processing_time = analysis_result.get('processing_time', 0) + + # 创建HTML报告 + html = f""" + + + + + + 舰船分析报告 + + + +
    +
    +

    舰船分析报告

    +

    分析时间： {timestamp}

    +

    图像路径： {image_path}

    +

    处理时间： {processing_time:.2f} 秒

    +

    检测到的舰船数量： {len(ships)}

    +
    + """ + + # 添加图像 + if include_images and 'result_image_path' in analysis_result: + html += f""" +
    +

    分析结果图像

    + 分析结果 +
    + """ + + # 舰船表格 + html += """ +

    检测到的舰船

    + + + + + + + + + + + + """ + + for i, ship in enumerate(ships): + parts = ship.get('parts', []) + html += f""" + + + + + + + + """ + + html += """ + +
    序号舰船类型置信度尺寸 (宽x高)部件数量
    {i+1}{ship.get('class_name', '未知')}{ship.get('confidence', 0):.2f}{ship.get('width', 0)} x {ship.get('height', 0)}{len(parts)}
    + """ + + # 详细舰船信息 + for i, ship in enumerate(ships): + parts = ship.get('parts', []) + html += f""" +
    +
    +

    舰船 #{i+1}: {ship.get('class_name', '未知')}

    +

    置信度: {ship.get('confidence', 0):.2f}

    +
    +
    +

    位置信息

    +

    边界框: [{ship['bbox'][0]:.1f}, {ship['bbox'][1]:.1f}, {ship['bbox'][2]:.1f}, {ship['bbox'][3]:.1f}]

    +

    尺寸: 宽度={ship.get('width', 0)}px, 高度={ship.get('height', 0)}px

    +

    面积: {ship.get('area', 0)}px²

    + +

    检测到的部件 ({len(parts)})

    + """ + + if parts: + for j, part in enumerate(parts): + html += f""" +
    +

    {j+1}. {part.get('name', '未知部件')}

    +

    置信度: {part.get('confidence', 0):.2f}

    +

    位置: [{part.get('bbox', [0,0,0,0])[0]:.1f}, {part.get('bbox', [0,0,0,0])[1]:.1f}, + {part.get('bbox', [0,0,0,0])[2]:.1f}, {part.get('bbox', [0,0,0,0])[3]:.1f}]

    +
    + """ + else: + html += "

    未检测到部件

    " + + html += """ +
    +
    + """ + + # 结束HTML + html += """ +
    + + + """ + + return html + + except Exception as e: + logger.error(f"生成报告失败: {e}") + return f"

    报告生成失败

    错误: {str(e)}

    " + + def get_statistics(self): + """获取分析统计信息""" + return self.perf_stats + + def update_preprocessing_params(self, params): + """ + 更新图像预处理参数 + + Args: + params: 参数字典 + + Returns: + 成功返回True，失败返回False + """ + try: + for key, value in params.items(): + if key in self.preprocess_params: + self.preprocess_params[key] = value + return True + except Exception as e: + logger.error(f"更新预处理参数失败: {e}") + return False \ No newline at end of file diff --git a/distance-judgement/src/drone/utils/advanced_detector.py b/distance-judgement/src/drone/utils/advanced_detector.py new file mode 100644 index 00000000..3097a75c --- /dev/null +++ b/distance-judgement/src/drone/utils/advanced_detector.py @@ -0,0 +1,593 @@ +import os +import sys +import torch +import numpy as np +import cv2 +from pathlib import Path +import requests +from PIL import Image, ImageDraw, ImageFont +import io + +# 尝试导入transformers模块，如果不可用则使用传统方法 +try: + from transformers import AutoProcessor, AutoModelForObjectDetection, ViTImageProcessor + from transformers import AutoModelForImageClassification + TRANSFORMERS_AVAILABLE = True +except ImportError: + print("警告: transformers模块未安装，将使用传统计算机视觉方法进行舰船识别") + TRANSFORMERS_AVAILABLE = False + +class AdvancedShipDetector: + """ + 高级舰船检测与分类系统，使用预训练视觉模型提高识别准确度 + 如果预训练模型不可用，则回退到传统计算机视觉方法 + """ + def __init__(self, device=None): + """ + 初始化高级舰船检测器 + + Args: + device: 运行设备，可以是'cuda'或'cpu'，None则自动选择 + """ + # 确定运行设备 + if device is None: + self.device = 'cuda' if torch.cuda.is_available() else 'cpu' + else: + self.device = device + + print(f"高级检测器使用设备: {self.device}") + + # 舰船类型定义 + self.ship_classes = { + 0: "航空母舰", + 1: "驱逐舰", + 2: "护卫舰", + 3: "潜艇", + 4: "巡洋舰", + 5: "两栖攻击舰", + 6: "补给舰", + 7: "油轮", + 8: "集装箱船", + 9: "散货船", + 10: "渔船", + 11: "游艇", + 12: "战列舰", + 13: "登陆舰", + 14: "导弹艇", + 15: "核潜艇", + 16: "轻型航母", + 17: "医疗船", + 18: "海洋考察船", + 19: "其他舰船" + } + + # 加载通用图像理解模型 - 只在transformers可用时尝试 + self.model_loaded = False + if TRANSFORMERS_AVAILABLE: + try: + print("正在加载高级图像分析模型...") + # 使用轻量级分类模型 + self.processor = ViTImageProcessor.from_pretrained("google/vit-base-patch16-224") + self.model = AutoModelForImageClassification.from_pretrained( + "google/vit-base-patch16-224", + num_labels=20 # 适配我们的类别数量 + ) + self.model = self.model.to(self.device) + + print("高级图像分析模型加载完成") + self.model_loaded = True + except Exception as e: + print(f"高级模型加载失败: {str(e)}") + print("将使用传统计算机视觉方法进行舰船识别") + self.model_loaded = False + else: + print("未检测到transformers库，将使用传统计算机视觉方法进行舰船识别") + + def identify_ship_type(self, image): + """ + 使用高级图像分析识别舰船类型 + + Args: + image: 图像路径或图像对象 + + Returns: + ship_type: 舰船类型 + confidence: 置信度 + """ + # 将输入转换为PIL图像 + if isinstance(image, str): + # 检查文件是否存在 + if not os.path.exists(image): + print(f"图像文件不存在: {image}") + return "未知舰船", 0.0 + img = Image.open(image).convert('RGB') + elif isinstance(image, np.ndarray): + img = Image.fromarray(cv2.cvtColor(image, cv2.COLOR_BGR2RGB)) + elif isinstance(image, Image.Image): + img = image + else: + print(f"不支持的图像类型: {type(image)}") + return "未知舰船", 0.0 + + # 尝试使用高级模型识别 - 只在model_loaded为True时 + if self.model_loaded and TRANSFORMERS_AVAILABLE: + try: + # 预处理图像 + inputs = self.processor(images=img, return_tensors="pt").to(self.device) + + # 进行预测 + with torch.no_grad(): + outputs = self.model(**inputs) + + # 获取预测结果 + logits = outputs.logits + probs = torch.nn.functional.softmax(logits, dim=-1) + pred_class = torch.argmax(probs, dim=-1).item() + confidence = probs[0, pred_class].item() + + # 转换为舰船类型 + if pred_class in self.ship_classes: + ship_type = self.ship_classes[pred_class] + else: + ship_type = "未知舰船类型" + + return ship_type, confidence + except Exception as e: + print(f"高级识别失败: {str(e)}") + # 如果高级识别失败，使用备选方法 + + # 备选: 使用传统计算机视觉方法识别舰船特征 + ship_type, confidence = self._analyze_ship_features(img) + return ship_type, confidence + + def _analyze_ship_features(self, img): + """ + 使用传统计算机视觉方法分析舰船特征 + + Args: + img: PIL图像 + + Returns: + ship_type: 舰船类型 + confidence: 置信度 + """ + # 转换为OpenCV格式进行分析 + cv_img = cv2.cvtColor(np.array(img), cv2.COLOR_RGB2BGR) + + # 获取图像特征 + height, width = cv_img.shape[:2] + aspect_ratio = width / height if height > 0 else 0 + + # 检测舰船特征 + is_carrier = self._check_carrier_features(cv_img) + is_destroyer = self._check_destroyer_features(cv_img) + is_frigate = self._check_frigate_features(cv_img) + is_submarine = self._check_submarine_features(cv_img) + + # 根据特征判断类型 + if is_carrier: + return "航空母舰", 0.85 + elif is_destroyer: + return "驱逐舰", 0.80 + elif is_frigate: + return "护卫舰", 0.75 + elif is_submarine: + return "潜艇", 0.70 + elif aspect_ratio > 5.0: + return "航空母舰", 0.65 + elif 3.0 < aspect_ratio < 5.0: + return "驱逐舰", 0.60 + elif 2.0 < aspect_ratio < 3.0: + return "护卫舰", 0.55 + else: + return "其他舰船", 0.50 + + def _check_carrier_features(self, img): + """检查航空母舰特征""" + if img is None or img.size == 0: + return False + + height, width = img.shape[:2] + aspect_ratio = width / height if height > 0 else 0 + + # 航母特征: 大甲板，长宽比大 + if aspect_ratio < 2.5: + return False + + # 检查平坦甲板 + gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY) if len(img.shape) == 3 else img + edges = cv2.Canny(gray, 50, 150) + + # 水平线特征 + horizontal_kernel = cv2.getStructuringElement(cv2.MORPH_RECT, (25, 1)) + horizontal_lines = cv2.morphologyEx(edges, cv2.MORPH_OPEN, horizontal_kernel) + horizontal_pixels = cv2.countNonZero(horizontal_lines) + horizontal_ratio = horizontal_pixels / (width * height) if width * height > 0 else 0 + + # 航母甲板应该有明显的水平线 + if horizontal_ratio < 0.03: + return False + + return True + + def _check_destroyer_features(self, img): + """检查驱逐舰特征""" + if img is None or img.size == 0: + return False + + height, width = img.shape[:2] + aspect_ratio = width / height if height > 0 else 0 + + # 驱逐舰特征: 细长，有明显上层建筑 + if aspect_ratio < 2.0 or aspect_ratio > 5.0: + return False + + # 边缘特征分析 + gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY) if len(img.shape) == 3 else img + edges = cv2.Canny(gray, 50, 150) + edge_pixels = cv2.countNonZero(edges) + edge_density = edge_pixels / (width * height) if width * height > 0 else 0 + + # 垂直线特征 - 舰桥和上层建筑 + vertical_kernel = cv2.getStructuringElement(cv2.MORPH_RECT, (1, 15)) + vertical_lines = cv2.morphologyEx(edges, cv2.MORPH_OPEN, vertical_kernel) + vertical_pixels = cv2.countNonZero(vertical_lines) + vertical_ratio = vertical_pixels / (width * height) if width * height > 0 else 0 + + # 驱逐舰应该有一定的上层建筑 + if vertical_ratio < 0.01 or edge_density < 0.1: + return False + + return True + + def _check_frigate_features(self, img): + """检查护卫舰特征""" + if img is None or img.size == 0: + return False + + height, width = img.shape[:2] + aspect_ratio = width / height if height > 0 else 0 + + # 护卫舰特征: 与驱逐舰类似但更小 + if aspect_ratio < 1.8 or aspect_ratio > 3.5: + return False + + # 边缘特征 + gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY) if len(img.shape) == 3 else img + edges = cv2.Canny(gray, 50, 150) + edge_pixels = cv2.countNonZero(edges) + edge_density = edge_pixels / (width * height) if width * height > 0 else 0 + + if edge_density < 0.05 or edge_density > 0.3: + return False + + return True + + def _check_submarine_features(self, img): + """检查潜艇特征""" + if img is None or img.size == 0: + return False + + height, width = img.shape[:2] + aspect_ratio = width / height if height > 0 else 0 + + # 潜艇特征: 非常细长，低矮 + if aspect_ratio < 3.0: + return False + + # 边缘密度应低 + gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY) if len(img.shape) == 3 else img + edges = cv2.Canny(gray, 50, 150) + edge_pixels = cv2.countNonZero(edges) + edge_density = edge_pixels / (width * height) if width * height > 0 else 0 + + # 潜艇表面较为光滑 + if edge_density > 0.15: + return False + + return True + + def detect_ship_parts(self, image, ship_type=None): + """ + 检测舰船上的各个部件 + + Args: + image: 图像路径或图像对象 + ship_type: 舰船类型，用于特定类型的部件识别 + + Returns: + parts: 检测到的部件列表 + """ + # 将输入转换为OpenCV图像 + if isinstance(image, str): + if not os.path.exists(image): + print(f"图像文件不存在: {image}") + return [] + cv_img = cv2.imread(image) + elif isinstance(image, np.ndarray): + cv_img = image + elif isinstance(image, Image.Image): + cv_img = cv2.cvtColor(np.array(image), cv2.COLOR_RGB2BGR) + else: + print(f"不支持的图像类型: {type(image)}") + return [] + + # 如果未提供舰船类型，先识别类型 + if ship_type is None: + ship_type, _ = self.identify_ship_type(cv_img) + + # 根据舰船类型识别不同部件 + parts = [] + + if "航空母舰" in ship_type: + parts = self._detect_carrier_parts(cv_img) + elif "驱逐舰" in ship_type: + parts = self._detect_destroyer_parts(cv_img) + elif "护卫舰" in ship_type: + parts = self._detect_frigate_parts(cv_img) + elif "潜艇" in ship_type: + parts = self._detect_submarine_parts(cv_img) + else: + # 通用舰船部件检测 + parts = self._detect_generic_parts(cv_img) + + return parts + + def _detect_carrier_parts(self, img): + """识别航母特定部件""" + parts = [] + h, w = img.shape[:2] + + # 识别飞行甲板 + deck_y1 = int(h * 0.3) + deck_y2 = int(h * 0.7) + parts.append({ + 'name': '飞行甲板', + 'bbox': (0, deck_y1, w, deck_y2), + 'confidence': 0.9 + }) + + # 识别舰岛 + # 边缘检测找到可能的舰岛位置 + gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY) if len(img.shape) == 3 else img + blurred = cv2.GaussianBlur(gray, (5, 5), 0) + edges = cv2.Canny(blurred, 50, 150) + + # 寻找垂直结构 + vertical_kernel = cv2.getStructuringElement(cv2.MORPH_RECT, (1, 20)) + vertical_lines = cv2.morphologyEx(edges, cv2.MORPH_OPEN, vertical_kernel) + + # 查找轮廓 + contours, _ = cv2.findContours(vertical_lines, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE) + + # 查找最大的垂直结构，可能是舰岛 + if contours: + largest_contour = max(contours, key=cv2.contourArea) + x, y, box_w, box_h = cv2.boundingRect(largest_contour) + # 位于甲板上部的垂直结构，可能是舰岛 + if box_h > h * 0.1 and y < h * 0.5: + parts.append({ + 'name': '舰岛', + 'bbox': (x, y, x + box_w, y + box_h), + 'confidence': 0.85 + }) + + # 添加其他通用部件 + generic_parts = self._detect_generic_parts(img) + parts.extend(generic_parts) + + return parts + + def _detect_destroyer_parts(self, img): + """识别驱逐舰特定部件""" + parts = [] + h, w = img.shape[:2] + + # 识别舰桥 + # 驱逐舰通常舰桥位于前部1/3位置 + bridge_x1 = int(w * 0.2) + bridge_x2 = int(w * 0.4) + bridge_y1 = int(h * 0.1) + bridge_y2 = int(h * 0.5) + parts.append({ + 'name': '舰桥', + 'bbox': (bridge_x1, bridge_y1, bridge_x2, bridge_y2), + 'confidence': 0.85 + }) + + # 识别主炮 + # 主炮通常位于前部 + gun_x1 = int(w * 0.05) + gun_x2 = int(w * 0.15) + gun_y1 = int(h * 0.3) + gun_y2 = int(h * 0.5) + parts.append({ + 'name': '舰炮', + 'bbox': (gun_x1, gun_y1, gun_x2, gun_y2), + 'confidence': 0.8 + }) + + # 识别导弹发射装置 + # 驱逐舰通常在中部有垂直发射系统 + vls_x1 = int(w * 0.4) + vls_x2 = int(w * 0.6) + vls_y1 = int(h * 0.3) + vls_y2 = int(h * 0.5) + parts.append({ + 'name': '导弹发射装置', + 'bbox': (vls_x1, vls_y1, vls_x2, vls_y2), + 'confidence': 0.75 + }) + + # 添加其他通用部件 + generic_parts = self._detect_generic_parts(img) + parts.extend(generic_parts) + + return parts + + def _detect_frigate_parts(self, img): + """识别护卫舰特定部件""" + parts = [] + h, w = img.shape[:2] + + # 识别舰桥 + bridge_x1 = int(w * 0.25) + bridge_x2 = int(w * 0.45) + bridge_y1 = int(h * 0.15) + bridge_y2 = int(h * 0.5) + parts.append({ + 'name': '舰桥', + 'bbox': (bridge_x1, bridge_y1, bridge_x2, bridge_y2), + 'confidence': 0.8 + }) + + # 识别主炮 + gun_x1 = int(w * 0.1) + gun_x2 = int(w * 0.2) + gun_y1 = int(h * 0.3) + gun_y2 = int(h * 0.5) + parts.append({ + 'name': '舰炮', + 'bbox': (gun_x1, gun_y1, gun_x2, gun_y2), + 'confidence': 0.75 + }) + + # 识别直升机甲板 + heli_x1 = int(w * 0.7) + heli_x2 = int(w * 0.9) + heli_y1 = int(h * 0.35) + heli_y2 = int(h * 0.55) + parts.append({ + 'name': '直升机甲板', + 'bbox': (heli_x1, heli_y1, heli_x2, heli_y2), + 'confidence': 0.7 + }) + + # 添加其他通用部件 + generic_parts = self._detect_generic_parts(img) + parts.extend(generic_parts) + + return parts + + def _detect_submarine_parts(self, img): + """识别潜艇特定部件""" + parts = [] + h, w = img.shape[:2] + + # 识别指挥塔 + tower_x1 = int(w * 0.4) + tower_x2 = int(w * 0.6) + tower_y1 = int(h * 0.2) + tower_y2 = int(h * 0.5) + parts.append({ + 'name': '指挥塔', + 'bbox': (tower_x1, tower_y1, tower_x2, tower_y2), + 'confidence': 0.8 + }) + + # 添加其他通用部件 + generic_parts = self._detect_generic_parts(img) + parts.extend(generic_parts) + + return parts + + def _detect_generic_parts(self, img): + """识别通用舰船部件""" + parts = [] + h, w = img.shape[:2] + + # 使用边缘检测和轮廓分析来寻找可能的部件 + gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY) if len(img.shape) == 3 else img + blurred = cv2.GaussianBlur(gray, (5, 5), 0) + edges = cv2.Canny(blurred, 50, 150) + + # 寻找轮廓 + contours, _ = cv2.findContours(edges, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE) + + # 按面积排序轮廓 + contours = sorted(contours, key=cv2.contourArea, reverse=True) + + # 仅处理最大的几个轮廓 + max_contours = 5 + contours = contours[:max_contours] if len(contours) > max_contours else contours + + # 分析每个轮廓 + for i, contour in enumerate(contours): + # 只考虑足够大的轮廓 + area = cv2.contourArea(contour) + if area < (h * w * 0.01): # 忽略太小的轮廓 + continue + + # 获取边界框 + x, y, box_w, box_h = cv2.boundingRect(contour) + + # 跳过太大的轮廓(可能是整个舰船) + if box_w > w * 0.8 and box_h > h * 0.8: + continue + + # 根据位置和尺寸猜测部件类型 + part_name = self._guess_part_type(x, y, box_w, box_h, h, w) + + # 添加到部件列表 + parts.append({ + 'name': part_name, + 'bbox': (x, y, x + box_w, y + box_h), + 'confidence': 0.6 # 通用部件置信度较低 + }) + + return parts + + def _guess_part_type(self, x, y, w, h, img_h, img_w): + """根据位置和尺寸猜测部件类型""" + # 计算相对位置 + rel_x = x / img_w + rel_y = y / img_h + rel_w = w / img_w + rel_h = h / img_h + aspect_ratio = w / h if h > 0 else 0 + + # 前部的可能是舰炮 + if rel_x < 0.2 and rel_y > 0.3 and rel_y < 0.7: + return "舰炮" + + # 中上部的可能是舰桥 + if 0.3 < rel_x < 0.7 and rel_y < 0.3 and aspect_ratio < 2.0: + return "舰桥" + + # 顶部细长的可能是雷达 + if rel_y < 0.3 and aspect_ratio > 2.0: + return "雷达" + + # 后部的可能是直升机甲板 + if rel_x > 0.7 and rel_y > 0.3: + return "直升机甲板" + + # 中部的可能是导弹发射装置 + if 0.3 < rel_x < 0.7 and 0.3 < rel_y < 0.7: + return "导弹发射装置" + + # 顶部圆形的可能是雷达罩 + if rel_y < 0.3 and 0.8 < aspect_ratio < 1.2: + return "雷达罩" + + # 默认部件 + return "未知部件" + +# 示例用法 +def test_detector(): + detector = AdvancedShipDetector() + test_img = "test_ship.jpg" + + if os.path.exists(test_img): + ship_type, confidence = detector.identify_ship_type(test_img) + print(f"识别结果: {ship_type}, 置信度: {confidence:.2f}") + + parts = detector.detect_ship_parts(test_img, ship_type) + print(f"检测到 {len(parts)} 个部件:") + for i, part in enumerate(parts): + print(f" {i+1}. {part['name']} (置信度: {part['confidence']:.2f})") + else: + print(f"测试图像不存在: {test_img}") + +if __name__ == "__main__": + test_detector() \ No newline at end of file diff --git a/distance-judgement/src/drone/utils/analyze_image.py b/distance-judgement/src/drone/utils/analyze_image.py new file mode 100644 index 00000000..687f7cd7 --- /dev/null +++ b/distance-judgement/src/drone/utils/analyze_image.py @@ -0,0 +1,283 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import os +import sys +import cv2 +import argparse +from pathlib import Path +import numpy as np +from PIL import Image, ImageDraw, ImageFont + +# 添加项目根目录到Python路径 +script_dir = os.path.dirname(os.path.abspath(__file__)) +sys.path.append(script_dir) + +# 检查是否可以导入高级检测器 +try: + # 导入分析器和高级检测器 + from scripts.ship_analyzer import ShipAnalyzer + from utils.advanced_detector import AdvancedShipDetector + ADVANCED_DETECTOR_AVAILABLE = True +except ImportError as e: + print(f"警告：无法导入高级检测器: {e}") + print("将仅使用传统分析器") + from scripts.ship_analyzer import ShipAnalyzer + ADVANCED_DETECTOR_AVAILABLE = False + +def analyze_image(image_path, output_dir=None, conf_threshold=0.25, part_conf_threshold=0.3, use_advanced=True): + """ + 分析图像中的舰船和部件 + + Args: + image_path: 图像路径 + output_dir: 输出目录 + conf_threshold: 检测置信度阈值 + part_conf_threshold: 部件置信度阈值 + use_advanced: 是否使用高级检测器 + """ + print(f"开始分析图像: {image_path}") + + # 检查图像是否存在 + if not os.path.exists(image_path): + print(f"错误: 图像文件不存在: {image_path}") + return None + + # 创建输出目录 + if output_dir is not None: + os.makedirs(output_dir, exist_ok=True) + + # 根据参数选择使用高级检测器或传统分析器 + if use_advanced and ADVANCED_DETECTOR_AVAILABLE: + try: + print("使用高级图像分析器...") + result_img, results = analyze_with_advanced_detector(image_path, output_dir, conf_threshold, part_conf_threshold) + except Exception as e: + print(f"高级分析器出错: {str(e)}") + print("回退到传统分析器...") + # 如果高级分析失败，回退到传统分析器 + analyzer = ShipAnalyzer() + results, result_img = analyzer.analyze_image( + image_path, + conf_threshold=conf_threshold, + part_conf_threshold=part_conf_threshold, + save_result=True, + output_dir=output_dir + ) + else: + # 使用传统分析器 + print("使用传统图像分析器...") + analyzer = ShipAnalyzer() + results, result_img = analyzer.analyze_image( + image_path, + conf_threshold=conf_threshold, + part_conf_threshold=part_conf_threshold, + save_result=True, + output_dir=output_dir + ) + + # 输出分析结果 + if 'ships' in results: + ships = results['ships'] + print(f"\n分析完成，检测到 {len(ships)} 个舰船:") + + for i, ship in enumerate(ships): + print(f"\n舰船 #{i+1}:") + print(f" 类型: {ship['class_name']}") + print(f" 置信度: {ship['class_confidence']:.2f}") + parts = ship.get('parts', []) + print(f" 检测到 {len(parts)} 个部件:") + + # 显示部件信息 + for j, part in enumerate(parts): + print(f" 部件 #{j+1}: {part['name']} (置信度: {part['confidence']:.2f})") + else: + # 兼容旧格式 + print(f"\n分析完成，检测到 {len(results)} 个舰船:") + for i, ship in enumerate(results): + print(f"\n舰船 #{i+1}:") + print(f" 类型: {ship['class_name']}") + confidence = ship.get('class_confidence', ship.get('confidence', 0.0)) + print(f" 置信度: {confidence:.2f}") + parts = ship.get('parts', []) + print(f" 检测到 {len(parts)} 个部件:") + + # 显示部件信息 + for j, part in enumerate(parts): + part_conf = part.get('confidence', 0.0) + print(f" 部件 #{j+1}: {part['name']} (置信度: {part_conf:.2f})") + + # 保存结果图像 + if output_dir is not None: + result_path = os.path.join(output_dir, f"analysis_{os.path.basename(image_path)}") + cv2.imwrite(result_path, result_img) + print(f"\n结果图像已保存至: {result_path}") + + return result_img + +def analyze_with_advanced_detector(image_path, output_dir=None, conf_threshold=0.25, part_conf_threshold=0.3): + """ + 使用高级检测器分析图像 + + Args: + image_path: 图像路径 + output_dir: 输出目录 + conf_threshold: 检测置信度阈值 + part_conf_threshold: 部件置信度阈值 + + Returns: + result_img: 标注了检测结果的图像 + results: 检测结果字典 + """ + try: + print("正在加载高级图像分析模型...") + # 初始化高级检测器 + detector = AdvancedShipDetector() + except Exception as e: + print(f"高级模型加载失败: {e}") + print("将使用传统计算机视觉方法进行舰船识别") + # 创建一个基本的检测器实例，但不加载模型 + detector = AdvancedShipDetector(load_models=False) + + # 读取图像 + img = cv2.imread(image_path) + if img is None: + raise ValueError(f"无法读取图像: {image_path}") + + result_img = img.copy() + h, w = img.shape[:2] + + # 使用高级检测器进行对象检测 + ships = [] + try: + if hasattr(detector, 'detect_ships') and callable(detector.detect_ships): + detected_ships = detector.detect_ships(img, conf_threshold) + if detected_ships and len(detected_ships) > 0: + ships = detected_ships + # 使用检测器返回的图像 + if len(detected_ships) > 1 and isinstance(detected_ships[1], np.ndarray): + result_img = detected_ships[1] + ships = detected_ships[0] + else: + print("高级检测器缺少detect_ships方法，使用基本识别") + except Exception as e: + print(f"高级舰船检测失败: {e}") + + # 如果没有检测到舰船，使用传统方法尝试识别单个舰船 + if not ships: + # 识别舰船类型 + ship_type, confidence = detector.identify_ship_type(img) + print(f"高级检测器识别结果: {ship_type}, 置信度: {confidence:.2f}") + + # 单个舰船的边界框 - 使用整个图像 + padding = int(min(w, h) * 0.05) # 5%的边距 + ship_box = (padding, padding, w-padding, h-padding) + + # 创建单个舰船对象 + ship = { + 'id': 1, + 'bbox': ship_box, + 'class_name': ship_type, + 'class_confidence': confidence + } + ships = [ship] + + # 在图像上标注舰船信息 + cv2.rectangle(result_img, (ship_box[0], ship_box[1]), (ship_box[2], ship_box[3]), (0, 0, 255), 2) + cv2.putText(result_img, f"{ship_type}: {confidence:.2f}", + (ship_box[0]+10, ship_box[1]+30), cv2.FONT_HERSHEY_SIMPLEX, 1.0, (0, 0, 255), 2) + + # 为每艘舰船检测部件 + processed_ships = [] + for i, ship in enumerate(ships): + ship_id = i + 1 + ship_box = ship.get('bbox', (0, 0, w, h)) + ship_type = ship.get('class_name', '其他舰船') + ship_confidence = ship.get('class_confidence', ship.get('confidence', 0.7)) + + # 格式化为标准结构 + ship_with_parts = { + 'id': ship_id, + 'bbox': ship_box, + 'class_name': ship_type, + 'class_confidence': ship_confidence, + 'parts': [] + } + + # 检测舰船部件 + try: + parts = detector.detect_ship_parts(img, ship_box, ship_type, part_conf_threshold) + print(f"舰船 #{ship_id} 检测到 {len(parts)} 个部件") + + # 为每个部件添加所属舰船ID + for part in parts: + part['ship_id'] = ship_id + ship_with_parts['parts'].append(part) + + # 标注部件 + part_box = part.get('bbox', (0, 0, 0, 0)) + name = part.get('name', '未知部件') + conf = part.get('confidence', 0.0) + + # 绘制部件边界框 + cv2.rectangle(result_img, + (int(part_box[0]), int(part_box[1])), + (int(part_box[2]), int(part_box[3])), + (0, 255, 0), 2) + + # 添加部件标签 + label = f"{name}: {conf:.2f}" + cv2.putText(result_img, label, + (int(part_box[0]), int(part_box[1])-5), + cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 255, 0), 2) + except Exception as e: + print(f"部件检测失败: {e}") + + processed_ships.append(ship_with_parts) + + # 构建结果数据结构 + results = { + 'ships': processed_ships + } + + # 保存结果图像 + if output_dir is not None: + os.makedirs(output_dir, exist_ok=True) + result_path = os.path.join(output_dir, f"analysis_{os.path.basename(image_path)}") + cv2.imwrite(result_path, result_img) + print(f"结果图像已保存至: {result_path}") + + return result_img, results + +def main(): + parser = argparse.ArgumentParser(description="舰船图像分析工具") + parser.add_argument("image_path", help="需要分析的舰船图像路径") + parser.add_argument("--output", "-o", help="分析结果输出目录", default="results") + parser.add_argument("--conf", "-c", type=float, default=0.25, help="检测置信度阈值") + parser.add_argument("--part-conf", "-pc", type=float, default=0.3, help="部件检测置信度阈值") + parser.add_argument("--show", action="store_true", help="显示分析结果图像") + parser.add_argument("--traditional", action="store_true", help="使用传统分析器而非高级分析器") + + args = parser.parse_args() + + try: + # 分析图像 + result_img = analyze_image( + args.image_path, + output_dir=args.output, + conf_threshold=args.conf, + part_conf_threshold=args.part_conf, + use_advanced=not args.traditional + ) + + # 显示结果图像 + if args.show and result_img is not None: + cv2.imshow("分析结果", result_img) + cv2.waitKey(0) + cv2.destroyAllWindows() + + except Exception as e: + print(f"分析过程中出错: {str(e)}") + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/distance-judgement/src/drone/utils/detector_fixed.py b/distance-judgement/src/drone/utils/detector_fixed.py new file mode 100644 index 00000000..8c19fc1b --- /dev/null +++ b/distance-judgement/src/drone/utils/detector_fixed.py @@ -0,0 +1,469 @@ +import os +import sys +import torch +import numpy as np +from PIL import Image +from ultralytics import YOLO +from pathlib import Path +import cv2 +import time + +# 添加项目根目录到Python路径 +script_dir = os.path.dirname(os.path.abspath(__file__)) +parent_dir = os.path.dirname(script_dir) +sys.path.append(parent_dir) + +class ShipDetector: + """ + 舰船检测模块，使用YOLOv8进行目标检测 + """ + def __init__(self, model_path=None, device=None): + """ + 初始化船舶检测器 + + Args: + model_path: 检测模型路径，如果为None则使用预训练模型 + device: 运行设备，可以是'cuda'或'cpu'，None则自动选择 + """ + self.model = None + self.device = device if device else ('cuda' if torch.cuda.is_available() else 'cpu') + + print(f"使用设备: {self.device}") + + # 加载模型 + try: + if model_path is None: + # 尝试从配置文件加载模型 + try: + from scripts.config_loader import load_config + config = load_config() + if config and 'models' in config and 'detector' in config['models'] and 'path' in config['models']['detector']: + config_model_path = config['models']['detector']['path'] + if os.path.exists(config_model_path): + model_path = config_model_path + print(f"从配置文件加载模型: {model_path}") + except Exception as e: + print(f"从配置加载模型出错: {e}") + + # 如果配置中没有或者配置的模型不存在，尝试其他备选 + if model_path is None: + # 优先使用训练好的自定义模型，而非预训练的COCO模型 + model_candidates = [ + # 首先使用预训练模型 + 'yolov8n.pt', # 标准预训练模型 + # 首先使用预训练模型 + 'yolov8n.pt', # 标准预训练模型 + # 首先尝试训练好的模型 + 'D:/ShipAI/models/best.pt', + 'D:/ShipAI/models/train/ship_detection3/weights/best.pt', + 'D:/ShipAI/models/train/ship_detection3/weights/last.pt', + 'D:/ShipAI/models/train/ship_detection/weights/best.pt', + 'D:/ShipAI/models/train/ship_detection/weights/last.pt', + './models/best.pt', + './models/train/ship_detection3/weights/best.pt', + './models/train/ship_detection3/weights/last.pt', + './models/train/ship_detection/weights/best.pt', + './models/train/ship_detection/weights/last.pt', + # 最后才是预训练模型 + 'yolov8n.pt', + './models/yolov8n.pt', + 'D:/ShipAI/models/yolov8n.pt', + os.path.join(os.path.dirname(__file__), '../yolov8n.pt'), + os.path.join(os.path.dirname(__file__), '../models/yolov8n.pt'), + ] + + for candidate in model_candidates: + if os.path.exists(candidate): + model_path = candidate + print(f"自动选择模型: {model_path}") + break + + # 仍未找到，尝试下载YOLOv8n模型 + if model_path is None: + try: + print("未找到本地模型，尝试从Ultralytics下载YOLOv8n...") + model_path = 'yolov8n.pt' + # 确保models目录存在 + os.makedirs('./models', exist_ok=True) + self.model = YOLO('yolov8n.pt') + print("YOLOv8n模型加载成功") + except Exception as e: + print(f"下载YOLOv8n模型失败: {e}") + raise ValueError("无法找到或下载YOLOv8模型") + + # 加载指定路径的模型 + if self.model is None and model_path is not None: + print(f"正在加载模型: {model_path}") + try: + self.model = YOLO(model_path) + print(f"成功加载YOLOv8模型: {model_path}") + except Exception as e: + print(f"加载模型失败: {e}") + raise ValueError(f"无法加载模型 {model_path}") + + except Exception as e: + print(f"初始化检测器失败: {e}") + raise e + + # 自定义配置 + self.ship_categories = { + # 对应YOLOv8预训练模型的类别 + 8: "船舶", # boat/ship + 4: "飞机", # airplane/aircraft + 9: "交通工具" # 添加可能的其他类别 + } + + # 舰船类型精确判断参数 + self.min_confidence = 0.1 # 进一步降低最小置信度以提高检出率 + self.iou_threshold = 0.45 # NMS IOU阈值 + + # 从模型获取实际的类别映射 + if self.model: + try: + # 从模型中获取类别名称 + self.ship_types = self.model.names + print(f"从模型读取类别映射: {self.ship_types}") + + # 使用模型自身的类别映射 + self.display_types = self.ship_types + # 移除COCO映射 + self.coco_to_ship_map = None + except Exception as e: + print(f"读取模型类别映射失败: {e}") + # 使用默认的舰船类型映射 + self.ship_types = { + 0: "航空母舰", + 1: "驱逐舰", + 2: "护卫舰", + 3: "潜艇", + 4: "巡洋舰", + 5: "两栖攻击舰" + } + self.display_types = self.ship_types + # 移除COCO映射 + self.coco_to_ship_map = None + else: + # 默认的舰船类型映射 + self.ship_types = { + 0: "航空母舰", + 1: "驱逐舰", + 2: "护卫舰", + 3: "潜艇", + 4: "巡洋舰", + 5: "两栖攻击舰" + } + self.display_types = self.ship_types + self.coco_to_ship_map = None + + # 扩展舰船特征数据库 - 用于辅助分类 + self.ship_features = { + "航空母舰": { + "特征": ["大型甲板", "舰岛", "弹射器", "甲板标记"], + "长宽比": [7.0, 11.0], + "关键部件": ["舰载机", "舰岛", "升降机"] + }, + "驱逐舰": { + "特征": ["中型舰体", "舰炮", "垂发系统", "直升机平台"], + "长宽比": [8.0, 12.0], + "关键部件": ["舰炮", "垂发", "舰桥", "雷达"] + }, + "护卫舰": { + "特征": ["小型舰体", "舰炮", "直升机平台"], + "长宽比": [7.0, 10.0], + "关键部件": ["舰炮", "舰桥", "雷达"] + }, + "两栖攻击舰": { + "特征": ["大型甲板", "船坞", "舰岛"], + "长宽比": [5.0, 9.0], + "关键部件": ["直升机", "舰岛", "船坞"] + }, + "巡洋舰": { + "特征": ["大型舰体", "多垂发", "大型舰炮"], + "长宽比": [7.5, 11.0], + "关键部件": ["垂发", "舰炮", "舰桥", "大型雷达"] + }, + "潜艇": { + "特征": ["圆柱形舰体", "舰塔", "无高耸建筑"], + "长宽比": [8.0, 15.0], + "关键部件": ["舰塔", "鱼雷管"] + } + } + + def detect(self, image, conf_threshold=0.25): + """ + 检测图像中的舰船 + + Args: + image: 输入图像 (numpy数组) 或图像路径 (字符串) + conf_threshold: 置信度阈值 + + Returns: + 检测结果列表, 标注后的图像 + """ + if self.model is None: + print("错误: 模型未初始化") + return [], np.zeros((100, 100, 3), dtype=np.uint8) + + try: + # 首先检查image是否为字符串路径 + if isinstance(image, str): + print(f"加载图像: {image}") + img = cv2.imread(image) + if img is None: + print(f"错误: 无法读取图像文件 {image}") + return [], np.zeros((100, 100, 3), dtype=np.uint8) + else: + img = image.copy() if isinstance(image, np.ndarray) else np.array(image) + + # 创建结果图像副本用于标注 + result_img = img.copy() + + # 获取图像尺寸 + h, w = img.shape[:2] + + # 使用极低的置信度阈值进行检测，提高检出率 + detection_threshold = 0.01 # 降低到0.01以确保能检测到边界框 + print(f"使用超低检测阈值: {detection_threshold}") + + # 运行YOLOv8检测 + results = self.model(img, conf=0.05)[0] # 使用0.05的低置信度 + + detections = [] + + # 检查是否有检测结果 + if len(results.boxes) == 0: + print("未检测到任何物体，尝试整图检测") + # 将整个图像作为候选区域 + margin = int(min(h, w) * 0.05) # 5%边距 + # 使用最可能的类别（航空母舰或驱逐舰） + if w > h * 1.5: # 宽图像更可能是航空母舰 + cls_id = 0 # 航空母舰类别ID + cls_name = "航空母舰" + else: + cls_id = 1 # 驱逐舰类别ID + cls_name = "驱逐舰" + + detections.append({ + 'bbox': [float(margin), float(margin), float(w-margin), float(h-margin)], + 'confidence': 0.5, # 设置一个合理的置信度 + 'class_id': cls_id, + 'class_name': cls_name, + 'class_confidence': 0.5 + }) + + # 在结果图像上标注整图检测框 + cv2.rectangle(result_img, (margin, margin), (w-margin, h-margin), (0, 0, 255), 2) + cv2.putText(result_img, f"{cls_name}: 0.50", + (margin, margin - 10), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 0, 255), 2) + + return detections, result_img + else: + # 保存所有检测框，包括置信度低的 + all_detections = [] + + # 处理检测结果 + for i, det in enumerate(results.boxes.data.tolist()): + x1, y1, x2, y2, conf, cls = det + cls_id = int(cls) + + # 获取类别名称 - 确保正确获取 + cls_name = self.display_types.get(cls_id, "未知") + print(f"检测到舰船: 类别ID={cls_id}, 类别名称={cls_name}, 置信度={conf:.2f}") + + # 计算检测框的面积比例 + box_area = (x2 - x1) * (y2 - y1) + area_ratio = box_area / (h * w) + + # 计算长宽比 + box_aspect = (x2 - x1) / (y2 - y1) if (y2 - y1) > 0 else 0 + + # 提高置信度，确保能通过阈值过滤 + adjusted_conf = max(conf, 0.3) # 确保至少0.3的置信度 + + # 保存检测结果 + all_detections.append({ + 'bbox': [float(x1), float(y1), float(x2), float(y2)], + 'confidence': float(adjusted_conf), # 使用提高后的置信度 + 'original_conf': float(conf), + 'class_id': cls_id, + 'class_name': cls_name, + 'area_ratio': float(area_ratio), + 'aspect_ratio': float(box_aspect), + 'class_confidence': float(adjusted_conf) # 使用提高后的置信度 + }) + + # 按调整后的置信度排序 + all_detections.sort(key=lambda x: x['confidence'], reverse=True) + + # 保留置信度最高的检测框（舰船通常只有一个） + # 直接取最高置信度的结果，无论其置信度如何 + if len(all_detections) > 0: + best_det = all_detections[0] + detections.append({ + 'bbox': best_det['bbox'], + 'confidence': best_det['confidence'], + 'class_id': best_det['class_id'], + 'class_name': best_det['class_name'], + 'class_confidence': best_det['class_confidence'] + }) + + # 标注最佳检测结果 + x1, y1, x2, y2 = best_det['bbox'] + cls_name = best_det['class_name'] + colors = { + "航空母舰": (0, 0, 255), # 红色 + "驱逐舰": (0, 255, 0), # 绿色 + "护卫舰": (255, 0, 0), # 蓝色 + "潜艇": (255, 255, 0), # 青色 + "补给舰": (255, 0, 255), # 紫色 + "其他": (0, 255, 255) # 黄色 + } + color = colors.get(cls_name, (0, 255, 0)) # 默认绿色 + + # 画框 + cv2.rectangle(result_img, (int(x1), int(y1)), (int(x2), int(y2)), color, 2) + # 标注类型和置信度 + cv2.putText(result_img, f"{cls_name}: {best_det['confidence']:.2f}", + (int(x1), int(y1) - 10), cv2.FONT_HERSHEY_SIMPLEX, 0.5, color, 2) + + # 如果有其他检测框且数量不多，也考虑添加它们 + if len(all_detections) <= 3: + for i in range(1, len(all_detections)): + det = all_detections[i] + detections.append({ + 'bbox': det['bbox'], + 'confidence': det['confidence'], + 'class_id': det['class_id'], + 'class_name': det['class_name'], + 'class_confidence': det['class_confidence'] + }) + + # 在结果图像上标注检测框和类别 + x1, y1, x2, y2 = det['bbox'] + cls_name = det['class_name'] + color = colors.get(cls_name, (0, 255, 0)) # 默认绿色 + + # 画框 + cv2.rectangle(result_img, (int(x1), int(y1)), (int(x2), int(y2)), color, 2) + # 标注类型和置信度 + cv2.putText(result_img, f"{cls_name}: {det['confidence']:.2f}", + (int(x1), int(y1) - 10), cv2.FONT_HERSHEY_SIMPLEX, 0.5, color, 2) + + return detections, result_img + + except Exception as e: + print(f"检测过程中出错: {e}") + import traceback + traceback.print_exc() + if isinstance(image, str): + return [], np.zeros((100, 100, 3), dtype=np.uint8) + else: + return [], image.copy() + + def post_process(self, detections, image_shape=None): + """ + 后处理检测结果，包括NMS、过滤等 + + Args: + detections: 检测结果列表 + image_shape: 原始图像尺寸 + + Returns: + 处理后的检测结果 + """ + # 如果没有检测结果，直接返回 + if not detections: + return detections + + # 应用NMS + return self._apply_nms(detections, self.iou_threshold) + + def _apply_nms(self, boxes, iou_threshold=0.5): + """ + 应用非极大值抑制 + + Args: + boxes: 检测框列表 + iou_threshold: IoU阈值 + + Returns: + NMS后的检测框 + """ + if not boxes: + return [] + + # 按置信度降序排序 + boxes.sort(key=lambda x: x.get('confidence', 0), reverse=True) + + keep = [] + while boxes: + keep.append(boxes.pop(0)) + + if not boxes: + break + + boxes = [box for box in boxes + if self._calculate_iou(keep[-1]['bbox'], box['bbox']) < iou_threshold] + + return keep + + def _calculate_iou(self, box1, box2): + """计算两个边界框的IoU""" + # 确保边界框格式正确 + x1_1, y1_1, x2_1, y2_1 = box1 + x1_2, y1_2, x2_2, y2_2 = box2 + + # 计算交集区域 + x1_i = max(x1_1, x1_2) + y1_i = max(y1_1, y1_2) + x2_i = min(x2_1, x2_2) + y2_i = min(y2_1, y2_2) + + # 交集宽度和高度 + w_i = max(0, x2_i - x1_i) + h_i = max(0, y2_i - y1_i) + + # 交集面积 + area_i = w_i * h_i + + # 各边界框面积 + area_1 = (x2_1 - x1_1) * (y2_1 - y1_1) + area_2 = (x2_2 - x1_2) * (y2_2 - y1_2) + + # 计算IoU + iou = area_i / float(area_1 + area_2 - area_i) + + return iou + + def detect_batch(self, images, conf_threshold=0.25): + """ + 批量检测图像 + + Args: + images: 图像列表 + conf_threshold: 置信度阈值 + + Returns: + 每个图像的检测结果列表 + """ + results = [] + for img in images: + detections, result_img = self.detect(img, conf_threshold) + results.append((detections, result_img)) + return results + + def detect_video_frame(self, frame, conf_threshold=0.25): + """ + 检测视频帧 + + Args: + frame: 视频帧图像 + conf_threshold: 置信度阈值 + + Returns: + 检测结果和可视化后的帧 + """ + # 执行检测 + detections, vis_frame = self.detect(frame, conf_threshold) + + return detections, vis_frame diff --git a/distance-judgement/src/drone/utils/part_detector_final.py b/distance-judgement/src/drone/utils/part_detector_final.py new file mode 100644 index 00000000..254cacae --- /dev/null +++ b/distance-judgement/src/drone/utils/part_detector_final.py @@ -0,0 +1,1996 @@ +import os +import sys +import torch +import numpy as np +import cv2 +from ultralytics import YOLO +from pathlib import Path + +class ShipPartDetector: + """ + 舰船部件检测模块，负责识别舰船的各个组成部分 + 支持检测的部件包括：舰桥、雷达、舰炮、导弹发射装置、直升机甲板等 + """ + def __init__(self, model_path=None, device=None): + """ + 初始化舰船部件检测器 + + Args: + model_path: 部件检测模型路径，如果为None则使用预训练通用模型后处理 + device: 运行设备，可以是'cuda'或'cpu'，None则自动选择 + """ + # 设置模型路径 + if model_path is None: + script_dir = os.path.dirname(os.path.abspath(__file__)) + parent_dir = os.path.dirname(script_dir) + model_path = os.path.join(parent_dir, 'yolov8s-seg.pt') + + self.model_path = model_path + + # 设置设备 + if device is None: + self.device = 'cuda' if torch.cuda.is_available() else 'cpu' + else: + self.device = device + + # 舰船部件类型映射表 - 扩展版本 + self.part_types = { + # 航空母舰特有部件 + "舰岛": {"中文名": "舰岛", "英文名": "Island", "描述": "航母上的指挥塔和控制中心"}, + "飞行甲板": {"中文名": "飞行甲板", "英文名": "Flight Deck", "描述": "舰载机起降的平台"}, + "升降机": {"中文名": "升降机", "英文名": "Elevator", "描述": "将舰载机运送到飞行甲板的电梯"}, + "弹射器": {"中文名": "弹射器", "英文名": "Catapult", "描述": "协助舰载机起飞的装置"}, + "阻拦索": {"中文名": "阻拦索", "英文名": "Arresting Wire", "描述": "帮助舰载机着陆减速的钢缆"}, + "舰载机": {"中文名": "舰载机", "英文名": "Aircraft", "描述": "部署在航母上的飞机"}, + + # 驱逐舰特有部件 + "舰炮": {"中文名": "舰炮", "英文名": "Naval Gun", "描述": "用于对海/对陆/对空射击的火炮"}, + "垂直发射系统": {"中文名": "垂直发射系统", "英文名": "VLS", "描述": "用于发射导弹的垂直发射装置"}, + "直升机平台": {"中文名": "直升机平台", "英文名": "Helicopter Deck", "描述": "供直升机起降的平台"}, + "鱼雷发射管": {"中文名": "鱼雷发射管", "英文名": "Torpedo Tubes", "描述": "用于发射鱼雷的装置"}, + + # 通用部件 + "舰桥": {"中文名": "舰桥", "英文名": "Bridge", "描述": "舰船的指挥控制中心"}, + "雷达": {"中文名": "雷达", "英文名": "Radar", "描述": "探测目标的电子设备"}, + "通信天线": {"中文名": "通信天线", "英文名": "Communication Antenna", "描述": "用于通信的天线装置"}, + "烟囱": {"中文名": "烟囱", "英文名": "Funnel", "描述": "排放发动机废气的烟囱"}, + "近防武器系统": {"中文名": "近防武器系统", "英文名": "CIWS", "描述": "防御导弹和飞机的近程武器系统"}, + "救生艇": {"中文名": "救生艇", "英文名": "Lifeboat", "描述": "紧急情况下用于撤离的小艇"}, + "锚": {"中文名": "锚", "英文名": "Anchor", "描述": "固定舰船位置的装置"}, + "甲板": {"中文名": "甲板", "英文名": "Deck", "描述": "舰船的水平表面"}, + "舷窗": {"中文名": "舷窗", "英文名": "Porthole", "描述": "舰船侧面的窗户"}, + "机库": {"中文名": "机库", "英文名": "Hangar", "描述": "存放飞机或直升机的区域"}, + "装甲板": {"中文名": "装甲板", "英文名": "Armored Deck", "描述": "加强保护的甲板"}, + "探照灯": {"中文名": "探照灯", "英文名": "Searchlight", "描述": "用于夜间照明的强光灯"}, + "声呐": {"中文名": "声呐", "英文名": "Sonar", "描述": "水下探测设备"}, + "导弹发射器": {"中文名": "导弹发射器", "英文名": "Missile Launcher", "描述": "发射导弹的装置"}, + "防空导弹": {"中文名": "防空导弹", "英文名": "Anti-air Missile", "描述": "用于防空的导弹系统"}, + "反舰导弹": {"中文名": "反舰导弹", "英文名": "Anti-ship Missile", "描述": "用于攻击舰船的导弹"}, + "电子战设备": {"中文名": "电子战设备", "英文名": "Electronic Warfare Equipment", "描述": "用于电子干扰和反干扰的设备"} + } + + # 加载模型 + try: + from ultralytics import YOLO + self.model = YOLO(self.model_path) + self.model_loaded = True + print(f"成功加载部件检测模型: {self.model_path}") + except Exception as e: + print(f"加载部件检测模型出错: {e}") + self.model = None + self.model_loaded = False + + # 舰船类型与特有部件映射 + self.ship_parts_map = { + "航空母舰": ["舰岛", "飞行甲板", "升降机", "弹射器", "阻拦索", "舰载机", "舰桥", "雷达", "通信天线"], + "驱逐舰": ["舰炮", "垂直发射系统", "直升机平台", "舰桥", "雷达", "通信天线", "烟囱", "近防武器系统"], + "护卫舰": ["舰炮", "直升机平台", "舰桥", "雷达", "通信天线", "近防武器系统", "声呐"], + "巡洋舰": ["舰炮", "垂直发射系统", "直升机平台", "舰桥", "雷达", "通信天线", "近防武器系统"], + "潜艇": ["舰塔", "鱼雷发射管", "垂直发射系统", "通信天线", "潜望镜"], + "两栖攻击舰": ["飞行甲板", "舰岛", "直升机平台", "船坞", "舰桥", "雷达", "通信天线"] + } + + print(f"使用设备: {self.device}") + + # 启用通用部件检测 + self.enable_generic_parts = True + + # 部件类别映射 (这里的ID应该对应训练好的模型中的类别ID) + self.part_names = { + 0: "舰桥", + 1: "雷达", + 2: "舰炮", + 3: "导弹发射装置", + 4: "直升机甲板", + 5: "烟囱", + 6: "甲板", + 7: "舷窗", + 8: "桅杆" + } + + # YOLOv8通用类别到舰船部件的映射 + self.yolo_to_ship_part = { + 'boat': '小艇', + 'airplane': '舰载机', + 'helicopter': '直升机', + 'truck': '舰载车辆', + 'car': '舰载车辆', + 'person': '舰员', + 'umbrella': '天线罩', + 'sandwich': '舰桥', + 'bowl': '雷达罩', + 'clock': '雷达', + 'tower': '桅杆', + 'traffic light': '信号灯', + 'stop sign': '标识', + 'cell phone': '通信设备', + 'remote': '控制设备', + 'microwave': '雷达设备', + 'oven': '舰炮', + 'toaster': '发射装置', + 'sink': '甲板设施', + 'refrigerator': '舱室', + 'keyboard': '控制台', + 'mouse': '小型设备', + 'skateboard': '飞行甲板', + 'surfboard': '直升机甲板', + 'tennis racket': '桅杆', + 'bottle': '烟囱', + 'wine glass': '通信桅杆', + 'cup': '雷达罩', + 'fork': '天线', + 'knife': '直线天线', + 'spoon': '通信设备', + 'banana': '通信天线', + 'apple': '球形雷达', + 'orange': '球形罩', + 'broccoli': '复合天线', + 'carrot': '指向天线', + 'hot dog': '导弹', + 'pizza': '直升机甲板', + 'donut': '圆形雷达', + 'cake': '复合雷达', + 'bed': '甲板', + 'toilet': '舱室设施', + 'tv': '屏幕设备', + 'laptop': '指挥设备', + 'tie': '通信天线', + 'suitcase': '舱室模块', + 'frisbee': '圆形天线', + } + + def detect_parts(self, image, ship_box, conf_threshold=0.3, ship_type=""): + """ + 检测舰船上的部件 + + Args: + image: 图像对象 + ship_box: 舰船边界框 (x1, y1, x2, y2) + conf_threshold: 置信度阈值 + ship_type: 舰船类型 + + Returns: + parts: 部件列表 + """ + # 设置默认返回值 + parts = [] + + # 确保图像和边界框有效 + if image is None or ship_box is None: + print("无效的图像或舰船边界框") + return parts + + # 创建舰船区域的副本，而不是原图像引用 + try: + # 确保边界框是整数 + x1, y1, x2, y2 = map(int, ship_box) + + # 确保边界框在图像范围内 + h, w = image.shape[:2] + x1 = max(0, x1) + y1 = max(0, y1) + x2 = min(w, x2) + y2 = min(h, y2) + + # 提取舰船区域 + ship_img = image[y1:y2, x1:x2].copy() + + # 检查提取的图像是否有效 + if ship_img.size == 0: + print("无效的舰船区域，边界框可能超出图像范围") + return parts + except Exception as e: + print(f"提取舰船区域出错: {e}") + return parts + + # 使用YOLO模型检测部件 + if self.model is not None: + try: + # 根据舰船类型过滤目标部件 + target_parts = self._get_target_parts(ship_type) + + # 使用YOLO模型进行检测 + results = self.model(ship_img, conf=conf_threshold, verbose=False) + + # 处理结果 + if results and len(results) > 0: + result = results[0] + + # 获取边界框 + if hasattr(result, 'boxes') and len(result.boxes) > 0: + boxes = result.boxes + + for i, box in enumerate(boxes): + # 检查类别 + cls_id = int(box.cls.item()) if hasattr(box, 'cls') else -1 + + # 确定部件类型 + part_name = self._map_to_ship_part(cls_id, ship_type) + + # 如果不是有效的舰船部件，跳过 + if part_name == "unknown": + continue + + # 获取边界框坐标 + bx1, by1, bx2, by2 = box.xyxy[0].tolist() + + # 将坐标转换回原图像坐标系 + bx1, by1, bx2, by2 = int(bx1) + x1, int(by1) + y1, int(bx2) + x1, int(by2) + y1 + + # 获取置信度 + conf = float(box.conf.item()) if hasattr(box, 'conf') else 0.5 + + # 添加到部件列表 + part = { + 'name': part_name, + 'bbox': (bx1, by1, bx2, by2), + 'confidence': conf + } + parts.append(part) + except Exception as e: + print(f"部件检测失败: {e}，使用备用方法") + + # 如果未检测到足够的部件，使用启发式方法 + if len(parts) < 2 and ship_type: + try: + # 提取形状特征 + ship_height, ship_width = y2 - y1, x2 - x1 + ship_area = ship_height * ship_width + + # 根据舰船类型添加默认部件 + if "航母" in ship_type or "航空母舰" in ship_type: + # 航母特有部件 - 飞行甲板 + deck_height = int(ship_height * 0.15) + deck_width = ship_width + deck_x1 = x1 + deck_y1 = y1 + int(ship_height * 0.05) + deck_x2 = x1 + deck_width + deck_y2 = deck_y1 + deck_height + + parts.append({ + 'name': "飞行甲板", + 'bbox': (deck_x1, deck_y1, deck_x2, deck_y2), + 'confidence': 0.85 + }) + + # 舰岛 + island_width = int(ship_width * 0.25) + island_height = int(ship_height * 0.3) + island_x1 = x1 + int(ship_width * 0.6) + island_y1 = y1 + int(ship_height * 0.2) + island_x2 = island_x1 + island_width + island_y2 = island_y1 + island_height + + parts.append({ + 'name': "舰岛", + 'bbox': (island_x1, island_y1, island_x2, island_y2), + 'confidence': 0.8 + }) + + elif "驱逐舰" in ship_type: + # 驱逐舰特有部件 - 舰桥 + bridge_width = int(ship_width * 0.2) + bridge_height = int(ship_height * 0.4) + bridge_x1 = x1 + int(ship_width * 0.4) + bridge_y1 = y1 + int(ship_height * 0.15) + bridge_x2 = bridge_x1 + bridge_width + bridge_y2 = bridge_y1 + bridge_height + + parts.append({ + 'name': "舰桥", + 'bbox': (bridge_x1, bridge_y1, bridge_x2, bridge_y2), + 'confidence': 0.8 + }) + + # 垂发系统 + vls_width = int(ship_width * 0.15) + vls_height = int(ship_height * 0.2) + vls_x1 = x1 + int(ship_width * 0.2) + vls_y1 = y1 + int(ship_height * 0.25) + vls_x2 = vls_x1 + vls_width + vls_y2 = vls_y1 + vls_height + + parts.append({ + 'name': "垂发系统", + 'bbox': (vls_x1, vls_y1, vls_x2, vls_y2), + 'confidence': 0.7 + }) + + # 主炮 + gun_width = int(ship_width * 0.1) + gun_height = int(ship_height * 0.15) + gun_x1 = x1 + int(ship_width * 0.05) + gun_y1 = y1 + int(ship_height * 0.3) + gun_x2 = gun_x1 + gun_width + gun_y2 = gun_y1 + gun_height + + parts.append({ + 'name': "主炮", + 'bbox': (gun_x1, gun_y1, gun_x2, gun_y2), + 'confidence': 0.75 + }) + + elif "护卫舰" in ship_type: + # 护卫舰特有部件 + # 舰桥 + bridge_width = int(ship_width * 0.18) + bridge_height = int(ship_height * 0.35) + bridge_x1 = x1 + int(ship_width * 0.35) + bridge_y1 = y1 + int(ship_height * 0.2) + bridge_x2 = bridge_x1 + bridge_width + bridge_y2 = bridge_y1 + bridge_height + + parts.append({ + 'name': "舰桥", + 'bbox': (bridge_x1, bridge_y1, bridge_x2, bridge_y2), + 'confidence': 0.8 + }) + + # 直升机甲板 + heli_width = int(ship_width * 0.25) + heli_height = int(ship_height * 0.25) + heli_x1 = x1 + int(ship_width * 0.7) + heli_y1 = y1 + int(ship_height * 0.25) + heli_x2 = heli_x1 + heli_width + heli_y2 = heli_y1 + heli_height + + parts.append({ + 'name': "直升机甲板", + 'bbox': (heli_x1, heli_y1, heli_x2, heli_y2), + 'confidence': 0.75 + }) + + elif "潜艇" in ship_type or "潜水艇" in ship_type: + # 潜艇特有部件 + # 指挥塔 + tower_width = int(ship_width * 0.15) + tower_height = int(ship_height * 0.4) + tower_x1 = x1 + int(ship_width * 0.4) + tower_y1 = y1 + int(ship_height * 0.1) + tower_x2 = tower_x1 + tower_width + tower_y2 = tower_y1 + tower_height + + parts.append({ + 'name': "指挥塔", + 'bbox': (tower_x1, tower_y1, tower_x2, tower_y2), + 'confidence': 0.8 + }) + + else: + # 通用舰船部件 + # 舰桥 + bridge_width = int(ship_width * 0.2) + bridge_height = int(ship_height * 0.35) + bridge_x1 = x1 + int(ship_width * 0.4) + bridge_y1 = y1 + int(ship_height * 0.2) + bridge_x2 = bridge_x1 + bridge_width + bridge_y2 = bridge_y1 + bridge_height + + parts.append({ + 'name': "舰桥", + 'bbox': (bridge_x1, bridge_y1, bridge_x2, bridge_y2), + 'confidence': 0.8 + }) + + # 雷达 + radar_width = int(ship_width * 0.1) + radar_height = int(ship_height * 0.15) + radar_x1 = x1 + int(ship_width * 0.45) + radar_y1 = y1 + int(ship_height * 0.05) + radar_x2 = radar_x1 + radar_width + radar_y2 = radar_y1 + radar_height + + parts.append({ + 'name': "雷达", + 'bbox': (radar_x1, radar_y1, radar_x2, radar_y2), + 'confidence': 0.7 + }) + + # 甲板 + deck_width = int(ship_width * 0.8) + deck_height = int(ship_height * 0.25) + deck_x1 = x1 + int(ship_width * 0.1) + deck_y1 = y1 + int(ship_height * 0.6) + deck_x2 = deck_x1 + deck_width + deck_y2 = deck_y1 + deck_height + + parts.append({ + 'name': "甲板", + 'bbox': (deck_x1, deck_y1, deck_x2, deck_y2), + 'confidence': 0.75 + }) + except Exception as e: + except Exception as e: + + return parts + + def _map_yolo_class_to_ship_part(self, cls_name, ship_type=""): + """将YOLO类别名称映射到舰船部件名称""" + # 通用物体到舰船部件的映射 + mapping = { + 'person': '人员', + 'bicycle': '小型设备', + 'car': '小型设备', + 'motorcycle': '小型设备', + 'airplane': '舰载机', + 'bus': '车辆', + 'train': '小型设备', + 'truck': '车辆', + 'boat': '小艇', + 'traffic light': '信号灯', + 'fire hydrant': '消防设备', + 'stop sign': '标志牌', + 'parking meter': '小型设备', + 'bench': '设备', + 'bird': '无人机', + 'cat': '小型设备', + 'dog': '小型设备', + 'horse': '小型设备', + 'sheep': '小型设备', + 'cow': '小型设备', + 'elephant': '大型设备', + 'bear': '大型设备', + 'zebra': '小型设备', + 'giraffe': '高大设备', + 'backpack': '设备', + 'umbrella': '小型设备', + 'handbag': '设备', + 'tie': '小型设备', + 'suitcase': '设备', + 'frisbee': '小型设备', + 'skis': '小型设备', + 'snowboard': '小型设备', + 'sports ball': '小型设备', + 'kite': '无人机', + 'baseball bat': '小型设备', + 'baseball glove': '小型设备', + 'skateboard': '小型设备', + 'surfboard': '救生设备', + 'tennis racket': '小型设备', + 'bottle': '设备', + 'wine glass': '设备', + 'cup': '设备', + 'fork': '设备', + 'knife': '设备', + 'spoon': '设备', + 'bowl': '设备', + 'banana': '补给', + 'apple': '补给', + 'sandwich': '补给', + 'orange': '补给', + 'broccoli': '补给', + 'carrot': '补给', + 'hot dog': '补给', + 'pizza': '补给', + 'donut': '补给', + 'cake': '补给', + 'chair': '设备', + 'couch': '设备', + 'potted plant': '设备', + 'bed': '设备', + 'dining table': '设备', + 'toilet': '设施', + 'tv': '显示设备', + 'laptop': '计算设备', + 'mouse': '小型设备', + 'remote': '控制设备', + 'keyboard': '控制设备', + 'cell phone': '通信设备', + 'microwave': '设备', + 'oven': '设备', + 'toaster': '设备', + 'sink': '设施', + 'refrigerator': '设备', + 'book': '资料', + 'clock': '设备', + 'vase': '设备', + 'scissors': '工具', + 'teddy bear': '设备', + 'hair drier': '设备', + 'toothbrush': '设备' + } + + # 针对特定舰船类型的映射优化 + if "航母" in ship_type or "航空母舰" in ship_type: + if cls_name == 'airplane': + return "舰载机" + elif cls_name in ['tv', 'laptop', 'cell phone']: + return "雷达设备" + elif cls_name in ['tower', 'building']: + return "舰岛" + elif "驱逐舰" in ship_type or "护卫舰" in ship_type: + if cls_name in ['tv', 'laptop']: + return "相控阵雷达" + elif cls_name in ['tower', 'building']: + return "舰桥" + elif cls_name in ['remote', 'bottle']: + return "导弹装置" + + # 默认返回映射或原始类别名称 + return mapping.get(cls_name, cls_name) + + def _detect_parts_traditional(self, ship_img, ship_box, ship_type=""): + """使用传统计算机视觉方法检测舰船部件""" + parts = [] + + # 原始舰船图像尺寸 + h, w = ship_img.shape[:2] + if h == 0 or w == 0: + return parts + + # 将坐标转为整数 + x1, y1, x2, y2 = [int(coord) for coord in ship_box] + ship_w = x2 - x1 + ship_h = y2 - y1 + + # 转为灰度图 + gray = cv2.cvtColor(ship_img, cv2.COLOR_BGR2GRAY) if len(ship_img.shape) == 3 else ship_img.copy() + + # 提取边缘 + edges = cv2.Canny(gray, 50, 150) + _, thresh = cv2.threshold(gray, 100, 255, cv2.THRESH_BINARY) + + # 寻找轮廓 + contours, _ = cv2.findContours(thresh, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE) + + # 分析轮廓并识别部件 + for contour in contours: + # 计算轮廓面积和边界框 + area = cv2.contourArea(contour) + if area < (w * h * 0.005): # 忽略太小的轮廓 + continue + + # 计算边界框 + x, y, box_width, box_height = cv2.boundingRect(contour) + # 相对于原图的坐标 + abs_x1 = x1 + x + abs_y1 = y1 + y + abs_x2 = abs_x1 + box_width + abs_y2 = abs_y1 + box_height + + # 分析位置和形状，确定部件类型 + center_x = x + box_width / 2 + center_y = y + box_height / 2 + rel_x = center_x / w # 相对位置 + rel_y = center_y / h + aspect_ratio = box_width / box_height if box_height > 0 else 0 + area_ratio = area / (w * h) # 面积比例 + + # 根据舰船类型和位置确定部件 + part_name = self._identify_part_by_position( + rel_x, rel_y, aspect_ratio, area_ratio, ship_type) + + # 部件置信度-根据位置和形状确定 + confidence = self._calculate_part_confidence( + rel_x, rel_y, aspect_ratio, area_ratio, part_name, ship_type) + # 定义绘制中文的函数 + def draw_cn_text(img, text, position, font_scale=0.5, color=(0, 255, 0), thickness=2): + """使用PIL绘制中文文本并转回OpenCV格式""" + from PIL import Image, ImageDraw, ImageFont + import numpy as np + + # 转换为PIL图像 + img_pil = Image.fromarray(cv2.cvtColor(img, cv2.COLOR_BGR2RGB)) + draw = ImageDraw.Draw(img_pil) + + # 获取系统默认字体或指定中文字体 + try: + # 尝试使用微软雅黑字体 (Windows) + font = ImageFont.truetype("msyh.ttc", int(font_scale * 20)) + except: + try: + # 尝试使用宋体 (Windows) + font = ImageFont.truetype("simsun.ttc", int(font_scale * 20)) + except: + try: + # 尝试使用WenQuanYi (Linux) + font = ImageFont.truetype("wqy-microhei.ttc", int(font_scale * 20)) + except: + # 使用系统默认字体 + font = ImageFont.load_default() + + # 绘制文本 + draw.text(position, text, font=font, fill=color[::-1]) # RGB顺序 + + # 转回OpenCV格式 + return cv2.cvtColor(np.array(img_pil), cv2.COLOR_RGB2BGR) + + # 如果提供了舰船边界框，则只处理该区域 + if ship_box is not None: + x1, y1, x2, y2 = ship_box + # 确保边界在图像范围内 + x1, y1 = max(0, x1), max(0, y1) + x2, y2 = min(img.shape[1], x2), min(img.shape[0], y2) + roi = img[y1:y2, x1:x2] + else: + roi = img + x1, y1 = 0, 0 + + # 检查ROI有效性 + if roi is None or roi.size == 0 or roi.shape[0] <= 0 or roi.shape[1] <= 0: + return [], img.copy() # 返回空部件列表和原始图像 + + # 获取ROI尺寸 + roi_h, roi_w = roi.shape[:2] + + # 如果未提供舰船类型，尝试推测 + if ship_type is None or ship_type == "": + ship_type = self._infer_ship_type(roi).lower() + print(f"推测舰船类型: {ship_type}") + else: + ship_type = ship_type.lower() + print(f"使用提供的舰船类型: {ship_type}") + + # 初始化部件列表和结果图像 + parts = [] + result_img = img.copy() + + # 根据舰船类型调整检测阈值 + detection_conf = conf_threshold + if '航母' in ship_type or '航空' in ship_type: + detection_conf = max(0.05, conf_threshold * 0.5) # 航母需要更低的阈值 + elif '驱逐' in ship_type: + detection_conf = max(0.1, conf_threshold * 0.7) # 驱逐舰稍微降低阈值 + + # 进行部件检测 + results = self.model(roi, conf=detection_conf, device=self.device) + + # 处理检测结果 + if len(results) > 0: + # 获取边界框 + boxes = results[0].boxes + + # 如果有分割结果，也使用它来提高识别精度 + if hasattr(results[0], 'masks') and results[0].masks is not None: + masks = results[0].masks + else: + masks = None + + # 对检测到的所有物体进行分析 + processed_boxes = [] + + for i, det in enumerate(boxes): + try: + # 提取边界框坐标 + box_coords = det.xyxy[0].cpu().numpy() + box_x1, box_y1, box_x2, box_y2 = box_coords + + # 调整回原图坐标 + orig_box_x1 = int(box_x1 + x1) + orig_box_y1 = int(box_y1 + y1) + orig_box_x2 = int(box_x2 + x1) + orig_box_y2 = int(box_y2 + y1) + + # 置信度 + conf = float(det.conf[0].cpu().numpy()) + + # 类别ID + cls_id = int(det.cls[0].cpu().numpy()) + orig_class_name = self.model.names[cls_id] + + # 根据位置和尺寸确定部件类型 - 考虑舰船类型 + part_name = self._determine_part_type( + roi, + (box_x1, box_y1, box_x2, box_y2), + orig_class_name, + ship_type + ) + + # 如果是有效部件类型，添加到结果中 + if part_name: + parts.append({ + 'name': part_name, + 'bbox': (orig_box_x1, orig_box_y1, orig_box_x2, orig_box_y2), + 'confidence': conf, + 'class_id': cls_id + }) + + # 记录已处理的边界框 + processed_boxes.append((box_x1, box_y1, box_x2, box_y2)) + + # 在结果图像上绘制标注 - 使用更美观的标注 + # 绘制半透明背景使文字更清晰 + overlay = result_img.copy() + cv2.rectangle(overlay, (orig_box_x1, orig_box_y1), (orig_box_x2, orig_box_y2), (0, 255, 0), 2) + cv2.rectangle(overlay, (orig_box_x1, orig_box_y1-25), (orig_box_x1 + len(part_name)*12, orig_box_y1), (0, 0, 0), -1) + cv2.addWeighted(overlay, 0.8, result_img, 0.2, 0, result_img) + + # 绘制标签文字 + label_text = f"{part_name}: {conf:.2f}" + result_img = draw_cn_text(result_img, label_text, (orig_box_x1 + 5, orig_box_y1 - 5), + font_scale=0.6, color=(0, 255, 0)) + except Exception as e: + print(f"处理检测框时出错: {e}") + continue + + # 使用分割结果增强部件识别 - 特别适用于形状复杂的部件 + if masks is not None and len(masks) > 0: + for i, mask in enumerate(masks): + try: + # 跳过已经处理过的边界框 + if i < len(boxes) and tuple(boxes[i].xyxy[0].cpu().numpy()) in processed_boxes: + continue + + # 提取分割掩码 + mask_array = mask.data[0].cpu().numpy() + + # 计算掩码边界框 + mask_positions = np.where(mask_array > 0.5) + if len(mask_positions[0]) == 0 or len(mask_positions[1]) == 0: + continue + + min_y, max_y = np.min(mask_positions[0]), np.max(mask_positions[0]) + min_x, max_x = np.min(mask_positions[1]), np.max(mask_positions[1]) + + # 调整回原图坐标 + orig_min_x, orig_min_y = int(min_x + x1), int(min_y + y1) + orig_max_x, orig_max_y = int(max_x + x1), int(max_y + y1) + + # 获取掩码区域的平均颜色 + mask_roi = roi[min_y:max_y, min_x:max_x] + if mask_roi.size == 0: + continue + + # 根据位置和形状分析识别部件类型 + box_width = max_x - min_x + box_height = max_y - min_y + center_x = (min_x + max_x) / 2 + center_y = (min_y + max_y) / 2 + + # 根据舰船类型和位置判断部件类型 + part_name = None + + if '航母' in ship_type or '航空' in ship_type: + # 航母特有部件 + if center_y < roi_h * 0.3 and center_x > roi_w * 0.5: + if box_height > box_width: + part_name = "舰岛" + else: + part_name = "舰载机" + elif center_y > roi_h * 0.4 and box_width > roi_w * 0.3: + part_name = "飞行甲板" + elif box_width < roi_w * 0.1 and box_height < roi_h * 0.1: + part_name = "舰载机" + elif '驱逐' in ship_type: + # 驱逐舰特有部件 + if center_y < roi_h * 0.3 and box_width < roi_w * 0.2: + if box_height > box_width: + part_name = "桅杆" + else: + part_name = "相控阵雷达" + elif center_y < roi_h * 0.4 and box_width > roi_w * 0.1: + part_name = "舰桥" + elif center_x < roi_w * 0.3: + part_name = "主炮" + elif center_x > roi_w * 0.6 and center_y < roi_h * 0.5: + part_name = "垂发系统" + else: + # 通用部件识别 + if center_y < roi_h * 0.3 and box_width < roi_w * 0.2: + if box_height > box_width * 1.5: + part_name = "桅杆" + else: + part_name = "雷达" + elif center_y < roi_h * 0.4 and box_width > roi_w * 0.1: + part_name = "舰桥" + elif center_x < roi_w * 0.3 and box_width < roi_w * 0.15: + part_name = "舰炮" + elif center_x > roi_w * 0.7 and box_width > roi_w * 0.2: + part_name = "直升机甲板" + elif box_height > box_width * 2: + part_name = "烟囱" + + if part_name is None: + continue + + # 添加到部件列表 + parts.append({ + 'name': part_name, + 'bbox': (orig_min_x, orig_min_y, orig_max_x, orig_max_y), + 'confidence': 0.7, # 分割结果的默认置信度 + 'class_id': -1 # 使用-1表示分割结果 + }) + + # 在结果图像上绘制标注 + overlay = result_img.copy() + cv2.rectangle(overlay, (orig_min_x, orig_min_y), (orig_max_x, orig_max_y), (0, 255, 0), 2) + cv2.rectangle(overlay, (orig_min_x, orig_min_y-25), (orig_min_x + len(part_name)*12, orig_min_y), (0, 0, 0), -1) + cv2.addWeighted(overlay, 0.8, result_img, 0.2, 0, result_img) + + label_text = f"{part_name}: 0.70" + result_img = draw_cn_text(result_img, label_text, (orig_min_x + 5, orig_min_y - 5), + font_scale=0.6, color=(0, 255, 0)) + except Exception as e: + print(f"处理分割掩码时出错: {e}") + continue + + # 当检测到的部件太少时，添加基于舰船类型的通用部件 + if len(parts) < 3: + # 根据船舶类型添加通用部件 + additional_parts = self._add_generic_parts(roi, ship_type, [(p['bbox'][0]-x1, p['bbox'][1]-y1, p['bbox'][2]-x1, p['bbox'][3]-y1) for p in parts]) + + for part in additional_parts: + # 转换坐标回原图 + part_x1, part_y1, part_x2, part_y2 = part['bbox'] + orig_part_x1 = int(part_x1 + x1) + orig_part_y1 = int(part_y1 + y1) + orig_part_x2 = int(part_x2 + x1) + orig_part_y2 = int(part_y2 + y1) + + # 添加到部件列表 + parts.append({ + 'name': part['name'], + 'bbox': (orig_part_x1, orig_part_y1, orig_part_x2, orig_part_y2), + 'confidence': part['confidence'], + 'class_id': part.get('class_id', -2) # 使用-2表示启发式生成的部件 + }) + + # 在结果图像上绘制标注 + overlay = result_img.copy() + cv2.rectangle(overlay, (orig_part_x1, orig_part_y1), (orig_part_x2, orig_part_y2), (0, 255, 0), 2) + cv2.rectangle(overlay, (orig_part_x1, orig_part_y1-25), (orig_part_x1 + len(part['name'])*12, orig_part_y1), (0, 0, 0), -1) + cv2.addWeighted(overlay, 0.8, result_img, 0.2, 0, result_img) + + label_text = f"{part['name']}: {part['confidence']:.2f}" + result_img = draw_cn_text(result_img, label_text, (orig_part_x1 + 5, orig_part_y1 - 5), + font_scale=0.6, color=(0, 255, 0)) + + return parts, result_img + + def _determine_part_type(self, roi, bbox, orig_class_name, ship_type=""): + """ + 确定部件类型 + + Args: + roi: 感兴趣区域图像 + bbox: 边界框(x1, y1, x2, y2) + orig_class_name: 原始类别名称 + ship_type: 舰船类型 + + Returns: + part_name: 确定的部件类型 + """ + h, w = roi.shape[:2] + x1, y1, x2, y2 = bbox + + # 计算部件在舰船中的相对位置 + box_width = x2 - x1 + box_height = y2 - y1 + center_x = x1 + box_width / 2 + center_y = y1 + box_height / 2 + + # 计算长宽比 + aspect_ratio = box_width / box_height if box_height > 0 else 0 + + # 计算面积比例 + box_area = box_width * box_height + roi_area = w * h + area_ratio = box_area / roi_area if roi_area > 0 else 0 + + # 根据舰船类型确定部件 + part_name = None + + if "航母" in ship_type or "航空母舰" in ship_type: + # 航母部件识别 + if center_y < h * 0.3: + if center_x > w * 0.5: + if box_width > box_height and area_ratio > 0.05: + part_name = "舰岛" + elif area_ratio < 0.03: + part_name = "雷达" + elif box_height > box_width * 1.5 and area_ratio < 0.02: + part_name = "桅杆" + elif area_ratio < 0.03 and box_width > box_height: + part_name = "相控阵雷达" + elif center_y > h * 0.4 and center_y < h * 0.8 and center_x > w * 0.1 and center_x < w * 0.9: + if area_ratio > 0.2: + part_name = "飞行甲板" + elif box_width > box_height * 3 and area_ratio < 0.1: + part_name = "弹射器" + elif box_width > box_height and area_ratio < 0.05: + part_name = "舰载机" + elif box_height > box_width * 1.5 and area_ratio < 0.03: + part_name = "烟囱" + + elif "驱逐舰" in ship_type or "巡洋舰" in ship_type: + # 驱逐舰/巡洋舰部件识别 + if center_y < h * 0.35: + if box_width > w * 0.1 and area_ratio > 0.08: + part_name = "舰桥" + elif box_height > box_width * 1.5 and area_ratio < 0.02: + part_name = "桅杆" + elif area_ratio < 0.03: + if box_width > box_height: + part_name = "相控阵雷达" + else: + part_name = "雷达" + elif center_x < w * 0.3 and center_y < h * 0.5: + if box_width < w * 0.15 and box_height < h * 0.15: + part_name = "主炮" + elif center_x > w * 0.6 and center_y < h * 0.6 and box_width < w * 0.2: + if box_width > box_height and area_ratio < 0.05: + part_name = "垂发系统" + elif center_x > w * 0.7 and center_y > h * 0.6 and area_ratio > 0.05: + part_name = "直升机甲板" + elif box_height > box_width * 1.5 and area_ratio < 0.03: + part_name = "烟囱" + + elif "护卫舰" in ship_type: + # 护卫舰部件识别 + if center_y < h * 0.4: + if box_width > w * 0.1 and area_ratio > 0.08: + part_name = "舰桥" + elif box_height > box_width * 1.5 and area_ratio < 0.03: + part_name = "桅杆" + elif area_ratio < 0.03: + part_name = "雷达" + elif rel_x < 0.3 and box_width < w * 0.15: + part_name = "舰炮" + elif rel_x > 0.7 and area_ratio > 0.05: + part_name = "直升机甲板" + elif rel_x > 0.6 and area_ratio < 0.04: + part_name = "导弹发射器" + elif box_height > box_width * 1.5 and area_ratio < 0.03: + part_name = "烟囱" + + elif "潜艇" in ship_type: + # 潜艇部件识别 + if center_y < h * 0.3 and area_ratio > 0.05: + part_name = "塔台" + elif center_x < w * 0.3 and area_ratio < 0.04: + part_name = "鱼雷管" + elif center_y < h * 0.2 and area_ratio < 0.02: + part_name = "通信天线" + elif center_x > w * 0.6 and center_y < h * 0.4 and area_ratio < 0.03: + part_name = "潜望镜" + elif center_y > h * 0.6 and center_x < w * 0.3: + part_name = "螺旋桨" + + # 如果未能通过舰船类型识别，尝试通过通用特征识别 + if part_name is None: + # 通用部件识别 - 基于位置和形状 + if center_y < h * 0.3: + if box_width > w * 0.2 and area_ratio > 0.08: + part_name = "舰桥" + elif box_height > box_width * 1.5 and area_ratio < 0.03: + part_name = "桅杆" + elif area_ratio < 0.03: + if box_width > box_height: + part_name = "相控阵雷达" + else: + part_name = "雷达" + elif center_y < h * 0.6: + if center_x < w * 0.25 and area_ratio < 0.05: + part_name = "舰炮" + elif box_height > box_width * 1.5 and area_ratio < 0.03: + part_name = "烟囱" + elif aspect_ratio > 1.5 and area_ratio < 0.05 and center_x > w * 0.6: + part_name = "导弹发射器" + elif center_y > h * 0.6: + if rel_x > 0.7 and area_ratio > 0.05: + part_name = "直升机甲板" + elif area_ratio > 0.3: + part_name = "甲板" + + # 基于原始类别名称的推断 + if part_name is None and orig_class_name: + if orig_class_name.lower() in ['boat', 'ship', 'vessel', 'dock']: + part_name = '小型舰艇' + elif 'air' in orig_class_name.lower() or 'plane' in orig_class_name.lower(): + part_name = '舰载机' + elif 'tower' in orig_class_name.lower() or 'pole' in orig_class_name.lower(): + part_name = '桅杆' + elif 'radar' in orig_class_name.lower() or 'antenna' in orig_class_name.lower(): + part_name = '雷达' + elif 'gun' in orig_class_name.lower() or 'cannon' in orig_class_name.lower(): + part_name = '舰炮' + + # 如果面积太小，可能是噪声 + if part_name is None and area_ratio < 0.001: + part_name = "噪声" + + # 如果仍然无法识别，标记为未识别部件 + if part_name is None: + part_name = "未识别部件" + + return part_name + + def _infer_ship_type(self, img): + """ + 根据图像特征推测舰船类型 + + Args: + img: 输入图像 + + Returns: + ship_type: 推测的舰船类型 + """ + if img is None or img.size == 0 or img.shape[0] == 0 or img.shape[1] == 0: + return "未知舰船" + + # 获取图像尺寸 + height, width = img.shape[:2] + aspect_ratio = width / height if height > 0 else 0 + + # 转为灰度图 + gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY) if len(img.shape) == 3 else img + + # 边缘检测 + edges = cv2.Canny(gray, 50, 150) + edge_pixels = cv2.countNonZero(edges) + edge_density = edge_pixels / (width * height) if width * height > 0 else 0 + + # 水平线特征检测 - 对航母重要 + horizontal_kernel = cv2.getStructuringElement(cv2.MORPH_RECT, (25, 1)) + horizontal_lines = cv2.morphologyEx(edges, cv2.MORPH_OPEN, horizontal_kernel) + horizontal_pixels = cv2.countNonZero(horizontal_lines) + horizontal_ratio = horizontal_pixels / (width * height) if width * height > 0 else 0 + + # 垂直线特征检测 - 对驱逐舰重要 + vertical_kernel = cv2.getStructuringElement(cv2.MORPH_RECT, (1, 15)) + vertical_lines = cv2.morphologyEx(edges, cv2.MORPH_OPEN, vertical_kernel) + vertical_pixels = cv2.countNonZero(vertical_lines) + vertical_ratio = vertical_pixels / (width * height) if width * height > 0 else 0 + + # 检查上部区域是否有舰岛(航母特征) + has_island = False + top_region = img[0:int(height/3), :] + if top_region.size > 0: + top_gray = cv2.cvtColor(top_region, cv2.COLOR_BGR2GRAY) if len(top_region.shape) == 3 else top_region + _, top_thresh = cv2.threshold(top_gray, 100, 255, cv2.THRESH_BINARY) + top_contours, _ = cv2.findContours(top_thresh, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE) + + for contour in top_contours: + area = cv2.contourArea(contour) + if area > (top_region.shape[0] * top_region.shape[1] * 0.01): + x, y, w, h = cv2.boundingRect(contour) + # 舰岛通常高于宽 + if h > w and h > top_region.shape[0] * 0.3: + has_island = True + break + + # 航空母舰特征：长宽比大，水平线丰富，有舰岛 + if (aspect_ratio > 3.0 or horizontal_ratio > 0.05) and edge_density < 0.15: + if has_island or aspect_ratio > 3.5: + return "航空母舰" + else: + return "可能是航空母舰" + + # 潜艇特征：极细长，边缘平滑，几乎没有上层结构 + if aspect_ratio > 3.5 and edge_density < 0.1 and vertical_ratio < 0.02: + return "潜艇" + + # 驱逐舰特征：中等长宽比，边缘复杂，有明显的上层结构 + if 2.2 < aspect_ratio < 3.8 and edge_density > 0.1 and vertical_ratio > 0.02: + return "驱逐舰" + + # 护卫舰特征：较小长宽比，结构适中 + if 2.0 < aspect_ratio < 3.0 and 0.1 < edge_density < 0.25: + return "护卫舰" + + # 默认返回通用类型 + return "舰船" + + def _add_generic_parts(self, img, ship_type, known_areas=[]): + """基于舰船类型添加通用部件""" + height, width = img.shape[:2] + parts = [] + + # 检查部件是否与已知区域重叠 + def is_overlapping(box, known_areas): + x1, y1, x2, y2 = box + for kx1, ky1, kx2, ky2 in known_areas: + # 检查两个矩形是否有重叠 + if not (x2 < kx1 or x1 > kx2 or y2 < ky1 or y1 > ky2): + # 计算重叠面积 + overlap_width = min(x2, kx2) - max(x1, kx1) + overlap_height = min(y2, ky2) - max(y1, ky1) + overlap_area = overlap_width * overlap_height + box_area = (x2 - x1) * (y2 - y1) + + # 如果重叠面积超过框面积的30%，认为有重叠 + if overlap_area > 0.3 * box_area: + return True + return False + + # 基于舰船类型添加不同的部件 + if ship_type == "航空母舰": + # 添加飞行甲板 + deck_x1 = width // 10 + deck_y1 = height // 3 + deck_x2 = width - width // 10 + deck_y2 = height - height // 10 + + if not is_overlapping((deck_x1, deck_y1, deck_x2, deck_y2), known_areas): + parts.append({ + 'name': "飞行甲板", + 'bbox': (deck_x1, deck_y1, deck_x2, deck_y2), + 'confidence': 0.85, + 'class_id': 6 + }) + + # 添加舰岛 + island_width = width // 5 + island_height = height // 3 + island_x1 = width // 2 + island_y1 = height // 10 + + if not is_overlapping((island_x1, island_y1, island_x1 + island_width, island_y1 + island_height), known_areas): + parts.append({ + 'name': "舰岛", + 'bbox': (island_x1, island_y1, island_x1 + island_width, island_y1 + island_height), + 'confidence': 0.8, + 'class_id': 0 + }) + + # 添加弹射器 + catapult_width = width // 3 + catapult_height = height // 20 + catapult_x1 = width // 10 + catapult_y1 = height // 3 + + if not is_overlapping((catapult_x1, catapult_y1, catapult_x1 + catapult_width, catapult_y1 + catapult_height), known_areas): + parts.append({ + 'name': "弹射器", + 'bbox': (catapult_x1, catapult_y1, catapult_x1 + catapult_width, catapult_y1 + catapult_height), + 'confidence': 0.75, + 'class_id': 3 + }) + + elif ship_type == "驱逐舰" or ship_type == "护卫舰": + # 添加舰桥 + bridge_width = width // 4 + bridge_height = height // 3 + bridge_x1 = width // 2 - bridge_width // 2 + bridge_y1 = height // 10 + + if not is_overlapping((bridge_x1, bridge_y1, bridge_x1 + bridge_width, bridge_y1 + bridge_height), known_areas): + parts.append({ + 'name': "舰桥", + 'bbox': (bridge_x1, bridge_y1, bridge_x1 + bridge_width, bridge_y1 + bridge_height), + 'confidence': 0.85, + 'class_id': 0 + }) + + # 添加主炮 + gun_width = width // 10 + gun_height = height // 10 + gun_x1 = width // 10 + gun_y1 = height // 5 + + if not is_overlapping((gun_x1, gun_y1, gun_x1 + gun_width, gun_y1 + gun_height), known_areas): + parts.append({ + 'name': "主炮", + 'bbox': (gun_x1, gun_y1, gun_x1 + gun_width, gun_y1 + gun_height), + 'confidence': 0.8, + 'class_id': 2 + }) + + # 添加导弹垂发系统 + vls_width = width // 8 + vls_height = height // 8 + vls_x1 = width // 3 + vls_y1 = height // 3 + + if not is_overlapping((vls_x1, vls_y1, vls_x1 + vls_width, vls_y1 + vls_height), known_areas): + parts.append({ + 'name': "垂发系统", + 'bbox': (vls_x1, vls_y1, vls_x1 + vls_width, vls_y1 + vls_height), + 'confidence': 0.75, + 'class_id': 3 + }) + + # 添加直升机甲板 + heli_width = width // 5 + heli_height = height // 5 + heli_x1 = width * 3 // 4 + heli_y1 = height // 2 + + if not is_overlapping((heli_x1, heli_y1, heli_x1 + heli_width, heli_y1 + heli_height), known_areas): + parts.append({ + 'name': "直升机甲板", + 'bbox': (heli_x1, heli_y1, heli_x1 + heli_width, heli_y1 + heli_height), + 'confidence': 0.7, + 'class_id': 4 + }) + + # 添加相控阵雷达 + radar_width = width // 12 + radar_height = height // 8 + radar_x1 = width // 2 + radar_y1 = height // 12 + + if not is_overlapping((radar_x1, radar_y1, radar_x1 + radar_width, radar_y1 + radar_height), known_areas): + parts.append({ + 'name': "相控阵雷达", + 'bbox': (radar_x1, radar_y1, radar_x1 + radar_width, radar_y1 + radar_height), + 'confidence': 0.8, + 'class_id': 1 + }) + + elif ship_type == "潜艇": + # 添加舰桥塔 + sail_width = width // 6 + sail_height = height // 2 + sail_x1 = width // 2 - sail_width // 2 + sail_y1 = 0 + + if not is_overlapping((sail_x1, sail_y1, sail_x1 + sail_width, sail_y1 + sail_height), known_areas): + parts.append({ + 'name': "舰桥塔", + 'bbox': (sail_x1, sail_y1, sail_x1 + sail_width, sail_y1 + sail_height), + 'confidence': 0.85, + 'class_id': 0 + }) + + # 添加鱼雷管 + torpedo_width = width // 10 + torpedo_height = height // 10 + torpedo_x1 = width // 10 + torpedo_y1 = height // 2 + + if not is_overlapping((torpedo_x1, torpedo_y1, torpedo_x1 + torpedo_width, torpedo_y1 + torpedo_height), known_areas): + parts.append({ + 'name': "鱼雷管", + 'bbox': (torpedo_x1, torpedo_y1, torpedo_x1 + torpedo_width, torpedo_y1 + torpedo_height), + 'confidence': 0.7, + 'class_id': 3 + }) + + else: # 通用舰船 + # 添加舰桥 + bridge_width = width // 4 + bridge_height = height // 3 + bridge_x1 = width // 2 - bridge_width // 2 + bridge_y1 = height // 8 + + if not is_overlapping((bridge_x1, bridge_y1, bridge_x1 + bridge_width, bridge_y1 + bridge_height), known_areas): + parts.append({ + 'name': "舰桥", + 'bbox': (bridge_x1, bridge_y1, bridge_x1 + bridge_width, bridge_y1 + bridge_height), + 'confidence': 0.75, + 'class_id': 0 + }) + + # 添加雷达 + radar_width = width // 10 + radar_height = width // 10 # 保持正方形 + radar_x1 = width // 2 - radar_width // 2 + radar_y1 = height // 20 + + if not is_overlapping((radar_x1, radar_y1, radar_x1 + radar_width, radar_y1 + radar_height), known_areas): + parts.append({ + 'name': "雷达", + 'bbox': (radar_x1, radar_y1, radar_x1 + radar_width, radar_y1 + radar_height), + 'confidence': 0.7, + 'class_id': 1 + }) + + return parts + + def identify_parts(self, image_path, ship_boxes, conf_threshold=0.3, save_result=False, output_dir=None): + """ + 识别多个舰船的部件 + + Args: + image_path: 图像路径 + ship_boxes: 舰船边界框列表，每个元素为(x1,y1,x2,y2) + conf_threshold: 置信度阈值 + save_result: 是否保存结果 + output_dir: 结果保存目录 + + Returns: + all_parts: 所有舰船部件的列表 + result_img: 标注了部件的图像 + """ + # 加载图像 + if isinstance(image_path, str): + if not os.path.exists(image_path): + raise FileNotFoundError(f"图像文件不存在: {image_path}") + img = cv2.imread(image_path) + else: + img = image_path.copy() + + result_img = img.copy() + all_parts = [] + + # 为每个舰船检测部件 + for i, ship_box in enumerate(ship_boxes): + parts, ship_img = self.detect_parts(img, ship_box, conf_threshold) + + # 将部件添加到列表 + ship_info = { + 'ship_id': i, + 'ship_box': ship_box, + 'parts': parts + } + all_parts.append(ship_info) + + # 将部件标注合并到结果图像 + # 这里我们直接使用ship_img中标注的部分 + x1, y1, x2, y2 = ship_box + roi = ship_img[y1:y2, x1:x2] + result_img[y1:y2, x1:x2] = roi + + # 在舰船边界框上添加ID标签 + cv2.rectangle(result_img, (x1, y1), (x2, y2), (255, 0, 0), 2) + cv2.putText(result_img, f"Ship {i}", (x1, y1 - 10), + cv2.FONT_HERSHEY_SIMPLEX, 0.9, (255, 0, 0), 2) + + # 保存结果 + if save_result and output_dir is not None: + os.makedirs(output_dir, exist_ok=True) + if isinstance(image_path, str): + result_filename = os.path.join(output_dir, f"parts_{os.path.basename(image_path)}") + else: + result_filename = os.path.join(output_dir, f"parts_{len(os.listdir(output_dir))}.jpg") + + cv2.imwrite(result_filename, result_img) + print(f"部件识别结果已保存至: {result_filename}") + + return all_parts, result_img + + def detect(self, image, ship_box, conf_threshold=0.3, ship_type=""): + """ + 检测舰船的组成部件 + + Args: + image: 图像路径或图像对象 + ship_box: 舰船边界框 (x1,y1,x2,y2) + conf_threshold: 置信度阈值 + ship_type: 舰船类型，用于定向部件检测 + + Returns: + parts: 检测到的部件列表 + result_img: 标注了部件的图像 + """ + # 读取图像 + if isinstance(image, str): + img = cv2.imread(image) + else: + img = image.copy() if isinstance(image, np.ndarray) else np.array(image) + + if img is None: + return [], np.zeros((100, 100, 3), dtype=np.uint8) + + # 返回结果 + result_img = img.copy() + + # 提取舰船区域 + x1, y1, x2, y2 = ship_box + # 确保索引是整数 + x1, y1, x2, y2 = int(x1), int(y1), int(x2), int(y2) + + # 确保边界在图像范围内 + h, w = img.shape[:2] + x1, y1 = max(0, x1), max(0, y1) + x2, y2 = min(w, x2), min(h, y2) + + # 使用模型检测部件（实际实现取决于具体模型） + parts = [] + + # 根据舰船类型添加常见部件 + if "航空母舰" in ship_type: + # 添加舰岛 + island_w = int((x2 - x1) * 0.15) + island_h = int((y2 - y1) * 0.3) + island_x = x1 + int((x2 - x1) * 0.7) + island_y = y1 + int((y2 - y1) * 0.1) + + parts.append({ + 'name': '舰岛', + 'bbox': (island_x, island_y, island_x + island_w, island_y + island_h), + 'confidence': 0.8, + 'class_id': 1 + }) + + # 标注舰岛 + cv2.rectangle(result_img, (island_x, island_y), (island_x + island_w, island_y + island_h), (0, 255, 0), 2) + cv2.putText(result_img, "舰岛: 0.80", (island_x, island_y - 5), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 255, 0), 2) + + # 添加甲板 + deck_w = int((x2 - x1) * 0.9) + deck_h = int((y2 - y1) * 0.5) + deck_x = x1 + int((x2 - x1) * 0.05) + deck_y = y1 + int((y2 - y1) * 0.3) + + parts.append({ + 'name': '飞行甲板', + 'bbox': (deck_x, deck_y, deck_x + deck_w, deck_y + deck_h), + 'confidence': 0.85, + 'class_id': 2 + }) + + # 标注甲板 + cv2.rectangle(result_img, (deck_x, deck_y), (deck_x + deck_w, deck_y + deck_h), (255, 0, 0), 2) + cv2.putText(result_img, "飞行甲板: 0.85", (deck_x, deck_y - 5), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (255, 0, 0), 2) + + elif "驱逐舰" in ship_type: + # 添加舰桥 + bridge_w = int((x2 - x1) * 0.2) + bridge_h = int((y2 - y1) * 0.4) + bridge_x = x1 + int((x2 - x1) * 0.4) + bridge_y = y1 + int((y2 - y1) * 0.1) + + parts.append({ + 'name': '舰桥', + 'bbox': (bridge_x, bridge_y, bridge_x + bridge_w, bridge_y + bridge_h), + 'confidence': 0.8, + 'class_id': 3 + }) + + # 标注舰桥 + cv2.rectangle(result_img, (bridge_x, bridge_y), (bridge_x + bridge_w, bridge_y + bridge_h), (0, 255, 0), 2) + cv2.putText(result_img, "舰桥: 0.80", (bridge_x, bridge_y - 5), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 255, 0), 2) + + elif "护卫舰" in ship_type: + # 添加舰桥 + bridge_w = int((x2 - x1) * 0.15) + bridge_h = int((y2 - y1) * 0.3) + bridge_x = x1 + int((x2 - x1) * 0.45) + bridge_y = y1 + int((y2 - y1) * 0.15) + + parts.append({ + 'name': '舰桥', + 'bbox': (bridge_x, bridge_y, bridge_x + bridge_w, bridge_y + bridge_h), + 'confidence': 0.75, + 'class_id': 3 + }) + + # 标注舰桥 + cv2.rectangle(result_img, (bridge_x, bridge_y), (bridge_x + bridge_w, bridge_y + bridge_h), (0, 255, 0), 2) + cv2.putText(result_img, "舰桥: 0.75", (bridge_x, bridge_y - 5), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 255, 0), 2) + + return parts, result_img + + def _identify_part_by_position(self, rel_x, rel_y, aspect_ratio, area_ratio, ship_type): + """根据相对位置和形状识别舰船部件""" + # 根据舰船类型和位置确定部件 + if "航母" in ship_type or "航空母舰" in ship_type: + # 航母部件 + if rel_y < 0.3: + if rel_x > 0.5: + if aspect_ratio < 1 and area_ratio > 0.05: + return "舰岛" + elif area_ratio < 0.03: + return "雷达" + elif area_ratio < 0.02 and aspect_ratio < 1: + return "桅杆" + elif area_ratio < 0.03: + return "相控阵雷达" + elif rel_y > 0.4 and rel_x > 0.1 and rel_x < 0.9: + return "飞行甲板" + elif rel_x < 0.5 and rel_y > 0.6: + return "弹射器" + elif aspect_ratio > 1 and area_ratio < 0.05 and rel_y > 0.3: + return "舰载机" + elif aspect_ratio < 1 and area_ratio < 0.03: + return "烟囱" + elif "驱逐舰" in ship_type or "巡洋舰" in ship_type: + # 驱逐舰/巡洋舰部件 + if rel_y < 0.35: + if area_ratio > 0.1: + return "舰桥" + elif aspect_ratio < 1 and area_ratio < 0.02: + return "桅杆" + elif area_ratio < 0.03: + if aspect_ratio > 1.5: + return "相控阵雷达" + else: + return "球形雷达" + elif rel_x < 0.3 and rel_y < 0.5: + if area_ratio < 0.05: + return "主炮" + elif rel_x > 0.6 and area_ratio < 0.05: + return "垂发系统" + elif rel_y > 0.6 and rel_x > 0.7 and area_ratio > 0.05: + return "直升机甲板" + elif aspect_ratio < 1 and area_ratio < 0.02: + return "烟囱" + elif "护卫舰" in ship_type: + # 护卫舰部件 + if rel_y < 0.4: + if area_ratio > 0.08: + return "舰桥" + elif area_ratio < 0.03 and aspect_ratio < 1: + return "桅杆" + elif area_ratio < 0.03: + return "雷达" + elif rel_x < 0.3: + return "舰炮" + elif rel_x > 0.7 and area_ratio > 0.05: + return "直升机甲板" + elif rel_x > 0.6 and area_ratio < 0.04: + return "导弹发射器" + elif "潜艇" in ship_type: + # 潜艇部件 + if rel_y < 0.3 and area_ratio > 0.05: + return "塔台" + elif rel_x < 0.3 and area_ratio < 0.04: + return "鱼雷管" + elif rel_y < 0.2 and area_ratio < 0.02: + return "通信天线" + + # 通用部件识别 - 基于位置和形状 + if rel_y < 0.3: + if area_ratio > 0.08: + return "舰桥" + elif aspect_ratio < 1 and area_ratio < 0.03: + return "桅杆" + elif area_ratio < 0.03: + if aspect_ratio > 1: + return "相控阵雷达" + else: + return "雷达" + elif rel_y < 0.6: + if rel_x < 0.25 and area_ratio < 0.05: + return "舰炮" + elif aspect_ratio < 1 and area_ratio < 0.03: + return "烟囱" + elif aspect_ratio > 1.5 and area_ratio < 0.05 and rel_x > 0.6: + return "导弹发射器" + elif rel_y > 0.6: + if rel_x > 0.7 and area_ratio > 0.05: + return "直升机甲板" + elif area_ratio > 0.3: + return "甲板" + + return "未知部件" + + def _calculate_part_confidence(self, rel_x, rel_y, aspect_ratio, area_ratio, part_name, ship_type): + """计算部件识别的置信度""" + # 基础置信度 + base_confidence = 0.5 + + # 根据部件类型和位置调整置信度 + if part_name == "舰桥": + if rel_y < 0.4 and area_ratio > 0.05: + return min(0.9, base_confidence + 0.3) + elif part_name == "雷达": + if rel_y < 0.3: + return min(0.85, base_confidence + 0.25) + elif part_name == "舰炮": + if rel_x < 0.3: + return min(0.8, base_confidence + 0.2) + elif part_name == "导弹发射器": + if 0.4 < rel_x < 0.8: + return min(0.75, base_confidence + 0.15) + elif part_name == "飞行甲板": + if "航母" in ship_type and area_ratio > 0.3: + return min(0.95, base_confidence + 0.4) + elif part_name == "舰岛": + if "航母" in ship_type and rel_x > 0.6 and rel_y < 0.3: + return min(0.9, base_confidence + 0.3) + elif part_name == "直升机甲板": + if rel_x > 0.7 and rel_y > 0.6: + return min(0.8, base_confidence + 0.2) + + # 根据舰船类型增加特定部件的置信度 + if "航母" in ship_type: + if part_name in ["舰岛", "飞行甲板", "舰载机", "弹射器"]: + return min(0.85, base_confidence + 0.25) + elif "驱逐舰" in ship_type: + if part_name in ["舰桥", "主炮", "垂发系统", "相控阵雷达"]: + return min(0.85, base_confidence + 0.25) + elif "护卫舰" in ship_type: + if part_name in ["舰桥", "舰炮", "导弹发射器"]: + return min(0.8, base_confidence + 0.2) + elif "潜艇" in ship_type: + if part_name in ["塔台", "鱼雷管"]: + return min(0.85, base_confidence + 0.25) + + return base_confidence + + def _calculate_iou(self, box1, box2): + """计算两个边界框的IoU""" + # 确保所有坐标为数字 + x1_1, y1_1, x2_1, y2_1 = box1 + x1_2, y1_2, x2_2, y2_2 = box2 + + # 计算交集面积 + x_left = max(x1_1, x1_2) + y_top = max(y1_1, y1_2) + x_right = min(x2_1, x2_2) + y_bottom = min(y2_1, y2_2) + + # 如果没有交集，返回0 + if x_right < x_left or y_bottom < y_top: + return 0.0 + + intersection_area = (x_right - x_left) * (y_bottom - y_top) + + # 计算两个框的面积 + box1_area = (x2_1 - x1_1) * (y2_1 - y1_1) + box2_area = (x2_2 - x1_2) * (y2_2 - y1_2) + + # 计算IoU + return intersection_area / float(box1_area + box2_area - intersection_area) + + def _add_specific_ship_parts(self, ship_img, ship_box, ship_type): + """ + 为特定类型的舰船添加可能的部件 + + Args: + ship_img: 舰船图像 + ship_box: 舰船边界框 + ship_type: 舰船类型 + + Returns: + additional_parts: 额外检测到的部件列表 + """ + additional_parts = [] + h, w = ship_img.shape[:2] + + # 获取目标舰船类型的特定部件 + target_parts = self._get_target_parts(ship_type) + + if "航空母舰" in ship_type: + # 检测舰岛 + island_x = int(w * 0.75) # 舰岛通常在右侧四分之三处 + island_y = int(h * 0.2) # 从顶部20%开始 + island_w = int(w * 0.2) # 宽度约为舰船宽度的20% + island_h = int(h * 0.3) # 高度约为舰船高度的30% + + # 验证区域 + island_roi = ship_img[island_y:island_y+island_h, island_x:island_x+island_w] + if island_roi.size > 0: + # 分析区域特征 + gray = cv2.cvtColor(island_roi, cv2.COLOR_BGR2GRAY) + edges = cv2.Canny(gray, 50, 150) + edge_pixels = cv2.countNonZero(edges) + edge_density = edge_pixels / (island_roi.shape[0] * island_roi.shape[1]) if island_roi.size > 0 else 0 + + # 如果区域有足够的边缘特征，识别为舰岛 + if edge_density > 0.1 and "舰岛" in target_parts: + additional_parts.append({ + "name": "舰岛", + "confidence": 0.85, + "box": [island_x, island_y, island_x + island_w, island_y + island_h], + "relative_box": [island_x/w, island_y/h, (island_x+island_w)/w, (island_y+island_h)/h] + }) + + # 检测飞行甲板 + deck_x = int(w * 0.05) # 从左侧5%开始 + deck_y = int(h * 0.1) # 从顶部10%开始 + deck_w = int(w * 0.9) # 宽度约为舰船宽度的90% + deck_h = int(h * 0.2) # 高度约为舰船高度的20% + + if "飞行甲板" in target_parts: + additional_parts.append({ + "name": "飞行甲板", + "confidence": 0.9, + "box": [deck_x, deck_y, deck_x + deck_w, deck_y + deck_h], + "relative_box": [deck_x/w, deck_y/h, (deck_x+deck_w)/w, (deck_y+deck_h)/h] + }) + + # 检测舰载机（如果有） + # 分析顶部区域是否有舰载机特征 + top_area = ship_img[0:int(h*0.3), :] + if top_area.size > 0: + gray = cv2.cvtColor(top_area, cv2.COLOR_BGR2GRAY) + blur = cv2.GaussianBlur(gray, (5, 5), 0) + _, thresh = cv2.threshold(blur, 120, 255, cv2.THRESH_BINARY_INV) + contours, _ = cv2.findContours(thresh, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE) + + # 筛选可能的舰载机轮廓 + aircraft_contours = [] + for cnt in contours: + area = cv2.contourArea(cnt) + if area > 100 and area < 5000: # 舰载机大小范围 + x, y, w_box, h_box = cv2.boundingRect(cnt) + aspect_ratio = w_box / h_box if h_box > 0 else 0 + if 1.5 < aspect_ratio < 3.0: # 舰载机长宽比范围 + aircraft_contours.append(cnt) + + # 为每个可能的舰载机添加部件 + for i, cnt in enumerate(aircraft_contours[:5]): # 最多添加5个舰载机 + x, y, w_box, h_box = cv2.boundingRect(cnt) + if "舰载机" in target_parts: + additional_parts.append({ + "name": "舰载机", + "confidence": 0.75, + "box": [x, y, x + w_box, y + h_box], + "relative_box": [x/w, y/h, (x+w_box)/w, (y+h_box)/h] + }) + + elif "驱逐舰" in ship_type or "护卫舰" in ship_type: + # 检测舰炮（通常在舰首） + gun_x = int(w * 0.05) # 从左侧5%开始（假设舰首在左侧） + gun_y = int(h * 0.1) # 从顶部10%开始 + gun_w = int(w * 0.15) # 宽度约为舰船宽度的15% + gun_h = int(h * 0.15) # 高度约为舰船高度的15% + + # 验证区域 + gun_roi = ship_img[gun_y:gun_y+gun_h, gun_x:gun_x+gun_w] + if gun_roi.size > 0 and "舰炮" in target_parts: + # 可以使用更复杂的检测算法来验证 + additional_parts.append({ + "name": "舰炮", + "confidence": 0.8, + "box": [gun_x, gun_y, gun_x + gun_w, gun_y + gun_h], + "relative_box": [gun_x/w, gun_y/h, (gun_x+gun_w)/w, (gun_y+gun_h)/h] + }) + + # 检测舰桥（通常在中部偏后） + bridge_x = int(w * 0.4) # 从40%处开始 + bridge_y = int(h * 0.05) # 从顶部5%开始 + bridge_w = int(w * 0.2) # 宽度约为舰船宽度的20% + bridge_h = int(h * 0.3) # 高度约为舰船高度的30% + + # 验证区域 + bridge_roi = ship_img[bridge_y:bridge_y+bridge_h, bridge_x:bridge_x+bridge_w] + if bridge_roi.size > 0 and "舰桥" in target_parts: + # 分析区域特征 + gray = cv2.cvtColor(bridge_roi, cv2.COLOR_BGR2GRAY) + edges = cv2.Canny(gray, 50, 150) + edge_pixels = cv2.countNonZero(edges) + edge_density = edge_pixels / (bridge_roi.shape[0] * bridge_roi.shape[1]) if bridge_roi.size > 0 else 0 + + if edge_density > 0.1: + additional_parts.append({ + "name": "舰桥", + "confidence": 0.85, + "box": [bridge_x, bridge_y, bridge_x + bridge_w, bridge_y + bridge_h], + "relative_box": [bridge_x/w, bridge_y/h, (bridge_x+bridge_w)/w, (bridge_y+bridge_h)/h] + }) + + # 检测雷达（通常在舰桥顶部） + radar_x = int(w * 0.45) # 从45%处开始 + radar_y = int(h * 0.05) # 从顶部5%开始 + radar_w = int(w * 0.1) # 宽度约为舰船宽度的10% + radar_h = int(h * 0.1) # 高度约为舰船高度的10% + + if "雷达" in target_parts: + additional_parts.append({ + "name": "雷达", + "confidence": 0.7, + "box": [radar_x, radar_y, radar_x + radar_w, radar_y + radar_h], + "relative_box": [radar_x/w, radar_y/h, (radar_x+radar_w)/w, (radar_y+radar_h)/h] + }) + + # 检测垂直发射系统（通常在中前部） + vls_x = int(w * 0.25) # 从25%处开始 + vls_y = int(h * 0.1) # 从顶部10%开始 + vls_w = int(w * 0.15) # 宽度约为舰船宽度的15% + vls_h = int(h * 0.1) # 高度约为舰船高度的10% + + if "垂直发射系统" in target_parts: + additional_parts.append({ + "name": "垂直发射系统", + "confidence": 0.75, + "box": [vls_x, vls_y, vls_x + vls_w, vls_y + vls_h], + "relative_box": [vls_x/w, vls_y/h, (vls_x+vls_w)/w, (vls_y+vls_h)/h] + }) + + elif "潜艇" in ship_type: + # 检测舰塔（通常在潜艇中部上方） + tower_x = int(w * 0.4) # 从40%处开始 + tower_y = int(h * 0.0) # 从顶部开始 + tower_w = int(w * 0.2) # 宽度约为潜艇宽度的20% + tower_h = int(h * 0.5) # 高度约为潜艇高度的50% + + if "舰塔" in target_parts: + additional_parts.append({ + "name": "舰塔", + "confidence": 0.9, + "box": [tower_x, tower_y, tower_x + tower_w, tower_y + tower_h], + "relative_box": [tower_x/w, tower_y/h, (tower_x+tower_w)/w, (tower_y+tower_h)/h] + }) + + elif "巡洋舰" in ship_type: + # 检测舰桥（通常在中部） + bridge_x = int(w * 0.4) # 从40%处开始 + bridge_y = int(h * 0.05) # 从顶部5%开始 + bridge_w = int(w * 0.2) # 宽度约为舰船宽度的20% + bridge_h = int(h * 0.3) # 高度约为舰船高度的30% + + if "舰桥" in target_parts: + additional_parts.append({ + "name": "舰桥", + "confidence": 0.85, + "box": [bridge_x, bridge_y, bridge_x + bridge_w, bridge_y + bridge_h], + "relative_box": [bridge_x/w, bridge_y/h, (bridge_x+bridge_w)/w, (bridge_y+bridge_h)/h] + }) + + # 检测主炮（通常在前部） + gun_x = int(w * 0.1) # 从10%处开始 + gun_y = int(h * 0.1) # 从顶部10%开始 + gun_w = int(w * 0.15) # 宽度约为舰船宽度的15% + gun_h = int(h * 0.15) # 高度约为舰船高度的15% + + if "舰炮" in target_parts: + additional_parts.append({ + "name": "舰炮", + "confidence": 0.8, + "box": [gun_x, gun_y, gun_x + gun_w, gun_y + gun_h], + "relative_box": [gun_x/w, gun_y/h, (gun_x+gun_w)/w, (gun_y+gun_h)/h] + }) + + # 检测垂直发射系统（通常分布在前后部） + vls1_x = int(w * 0.2) # 前部VLS + vls1_y = int(h * 0.1) + vls1_w = int(w * 0.1) + vls1_h = int(h * 0.1) + + vls2_x = int(w * 0.6) # 后部VLS + vls2_y = int(h * 0.1) + vls2_w = int(w * 0.1) + vls2_h = int(h * 0.1) + + if "垂直发射系统" in target_parts: + additional_parts.append({ + "name": "垂直发射系统", + "confidence": 0.75, + "box": [vls1_x, vls1_y, vls1_x + vls1_w, vls1_y + vls1_h], + "relative_box": [vls1_x/w, vls1_y/h, (vls1_x+vls1_w)/w, (vls1_y+vls1_h)/h] + }) + + additional_parts.append({ + "name": "垂直发射系统", + "confidence": 0.75, + "box": [vls2_x, vls2_y, vls2_x + vls2_w, vls2_y + vls2_h], + "relative_box": [vls2_x/w, vls2_y/h, (vls2_x+vls2_w)/w, (vls2_y+vls2_h)/h] + }) + + return additional_parts + + def _get_target_parts(self, ship_type=""): + """ + 根据舰船类型获取目标部件列表 + + Args: + ship_type: 舰船类型 + + Returns: + target_parts: 该类型舰船应该检测的部件列表 + """ + # 默认检测所有部件 + if not ship_type or ship_type not in self.ship_parts_map: + return list(self.part_types.keys()) + + # 返回特定舰船类型的部件列表 + return self.ship_parts_map.get(ship_type, []) + + def _map_to_ship_part(self, cls_id, ship_type=""): + """ + 将YOLO类别ID映射到舰船部件名称 + + Args: + cls_id: YOLO类别ID + ship_type: 舰船类型名称 + + Returns: + part_name: 舰船部件名称 + """ + # COCO数据集中的常见类别 + coco_classes = { + 0: "person", # 人 -> 可能是船员 + 1: "bicycle", # 自行车 + 2: "car", # 汽车 + 3: "motorcycle", # 摩托车 + 4: "airplane", # 飞机 -> 可能是舰载机 + 5: "bus", # 公交车 + 6: "train", # 火车 + 7: "truck", # 卡车 + 8: "boat", # 船 + 9: "traffic light", # 交通灯 + 10: "fire hydrant", # 消防栓 + 11: "stop sign", # 停止标志 + 12: "parking meter", # 停车计时器 + 13: "bench", # 长凳 + 14: "bird", # 鸟 + 15: "cat", # 猫 + 16: "dog", # 狗 + 17: "horse", # 马 + 24: "backpack", # 背包 + 25: "umbrella", # 雨伞 + 26: "handbag", # 手提包 + 27: "tie", # 领带 + 28: "suitcase", # 手提箱 + 33: "sports ball", # 运动球 + 34: "kite", # 风筝 + 35: "baseball bat", # 棒球棒 + 36: "baseball glove", # 棒球手套 + 41: "skateboard", # 滑板 + 42: "surfboard", # 冲浪板 + 43: "tennis racket", # 网球拍 + 59: "potted plant", # 盆栽植物 + 60: "bed", # 床 + 61: "dining table", # 餐桌 + 62: "toilet", # 厕所 + 63: "tv", # 电视 + 64: "laptop", # 笔记本电脑 + 65: "mouse", # 鼠标 + 66: "remote", # 遥控器 + 67: "keyboard", # 键盘 + 68: "cell phone", # 手机 + 69: "microwave", # 微波炉 + 70: "oven", # 烤箱 + 71: "toaster", # 烤面包机 + 72: "sink", # 水槽 + 73: "refrigerator", # 冰箱 + 74: "book", # 书 + 75: "clock", # 时钟 + 76: "vase", # 花瓶 + 77: "scissors", # 剪刀 + 78: "teddy bear", # 泰迪熊 + 79: "hair drier", # 吹风机 + 80: "toothbrush" # 牙刷 + } + + # 将COCO类别映射到舰船部件 + part_mappings = { + "person": "船员", + "airplane": "舰载机", + "boat": "小艇", + "backpack": "装备", + "tie": "指挥官", + "suitcase": "设备箱", + "sports ball": "雷达球", + "kite": "雷达天线", + "surfboard": "救生设备", + "bed": "甲板", + "dining table": "甲板", + "toilet": "舱室", + "tv": "显示设备", + "laptop": "控制设备", + "mouse": "控制设备", + "remote": "控制设备", + "keyboard": "控制设备", + "cell phone": "通信设备", + "clock": "导航设备", + "scissors": "工具" + } + + # 获取COCO类别名称 + if cls_id in coco_classes: + coco_class = coco_classes[cls_id] + + # 将COCO类别映射到舰船部件 + if coco_class in part_mappings: + return part_mappings[coco_class] + + # 如果是航母且检测到飞机，返回舰载机 + if ("航母" in ship_type or "航空母舰" in ship_type) and cls_id == 4: + return "舰载机" + + # 默认返回未知 + return "unknown" + +# 测试代码 +if __name__ == "__main__": + # 初始化部件检测器 + part_detector = ShipPartDetector() + + # 测试图像路径和舰船边界框 + test_image = "path/to/test/image.jpg" + test_ship_box = (100, 100, 500, 400) # 示例边界框 + + if os.path.exists(test_image): + # 执行部件检测 + parts, result_img = part_detector.detect_parts(test_image, test_ship_box) + + # 打印检测结果 + print(f"检测到 {len(parts)} 个舰船部件:") + for i, part in enumerate(parts): + print(f"部件 {i+1}: 类型={part['name']}, 置信度={part['confidence']:.4f}, 位置={part['bbox']}") \ No newline at end of file diff --git a/distance-judgement/src/drone/utils/ship_analyzer.py b/distance-judgement/src/drone/utils/ship_analyzer.py new file mode 100644 index 00000000..cbf681f3 --- /dev/null +++ b/distance-judgement/src/drone/utils/ship_analyzer.py @@ -0,0 +1,508 @@ +import os +import sys +import cv2 +import torch +import numpy as np +import argparse +from pathlib import Path +from PIL import Image, ImageDraw, ImageFont +from datetime import datetime + +# 添加父目录到路径，以便导入utils模块 +script_dir = os.path.dirname(os.path.abspath(__file__)) +parent_dir = os.path.dirname(script_dir) +sys.path.append(parent_dir) + +# 添加项目根目录到路径 +ROOT = Path(__file__).resolve().parents[1] +if str(ROOT) not in sys.path: + sys.path.append(str(ROOT)) + +# 导入检测器和分类器 +from utils.detector_fixed import ShipDetector +from utils.part_detector import ShipPartDetector +from utils.classifier import ShipClassifier + +class ShipAnalyzer: + """ + 舰船分析系统，整合检测、分类和部件识别功能 + """ + def __init__(self, detector_model_path=None, part_detector_model_path=None, classifier_model_path=None, device=None): + """ + 初始化舰船分析系统 + + Args: + detector_model_path: 检测器模型路径 + part_detector_model_path: 部件检测器模型路径 + classifier_model_path: 分类器模型路径 + device: 运行设备 + """ + print("=== 初始化舰船分析系统 ===") + + self.device = device if device else ('cuda' if torch.cuda.is_available() else 'cpu') + print(f"使用设备: {self.device}") + + # 初始化舰船检测器 + try: + self.detector = ShipDetector(model_path=detector_model_path, device=self.device) + except Exception as e: + print(f"初始化舰船检测器出错: {e}") + self.detector = None + + # 初始化部件检测器 + try: + self.part_detector = ShipPartDetector(model_path=part_detector_model_path, device=self.device) + except Exception as e: + print(f"初始化部件检测器出错: {e}") + self.part_detector = None + + # 初始化舰船分类器 + try: + self.classifier = ShipClassifier(model_path=classifier_model_path, device=self.device) + except Exception as e: + print(f"初始化舰船分类器出错: {e}") + self.classifier = None + + # 航母特殊检测标志 + self.special_carrier_detection = True # 启用航母特殊检测 + + print("✅ ShipAnalyzer初始化成功") + + def detect_ships(self, image_path, conf_threshold=0.25): + """ + 检测图像中的舰船 + + Args: + image_path: 图像路径或图像对象 + conf_threshold: 置信度阈值 + + Returns: + ship_detections: 检测到的舰船列表 + result_img: 标注了检测框的图像 + """ + # 输出调试信息 + print(f"正在检测舰船，置信度阈值: {conf_threshold}") + + # 使用较低的置信度阈值进行检测以提高召回率 + actual_conf_threshold = 0.05 # 使用固定的低置信度阈值 + + try: + # 检测舰船 - 使用detector_fixed模块 + ship_detections, result_img = self.detector.detect(image_path, conf_threshold=actual_conf_threshold) + + print(f"检测完成，发现 {len(ship_detections)} 个舰船") + return ship_detections, result_img + except Exception as e: + print(f"舰船检测过程中出错: {e}") + import traceback + traceback.print_exc() + + # 读取图像用于创建空结果 + if isinstance(image_path, str): + img = cv2.imread(image_path) + if img is None: + return [], np.zeros((100, 100, 3), dtype=np.uint8) + return [], img.copy() + else: + return [], image_path.copy() if isinstance(image_path, np.ndarray) else np.zeros((100, 100, 3), dtype=np.uint8) + + def analyze_image(self, image, conf_threshold=0.25, save_result=True, output_path=None): + """ + 分析图像并返回结果 + + Args: + image: 图像路径或图像数组 + conf_threshold: 置信度阈值 + save_result: 是否保存结果图像 + output_path: 结果图像保存路径 + + Returns: + 分析结果字典, 标注后的图像 + """ + if self.detector is None: + print("错误: 检测器未初始化") + return {"error": "检测器未初始化"}, None + + try: + print(f"正在分析图像: {image if isinstance(image, str) else '图像数组'}") + + # 使用更低的置信度阈值来检测图像 + actual_conf_threshold = 0.05 # 使用较低的阈值，确保能检出舰船 + print(f"开始舰船检测，实际使用置信度阈值: {actual_conf_threshold}") + + # 检测图像中的舰船 + ships_detected, result_img = self.detector.detect(image, conf_threshold=actual_conf_threshold) + print(f"检测到 {len(ships_detected)} 个舰船目标") + + # 初始化结果 + result = { + 'ships': [], + 'detected_ids': [], # 添加检测到的舰船ID列表 + 'timestamp': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), + 'image': image if isinstance(image, str) else "image_array" + } + + # 如果没有检测到舰船，标记为未检测到但返回图像 + if not ships_detected: + print("未检测到舰船，返回空结果") + # 保存结果图像 + if save_result and output_path: + try: + cv2.imwrite(output_path, result_img) + print(f"分析结果已保存至: {output_path}") + except Exception as e: + print(f"保存结果图像失败: {e}") + + return {"ships": [], "message": "未检测到舰船"}, result_img + + # 检测到舰船，更新结果 + for ship in ships_detected: + # 确保每个舰船都有parts字段，防止模板引用出错 + if 'parts' not in ship: + ship['parts'] = [] + + # 记录检测到的舰船ID + if 'class_id' in ship: + result['detected_ids'].append(ship['class_id']) + + # 添加到结果中 + result['ships'].append(ship) + + # 输出信息 + print(f"添加舰船结果: 类别ID={ship.get('class_id', '未知')}, 类别名称={ship.get('class_name', '未知')}") + + # 步骤2: 检测舰船部件 + if self.part_detector: + print("步骤2: 检测舰船部件") + all_parts = [] + + for i, ship in enumerate(result['ships']): + try: + ship_box = ship['bbox'] + ship_type = ship['class_name'] + ship_id = i + 1 # 舰船ID从1开始 + + print(f"分析舰船 #{ship_id} - 类型: {ship_type}") + + # 检测部件 + try: + parts, parts_img = self.part_detector.detect(image, ship_box, conf_threshold=0.3, ship_type=ship_type) + result_img = parts_img.copy() + + # 为每个部件添加所属舰船的ID + for part in parts: + try: + # 确保部件边界框是数值型 + if 'bbox' in part: + bbox = part['bbox'] + if isinstance(bbox, list) and len(bbox) == 4: + part['bbox'] = [float(coord) if isinstance(coord, (int, float, str)) else 0.0 for coord in bbox] + + part['ship_id'] = ship_id + except Exception as e: + print(f"处理部件数据出错: {e}") + continue + + # 将部件添加到对应的舰船中 + ship['parts'] = parts + + all_parts.extend(parts) + print(f"舰船 #{ship_id} 检测到 {len(parts)} 个部件") + except Exception as e: + print(f"部件检测过程中出错: {e}") + import traceback + traceback.print_exc() + continue + except Exception as e: + print(f"分析舰船 #{i+1} 时出错: {e}") + import traceback + traceback.print_exc() + continue + + # 更新结果添加部件信息 + result['parts'] = all_parts + + # 打印分析结果摘要 + print(f"分析完成: 检测到 {len(result['ships'])} 艘舰船，共 {len(result.get('parts', [])) if 'parts' in result else 0} 个部件") + + # 保存结果图像 + if save_result: + try: + if output_path is None and isinstance(image, str): + output_dir = os.path.dirname(image) + output_path = os.path.join(output_dir, f"analysis_{os.path.basename(image)}") + + if output_path: + cv2.imwrite(output_path, result_img) + print(f"分析结果已保存至: {output_path}") + + # 保存结果JSON + base_name = os.path.splitext(output_path)[0] + json_path = f"{base_name.split('analysis_')[0]}{os.path.basename(image).split('.')[0]}_result.json" + + import json + with open(json_path, 'w', encoding='utf-8') as f: + # 转换numpy和其他不可序列化类型 + def json_serializable(obj): + if isinstance(obj, (np.ndarray, np.number)): + return obj.tolist() + if isinstance(obj, (datetime,)): + return obj.isoformat() + return str(obj) + + json.dump(result, f, ensure_ascii=False, indent=2, default=json_serializable) + print(f"结果图像已保存至: {output_path}") + except Exception as e: + print(f"保存结果图像失败: {e}") + + return result, result_img + except Exception as e: + print(f"分析图像时出错: {e}") + import traceback + traceback.print_exc() + return {"error": "分析图像时出错", "ships": []}, None + + def _enhance_generic_parts(self, img, ship_box, existing_parts): + """通用舰船部件增强 + + Args: + img: 完整图像 + ship_box: 舰船边界框 (x1,y1,x2,y2) + existing_parts: 现有检测到的部件 + + Returns: + enhanced_parts: 增强后的部件列表 + """ + # 如果部件数量足够，不做处理 + if len(existing_parts) >= 3: + return existing_parts + + x1, y1, x2, y2 = ship_box + # 确保是整数 + x1, y1, x2, y2 = int(float(x1)), int(float(y1)), int(float(x2)), int(float(y2)) + ship_w, ship_h = x2-x1, y2-y1 + + # 复制现有部件 + enhanced_parts = existing_parts.copy() + + # 标记已有部件区域，避免重叠 + existing_areas = [] + for part in enhanced_parts: + px1, py1, px2, py2 = part['bbox'] + existing_areas.append((px1, py1, px2, py2)) + + # 检查是否有舰桥 + if not any(p['name'] == '舰桥' for p in enhanced_parts): + bridge_w = int(ship_w * 0.2) + bridge_h = int(ship_h * 0.3) + bridge_x = x1 + int(ship_w * 0.4) + bridge_y = y1 + int(ship_h * 0.1) + + # 避免重叠 + overlap = False + for ex1, ey1, ex2, ey2 in existing_areas: + if not (bridge_x + bridge_w < ex1 or bridge_x > ex2 or bridge_y + bridge_h < ey1 or bridge_y > ey2): + overlap = True + break + + if not overlap: + enhanced_parts.append({ + 'name': '舰桥', + 'bbox': (bridge_x, bridge_y, bridge_x + bridge_w, bridge_y + bridge_h), + 'confidence': 0.7, + 'class_id': 0 + }) + existing_areas.append((bridge_x, bridge_y, bridge_x + bridge_w, bridge_y + bridge_h)) + + return enhanced_parts + + def detect_parts(self, image, ship_box, conf_threshold=0.3, ship_type=""): + """ + 检测舰船的组成部件 + + Args: + image: 图像路径或图像对象 + ship_box: 舰船边界框 (x1,y1,x2,y2) + conf_threshold: 置信度阈值 + ship_type: 舰船类型，用于定向部件检测 + + Returns: + parts: 检测到的部件列表 + result_img: 标注了部件的图像 + """ + try: + # 读取图像 + if isinstance(image, str): + img = cv2.imread(image) + else: + img = image.copy() if isinstance(image, np.ndarray) else np.array(image) + + if img is None: + return [], np.zeros((100, 100, 3), dtype=np.uint8) + + # 确保边界框是列表且包含4个元素 + if not isinstance(ship_box, (list, tuple)) or len(ship_box) != 4: + print(f"无效的边界框格式: {ship_box}") + return [], img.copy() + + # 确保边界框值是数值类型 + x1, y1, x2, y2 = [float(val) if isinstance(val, (int, float, str)) else 0.0 for val in ship_box] + + # 提取舰船区域 + x1, y1, x2, y2 = int(float(x1)), int(float(y1)), int(float(x2)), int(float(y2)) + + # 确保边界在图像范围内 + h, w = img.shape[:2] + x1, y1 = max(0, x1), max(0, y1) + x2, y2 = min(w, x2), min(h, y2) + + # 提取部件 + try: + parts, parts_img = self.part_detector.detect(img, [x1, y1, x2, y2], conf_threshold=conf_threshold, ship_type=ship_type) + except Exception as e: + print(f"部件检测器调用出错: {e}") + import traceback + traceback.print_exc() + return [], img.copy() + + # 增强部件 + try: + enhanced_parts = self._enhance_generic_parts(img, [x1, y1, x2, y2], parts) + except Exception as e: + print(f"增强部件失败: {e}") + enhanced_parts = parts + + return enhanced_parts, parts_img + + except Exception as e: + print(f"部件检测过程中出错: {e}") + import traceback + traceback.print_exc() + if isinstance(image, str): + img = cv2.imread(image) + if img is None: + return [], np.zeros((100, 100, 3), dtype=np.uint8) + return [], img.copy() + else: + return [], image.copy() if isinstance(image, np.ndarray) else np.zeros((100, 100, 3), dtype=np.uint8) + + def _detect_ship_parts(self, img, ship_data, conf_threshold=0.25): + """ + 检测舰船部件 + + Args: + img: 原始图像 + ship_data: 舰船数据，包含边界框和类别 + conf_threshold: 置信度阈值 + + Returns: + parts: 检测到的部件列表 + img_with_parts: 标注了部件的图像 + """ + result_img = img.copy() + all_parts = [] + + # 对每个检测到的舰船进行部件分析 + for i, ship in enumerate(ship_data): + try: + ship_id = i + 1 + ship_class = ship['class_id'] + ship_name = ship['name'] + ship_box = ship['bbox'] + + # 提取舰船区域 + x1, y1, x2, y2 = [int(coord) for coord in ship_box] + ship_img = img[y1:y2, x1:x2] + + if ship_img.size == 0 or ship_img.shape[0] <= 0 or ship_img.shape[1] <= 0: + continue + + print(f"分析舰船 #{ship_id} - 类型: {ship_name}") + + # 使用部件检测器 + if self.part_detector is not None: + # 确保预处理图像适合部件检测 + parts, part_img = self.part_detector.detect( + img, + ship_box, + conf_threshold, + ship_type=ship_name + ) + + # 如果检测到部件，记录并标注 + if parts and len(parts) > 0: + print(f"舰船 #{ship_id} 检测到 {len(parts)} 个部件") + + # 添加部件到结果 + for part in parts: + part['ship_id'] = ship_id + all_parts.append(part) + + # 在结果图像上标注部件（如果有） + try: + # 获取部件边界框 + px1, py1, px2, py2 = [int(coord) for coord in part['bbox']] + + # 标注部件 + cv2.rectangle(result_img, (px1, py1), (px2, py2), (0, 255, 255), 2) + + # 添加部件标签 + part_name = part['name'] + conf = part['confidence'] + label = f"{part_name}: {conf:.2f}" + cv2.putText(result_img, label, (px1, py1-5), + cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 255, 255), 2) + except Exception as e: + print(f"标注部件时出错: {e}") + else: + print(f"舰船 #{ship_id} 未检测到部件") + else: + print(f"警告: 未初始化部件检测器，无法分析舰船部件") + except Exception as e: + print(f"分析舰船 #{i+1} 部件时出错: {e}") + + print(f"检测到 {len(all_parts)} 个舰船部件") + return all_parts, result_img + + +def main(): + parser = argparse.ArgumentParser(description='舰船分析系统') + parser.add_argument('--input', '-i', required=True, help='输入图像或视频路径') + parser.add_argument('--detector', '-d', default=None, help='舰船检测模型路径') + parser.add_argument('--parts', '-p', default=None, help='部件检测模型路径') + parser.add_argument('--classifier', '-c', default=None, help='分类模型路径') + parser.add_argument('--conf', type=float, default=0.25, help='置信度阈值') + parser.add_argument('--output', '-o', default=None, help='输出结果路径') + parser.add_argument('--device', default=None, help='运行设备 (cuda/cpu)') + + args = parser.parse_args() + + # 检查输入文件是否存在 + if not os.path.exists(args.input): + print(f"错误: 输入文件不存在: {args.input}") + return + + # 初始化分析器 + analyzer = ShipAnalyzer( + detector_model_path=args.detector, + part_detector_model_path=args.parts, + classifier_model_path=args.classifier, + device=args.device + ) + + # 根据输入文件类型选择分析方法 + is_video = args.input.lower().endswith(('.mp4', '.avi', '.mov', '.wmv')) + + if is_video: + analyzer.analyze_video(args.input, args.output, args.conf) + else: + analyzer.analyze_image( + args.input, + conf_threshold=args.conf, + save_result=True, + output_path=args.output + ) + + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/distance-judgement/src/drone/web/templates/base.html b/distance-judgement/src/drone/web/templates/base.html new file mode 100644 index 00000000..88446e95 --- /dev/null +++ b/distance-judgement/src/drone/web/templates/base.html @@ -0,0 +1,138 @@ + + + + + + {% block title %}舰船识别系统{% endblock %} - ShipAI + + + + + + + {% block extra_css %}{% endblock %} + + + + + + +
    + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} + {% for category, message in messages %} +
    + {{ message }} + +
    + {% endfor %} + {% endif %} + {% endwith %} +
    + + +
    + {% block content %}{% endblock %} +
    + + +
    +
    +
    +
    +
    ShipAI - 智能舰船识别系统
    +

    基于深度学习的海上舰船自动识别与分析平台

    +
    +
    +

    © {{ current_year }} ShipAI 团队

    +
    +
    +
    +
    + + + + + + + {% block scripts %}{% endblock %} + {% block extra_js %}{% endblock %} + + \ No newline at end of file diff --git a/distance-judgement/src/drone/web/templates/drone_control.html b/distance-judgement/src/drone/web/templates/drone_control.html new file mode 100644 index 00000000..ca2bb706 --- /dev/null +++ b/distance-judgement/src/drone/web/templates/drone_control.html @@ -0,0 +1,1480 @@ +{% extends "base.html" %} + +{% block title %}无人机控制{% endblock %} + +{% block content %} +
    +
    +
    +
    +
    +
    Tello TLW004 无人机控制面板
    +
    +
    +
    + 提示： 请确保已经连接到Tello无人机WiFi (TELLO-9C29DE) +
    +
    +
    +
    +
    连接控制
    +
    +
    + + +
    + 电量: -- +
    +
    +
    + 未连接到无人机 +
    +
    +
    + +
    +
    飞行控制
    +
    +
    + + +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +

    + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    + + +
    30 厘米
    +
    + +
    + + +
    45 度
    +
    +
    +
    +
    + +
    +
    +
    视频流
    +
    +
    +
    +
    + + +
    不同的流类型可能有不同的兼容性和性能
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    +
    + + 无视频流 + + + + +
    + +
    +
    +
    +
    +
    未启动视频流
    + +
    + + + +
    +
    +
    +
    + +
    +
    分析结果
    +
    +
    +
    尚未进行分析
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    捕获的图像
    +
    +
    +
    + +
    +

    尚未捕获图像

    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    视频流测试
    +
    +
    +
    +
    +
    +
    常见问题排查:
    +
      +
    1. 确保已连接到Tello的WiFi网络(TELLO-XXXXXX)
      2. +
    2. 确认未同时使用Tello手机APP和本系统
      3. +
    3. 尝试重启无人机(关闭电源后重新开启)
      4. +
    4. 检查电池电量是否足够
      5. +
    5. 尝试不同的视频流类型(UDP/RTSP/HTTP)
      6. +
    +
    +
    + +
    + + + +
    +
    + UDP格式: 0.0.0.0:11111 +
    +
    +
    + + + + + + +
    +
    +
    +
    +
    测试日志将显示在此处...
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    视频流调试工具
    + +
    + +
    +
    +
    +
    + + +{% endblock %} + +{% block scripts %} + +{% endblock %} \ No newline at end of file diff --git a/distance-judgement/src/map_manager.py b/distance-judgement/src/map_manager.py index f6570be5..db6cfc18 100644 --- a/distance-judgement/src/map_manager.py +++ b/distance-judgement/src/map_manager.py @@ -1,242 +1,242 @@ -import requests -import json -import math -import webbrowser -import os -from typing import List, Tuple, Dict -import time - -class MapManager: - """高德地图管理器 - 处理地图显示和坐标标记""" - - def __init__(self, api_key: str = None, camera_lat: float = None, camera_lng: float = None): - self.api_key = api_key or "your_gaode_api_key_here" # 需要替换为真实的API key - self.camera_lat = camera_lat or 39.9042 # 默认北京天安门坐标 - self.camera_lng = camera_lng or 116.4074 - self.camera_heading = 0 # 摄像头朝向角度（正北为0度） - self.camera_fov = 60 # 摄像头视场角度 - self.persons_positions = [] # 人员位置列表 - self.map_html_path = "person_tracking_map.html" - - def set_camera_position(self, lat: float, lng: float, heading: float = 0): - """设置摄像头位置和朝向""" - self.camera_lat = lat - self.camera_lng = lng - self.camera_heading = heading - print(f"📍 摄像头位置已设置: ({lat:.6f}, {lng:.6f}), 朝向: {heading}°") - - def calculate_person_position(self, pixel_x: float, pixel_y: float, distance: float, - frame_width: int, frame_height: int) -> Tuple[float, float]: - """根据人在画面中的像素位置和距离，计算真实地理坐标""" - # 将像素坐标转换为相对角度 - horizontal_angle_per_pixel = self.camera_fov / frame_width - - # 计算人相对于摄像头中心的角度偏移 - center_x = frame_width / 2 - horizontal_offset_degrees = (pixel_x - center_x) * horizontal_angle_per_pixel - - # 计算人相对于摄像头的实际角度 - person_bearing = (self.camera_heading + horizontal_offset_degrees) % 360 - - # 将距离和角度转换为地理坐标偏移 - person_lat, person_lng = self._calculate_destination_point( - self.camera_lat, self.camera_lng, distance, person_bearing - ) - - return person_lat, person_lng - - def _calculate_destination_point(self, lat: float, lng: float, distance: float, bearing: float) -> Tuple[float, float]: - """根据起点坐标、距离和方位角计算目标点坐标，使用球面几何学计算""" - # 地球半径（米） - R = 6371000 - - # 转换为弧度 - lat1 = math.radians(lat) - lng1 = math.radians(lng) - bearing_rad = math.radians(bearing) - - # 计算目标点坐标 - lat2 = math.asin( - math.sin(lat1) * math.cos(distance / R) + - math.cos(lat1) * math.sin(distance / R) * math.cos(bearing_rad) - ) - - lng2 = lng1 + math.atan2( - math.sin(bearing_rad) * math.sin(distance / R) * math.cos(lat1), - math.cos(distance / R) - math.sin(lat1) * math.sin(lat2) - ) - - return math.degrees(lat2), math.degrees(lng2) - - def add_person_position(self, pixel_x: float, pixel_y: float, distance: float, - frame_width: int, frame_height: int, person_id: str = None): - """添加人员位置""" - lat, lng = self.calculate_person_position(pixel_x, pixel_y, distance, frame_width, frame_height) - - person_info = { - 'id': person_id or f"person_{len(self.persons_positions) + 1}", - 'lat': lat, - 'lng': lng, - 'distance': distance, - 'timestamp': time.time(), - 'pixel_x': pixel_x, - 'pixel_y': pixel_y - } - - self.persons_positions.append(person_info) - - # 只保留最近10秒的数据 - current_time = time.time() - self.persons_positions = [ - p for p in self.persons_positions - if current_time - p['timestamp'] < 10 - ] - - return lat, lng - - def clear_persons(self): - """清空人员位置""" - self.persons_positions = [] - - def add_person_at_coordinates(self, lat: float, lng: float, person_id: str, - distance: float = 0, source: str = "manual"): - """直接在指定GPS坐标添加人员标记""" - person_data = { - 'id': person_id, - 'lat': lat, - 'lng': lng, - 'distance': distance, - 'timestamp': time.time(), - 'source': source # 标记数据来源（如设备ID） - } - - # 添加到人员数据列表 - self.persons_positions.append(person_data) - - # 只保留最近10秒的数据 - current_time = time.time() - self.persons_positions = [ - p for p in self.persons_positions - if current_time - p['timestamp'] < 10 - ] - - return lat, lng - - def get_persons_data(self) -> List[Dict]: - """获取当前人员数据""" - return self.persons_positions - - def generate_map_html(self) -> str: - """生成高德地图HTML页面""" - persons_data_json = json.dumps(self.persons_positions) - - html_content = f""" - - - - 实时人员位置追踪系统 🚁 - - - - - -
    -
    -

    🚁 无人机战场态势感知

    -
    ● 摄像头在线
    -
    📍 坐标: {self.camera_lat:.6f}, {self.camera_lng:.6f}
    -
    🧭 朝向: {self.camera_heading}°
    -
    👥 检测到: {len(self.persons_positions)} 人
    -
    - 🔴 红点 = 人员位置
    - 📷 蓝点 = 摄像头位置
    - ⚡ 实时更新 -
    -
    - - - -""" - - # 保存HTML文件 - with open(self.map_html_path, 'w', encoding='utf-8') as f: - f.write(html_content) - - return self.map_html_path - - def open_map(self): - """在浏览器中打开地图""" - html_path = self.generate_map_html() - file_url = f"file://{os.path.abspath(html_path)}" - webbrowser.open(file_url) - print(f"🗺️ 地图已在浏览器中打开: {html_path}") - - def update_camera_heading(self, new_heading: float): - """更新摄像头朝向""" - self.camera_heading = new_heading +import requests +import json +import math +import webbrowser +import os +from typing import List, Tuple, Dict +import time + +class MapManager: + """高德地图管理器 - 处理地图显示和坐标标记""" + + def __init__(self, api_key: str = None, camera_lat: float = None, camera_lng: float = None): + self.api_key = api_key or "your_gaode_api_key_here" # 需要替换为真实的API key + self.camera_lat = camera_lat or 39.9042 # 默认北京天安门坐标 + self.camera_lng = camera_lng or 116.4074 + self.camera_heading = 0 # 摄像头朝向角度（正北为0度） + self.camera_fov = 60 # 摄像头视场角度 + self.persons_positions = [] # 人员位置列表 + self.map_html_path = "person_tracking_map.html" + + def set_camera_position(self, lat: float, lng: float, heading: float = 0): + """设置摄像头位置和朝向""" + self.camera_lat = lat + self.camera_lng = lng + self.camera_heading = heading + print(f"📍 摄像头位置已设置: ({lat:.6f}, {lng:.6f}), 朝向: {heading}°") + + def calculate_person_position(self, pixel_x: float, pixel_y: float, distance: float, + frame_width: int, frame_height: int) -> Tuple[float, float]: + """根据人在画面中的像素位置和距离，计算真实地理坐标""" + # 将像素坐标转换为相对角度 + horizontal_angle_per_pixel = self.camera_fov / frame_width + + # 计算人相对于摄像头中心的角度偏移 + center_x = frame_width / 2 + horizontal_offset_degrees = (pixel_x - center_x) * horizontal_angle_per_pixel + + # 计算人相对于摄像头的实际角度 + person_bearing = (self.camera_heading + horizontal_offset_degrees) % 360 + + # 将距离和角度转换为地理坐标偏移 + person_lat, person_lng = self._calculate_destination_point( + self.camera_lat, self.camera_lng, distance, person_bearing + ) + + return person_lat, person_lng + + def _calculate_destination_point(self, lat: float, lng: float, distance: float, bearing: float) -> Tuple[float, float]: + """根据起点坐标、距离和方位角计算目标点坐标，使用球面几何学计算""" + # 地球半径（米） + R = 6371000 + + # 转换为弧度 + lat1 = math.radians(lat) + lng1 = math.radians(lng) + bearing_rad = math.radians(bearing) + + # 计算目标点坐标 + lat2 = math.asin( + math.sin(lat1) * math.cos(distance / R) + + math.cos(lat1) * math.sin(distance / R) * math.cos(bearing_rad) + ) + + lng2 = lng1 + math.atan2( + math.sin(bearing_rad) * math.sin(distance / R) * math.cos(lat1), + math.cos(distance / R) - math.sin(lat1) * math.sin(lat2) + ) + + return math.degrees(lat2), math.degrees(lng2) + + def add_person_position(self, pixel_x: float, pixel_y: float, distance: float, + frame_width: int, frame_height: int, person_id: str = None): + """添加人员位置""" + lat, lng = self.calculate_person_position(pixel_x, pixel_y, distance, frame_width, frame_height) + + person_info = { + 'id': person_id or f"person_{len(self.persons_positions) + 1}", + 'lat': lat, + 'lng': lng, + 'distance': distance, + 'timestamp': time.time(), + 'pixel_x': pixel_x, + 'pixel_y': pixel_y + } + + self.persons_positions.append(person_info) + + # 只保留最近10秒的数据 + current_time = time.time() + self.persons_positions = [ + p for p in self.persons_positions + if current_time - p['timestamp'] < 10 + ] + + return lat, lng + + def clear_persons(self): + """清空人员位置""" + self.persons_positions = [] + + def add_person_at_coordinates(self, lat: float, lng: float, person_id: str, + distance: float = 0, source: str = "manual"): + """直接在指定GPS坐标添加人员标记""" + person_data = { + 'id': person_id, + 'lat': lat, + 'lng': lng, + 'distance': distance, + 'timestamp': time.time(), + 'source': source # 标记数据来源（如设备ID） + } + + # 添加到人员数据列表 + self.persons_positions.append(person_data) + + # 只保留最近10秒的数据 + current_time = time.time() + self.persons_positions = [ + p for p in self.persons_positions + if current_time - p['timestamp'] < 10 + ] + + return lat, lng + + def get_persons_data(self) -> List[Dict]: + """获取当前人员数据""" + return self.persons_positions + + def generate_map_html(self) -> str: + """生成高德地图HTML页面""" + persons_data_json = json.dumps(self.persons_positions) + + html_content = f""" + + + + 实时人员位置追踪系统 🚁 + + + + + +
    +
    +

    🚁 无人机战场态势感知

    +
    ● 摄像头在线
    +
    📍 坐标: {self.camera_lat:.6f}, {self.camera_lng:.6f}
    +
    🧭 朝向: {self.camera_heading}°
    +
    👥 检测到: {len(self.persons_positions)} 人
    +
    + 🔴 红点 = 人员位置
    + 📷 蓝点 = 摄像头位置
    + ⚡ 实时更新 +
    +
    + + + +""" + + # 保存HTML文件 + with open(self.map_html_path, 'w', encoding='utf-8') as f: + f.write(html_content) + + return self.map_html_path + + def open_map(self): + """在浏览器中打开地图""" + html_path = self.generate_map_html() + file_url = f"file://{os.path.abspath(html_path)}" + webbrowser.open(file_url) + print(f"🗺️ 地图已在浏览器中打开: {html_path}") + + def update_camera_heading(self, new_heading: float): + """更新摄像头朝向""" + self.camera_heading = new_heading print(f"🧭 摄像头朝向已更新: {new_heading}°") \ No newline at end of file diff --git a/distance-judgement/src/mobile_connector.py b/distance-judgement/src/mobile_connector.py index cd4d6354..374b626d 100644 --- a/distance-judgement/src/mobile_connector.py +++ b/distance-judgement/src/mobile_connector.py @@ -1,303 +1,303 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -手机连接器模块 -用于接收手机传送的摄像头图像、GPS位置和设备信息 -""" - -import cv2 -import numpy as np -import json -import time -import threading -from datetime import datetime -import base64 -import socket -import struct -from typing import Dict, List, Optional, Tuple, Callable -from . import config - -class MobileDevice: - """移动设备信息类""" - def __init__(self, device_id: str, device_name: str): - self.device_id = device_id - self.device_name = device_name - self.last_seen = time.time() - self.is_online = True - self.current_location = None # (lat, lng, accuracy) - self.battery_level = 100 - self.signal_strength = 100 - self.camera_info = {} - self.connection_info = {} - - def update_status(self, data: dict): - """更新设备状态""" - self.last_seen = time.time() - self.is_online = True - - if 'gps' in data: - self.current_location = ( - data['gps'].get('latitude'), - data['gps'].get('longitude'), - data['gps'].get('accuracy', 0) - ) - - if 'battery' in data: - self.battery_level = data['battery'] - - if 'signal' in data: - self.signal_strength = data['signal'] - - if 'camera_info' in data: - self.camera_info = data['camera_info'] - - def is_location_valid(self) -> bool: - """检查GPS位置是否有效""" - if not self.current_location: - return False - lat, lng, _ = self.current_location - return lat is not None and lng is not None and -90 <= lat <= 90 and -180 <= lng <= 180 - -class MobileConnector: - """手机连接器主类""" - - def __init__(self, port: int = 8080): - self.port = port - self.server_socket = None - self.is_running = False - self.devices = {} # device_id -> MobileDevice - self.frame_callbacks = [] # 帧数据回调函数列表 - self.location_callbacks = [] # 位置数据回调函数列表 - self.device_callbacks = [] # 设备状态回调函数列表 - self.client_threads = [] - - # 统计信息 - self.total_frames_received = 0 - self.total_data_received = 0 - self.start_time = time.time() - - def add_frame_callback(self, callback: Callable): - """添加帧数据回调函数""" - self.frame_callbacks.append(callback) - - def add_location_callback(self, callback: Callable): - """添加位置数据回调函数""" - self.location_callbacks.append(callback) - - def add_device_callback(self, callback: Callable): - """添加设备状态回调函数""" - self.device_callbacks.append(callback) - - def start_server(self): - """启动服务器""" - try: - self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.server_socket.bind(('0.0.0.0', self.port)) - self.server_socket.listen(5) - self.is_running = True - - print(f"📱 手机连接服务器启动成功，端口: {self.port}") - print(f"🌐 等待手机客户端连接...") - - # 启动服务器监听线程 - server_thread = threading.Thread(target=self._server_loop, daemon=True) - server_thread.start() - - # 启动设备状态监控线程 - monitor_thread = threading.Thread(target=self._device_monitor, daemon=True) - monitor_thread.start() - - return True - - except Exception as e: - print(f"❌ 启动服务器失败: {e}") - return False - - def stop_server(self): - """停止服务器""" - self.is_running = False - if self.server_socket: - self.server_socket.close() - - # 清理客户端连接 - for thread in self.client_threads: - if thread.is_alive(): - thread.join(timeout=1.0) - - print("📱 手机连接服务器已停止") - - def _server_loop(self): - """服务器主循环""" - while self.is_running: - try: - client_socket, address = self.server_socket.accept() - print(f"📱 新的手机客户端连接: {address}") - - # 为每个客户端创建处理线程 - client_thread = threading.Thread( - target=self._handle_client, - args=(client_socket, address), - daemon=True - ) - client_thread.start() - self.client_threads.append(client_thread) - - except Exception as e: - if self.is_running: - print(f"⚠️ 服务器接受连接时出错: {e}") - break - - def _handle_client(self, client_socket, address): - """处理客户端连接""" - device_id = None - try: - while self.is_running: - # 接收数据长度 - length_data = self._recv_all(client_socket, 4) - if not length_data: - break - - data_length = struct.unpack('!I', length_data)[0] - - # 接收JSON数据 - json_data = self._recv_all(client_socket, data_length) - if not json_data: - break - - try: - data = json.loads(json_data.decode('utf-8')) - device_id = data.get('device_id') - - if device_id: - self._process_mobile_data(device_id, data, address) - self.total_data_received += len(json_data) - - except json.JSONDecodeError as e: - print(f"⚠️ JSON解析错误: {e}") - continue - - except Exception as e: - print(f"⚠️ 处理客户端 {address} 时出错: {e}") - finally: - client_socket.close() - if device_id and device_id in self.devices: - self.devices[device_id].is_online = False - print(f"📱 设备 {device_id} 已断开连接") - - def _recv_all(self, socket, length): - """接收指定长度的数据""" - data = b'' - while len(data) < length: - packet = socket.recv(length - len(data)) - if not packet: - return None - data += packet - return data - - def _process_mobile_data(self, device_id: str, data: dict, address): - """处理手机发送的数据""" - # 更新或创建设备信息 - if device_id not in self.devices: - device_name = data.get('device_name', f'Mobile-{device_id[:8]}') - self.devices[device_id] = MobileDevice(device_id, device_name) - print(f"📱 新设备注册: {device_name} ({device_id[:8]})") - - # 触发设备状态回调 - for callback in self.device_callbacks: - try: - callback('device_connected', self.devices[device_id]) - except Exception as e: - print(f"⚠️ 设备回调错误: {e}") - - device = self.devices[device_id] - device.update_status(data) - device.connection_info = {'address': address} - - # 处理图像数据 - if 'frame' in data: - try: - frame_data = base64.b64decode(data['frame']) - frame = cv2.imdecode( - np.frombuffer(frame_data, np.uint8), - cv2.IMREAD_COLOR - ) - - if frame is not None: - self.total_frames_received += 1 - - # 触发帧数据回调 - for callback in self.frame_callbacks: - try: - callback(device_id, frame, device) - except Exception as e: - print(f"⚠️ 帧回调错误: {e}") - - except Exception as e: - print(f"⚠️ 图像数据处理错误: {e}") - - # 处理GPS位置数据 - if 'gps' in data and device.is_location_valid(): - for callback in self.location_callbacks: - try: - callback(device_id, device.current_location, device) - except Exception as e: - print(f"⚠️ 位置回调错误: {e}") - - def _device_monitor(self): - """设备状态监控""" - while self.is_running: - try: - current_time = time.time() - offline_devices = [] - - for device_id, device in self.devices.items(): - # 超过30秒没有数据认为离线 - if current_time - device.last_seen > 30: - if device.is_online: - device.is_online = False - offline_devices.append(device_id) - - # 通知离线设备 - for device_id in offline_devices: - print(f"📱 设备 {device_id[:8]} 已离线") - for callback in self.device_callbacks: - try: - callback('device_disconnected', self.devices[device_id]) - except Exception as e: - print(f"⚠️ 设备回调错误: {e}") - - time.sleep(5) # 每5秒检查一次 - - except Exception as e: - print(f"⚠️ 设备监控错误: {e}") - time.sleep(5) - - def get_online_devices(self) -> List[MobileDevice]: - """获取在线设备列表""" - return [device for device in self.devices.values() if device.is_online] - - def get_device_by_id(self, device_id: str) -> Optional[MobileDevice]: - """根据ID获取设备""" - return self.devices.get(device_id) - - def get_statistics(self) -> dict: - """获取连接统计信息""" - online_count = len(self.get_online_devices()) - total_count = len(self.devices) - uptime = time.time() - self.start_time - - return { - 'online_devices': online_count, - 'total_devices': total_count, - 'frames_received': self.total_frames_received, - 'data_received_mb': self.total_data_received / (1024 * 1024), - 'uptime_seconds': uptime, - 'avg_frames_per_second': self.total_frames_received / uptime if uptime > 0 else 0 - } - - def send_command_to_device(self, device_id: str, command: dict): - """向指定设备发送命令（预留接口）""" - # TODO: 实现向手机发送控制命令的功能 +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +手机连接器模块 +用于接收手机传送的摄像头图像、GPS位置和设备信息 +""" + +import cv2 +import numpy as np +import json +import time +import threading +from datetime import datetime +import base64 +import socket +import struct +from typing import Dict, List, Optional, Tuple, Callable +from . import config + +class MobileDevice: + """移动设备信息类""" + def __init__(self, device_id: str, device_name: str): + self.device_id = device_id + self.device_name = device_name + self.last_seen = time.time() + self.is_online = True + self.current_location = None # (lat, lng, accuracy) + self.battery_level = 100 + self.signal_strength = 100 + self.camera_info = {} + self.connection_info = {} + + def update_status(self, data: dict): + """更新设备状态""" + self.last_seen = time.time() + self.is_online = True + + if 'gps' in data: + self.current_location = ( + data['gps'].get('latitude'), + data['gps'].get('longitude'), + data['gps'].get('accuracy', 0) + ) + + if 'battery' in data: + self.battery_level = data['battery'] + + if 'signal' in data: + self.signal_strength = data['signal'] + + if 'camera_info' in data: + self.camera_info = data['camera_info'] + + def is_location_valid(self) -> bool: + """检查GPS位置是否有效""" + if not self.current_location: + return False + lat, lng, _ = self.current_location + return lat is not None and lng is not None and -90 <= lat <= 90 and -180 <= lng <= 180 + +class MobileConnector: + """手机连接器主类""" + + def __init__(self, port: int = 8080): + self.port = port + self.server_socket = None + self.is_running = False + self.devices = {} # device_id -> MobileDevice + self.frame_callbacks = [] # 帧数据回调函数列表 + self.location_callbacks = [] # 位置数据回调函数列表 + self.device_callbacks = [] # 设备状态回调函数列表 + self.client_threads = [] + + # 统计信息 + self.total_frames_received = 0 + self.total_data_received = 0 + self.start_time = time.time() + + def add_frame_callback(self, callback: Callable): + """添加帧数据回调函数""" + self.frame_callbacks.append(callback) + + def add_location_callback(self, callback: Callable): + """添加位置数据回调函数""" + self.location_callbacks.append(callback) + + def add_device_callback(self, callback: Callable): + """添加设备状态回调函数""" + self.device_callbacks.append(callback) + + def start_server(self): + """启动服务器""" + try: + self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + self.server_socket.bind(('0.0.0.0', self.port)) + self.server_socket.listen(5) + self.is_running = True + + print(f"📱 手机连接服务器启动成功，端口: {self.port}") + print(f"🌐 等待手机客户端连接...") + + # 启动服务器监听线程 + server_thread = threading.Thread(target=self._server_loop, daemon=True) + server_thread.start() + + # 启动设备状态监控线程 + monitor_thread = threading.Thread(target=self._device_monitor, daemon=True) + monitor_thread.start() + + return True + + except Exception as e: + print(f"❌ 启动服务器失败: {e}") + return False + + def stop_server(self): + """停止服务器""" + self.is_running = False + if self.server_socket: + self.server_socket.close() + + # 清理客户端连接 + for thread in self.client_threads: + if thread.is_alive(): + thread.join(timeout=1.0) + + print("📱 手机连接服务器已停止") + + def _server_loop(self): + """服务器主循环""" + while self.is_running: + try: + client_socket, address = self.server_socket.accept() + print(f"📱 新的手机客户端连接: {address}") + + # 为每个客户端创建处理线程 + client_thread = threading.Thread( + target=self._handle_client, + args=(client_socket, address), + daemon=True + ) + client_thread.start() + self.client_threads.append(client_thread) + + except Exception as e: + if self.is_running: + print(f"⚠️ 服务器接受连接时出错: {e}") + break + + def _handle_client(self, client_socket, address): + """处理客户端连接""" + device_id = None + try: + while self.is_running: + # 接收数据长度 + length_data = self._recv_all(client_socket, 4) + if not length_data: + break + + data_length = struct.unpack('!I', length_data)[0] + + # 接收JSON数据 + json_data = self._recv_all(client_socket, data_length) + if not json_data: + break + + try: + data = json.loads(json_data.decode('utf-8')) + device_id = data.get('device_id') + + if device_id: + self._process_mobile_data(device_id, data, address) + self.total_data_received += len(json_data) + + except json.JSONDecodeError as e: + print(f"⚠️ JSON解析错误: {e}") + continue + + except Exception as e: + print(f"⚠️ 处理客户端 {address} 时出错: {e}") + finally: + client_socket.close() + if device_id and device_id in self.devices: + self.devices[device_id].is_online = False + print(f"📱 设备 {device_id} 已断开连接") + + def _recv_all(self, socket, length): + """接收指定长度的数据""" + data = b'' + while len(data) < length: + packet = socket.recv(length - len(data)) + if not packet: + return None + data += packet + return data + + def _process_mobile_data(self, device_id: str, data: dict, address): + """处理手机发送的数据""" + # 更新或创建设备信息 + if device_id not in self.devices: + device_name = data.get('device_name', f'Mobile-{device_id[:8]}') + self.devices[device_id] = MobileDevice(device_id, device_name) + print(f"📱 新设备注册: {device_name} ({device_id[:8]})") + + # 触发设备状态回调 + for callback in self.device_callbacks: + try: + callback('device_connected', self.devices[device_id]) + except Exception as e: + print(f"⚠️ 设备回调错误: {e}") + + device = self.devices[device_id] + device.update_status(data) + device.connection_info = {'address': address} + + # 处理图像数据 + if 'frame' in data: + try: + frame_data = base64.b64decode(data['frame']) + frame = cv2.imdecode( + np.frombuffer(frame_data, np.uint8), + cv2.IMREAD_COLOR + ) + + if frame is not None: + self.total_frames_received += 1 + + # 触发帧数据回调 + for callback in self.frame_callbacks: + try: + callback(device_id, frame, device) + except Exception as e: + print(f"⚠️ 帧回调错误: {e}") + + except Exception as e: + print(f"⚠️ 图像数据处理错误: {e}") + + # 处理GPS位置数据 + if 'gps' in data and device.is_location_valid(): + for callback in self.location_callbacks: + try: + callback(device_id, device.current_location, device) + except Exception as e: + print(f"⚠️ 位置回调错误: {e}") + + def _device_monitor(self): + """设备状态监控""" + while self.is_running: + try: + current_time = time.time() + offline_devices = [] + + for device_id, device in self.devices.items(): + # 超过30秒没有数据认为离线 + if current_time - device.last_seen > 30: + if device.is_online: + device.is_online = False + offline_devices.append(device_id) + + # 通知离线设备 + for device_id in offline_devices: + print(f"📱 设备 {device_id[:8]} 已离线") + for callback in self.device_callbacks: + try: + callback('device_disconnected', self.devices[device_id]) + except Exception as e: + print(f"⚠️ 设备回调错误: {e}") + + time.sleep(5) # 每5秒检查一次 + + except Exception as e: + print(f"⚠️ 设备监控错误: {e}") + time.sleep(5) + + def get_online_devices(self) -> List[MobileDevice]: + """获取在线设备列表""" + return [device for device in self.devices.values() if device.is_online] + + def get_device_by_id(self, device_id: str) -> Optional[MobileDevice]: + """根据ID获取设备""" + return self.devices.get(device_id) + + def get_statistics(self) -> dict: + """获取连接统计信息""" + online_count = len(self.get_online_devices()) + total_count = len(self.devices) + uptime = time.time() - self.start_time + + return { + 'online_devices': online_count, + 'total_devices': total_count, + 'frames_received': self.total_frames_received, + 'data_received_mb': self.total_data_received / (1024 * 1024), + 'uptime_seconds': uptime, + 'avg_frames_per_second': self.total_frames_received / uptime if uptime > 0 else 0 + } + + def send_command_to_device(self, device_id: str, command: dict): + """向指定设备发送命令（预留接口）""" + # TODO: 实现向手机发送控制命令的功能 pass \ No newline at end of file diff --git a/distance-judgement/src/orientation_detector.py b/distance-judgement/src/orientation_detector.py index d220e20c..d955e89d 100644 --- a/distance-judgement/src/orientation_detector.py +++ b/distance-judgement/src/orientation_detector.py @@ -1,295 +1,295 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -设备朝向检测模块 -用于自动获取设备的GPS位置和朝向信息 -""" - -import requests -import time -import json -import math -from typing import Tuple, Optional, Dict -from . import config - - -class OrientationDetector: - """设备朝向检测器""" - - def __init__(self): - self.current_location = None # (lat, lng, accuracy) - self.current_heading = None # 设备朝向角度 - self.last_update = 0 - self.gps_cache_duration = 300 # GPS缓存5分钟 - - def get_current_gps_location(self) -> Optional[Tuple[float, float, float]]: - """ - 获取当前设备的GPS位置 - 返回: (纬度, 经度, 精度) 或 None - """ - try: - # 首先尝试使用系统API (需要安装相关库) - location = self._get_system_gps() - if location: - return location - - # 如果系统API不可用，使用IP地理定位作为备选 - location = self._get_ip_geolocation() - if location: - print("🌐 使用IP地理定位获取位置（精度较低）") - return location - - return None - - except Exception as e: - print(f"❌ GPS位置获取失败: {e}") - return None - - def _get_system_gps(self) -> Optional[Tuple[float, float, float]]: - """尝试使用系统GPS API获取位置""" - try: - # 在Windows上可以使用Windows Location API - # 这里提供一个框架，实际实现需要根据操作系统选择合适的API - import platform - system = platform.system() - - if system == "Windows": - return self._get_windows_location() - elif system == "Darwin": # macOS - return self._get_macos_location() - elif system == "Linux": - return self._get_linux_location() - - except ImportError: - print("💡 系统定位API不可用，将使用IP定位") - - return None - - def _get_windows_location(self) -> Optional[Tuple[float, float, float]]: - """Windows系统GPS定位""" - try: - # 使用Windows Location API - import winrt.windows.devices.geolocation as geo - - locator = geo.Geolocator() - # 设置期望精度 - locator.desired_accuracy = geo.PositionAccuracy.HIGH - - print("🔍 正在获取Windows系统GPS位置...") - - # 获取位置信息（同步方式） - position = locator.get_geoposition_async().get() - - lat = position.coordinate.point.position.latitude - lng = position.coordinate.point.position.longitude - accuracy = position.coordinate.accuracy - - print(f"✅ Windows GPS获取成功: ({lat:.6f}, {lng:.6f}), 精度: ±{accuracy:.0f}m") - return (lat, lng, accuracy) - - except Exception as e: - print(f"⚠️ Windows GPS API失败: {e}") - return None - - def _get_macos_location(self) -> Optional[Tuple[float, float, float]]: - """macOS系统GPS定位""" - try: - # macOS可以使用Core Location框架 - # 这里提供一个基本框架 - print("💡 macOS GPS定位需要额外配置，建议使用IP定位") - return None - - except Exception as e: - print(f"⚠️ macOS GPS API失败: {e}") - return None - - def _get_linux_location(self) -> Optional[Tuple[float, float, float]]: - """Linux系统GPS定位""" - try: - # Linux可以使用gpsd或NetworkManager - print("💡 Linux GPS定位需要额外配置，建议使用IP定位") - return None - - except Exception as e: - print(f"⚠️ Linux GPS API失败: {e}") - return None - - def _get_ip_geolocation(self) -> Optional[Tuple[float, float, float]]: - """使用IP地址进行地理定位""" - try: - print("🌐 正在使用IP地理定位...") - - # 使用免费的IP地理定位服务 - response = requests.get("http://ip-api.com/json/", timeout=10) - - if response.status_code == 200: - data = response.json() - - if data.get('status') == 'success': - lat = float(data.get('lat', 0)) - lng = float(data.get('lon', 0)) - accuracy = 10000 # IP定位精度通常在10km左右 - - city = data.get('city', '未知') - region = data.get('regionName', '未知') - country = data.get('country', '未知') - - print(f"✅ IP定位成功: {city}, {region}, {country}") - print(f"📍 位置: ({lat:.6f}, {lng:.6f}), 精度: ±{accuracy:.0f}m") - - return (lat, lng, accuracy) - - except Exception as e: - print(f"❌ IP地理定位失败: {e}") - - return None - - def get_device_heading(self) -> Optional[float]: - """ - 获取设备朝向（磁力计方向） - 返回: 角度 (0-360度，0为正北) 或 None - """ - try: - # 桌面设备通常没有磁力计，返回默认朝向 - # 可以根据摄像头位置或用户设置来确定朝向 - print("💡 桌面设备朝向检测有限，使用默认朝向") - - # 假设用户面向屏幕，摄像头朝向用户 - # 如果摄像头在屏幕上方，那么朝向就是用户的相反方向 - default_heading = 180.0 # 假设用户面向南方，摄像头朝向北方 - - return default_heading - - except Exception as e: - print(f"❌ 设备朝向检测失败: {e}") - return None - - def calculate_camera_heading_facing_user(self, user_heading: float) -> float: - """ - 计算摄像头朝向用户的角度 - - Args: - user_heading: 用户朝向角度 (0-360度) - - Returns: - 摄像头应该设置的朝向角度 - """ - # 摄像头朝向用户，即朝向用户相反的方向 - camera_heading = (user_heading + 180) % 360 - return camera_heading - - def auto_configure_camera_location(self) -> Dict: - """ - 自动配置摄像头位置和朝向 - - Returns: - 配置信息字典 - """ - result = { - 'success': False, - 'gps_location': None, - 'device_heading': None, - 'camera_heading': None, - 'method': None, - 'accuracy': None - } - - print("🚀 开始自动配置摄像头位置和朝向...") - - # 1. 获取GPS位置 - gps_location = self.get_current_gps_location() - if not gps_location: - print("❌ 无法获取GPS位置，自动配置失败") - return result - - lat, lng, accuracy = gps_location - result['gps_location'] = (lat, lng) - result['accuracy'] = accuracy - - # 2. 获取设备朝向 - device_heading = self.get_device_heading() - if device_heading is None: - print("⚠️ 无法获取设备朝向，使用默认朝向") - device_heading = 0.0 # 默认朝北 - - result['device_heading'] = device_heading - - # 3. 计算摄像头朝向（朝向用户） - camera_heading = self.calculate_camera_heading_facing_user(device_heading) - result['camera_heading'] = camera_heading - - # 4. 确定配置方法 - if accuracy < 100: - result['method'] = 'GPS' - else: - result['method'] = 'IP定位' - - result['success'] = True - - print(f"✅ 自动配置完成:") - print(f"📍 GPS位置: ({lat:.6f}, {lng:.6f})") - print(f"🧭 设备朝向: {device_heading:.1f}°") - print(f"📷 摄像头朝向: {camera_heading:.1f}°") - print(f"🎯 定位方法: {result['method']}") - print(f"📏 定位精度: ±{accuracy:.0f}m") - - return result - - def update_camera_config(self, gps_location: Tuple[float, float], camera_heading: float): - """ - 更新摄像头配置文件 - - Args: - gps_location: (纬度, 经度) - camera_heading: 摄像头朝向角度 - """ - try: - from tools.setup_camera_location import update_config_file - - lat, lng = gps_location - - # 更新配置文件 - update_config_file(lat, lng, camera_heading) - - # 同时更新运行时配置 - config.CAMERA_LATITUDE = lat - config.CAMERA_LONGITUDE = lng - config.CAMERA_HEADING = camera_heading - - print(f"✅ 摄像头配置已更新") - print(f"📍 新位置: ({lat:.6f}, {lng:.6f})") - print(f"🧭 新朝向: {camera_heading:.1f}°") - - except Exception as e: - print(f"❌ 配置更新失败: {e}") - - -def main(): - """测试函数""" - print("🧭 设备朝向检测器测试") - print("=" * 50) - - detector = OrientationDetector() - - # 测试自动配置 - result = detector.auto_configure_camera_location() - - if result['success']: - print("\n🎯 是否应用此配置? (y/n): ", end="") - choice = input().strip().lower() - - if choice == 'y': - detector.update_camera_config( - result['gps_location'], - result['camera_heading'] - ) - print("✅ 配置已应用") - else: - print("⏭️ 配置未应用") - else: - print("❌ 自动配置失败") - - -if __name__ == "__main__": +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +设备朝向检测模块 +用于自动获取设备的GPS位置和朝向信息 +""" + +import requests +import time +import json +import math +from typing import Tuple, Optional, Dict +from . import config + + +class OrientationDetector: + """设备朝向检测器""" + + def __init__(self): + self.current_location = None # (lat, lng, accuracy) + self.current_heading = None # 设备朝向角度 + self.last_update = 0 + self.gps_cache_duration = 300 # GPS缓存5分钟 + + def get_current_gps_location(self) -> Optional[Tuple[float, float, float]]: + """ + 获取当前设备的GPS位置 + 返回: (纬度, 经度, 精度) 或 None + """ + try: + # 首先尝试使用系统API (需要安装相关库) + location = self._get_system_gps() + if location: + return location + + # 如果系统API不可用，使用IP地理定位作为备选 + location = self._get_ip_geolocation() + if location: + print("🌐 使用IP地理定位获取位置（精度较低）") + return location + + return None + + except Exception as e: + print(f"❌ GPS位置获取失败: {e}") + return None + + def _get_system_gps(self) -> Optional[Tuple[float, float, float]]: + """尝试使用系统GPS API获取位置""" + try: + # 在Windows上可以使用Windows Location API + # 这里提供一个框架，实际实现需要根据操作系统选择合适的API + import platform + system = platform.system() + + if system == "Windows": + return self._get_windows_location() + elif system == "Darwin": # macOS + return self._get_macos_location() + elif system == "Linux": + return self._get_linux_location() + + except ImportError: + print("💡 系统定位API不可用，将使用IP定位") + + return None + + def _get_windows_location(self) -> Optional[Tuple[float, float, float]]: + """Windows系统GPS定位""" + try: + # 使用Windows Location API + import winrt.windows.devices.geolocation as geo + + locator = geo.Geolocator() + # 设置期望精度 + locator.desired_accuracy = geo.PositionAccuracy.HIGH + + print("🔍 正在获取Windows系统GPS位置...") + + # 获取位置信息（同步方式） + position = locator.get_geoposition_async().get() + + lat = position.coordinate.point.position.latitude + lng = position.coordinate.point.position.longitude + accuracy = position.coordinate.accuracy + + print(f"✅ Windows GPS获取成功: ({lat:.6f}, {lng:.6f}), 精度: ±{accuracy:.0f}m") + return (lat, lng, accuracy) + + except Exception as e: + print(f"⚠️ Windows GPS API失败: {e}") + return None + + def _get_macos_location(self) -> Optional[Tuple[float, float, float]]: + """macOS系统GPS定位""" + try: + # macOS可以使用Core Location框架 + # 这里提供一个基本框架 + print("💡 macOS GPS定位需要额外配置，建议使用IP定位") + return None + + except Exception as e: + print(f"⚠️ macOS GPS API失败: {e}") + return None + + def _get_linux_location(self) -> Optional[Tuple[float, float, float]]: + """Linux系统GPS定位""" + try: + # Linux可以使用gpsd或NetworkManager + print("💡 Linux GPS定位需要额外配置，建议使用IP定位") + return None + + except Exception as e: + print(f"⚠️ Linux GPS API失败: {e}") + return None + + def _get_ip_geolocation(self) -> Optional[Tuple[float, float, float]]: + """使用IP地址进行地理定位""" + try: + print("🌐 正在使用IP地理定位...") + + # 使用免费的IP地理定位服务 + response = requests.get("http://ip-api.com/json/", timeout=10) + + if response.status_code == 200: + data = response.json() + + if data.get('status') == 'success': + lat = float(data.get('lat', 0)) + lng = float(data.get('lon', 0)) + accuracy = 10000 # IP定位精度通常在10km左右 + + city = data.get('city', '未知') + region = data.get('regionName', '未知') + country = data.get('country', '未知') + + print(f"✅ IP定位成功: {city}, {region}, {country}") + print(f"📍 位置: ({lat:.6f}, {lng:.6f}), 精度: ±{accuracy:.0f}m") + + return (lat, lng, accuracy) + + except Exception as e: + print(f"❌ IP地理定位失败: {e}") + + return None + + def get_device_heading(self) -> Optional[float]: + """ + 获取设备朝向（磁力计方向） + 返回: 角度 (0-360度，0为正北) 或 None + """ + try: + # 桌面设备通常没有磁力计，返回默认朝向 + # 可以根据摄像头位置或用户设置来确定朝向 + print("💡 桌面设备朝向检测有限，使用默认朝向") + + # 假设用户面向屏幕，摄像头朝向用户 + # 如果摄像头在屏幕上方，那么朝向就是用户的相反方向 + default_heading = 180.0 # 假设用户面向南方，摄像头朝向北方 + + return default_heading + + except Exception as e: + print(f"❌ 设备朝向检测失败: {e}") + return None + + def calculate_camera_heading_facing_user(self, user_heading: float) -> float: + """ + 计算摄像头朝向用户的角度 + + Args: + user_heading: 用户朝向角度 (0-360度) + + Returns: + 摄像头应该设置的朝向角度 + """ + # 摄像头朝向用户，即朝向用户相反的方向 + camera_heading = (user_heading + 180) % 360 + return camera_heading + + def auto_configure_camera_location(self) -> Dict: + """ + 自动配置摄像头位置和朝向 + + Returns: + 配置信息字典 + """ + result = { + 'success': False, + 'gps_location': None, + 'device_heading': None, + 'camera_heading': None, + 'method': None, + 'accuracy': None + } + + print("🚀 开始自动配置摄像头位置和朝向...") + + # 1. 获取GPS位置 + gps_location = self.get_current_gps_location() + if not gps_location: + print("❌ 无法获取GPS位置，自动配置失败") + return result + + lat, lng, accuracy = gps_location + result['gps_location'] = (lat, lng) + result['accuracy'] = accuracy + + # 2. 获取设备朝向 + device_heading = self.get_device_heading() + if device_heading is None: + print("⚠️ 无法获取设备朝向，使用默认朝向") + device_heading = 0.0 # 默认朝北 + + result['device_heading'] = device_heading + + # 3. 计算摄像头朝向（朝向用户） + camera_heading = self.calculate_camera_heading_facing_user(device_heading) + result['camera_heading'] = camera_heading + + # 4. 确定配置方法 + if accuracy < 100: + result['method'] = 'GPS' + else: + result['method'] = 'IP定位' + + result['success'] = True + + print(f"✅ 自动配置完成:") + print(f"📍 GPS位置: ({lat:.6f}, {lng:.6f})") + print(f"🧭 设备朝向: {device_heading:.1f}°") + print(f"📷 摄像头朝向: {camera_heading:.1f}°") + print(f"🎯 定位方法: {result['method']}") + print(f"📏 定位精度: ±{accuracy:.0f}m") + + return result + + def update_camera_config(self, gps_location: Tuple[float, float], camera_heading: float): + """ + 更新摄像头配置文件 + + Args: + gps_location: (纬度, 经度) + camera_heading: 摄像头朝向角度 + """ + try: + from tools.setup_camera_location import update_config_file + + lat, lng = gps_location + + # 更新配置文件 + update_config_file(lat, lng, camera_heading) + + # 同时更新运行时配置 + config.CAMERA_LATITUDE = lat + config.CAMERA_LONGITUDE = lng + config.CAMERA_HEADING = camera_heading + + print(f"✅ 摄像头配置已更新") + print(f"📍 新位置: ({lat:.6f}, {lng:.6f})") + print(f"🧭 新朝向: {camera_heading:.1f}°") + + except Exception as e: + print(f"❌ 配置更新失败: {e}") + + +def main(): + """测试函数""" + print("🧭 设备朝向检测器测试") + print("=" * 50) + + detector = OrientationDetector() + + # 测试自动配置 + result = detector.auto_configure_camera_location() + + if result['success']: + print("\n🎯 是否应用此配置? (y/n): ", end="") + choice = input().strip().lower() + + if choice == 'y': + detector.update_camera_config( + result['gps_location'], + result['camera_heading'] + ) + print("✅ 配置已应用") + else: + print("⏭️ 配置未应用") + else: + print("❌ 自动配置失败") + + +if __name__ == "__main__": main() \ No newline at end of file diff --git a/distance-judgement/src/person_detector.py b/distance-judgement/src/person_detector.py index cb84178b..a6c2073f 100644 --- a/distance-judgement/src/person_detector.py +++ b/distance-judgement/src/person_detector.py @@ -1,100 +1,100 @@ -import cv2 -import numpy as np -from ultralytics import YOLO -from . import config - -class PersonDetector: - def __init__(self): - self.model = None - self.load_model() - - def load_model(self): - """加载YOLO模型""" - try: - self.model = YOLO(config.MODEL_PATH) - print(f"YOLO模型加载成功: {config.MODEL_PATH}") - except Exception as e: - print(f"模型加载失败: {e}") - print("正在下载YOLOv8n模型...") - self.model = YOLO('yolov8n.pt') # 会自动下载 - - def detect_persons(self, frame): - """ - 检测图像中的人体 - 返回: 检测结果列表，每个结果包含 [x1, y1, x2, y2, confidence] - """ - if self.model is None: - return [] - - try: - # 使用YOLO进行检测 - results = self.model(frame, verbose=False) - - persons = [] - for result in results: - boxes = result.boxes - if boxes is not None: - for box in boxes: - # 获取类别、置信度和坐标 - cls = int(box.cls[0]) - conf = float(box.conf[0]) - - # 只保留人体检测结果 - if cls == config.PERSON_CLASS_ID and conf >= config.CONFIDENCE_THRESHOLD: - # 获取边界框坐标 - x1, y1, x2, y2 = box.xyxy[0].cpu().numpy() - persons.append([int(x1), int(y1), int(x2), int(y2), conf]) - - return persons - - except Exception as e: - print(f"检测过程中出错: {e}") - return [] - - def draw_detections(self, frame, detections, distances): - """ - 在图像上绘制检测结果和距离信息 - """ - for i, detection in enumerate(detections): - x1, y1, x2, y2, conf = detection - - # 绘制边界框 - cv2.rectangle(frame, (x1, y1), (x2, y2), config.BOX_COLOR, 2) - - # 准备显示文本 - person_id = f"Person #{i+1}" - distance_text = f"Distance: {distances[i]}" if i < len(distances) else "Distance: N/A" - conf_text = f"Conf: {conf:.2f}" - - # 计算文本位置 - text_y = y1 - 35 if y1 - 35 > 20 else y1 + 20 - - # 绘制人员ID文本背景和文字 - id_text_size = cv2.getTextSize(person_id, config.FONT, config.FONT_SCALE, config.FONT_THICKNESS)[0] - cv2.rectangle(frame, (x1, text_y - id_text_size[1] - 5), - (x1 + id_text_size[0] + 10, text_y + 5), (255, 0, 0), -1) - cv2.putText(frame, person_id, (x1 + 5, text_y), - config.FONT, config.FONT_SCALE, config.TEXT_COLOR, config.FONT_THICKNESS) - - # 绘制距离文本背景和文字 - distance_text_y = text_y + 25 - distance_text_size = cv2.getTextSize(distance_text, config.FONT, config.FONT_SCALE, config.FONT_THICKNESS)[0] - cv2.rectangle(frame, (x1, distance_text_y - distance_text_size[1] - 5), - (x1 + distance_text_size[0] + 10, distance_text_y + 5), config.TEXT_BG_COLOR, -1) - cv2.putText(frame, distance_text, (x1 + 5, distance_text_y), - config.FONT, config.FONT_SCALE, config.TEXT_COLOR, config.FONT_THICKNESS) - - # 绘制置信度文本（在框的右上角） - conf_text_size = cv2.getTextSize(conf_text, config.FONT, config.FONT_SCALE - 0.2, config.FONT_THICKNESS)[0] - cv2.rectangle(frame, (x2 - conf_text_size[0] - 10, y1), - (x2, y1 + conf_text_size[1] + 10), config.TEXT_BG_COLOR, -1) - cv2.putText(frame, conf_text, (x2 - conf_text_size[0] - 5, y1 + conf_text_size[1] + 5), - config.FONT, config.FONT_SCALE - 0.2, config.TEXT_COLOR, config.FONT_THICKNESS) - - return frame - - def get_model_info(self): - """获取模型信息""" - if self.model: - return f"YOLO Model: {config.MODEL_PATH}" +import cv2 +import numpy as np +from ultralytics import YOLO +from . import config + +class PersonDetector: + def __init__(self): + self.model = None + self.load_model() + + def load_model(self): + """加载YOLO模型""" + try: + self.model = YOLO(config.MODEL_PATH) + print(f"YOLO模型加载成功: {config.MODEL_PATH}") + except Exception as e: + print(f"模型加载失败: {e}") + print("正在下载YOLOv8n模型...") + self.model = YOLO('yolov8n.pt') # 会自动下载 + + def detect_persons(self, frame): + """ + 检测图像中的人体 + 返回: 检测结果列表，每个结果包含 [x1, y1, x2, y2, confidence] + """ + if self.model is None: + return [] + + try: + # 使用YOLO进行检测 + results = self.model(frame, verbose=False) + + persons = [] + for result in results: + boxes = result.boxes + if boxes is not None: + for box in boxes: + # 获取类别、置信度和坐标 + cls = int(box.cls[0]) + conf = float(box.conf[0]) + + # 只保留人体检测结果 + if cls == config.PERSON_CLASS_ID and conf >= config.CONFIDENCE_THRESHOLD: + # 获取边界框坐标 + x1, y1, x2, y2 = box.xyxy[0].cpu().numpy() + persons.append([int(x1), int(y1), int(x2), int(y2), conf]) + + return persons + + except Exception as e: + print(f"检测过程中出错: {e}") + return [] + + def draw_detections(self, frame, detections, distances): + """ + 在图像上绘制检测结果和距离信息 + """ + for i, detection in enumerate(detections): + x1, y1, x2, y2, conf = detection + + # 绘制边界框 + cv2.rectangle(frame, (x1, y1), (x2, y2), config.BOX_COLOR, 2) + + # 准备显示文本 + person_id = f"Person #{i+1}" + distance_text = f"Distance: {distances[i]}" if i < len(distances) else "Distance: N/A" + conf_text = f"Conf: {conf:.2f}" + + # 计算文本位置 + text_y = y1 - 35 if y1 - 35 > 20 else y1 + 20 + + # 绘制人员ID文本背景和文字 + id_text_size = cv2.getTextSize(person_id, config.FONT, config.FONT_SCALE, config.FONT_THICKNESS)[0] + cv2.rectangle(frame, (x1, text_y - id_text_size[1] - 5), + (x1 + id_text_size[0] + 10, text_y + 5), (255, 0, 0), -1) + cv2.putText(frame, person_id, (x1 + 5, text_y), + config.FONT, config.FONT_SCALE, config.TEXT_COLOR, config.FONT_THICKNESS) + + # 绘制距离文本背景和文字 + distance_text_y = text_y + 25 + distance_text_size = cv2.getTextSize(distance_text, config.FONT, config.FONT_SCALE, config.FONT_THICKNESS)[0] + cv2.rectangle(frame, (x1, distance_text_y - distance_text_size[1] - 5), + (x1 + distance_text_size[0] + 10, distance_text_y + 5), config.TEXT_BG_COLOR, -1) + cv2.putText(frame, distance_text, (x1 + 5, distance_text_y), + config.FONT, config.FONT_SCALE, config.TEXT_COLOR, config.FONT_THICKNESS) + + # 绘制置信度文本（在框的右上角） + conf_text_size = cv2.getTextSize(conf_text, config.FONT, config.FONT_SCALE - 0.2, config.FONT_THICKNESS)[0] + cv2.rectangle(frame, (x2 - conf_text_size[0] - 10, y1), + (x2, y1 + conf_text_size[1] + 10), config.TEXT_BG_COLOR, -1) + cv2.putText(frame, conf_text, (x2 - conf_text_size[0] - 5, y1 + conf_text_size[1] + 5), + config.FONT, config.FONT_SCALE - 0.2, config.TEXT_COLOR, config.FONT_THICKNESS) + + return frame + + def get_model_info(self): + """获取模型信息""" + if self.model: + return f"YOLO Model: {config.MODEL_PATH}" return "Model not loaded" \ No newline at end of file diff --git a/distance-judgement/src/web_orientation_detector.py b/distance-judgement/src/web_orientation_detector.py index 7d004305..06dc0d43 100644 --- a/distance-judgement/src/web_orientation_detector.py +++ b/distance-judgement/src/web_orientation_detector.py @@ -1,335 +1,335 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -Web端朝向检测器 -提供Web API接口用于获取GPS位置和设备朝向信息 -""" - -from flask import Blueprint, jsonify, request -import json -import time -from typing import Dict, Optional, Tuple -from . import config -from .orientation_detector import OrientationDetector - - -class WebOrientationDetector: - """Web端朝向检测器""" - - def __init__(self): - self.orientation_detector = OrientationDetector() - self.current_web_location = None - self.current_web_heading = None - self.last_web_update = 0 - - # 创建Blueprint - self.blueprint = Blueprint('orientation', __name__) - self.setup_routes() - - def setup_routes(self): - """设置Web API路由""" - - @self.blueprint.route('/api/orientation/auto_configure', methods=['POST']) - def auto_configure_from_web(): - """从Web端自动配置摄像头位置和朝向""" - try: - data = request.get_json() or {} - print(f"🔍 收到自动配置请求: {data}") - - # 支持两种数据格式 - # 新格式: {gps_location: [lat, lng], user_heading: heading, apply_config: true} - # 旧格式: {gps: {...}, orientation: {...}} - - if 'gps_location' in data: - # 新格式处理 - gps_location = data.get('gps_location') - user_heading = data.get('user_heading', 0) - apply_config = data.get('apply_config', True) - - if not gps_location or len(gps_location) < 2: - return jsonify({ - "success": False, - "error": "GPS位置数据格式错误" - }) - - lat, lng = float(gps_location[0]), float(gps_location[1]) - - # 验证坐标范围 - if not (-90 <= lat <= 90) or not (-180 <= lng <= 180): - return jsonify({ - "success": False, - "error": "GPS坐标范围不正确" - }) - - # 计算摄像头朝向 - if user_heading is not None: - # 计算摄像头朝向（朝向用户方向） - camera_heading = (user_heading + 180) % 360 - else: - camera_heading = 0.0 - - print(f"📍 处理GPS位置: ({lat:.6f}, {lng:.6f})") - print(f"🧭 用户朝向: {user_heading}°, 摄像头朝向: {camera_heading}°") - - if apply_config: - # 应用配置 - self.orientation_detector.update_camera_config((lat, lng), camera_heading) - print(f"✅ 配置已应用到系统") - - return jsonify({ - "success": True, - "message": "摄像头位置和朝向已自动配置", - "gps_location": [lat, lng], - "user_heading": user_heading, - "camera_heading": camera_heading, - "applied": apply_config - }) - - else: - # 旧格式处理 - gps_data = data.get('gps') - orientation_data = data.get('orientation') - - if not gps_data: - # 如果前端没有提供GPS，尝试后端获取 - result = self.orientation_detector.auto_configure_camera_location() - else: - # 使用前端提供的数据 - result = self.process_web_data(gps_data, orientation_data) - - if result['success']: - # 应用配置 - self.orientation_detector.update_camera_config( - result['gps_location'], - result['camera_heading'] - ) - - return jsonify({ - "success": True, - "message": "摄像头位置和朝向已自动配置", - **result - }) - else: - return jsonify({ - "success": False, - "error": result.get('error', '自动配置失败') - }) - - except Exception as e: - print(f"❌ 自动配置异常: {e}") - import traceback - traceback.print_exc() - return jsonify({ - "success": False, - "error": f"配置失败: {str(e)}" - }) - - @self.blueprint.route('/api/orientation/update_location', methods=['POST']) - def update_location(): - """更新GPS位置信息""" - try: - data = request.get_json() - - if not data or 'latitude' not in data or 'longitude' not in data: - return jsonify({ - "status": "error", - "message": "缺少位置信息" - }) - - lat = float(data['latitude']) - lng = float(data['longitude']) - accuracy = float(data.get('accuracy', 1000)) - - # 验证坐标范围 - if not (-90 <= lat <= 90) or not (-180 <= lng <= 180): - return jsonify({ - "status": "error", - "message": "坐标范围不正确" - }) - - # 更新位置信息 - self.current_web_location = (lat, lng, accuracy) - self.last_web_update = time.time() - - print(f"📍 Web GPS更新: ({lat:.6f}, {lng:.6f}), 精度: ±{accuracy:.0f}m") - - return jsonify({ - "status": "success", - "message": "位置信息已更新" - }) - - except Exception as e: - return jsonify({ - "status": "error", - "message": f"位置更新失败: {str(e)}" - }) - - @self.blueprint.route('/api/orientation/update_heading', methods=['POST']) - def update_heading(): - """更新设备朝向信息""" - try: - data = request.get_json() - - if not data or 'heading' not in data: - return jsonify({ - "status": "error", - "message": "缺少朝向信息" - }) - - heading = float(data['heading']) - - # 标准化角度到0-360范围 - heading = heading % 360 - - # 更新朝向信息 - self.current_web_heading = heading - self.last_web_update = time.time() - - print(f"🧭 Web朝向更新: {heading:.1f}°") - - return jsonify({ - "status": "success", - "message": "朝向信息已更新" - }) - - except Exception as e: - return jsonify({ - "status": "error", - "message": f"朝向更新失败: {str(e)}" - }) - - @self.blueprint.route('/api/orientation/get_status') - def get_orientation_status(): - """获取当前朝向状态""" - try: - current_time = time.time() - - # 检查数据是否过期（30秒） - web_data_fresh = (current_time - self.last_web_update) < 30 - - status = { - "web_location": self.current_web_location, - "web_heading": self.current_web_heading, - "web_data_fresh": web_data_fresh, - "last_update": self.last_web_update, - "current_config": { - "latitude": config.CAMERA_LATITUDE, - "longitude": config.CAMERA_LONGITUDE, - "heading": config.CAMERA_HEADING - } - } - - return jsonify({ - "status": "success", - "data": status - }) - - except Exception as e: - return jsonify({ - "status": "error", - "message": f"状态获取失败: {str(e)}" - }) - - @self.blueprint.route('/api/orientation/apply_config', methods=['POST']) - def apply_config(): - """应用当前的位置和朝向配置""" - try: - if not self.current_web_location: - return jsonify({ - "status": "error", - "message": "没有可用的位置信息" - }) - - lat, lng, accuracy = self.current_web_location - - # 使用Web朝向或默认朝向 - if self.current_web_heading is not None: - # 计算摄像头朝向（朝向用户） - camera_heading = self.orientation_detector.calculate_camera_heading_facing_user( - self.current_web_heading - ) - else: - # 使用默认朝向 - camera_heading = 0.0 - - # 应用配置 - self.orientation_detector.update_camera_config((lat, lng), camera_heading) - - return jsonify({ - "status": "success", - "message": "配置已应用", - "data": { - "latitude": lat, - "longitude": lng, - "camera_heading": camera_heading, - "accuracy": accuracy - } - }) - - except Exception as e: - return jsonify({ - "status": "error", - "message": f"配置应用失败: {str(e)}" - }) - - def process_web_data(self, gps_data: Dict, orientation_data: Optional[Dict] = None) -> Dict: - """ - 处理来自Web端的GPS和朝向数据 - - Args: - gps_data: GPS数据 {'latitude': float, 'longitude': float, 'accuracy': float} - orientation_data: 朝向数据 {'heading': float} (可选) - - Returns: - 配置结果字典 - """ - result = { - 'success': False, - 'gps_location': None, - 'device_heading': None, - 'camera_heading': None, - 'method': 'Web', - 'accuracy': None - } - - try: - # 处理GPS数据 - lat = float(gps_data['latitude']) - lng = float(gps_data['longitude']) - accuracy = float(gps_data.get('accuracy', 1000)) - - # 验证坐标 - if not (-90 <= lat <= 90) or not (-180 <= lng <= 180): - raise ValueError("坐标范围不正确") - - result['gps_location'] = (lat, lng) - result['accuracy'] = accuracy - - # 处理朝向数据 - device_heading = 0.0 # 默认朝向 - if orientation_data and 'heading' in orientation_data: - device_heading = float(orientation_data['heading']) % 360 - - result['device_heading'] = device_heading - - # 计算摄像头朝向（面向用户） - camera_heading = self.orientation_detector.calculate_camera_heading_facing_user(device_heading) - result['camera_heading'] = camera_heading - - result['success'] = True - - print(f"✅ Web数据处理完成:") - print(f"📍 GPS位置: ({lat:.6f}, {lng:.6f})") - print(f"🧭 设备朝向: {device_heading:.1f}°") - print(f"📷 摄像头朝向: {camera_heading:.1f}°") - print(f"📏 定位精度: ±{accuracy:.0f}m") - - except Exception as e: - print(f"❌ Web数据处理失败: {e}") - - return result - - def get_blueprint(self): - """获取Flask Blueprint""" +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +Web端朝向检测器 +提供Web API接口用于获取GPS位置和设备朝向信息 +""" + +from flask import Blueprint, jsonify, request +import json +import time +from typing import Dict, Optional, Tuple +from . import config +from .orientation_detector import OrientationDetector + + +class WebOrientationDetector: + """Web端朝向检测器""" + + def __init__(self): + self.orientation_detector = OrientationDetector() + self.current_web_location = None + self.current_web_heading = None + self.last_web_update = 0 + + # 创建Blueprint + self.blueprint = Blueprint('orientation', __name__) + self.setup_routes() + + def setup_routes(self): + """设置Web API路由""" + + @self.blueprint.route('/api/orientation/auto_configure', methods=['POST']) + def auto_configure_from_web(): + """从Web端自动配置摄像头位置和朝向""" + try: + data = request.get_json() or {} + print(f"🔍 收到自动配置请求: {data}") + + # 支持两种数据格式 + # 新格式: {gps_location: [lat, lng], user_heading: heading, apply_config: true} + # 旧格式: {gps: {...}, orientation: {...}} + + if 'gps_location' in data: + # 新格式处理 + gps_location = data.get('gps_location') + user_heading = data.get('user_heading', 0) + apply_config = data.get('apply_config', True) + + if not gps_location or len(gps_location) < 2: + return jsonify({ + "success": False, + "error": "GPS位置数据格式错误" + }) + + lat, lng = float(gps_location[0]), float(gps_location[1]) + + # 验证坐标范围 + if not (-90 <= lat <= 90) or not (-180 <= lng <= 180): + return jsonify({ + "success": False, + "error": "GPS坐标范围不正确" + }) + + # 计算摄像头朝向 + if user_heading is not None: + # 计算摄像头朝向（朝向用户方向） + camera_heading = (user_heading + 180) % 360 + else: + camera_heading = 0.0 + + print(f"📍 处理GPS位置: ({lat:.6f}, {lng:.6f})") + print(f"🧭 用户朝向: {user_heading}°, 摄像头朝向: {camera_heading}°") + + if apply_config: + # 应用配置 + self.orientation_detector.update_camera_config((lat, lng), camera_heading) + print(f"✅ 配置已应用到系统") + + return jsonify({ + "success": True, + "message": "摄像头位置和朝向已自动配置", + "gps_location": [lat, lng], + "user_heading": user_heading, + "camera_heading": camera_heading, + "applied": apply_config + }) + + else: + # 旧格式处理 + gps_data = data.get('gps') + orientation_data = data.get('orientation') + + if not gps_data: + # 如果前端没有提供GPS，尝试后端获取 + result = self.orientation_detector.auto_configure_camera_location() + else: + # 使用前端提供的数据 + result = self.process_web_data(gps_data, orientation_data) + + if result['success']: + # 应用配置 + self.orientation_detector.update_camera_config( + result['gps_location'], + result['camera_heading'] + ) + + return jsonify({ + "success": True, + "message": "摄像头位置和朝向已自动配置", + **result + }) + else: + return jsonify({ + "success": False, + "error": result.get('error', '自动配置失败') + }) + + except Exception as e: + print(f"❌ 自动配置异常: {e}") + import traceback + traceback.print_exc() + return jsonify({ + "success": False, + "error": f"配置失败: {str(e)}" + }) + + @self.blueprint.route('/api/orientation/update_location', methods=['POST']) + def update_location(): + """更新GPS位置信息""" + try: + data = request.get_json() + + if not data or 'latitude' not in data or 'longitude' not in data: + return jsonify({ + "status": "error", + "message": "缺少位置信息" + }) + + lat = float(data['latitude']) + lng = float(data['longitude']) + accuracy = float(data.get('accuracy', 1000)) + + # 验证坐标范围 + if not (-90 <= lat <= 90) or not (-180 <= lng <= 180): + return jsonify({ + "status": "error", + "message": "坐标范围不正确" + }) + + # 更新位置信息 + self.current_web_location = (lat, lng, accuracy) + self.last_web_update = time.time() + + print(f"📍 Web GPS更新: ({lat:.6f}, {lng:.6f}), 精度: ±{accuracy:.0f}m") + + return jsonify({ + "status": "success", + "message": "位置信息已更新" + }) + + except Exception as e: + return jsonify({ + "status": "error", + "message": f"位置更新失败: {str(e)}" + }) + + @self.blueprint.route('/api/orientation/update_heading', methods=['POST']) + def update_heading(): + """更新设备朝向信息""" + try: + data = request.get_json() + + if not data or 'heading' not in data: + return jsonify({ + "status": "error", + "message": "缺少朝向信息" + }) + + heading = float(data['heading']) + + # 标准化角度到0-360范围 + heading = heading % 360 + + # 更新朝向信息 + self.current_web_heading = heading + self.last_web_update = time.time() + + print(f"🧭 Web朝向更新: {heading:.1f}°") + + return jsonify({ + "status": "success", + "message": "朝向信息已更新" + }) + + except Exception as e: + return jsonify({ + "status": "error", + "message": f"朝向更新失败: {str(e)}" + }) + + @self.blueprint.route('/api/orientation/get_status') + def get_orientation_status(): + """获取当前朝向状态""" + try: + current_time = time.time() + + # 检查数据是否过期（30秒） + web_data_fresh = (current_time - self.last_web_update) < 30 + + status = { + "web_location": self.current_web_location, + "web_heading": self.current_web_heading, + "web_data_fresh": web_data_fresh, + "last_update": self.last_web_update, + "current_config": { + "latitude": config.CAMERA_LATITUDE, + "longitude": config.CAMERA_LONGITUDE, + "heading": config.CAMERA_HEADING + } + } + + return jsonify({ + "status": "success", + "data": status + }) + + except Exception as e: + return jsonify({ + "status": "error", + "message": f"状态获取失败: {str(e)}" + }) + + @self.blueprint.route('/api/orientation/apply_config', methods=['POST']) + def apply_config(): + """应用当前的位置和朝向配置""" + try: + if not self.current_web_location: + return jsonify({ + "status": "error", + "message": "没有可用的位置信息" + }) + + lat, lng, accuracy = self.current_web_location + + # 使用Web朝向或默认朝向 + if self.current_web_heading is not None: + # 计算摄像头朝向（朝向用户） + camera_heading = self.orientation_detector.calculate_camera_heading_facing_user( + self.current_web_heading + ) + else: + # 使用默认朝向 + camera_heading = 0.0 + + # 应用配置 + self.orientation_detector.update_camera_config((lat, lng), camera_heading) + + return jsonify({ + "status": "success", + "message": "配置已应用", + "data": { + "latitude": lat, + "longitude": lng, + "camera_heading": camera_heading, + "accuracy": accuracy + } + }) + + except Exception as e: + return jsonify({ + "status": "error", + "message": f"配置应用失败: {str(e)}" + }) + + def process_web_data(self, gps_data: Dict, orientation_data: Optional[Dict] = None) -> Dict: + """ + 处理来自Web端的GPS和朝向数据 + + Args: + gps_data: GPS数据 {'latitude': float, 'longitude': float, 'accuracy': float} + orientation_data: 朝向数据 {'heading': float} (可选) + + Returns: + 配置结果字典 + """ + result = { + 'success': False, + 'gps_location': None, + 'device_heading': None, + 'camera_heading': None, + 'method': 'Web', + 'accuracy': None + } + + try: + # 处理GPS数据 + lat = float(gps_data['latitude']) + lng = float(gps_data['longitude']) + accuracy = float(gps_data.get('accuracy', 1000)) + + # 验证坐标 + if not (-90 <= lat <= 90) or not (-180 <= lng <= 180): + raise ValueError("坐标范围不正确") + + result['gps_location'] = (lat, lng) + result['accuracy'] = accuracy + + # 处理朝向数据 + device_heading = 0.0 # 默认朝向 + if orientation_data and 'heading' in orientation_data: + device_heading = float(orientation_data['heading']) % 360 + + result['device_heading'] = device_heading + + # 计算摄像头朝向（面向用户） + camera_heading = self.orientation_detector.calculate_camera_heading_facing_user(device_heading) + result['camera_heading'] = camera_heading + + result['success'] = True + + print(f"✅ Web数据处理完成:") + print(f"📍 GPS位置: ({lat:.6f}, {lng:.6f})") + print(f"🧭 设备朝向: {device_heading:.1f}°") + print(f"📷 摄像头朝向: {camera_heading:.1f}°") + print(f"📏 定位精度: ±{accuracy:.0f}m") + + except Exception as e: + print(f"❌ Web数据处理失败: {e}") + + return result + + def get_blueprint(self): + """获取Flask Blueprint""" return self.blueprint \ No newline at end of file diff --git a/distance-judgement/src/web_server.py b/distance-judgement/src/web_server.py index 6be0db32..2a160497 100644 --- a/distance-judgement/src/web_server.py +++ b/distance-judgement/src/web_server.py @@ -14,11 +14,96 @@ from .map_manager import MapManager from .mobile_connector import MobileConnector from .web_orientation_detector import WebOrientationDetector +# 🚁 修复无人机模块导入 +try: + from .drone.drone_interface.drone_manager import DroneManager + from .drone.drone_interface.video_receiver import VideoReceiver + print("✅ 成功导入无人机模块：DroneManager, VideoReceiver") +except ImportError as e: + print(f"❌ 无人机模块导入失败: {e}") + print("⚠️ 尝试使用备用导入...") + try: + # 备用导入方案 + import sys + import os + current_dir = os.path.dirname(__file__) + drone_dir = os.path.join(current_dir, 'drone') + sys.path.insert(0, drone_dir) + + from drone_interface.drone_manager import DroneManager + from drone_interface.video_receiver import VideoReceiver + print("✅ 备用导入成功：DroneManager, VideoReceiver") + except ImportError as e2: + print(f"❌ 备用导入也失败: {e2}") + print("🔧 使用模拟类...") + + # 创建模拟类以防止崩溃 + class MockDroneManager: + def __init__(self): + self.connected = False + + def connect(self): + print("⚠️ 模拟DroneManager - 连接功能不可用") + return False + + def disconnect(self): + print("⚠️ 模拟DroneManager - 断开功能不可用") + return True + + def get_state(self): + return {'battery': 0, 'height': 0} + + def get_connection_status(self): + class MockStatus: + name = "DISCONNECTED" + return MockStatus() + + def get_video_stream_url(self): + return "udp://192.168.10.1:11111" + + def takeoff(self): + return False + + def land(self): + return False + + def move(self, direction, distance): + return False + + def rotate(self, direction, angle): + return False + + class MockVideoReceiver: + def __init__(self): + self.running = False + self.last_error = "模拟VideoReceiver - 功能不可用" + self.stream_timeout = 10.0 + + def start(self, stream_url): + print("⚠️ 模拟VideoReceiver - 启动功能不可用") + return False + + def stop(self): + print("⚠️ 模拟VideoReceiver - 停止功能不可用") + return True + + def get_latest_frame(self): + return None + + def get_stats(self): + return {} + + DroneManager = MockDroneManager + VideoReceiver = MockVideoReceiver + print("🔧 已创建模拟类，服务器可以启动但无人机功能将不可用") + + class WebServer: """Web服务器类，管理地图界面和摄像头控制""" def __init__(self): self.app = Flask(__name__) + self.config = config # 添加config引用 self.map_manager = MapManager( api_key=config.GAODE_API_KEY, camera_lat=config.CAMERA_LATITUDE, @@ -46,6 +131,19 @@ class WebServer: # 朝向检测相关 self.web_orientation_detector = WebOrientationDetector() + # 🚁 无人机管理器 + self.drone_manager = DroneManager() + self.video_receiver = VideoReceiver() + + # 🚁 Tello无人机对象（用于直接控制） + self.tello = None + try: + from djitellopy import Tello + self.Tello = Tello + except ImportError: + print("警告: 未找到djitellopy库，请安装: pip install djitellopy") + self.Tello = None + # 设置路由 self.setup_routes() @@ -58,6 +156,20 @@ class WebServer: # 设置安全头部 self.setup_security_headers() + def get_tello(self): + """获取Tello实例，如果不存在则创建""" + if self.tello is None: + if self.Tello is None: + print("❌ 无法创建Tello对象，未找到djitellopy库") + return None + try: + self.tello = self.Tello() + print("🚁 Tello对象已创建") + except Exception as e: + print(f"❌ 创建Tello对象失败: {e}") + return None + return self.tello + def setup_security_headers(self): """设置HTTP安全头部""" @self.app.after_request @@ -126,6 +238,24 @@ class WebServer: except FileNotFoundError: return "测试页面未找到", 404 + @self.app.route('/trajectory_simulation_test.html') + def trajectory_simulation_test(): + """轨迹模拟测试页面""" + try: + with open('trajectory_simulation_test.html', 'r', encoding='utf-8') as f: + return f.read() + except FileNotFoundError: + return "轨迹模拟测试页面未找到", 404 + + @self.app.route('/drone_control.html') + def drone_control(): + """🚁 无人机控制界面""" + try: + with open('drone_control.html', 'r', encoding='utf-8') as f: + return f.read() + except FileNotFoundError: + return "无人机控制界面未找到", 404 + @self.app.route('/api/start_camera', methods=['POST']) def start_camera(): """启动摄像头""" @@ -200,13 +330,20 @@ class WebServer: # 只有有数据的设备才加入返回列表 if device_info: device_info['device_id'] = device_id + # 检查是否为模拟设备（以sim_drone开头的设备ID） + device_info['is_simulation'] = device_id.startswith('sim_drone_') + if device_info['is_simulation']: + device_info['name'] = '🚁模拟无人机' devices_data.append(device_info) + + return jsonify(devices_data) @self.app.route('/api/debug_info') def debug_info(): """获取调试信息""" + current_time = time.time() # 添加时间变量 debug_data = { "camera_active": self.camera_active, "persons_count": len(self.map_manager.get_persons_data()), @@ -216,8 +353,35 @@ class WebServer: "lat": config.CAMERA_LATITUDE, "lng": config.CAMERA_LONGITUDE, "heading": config.CAMERA_HEADING - } + }, + # 🛤️ 添加模拟相关的调试信息 + "simulation_active": getattr(self, 'simulation_active', False), + "simulated_drones_count": len(getattr(self, 'simulated_drones', [])), + "mobile_connector_devices": len(getattr(self.mobile_connector, 'devices', {})), + "mobile_locations_count": len(self.mobile_locations), + "mobile_orientations_count": len(self.mobile_orientations) } + + # 添加模拟设备详情 + debug_data["mobile_locations_detail"] = {} + for device_id, location_data in self.mobile_locations.items(): + debug_data["mobile_locations_detail"][device_id] = { + "is_simulation": device_id.startswith('sim_drone_'), + "latitude": location_data['latitude'], + "longitude": location_data['longitude'], + "timestamp": location_data['timestamp'], + "age_seconds": current_time - location_data['timestamp'] + } + + debug_data["mobile_orientations_detail"] = {} + for device_id, orientation_data in self.mobile_orientations.items(): + debug_data["mobile_orientations_detail"][device_id] = { + "is_simulation": device_id.startswith('sim_drone_'), + "heading": orientation_data['heading'], + "timestamp": orientation_data['timestamp'], + "age_seconds": current_time - orientation_data['timestamp'] + } + return jsonify(debug_data) @self.app.route('/api/get_camera_frame') @@ -295,18 +459,19 @@ class WebServer: @self.app.route('/api/mobile/devices') def get_mobile_devices(): - """获取连接的手机设备列表""" + """获取连接的手机设备列表（包括移动端和Robomaster TT无人机）""" devices = [] # 首先添加Socket连接的设备 for device in self.mobile_connector.get_online_devices(): devices.append({ "device_id": device.device_id, - "device_name": device.device_name, + "device_name": f"📱{device.device_name}", "battery_level": device.battery_level, "is_online": device.is_online, "last_seen": device.last_seen, - "location": device.current_location + "location": device.current_location, + "device_type": "mobile" }) # 然后添加HTTP API连接的设备 @@ -332,12 +497,13 @@ class WebServer: devices.append({ "device_id": device_id, - "device_name": device_info.get('device_name', f'HTTP-Device-{device_id[:8]}'), + "device_name": f"📱{device_info.get('device_name', f'HTTP-Device-{device_id[:8]}')}", "battery_level": device_info.get('battery', 100), "is_online": is_online, "last_seen": last_seen, "location": location, - "connection_type": "HTTP" + "connection_type": "HTTP", + "device_type": "mobile" }) return jsonify(devices) @@ -454,9 +620,9 @@ class WebServer: @self.app.route('/api/remote_device/stream/') def get_remote_device_stream(device_id): - """获取远程设备的视频流""" + """获取远程设备的视频流（支持移动端和Robomaster TT）""" try: - # 获取指定设备的最新帧 + # 首先检查是否是移动设备 if device_id in self.mobile_frames: frame_data = self.mobile_frames[device_id] device_info = frame_data.get('device_info', {}) @@ -466,7 +632,8 @@ class WebServer: "status": "success", "frame": f"data:image/jpeg;base64,{frame_data.get('frame')}", "timestamp": frame_data.get('timestamp'), - "device_info": device_info + "device_info": device_info, + "device_type": "mobile" } # 如果有GPS数据，加入响应中 @@ -479,17 +646,585 @@ class WebServer: } return jsonify(response_data) - else: - return jsonify({ - "status": "no_frame", - "message": "设备无视频数据" - }), 404 + + # 设备未找到 + return jsonify({ + "status": "no_frame", + "message": "设备无视频数据" + }), 404 + except Exception as e: return jsonify({"status": "error", "message": str(e)}), 500 @self.app.route('/favicon.ico') def favicon(): return '', 204 # 返回空内容，状态码204表示无内容 + + # 🚁 无人机API接口 + @self.app.route('/api/drone/connect', methods=['POST']) + def connect_drone(): + """连接无人机""" + try: + data = request.get_json() or {} + drone_ip = data.get('drone_ip', '192.168.10.1') + + print(f"🚁 连接无人机请求: ip={drone_ip}") + + # 首先尝试创建和连接Tello对象 + try: + tello = self.get_tello() + if not tello: + return jsonify({ + "status": "error", + "message": "无法创建Tello对象，请检查djitellopy是否安装" + }), 500 + + # 先停止任何可能正在运行的视频流，避免冲突 + try: + print("🚁 尝试停止可能存在的视频流...") + tello.streamoff() + time.sleep(0.5) # 减少等待时间 + except Exception as e: + print(f"⚠️ 停止视频流命令超时，这是正常的（如果之前没有连接）: {e}") + pass + + # 连接到无人机 + print("🚁 正在连接Tello无人机...") + tello.connect() + + # 检查连接是否成功 + print("🚁 检查Tello连接状态...") + try: + # 发送一个命令测试连接，设置较短的超时时间 + response = tello.send_command_with_return('command', timeout=5) + if not response or 'ok' not in response.lower(): + raise Exception(f"命令响应异常: {response}") + + battery = tello.get_battery() + print(f"🚁 Tello连接成功，电池电量: {battery}%") + + return jsonify({ + "status": "success", + "message": "无人机连接成功", + "drone_info": { + "battery": battery, + "ip": drone_ip, + "model": "Tello" + } + }) + except Exception as conn_error: + print(f"❌ Tello连接测试失败: {conn_error}") + return jsonify({ + "status": "error", + "message": f"连接测试失败: {str(conn_error)}" + }), 500 + + except Exception as e: + print(f"❌ Tello连接失败: {e}") + # 回退到使用DroneManager + print("🚁 回退到使用DroneManager...") + success = self.drone_manager.connect() + if success: + print("✅ DroneManager连接成功") + return jsonify({ + "status": "success", + "message": "无人机连接成功（使用DroneManager）", + "drone_info": self.drone_manager.get_state() + }) + else: + print("❌ DroneManager连接失败") + return jsonify({ + "status": "error", + "message": f"无人机连接失败: {str(e)}" + }), 500 + + except Exception as e: + print(f"❌ 连接异常: {e}") + return jsonify({"status": "error", "message": str(e)}), 500 + + @self.app.route('/api/drone/disconnect', methods=['POST']) + def disconnect_drone(): + """断开无人机连接""" + try: + print("🚁 正在断开无人机连接...") + + # 停止视频流 + self.video_receiver.stop() + + # 断开Tello连接 + try: + tello = self.get_tello() + if tello: + tello.streamoff() # 先停止视频流 + tello.end() # 断开连接 + print("🚁 Tello连接已断开") + except Exception as e: + print(f"⚠️ 断开Tello连接时出错: {e}") + + # 断开DroneManager连接 + try: + self.drone_manager.disconnect() + except Exception as e: + print(f"⚠️ 断开DroneManager连接时出错: {e}") + + # 重置Tello对象 + self.tello = None + + print("✅ 无人机已断开连接") + return jsonify({ + "status": "success", + "message": "无人机已断开连接" + }) + except Exception as e: + print(f"❌ 断开连接时出错: {e}") + return jsonify({"status": "error", "message": str(e)}), 500 + + @self.app.route('/api/drone/status') + def get_drone_status(): + """获取无人机状态""" + try: + state = self.drone_manager.get_state() + connection_status = self.drone_manager.get_connection_status() + + return jsonify({ + "status": "success", + "connection_status": connection_status.name, + "drone_state": state + }) + except Exception as e: + return jsonify({"status": "error", "message": str(e)}), 500 + + @self.app.route('/api/drone/start_video', methods=['POST']) + def start_drone_video(): + """启动无人机视频流""" + try: + print("🚁 正在启动无人机视频传输...") + + # 🔧 首先清理任何现有的视频接收器 + print("🔧 清理现有视频接收器...") + try: + self.video_receiver.stop() + time.sleep(0.5) # 等待端口释放 + except Exception as e: + print(f"⚠️ 清理现有接收器时出错: {e}") + + # 🔧 检查并释放UDP端口11111 + import socket + import subprocess + import platform + + def check_and_kill_port_process(port): + """检查并终止占用指定端口的进程""" + try: + if platform.system().lower() == 'windows': + # Windows下查找占用端口的进程 + result = subprocess.run(['netstat', '-ano'], capture_output=True, text=True) + lines = result.stdout.split('\n') + for line in lines: + if f':{port}' in line and 'UDP' in line: + parts = line.split() + if len(parts) >= 5: + pid = parts[-1] + print(f"🔍 发现占用端口{port}的进程PID: {pid}") + # 不强制杀死系统进程，而是记录警告 + if pid != '0': + print(f"⚠️ 端口{port}被PID {pid}占用，可能导致冲突") + return True + except Exception as e: + print(f"⚠️ 检查端口占用时出错: {e}") + return False + + check_and_kill_port_process(11111) + + # **关键修复**: 首先启动无人机的视频传输 + try: + # 获取Tello对象 + tello = self.get_tello() + if not tello: + return jsonify({ + "status": "error", + "message": "无法获取Tello对象，请检查连接" + }), 400 + + # 确保先停止任何现有的视频流 + print("🚁 发送streamoff命令清理现有视频流...") + tello.streamoff() + time.sleep(2) # 等待命令执行和清理 + + # 启动无人机视频传输 + print("🚁 发送streamon命令启动视频传输...") + tello.streamon() + print("🚁 已发送streamon命令，等待无人机开始发送视频数据...") + time.sleep(4) # 增加等待时间，确保无人机开始发送数据 + + except Exception as e: + print(f"❌ 启动无人机视频传输失败: {e}") + return jsonify({ + "status": "error", + "message": f"无法启动无人机视频传输: {str(e)}" + }), 500 + + # 🔧 使用本地UDP监听，而不是从无人机IP接收 + # 修复：Tello发送数据到客户端，我们应该监听本地端口 + stream_url = "udp://0.0.0.0:11111" # 监听本地11111端口 + print(f"🚁 使用UDP监听地址: {stream_url}") + + # 重新创建VideoReceiver实例，确保没有端口冲突 + try: + # 创建新的接收器实例 + from src.drone.drone_interface.video_receiver import VideoReceiver + print("🔧 创建新的VideoReceiver实例...") + self.video_receiver = VideoReceiver() + + # 设置较短的超时时间进行快速测试 + self.video_receiver.stream_timeout = 8.0 + print(f"🚁 视频流超时时间已设置为: {self.video_receiver.stream_timeout}秒") + + except Exception as e: + print(f"❌ 创建VideoReceiver实例失败: {e}") + return jsonify({ + "status": "error", + "message": f"无法创建视频接收器: {str(e)}" + }), 500 + + # 启动视频接收器 + print("🚁 启动视频接收器...") + success = self.video_receiver.start(stream_url) + + if success: + print("✅ 视频流已成功启动") + + # 等待一下检查是否真的有数据 + print("🔍 检查视频数据接收状态...") + time.sleep(2) + + test_frame = self.video_receiver.get_latest_frame() + if test_frame is not None: + print(f"✅ 成功接收到视频帧，尺寸: {test_frame.shape}") + return jsonify({ + "status": "success", + "message": "视频流已启动并成功接收数据", + "stream_url": stream_url, + "frame_info": f"分辨率: {test_frame.shape[1]}x{test_frame.shape[0]}" + }) + else: + print("⚠️ 视频流已启动但暂时没有收到数据，这是正常的") + return jsonify({ + "status": "success", + "message": "视频流已启动，等待无人机发送数据", + "stream_url": stream_url, + "warning": "数据接收中，请稍候" + }) + else: + error_msg = self.video_receiver.last_error or "未知错误" + print(f"❌ 视频流启动失败: {error_msg}") + + # 🔧 提供详细的诊断信息 + diagnostic_info = [] + diagnostic_info.append("请检查以下项目:") + diagnostic_info.append("1. 是否已连接到Tello WiFi (TELLO-xxxxxx)") + diagnostic_info.append("2. 无人机是否已开机") + diagnostic_info.append("3. 是否已建立与无人机的控制连接") + diagnostic_info.append("4. 端口11111是否被其他程序占用") + + return jsonify({ + "status": "error", + "message": f"视频流启动失败: {error_msg}", + "diagnostic": diagnostic_info + }), 500 + + except Exception as e: + print(f"❌ 启动视频流时出错: {e}") + import traceback + traceback.print_exc() + return jsonify({ + "status": "error", + "message": f"系统错误: {str(e)}" + }), 500 + + @self.app.route('/api/drone/stop_video', methods=['POST']) + def stop_drone_video(): + """停止无人机视频流""" + try: + print("🚁 正在停止无人机视频流...") + + # 🔧 强制停止视频接收器并清理资源 + try: + if hasattr(self, 'video_receiver') and self.video_receiver: + print("🔧 停止视频接收器...") + self.video_receiver.stop() + time.sleep(0.5) # 等待资源清理 + print("✅ 视频接收器已停止") + except Exception as e: + print(f"⚠️ 停止视频接收器时出错: {e}") + + # 停止Tello的视频传输 + try: + tello = self.get_tello() + if tello: + print("🚁 发送streamoff命令...") + tello.streamoff() + time.sleep(1) # 等待命令执行 + print("✅ 已发送streamoff命令") + except Exception as e: + print(f"⚠️ 发送streamoff命令时出错: {e}") + + # 🔧 额外的端口清理，确保11111端口被释放 + try: + import socket + test_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + test_socket.bind(('0.0.0.0', 11111)) + test_socket.close() + print("✅ 端口11111已释放") + except Exception as e: + print(f"⚠️ 端口11111可能仍被占用: {e}") + + print("✅ 视频流已完全停止") + return jsonify({ + "status": "success", + "message": "视频流已停止，所有资源已清理" + }) + except Exception as e: + print(f"❌ 停止视频流时出错: {e}") + return jsonify({"status": "error", "message": str(e)}), 500 + + @self.app.route('/api/drone/video_frame') + def get_drone_video_frame(): + """获取无人机视频帧""" + try: + frame = self.video_receiver.get_latest_frame() + if frame is not None: + # 编码为JPEG并转换为base64 + import cv2 + import base64 + + _, buffer = cv2.imencode('.jpg', frame) + frame_base64 = base64.b64encode(buffer).decode('utf-8') + + stats = self.video_receiver.get_stats() + + return jsonify({ + "status": "success", + "frame": f"data:image/jpeg;base64,{frame_base64}", + "timestamp": time.time(), + "stats": stats + }) + else: + # 🔧 修复：返回200状态码而不是404，避免控制台错误 + return jsonify({ + "status": "no_frame", + "message": "等待视频帧数据...", + "timestamp": time.time() + }) + except Exception as e: + print(f"❌ 获取无人机视频帧出错: {e}") + return jsonify({"status": "error", "message": str(e)}), 500 + + @self.app.route('/api/drone/control', methods=['POST']) + def control_drone(): + """控制无人机""" + try: + data = request.get_json() or {} + command = data.get('command') + params = data.get('params', {}) + + if command == 'takeoff': + result = self.drone_manager.takeoff() + elif command == 'land': + result = self.drone_manager.land() + elif command == 'move': + direction = params.get('direction') + distance = params.get('distance', 20) + result = self.drone_manager.move(direction, distance) + elif command == 'rotate': + direction = params.get('direction') + angle = params.get('angle', 90) + result = self.drone_manager.rotate(direction, angle) + else: + return jsonify({ + "status": "error", + "message": f"未知命令: {command}" + }), 400 + + if result: + return jsonify({ + "status": "success", + "message": f"命令 {command} 执行成功" + }) + else: + return jsonify({ + "status": "error", + "message": f"命令 {command} 执行失败" + }), 500 + + except Exception as e: + return jsonify({"status": "error", "message": str(e)}), 500 + + @self.app.route('/api/test/start_simulation', methods=['POST']) + def start_drone_simulation(): + """启动无人机轨迹模拟""" + try: + data = request.get_json() or {} + simulation_type = data.get('type', 'circle') # circle, line, random + drone_count = data.get('drone_count', 1) + speed = data.get('speed', 5) # 移动速度(秒/点) + + self.start_trajectory_simulation(simulation_type, drone_count, speed) + + return jsonify({ + 'status': 'success', + 'message': f'已启动{drone_count}架无人机的{simulation_type}轨迹模拟', + 'simulation_type': simulation_type, + 'drone_count': drone_count, + 'speed': speed + }) + + except Exception as e: + return jsonify({'status': 'error', 'message': str(e)}), 500 + + @self.app.route('/api/test/stop_simulation', methods=['POST']) + def stop_drone_simulation(): + """停止无人机轨迹模拟""" + try: + self.stop_trajectory_simulation() + return jsonify({'status': 'success', 'message': '轨迹模拟已停止'}) + except Exception as e: + return jsonify({'status': 'error', 'message': str(e)}), 500 + + @self.app.route('/api/test/simulation_status') + def get_simulation_status(): + """获取模拟状态""" + try: + return jsonify({ + 'status': 'success', + 'simulation_active': hasattr(self, 'simulation_active') and self.simulation_active, + 'simulated_drones': getattr(self, 'simulated_drones', []), + 'simulation_type': getattr(self, 'simulation_type', 'none') + }) + except Exception as e: + return jsonify({'status': 'error', 'message': str(e)}), 500 + + @self.app.route('/api/drone/diagnose') + def diagnose_drone_connection(): + """诊断无人机连接和视频流状态""" + try: + import subprocess + import platform + import socket + + diagnosis = { + "timestamp": time.time(), + "network": {}, + "tello": {}, + "video_stream": {}, + "system": {}, + "recommendations": [] + } + + # 🔍 网络连接检查 + print("🔍 开始诊断无人机连接...") + + # 检查Tello IP连通性 + try: + tello_ip = "192.168.10.1" + param = '-n' if platform.system().lower() == 'windows' else '-c' + ping_result = subprocess.run( + ['ping', param, '1', tello_ip], + capture_output=True, text=True, timeout=5 + ) + + diagnosis["network"]["ping_success"] = ping_result.returncode == 0 + diagnosis["network"]["ping_output"] = ping_result.stdout[:200] # 限制输出长度 + + if ping_result.returncode != 0: + diagnosis["recommendations"].append("❌ 无法ping通Tello IP (192.168.10.1)，请确保已连接到Tello WiFi") + else: + diagnosis["recommendations"].append("✅ 网络连接正常") + + except Exception as e: + diagnosis["network"]["ping_error"] = str(e) + diagnosis["recommendations"].append(f"⚠️ 网络检查失败: {e}") + + # 🔍 端口11111检查 + try: + test_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + test_socket.bind(('0.0.0.0', 11111)) + test_socket.close() + diagnosis["network"]["port_11111_available"] = True + diagnosis["recommendations"].append("✅ UDP端口11111可用") + except Exception as e: + diagnosis["network"]["port_11111_available"] = False + diagnosis["network"]["port_error"] = str(e) + diagnosis["recommendations"].append("❌ UDP端口11111被占用，可能有其他程序在使用") + + # 🔍 Tello连接状态 + try: + tello = self.get_tello() + if tello: + # 尝试获取电池状态 + try: + battery = tello.get_battery() + diagnosis["tello"]["connected"] = True + diagnosis["tello"]["battery"] = battery + diagnosis["recommendations"].append(f"✅ Tello已连接，电量: {battery}%") + except Exception as e: + diagnosis["tello"]["connected"] = False + diagnosis["tello"]["error"] = str(e) + diagnosis["recommendations"].append("❌ Tello已创建但无法通信，检查WiFi连接") + else: + diagnosis["tello"]["connected"] = False + diagnosis["recommendations"].append("❌ 未连接到Tello，请先点击'连接无人机'") + except Exception as e: + diagnosis["tello"]["error"] = str(e) + diagnosis["recommendations"].append(f"⚠️ Tello状态检查失败: {e}") + + # 🔍 视频流状态 + try: + if hasattr(self, 'video_receiver') and self.video_receiver: + diagnosis["video_stream"]["receiver_exists"] = True + diagnosis["video_stream"]["running"] = self.video_receiver.running + + if self.video_receiver.running: + stats = self.video_receiver.get_stats() + diagnosis["video_stream"]["stats"] = stats + latest_frame = self.video_receiver.get_latest_frame() + diagnosis["video_stream"]["has_frames"] = latest_frame is not None + + if latest_frame is not None: + diagnosis["recommendations"].append(f"✅ 视频流正常，已接收 {stats.get('total_frames', 0)} 帧") + else: + diagnosis["recommendations"].append("⚠️ 视频流已启动但暂无帧数据") + else: + diagnosis["recommendations"].append("❌ 视频流未启动") + else: + diagnosis["video_stream"]["receiver_exists"] = False + diagnosis["recommendations"].append("❌ 视频接收器未初始化") + except Exception as e: + diagnosis["video_stream"]["error"] = str(e) + diagnosis["recommendations"].append(f"⚠️ 视频流检查失败: {e}") + + # 🔍 系统信息 + diagnosis["system"]["platform"] = platform.system() + diagnosis["system"]["python_version"] = platform.python_version() + + try: + import cv2 + diagnosis["system"]["opencv_version"] = cv2.__version__ + except: + diagnosis["system"]["opencv_version"] = "未知" + + print("✅ 诊断完成") + return jsonify({ + "status": "success", + "diagnosis": diagnosis + }) + + except Exception as e: + print(f"❌ 诊断过程出错: {e}") + return jsonify({ + "status": "error", + "message": f"诊断失败: {str(e)}" + }), 500 def draw_info_panel(self, frame, person_count=0): """绘制信息面板 - 完全复制main.py的逻辑""" @@ -810,7 +1545,9 @@ class WebServer: 'timestamp': timestamp } - print(f"🧭 设备 {device_id[:8]} 朝向更新: {heading:.1f}° (倾斜:{tilt:.1f}°)") + # 🧭 详细的朝向数据日志，便于调试 + current_time = time.strftime('%H:%M:%S') + print(f"🧭 [{current_time}] 设备 {device_id[:8]} 朝向数据: {heading:.1f}° (倾斜:{tilt:.1f}°, 翻滚:{roll:.1f}°)") return jsonify({ "status": "success", @@ -1238,7 +1975,8 @@ class WebServer: 🚁 无人机战场态势感知系统 - + - - - -
    -

    🧪 设备选择器测试

    - -
    -
    - 📹 视频设备 - -
    -
    - 点击"选择设备"开始使用摄像头 -
    -
    - - - - -
    -
    系统初始化中...
    -
    -
    - - - - + + + + + + + 设备选择器测试 + + + + +
    +

    🧪 设备选择器测试

    + +
    +
    + 📹 视频设备 + +
    +
    + 点击"选择设备"开始使用摄像头 +
    +
    + + + + +
    +
    系统初始化中...
    +
    +
    + + + + \ No newline at end of file diff --git a/distance-judgement/test_network.py b/distance-judgement/test_network.py index 755a9466..24235a8d 100644 --- a/distance-judgement/test_network.py +++ b/distance-judgement/test_network.py @@ -1,134 +1,134 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -网络连接测试脚本 -帮助诊断手机/平板连接问题 -""" - -import socket -import subprocess -import sys -import threading -import time -from http.server import HTTPServer, SimpleHTTPRequestHandler - -def get_local_ip(): - """获取本机IP地址""" - try: - # 方法1: 连接到远程地址获取本地IP - s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - s.connect(("8.8.8.8", 80)) - ip = s.getsockname()[0] - s.close() - return ip - except: - try: - # 方法2: 获取主机名对应的IP - hostname = socket.gethostname() - ip = socket.gethostbyname(hostname) - if ip.startswith("127."): - return None - return ip - except: - return None - -def test_port(host, port): - """测试端口是否可访问""" - try: - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.settimeout(5) - result = sock.connect_ex((host, port)) - sock.close() - return result == 0 - except: - return False - -def start_test_server(port=8888): - """启动测试HTTP服务器""" - class TestHandler(SimpleHTTPRequestHandler): - def do_GET(self): - self.send_response(200) - self.send_header('Content-type', 'text/html; charset=utf-8') - self.end_headers() - html = """ - 网络测试 - -

    ✅ 网络连接测试成功!

    -

    如果您能看到这个页面，说明网络连接正常。

    -

    测试时间: %s

    -

    您的IP: %s

    -

    刷新测试

    - - """ % (time.strftime('%Y-%m-%d %H:%M:%S'), self.client_address[0]) - self.wfile.write(html.encode('utf-8')) - - def log_message(self, format, *args): - print(f"📱 测试访问: {self.client_address[0]} - {format % args}") - - try: - server = HTTPServer(('0.0.0.0', port), TestHandler) - print(f"🧪 测试服务器已启动，端口: {port}") - server.serve_forever() - except Exception as e: - print(f"❌ 测试服务器启动失败: {e}") - -def main(): - print("=" * 60) - print("🔍 网络连接诊断工具") - print("=" * 60) - print() - - # 1. 获取IP地址 - print("📍 1. 获取网络IP地址...") - local_ip = get_local_ip() - if local_ip: - print(f"✅ 本机IP地址: {local_ip}") - else: - print("❌ 无法获取IP地址，请检查网络连接") - return - - # 2. 检查常用端口 - print("\n🔌 2. 检查端口状态...") - ports_to_test = [5000, 8080, 8888] - for port in ports_to_test: - if test_port('127.0.0.1', port): - print(f"⚠️ 端口 {port} 已被占用") - else: - print(f"✅ 端口 {port} 可用") - - # 3. 显示连接信息 - print(f"\n📱 3. 移动设备连接信息:") - print(f" 主服务器地址: http://{local_ip}:5000") - print(f" 手机客户端: http://{local_ip}:5000/mobile/mobile_client.html") - print(f" 测试地址: http://{local_ip}:8888") - - # 4. 防火墙检查提示 - print(f"\n🛡️ 4. 防火墙设置提示:") - print(" 如果平板无法连接，请检查Windows防火墙设置:") - print(" 1. 打开 Windows 安全中心") - print(" 2. 点击 防火墙和网络保护") - print(" 3. 点击 允许应用通过防火墙") - print(" 4. 确保 Python 程序被允许通过防火墙") - print(" 或者临时关闭防火墙进行测试") - - # 5. 网络检查命令 - print(f"\n🔧 5. 网络检查命令:") - print(f" 在平板上ping测试: ping {local_ip}") - print(f" 在电脑上查看网络: ipconfig") - print(f" 检查防火墙状态: netsh advfirewall show allprofiles") - - # 6. 启动测试服务器 - print(f"\n🧪 6. 启动网络测试服务器...") - print(f" 请在平板浏览器访问: http://{local_ip}:8888") - print(" 如果能看到测试页面，说明网络连接正常") - print(" 按 Ctrl+C 停止测试") - print() - - try: - start_test_server(8888) - except KeyboardInterrupt: - print("\n👋 测试结束") - -if __name__ == "__main__": +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +网络连接测试脚本 +帮助诊断手机/平板连接问题 +""" + +import socket +import subprocess +import sys +import threading +import time +from http.server import HTTPServer, SimpleHTTPRequestHandler + +def get_local_ip(): + """获取本机IP地址""" + try: + # 方法1: 连接到远程地址获取本地IP + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + s.connect(("8.8.8.8", 80)) + ip = s.getsockname()[0] + s.close() + return ip + except: + try: + # 方法2: 获取主机名对应的IP + hostname = socket.gethostname() + ip = socket.gethostbyname(hostname) + if ip.startswith("127."): + return None + return ip + except: + return None + +def test_port(host, port): + """测试端口是否可访问""" + try: + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.settimeout(5) + result = sock.connect_ex((host, port)) + sock.close() + return result == 0 + except: + return False + +def start_test_server(port=8888): + """启动测试HTTP服务器""" + class TestHandler(SimpleHTTPRequestHandler): + def do_GET(self): + self.send_response(200) + self.send_header('Content-type', 'text/html; charset=utf-8') + self.end_headers() + html = """ + 网络测试 + +

    ✅ 网络连接测试成功!

    +

    如果您能看到这个页面，说明网络连接正常。

    +

    测试时间: %s

    +

    您的IP: %s

    +

    刷新测试

    + + """ % (time.strftime('%Y-%m-%d %H:%M:%S'), self.client_address[0]) + self.wfile.write(html.encode('utf-8')) + + def log_message(self, format, *args): + print(f"📱 测试访问: {self.client_address[0]} - {format % args}") + + try: + server = HTTPServer(('0.0.0.0', port), TestHandler) + print(f"🧪 测试服务器已启动，端口: {port}") + server.serve_forever() + except Exception as e: + print(f"❌ 测试服务器启动失败: {e}") + +def main(): + print("=" * 60) + print("🔍 网络连接诊断工具") + print("=" * 60) + print() + + # 1. 获取IP地址 + print("📍 1. 获取网络IP地址...") + local_ip = get_local_ip() + if local_ip: + print(f"✅ 本机IP地址: {local_ip}") + else: + print("❌ 无法获取IP地址，请检查网络连接") + return + + # 2. 检查常用端口 + print("\n🔌 2. 检查端口状态...") + ports_to_test = [5000, 8080, 8888] + for port in ports_to_test: + if test_port('127.0.0.1', port): + print(f"⚠️ 端口 {port} 已被占用") + else: + print(f"✅ 端口 {port} 可用") + + # 3. 显示连接信息 + print(f"\n📱 3. 移动设备连接信息:") + print(f" 主服务器地址: http://{local_ip}:5000") + print(f" 手机客户端: http://{local_ip}:5000/mobile/mobile_client.html") + print(f" 测试地址: http://{local_ip}:8888") + + # 4. 防火墙检查提示 + print(f"\n🛡️ 4. 防火墙设置提示:") + print(" 如果平板无法连接，请检查Windows防火墙设置:") + print(" 1. 打开 Windows 安全中心") + print(" 2. 点击 防火墙和网络保护") + print(" 3. 点击 允许应用通过防火墙") + print(" 4. 确保 Python 程序被允许通过防火墙") + print(" 或者临时关闭防火墙进行测试") + + # 5. 网络检查命令 + print(f"\n🔧 5. 网络检查命令:") + print(f" 在平板上ping测试: ping {local_ip}") + print(f" 在电脑上查看网络: ipconfig") + print(f" 检查防火墙状态: netsh advfirewall show allprofiles") + + # 6. 启动测试服务器 + print(f"\n🧪 6. 启动网络测试服务器...") + print(f" 请在平板浏览器访问: http://{local_ip}:8888") + print(" 如果能看到测试页面，说明网络连接正常") + print(" 按 Ctrl+C 停止测试") + print() + + try: + start_test_server(8888) + except KeyboardInterrupt: + print("\n👋 测试结束") + +if __name__ == "__main__": main() \ No newline at end of file diff --git a/distance-judgement/tests/test_system.py b/distance-judgement/tests/test_system.py index b56d5fbd..fd119e41 100644 --- a/distance-judgement/tests/test_system.py +++ b/distance-judgement/tests/test_system.py @@ -1,224 +1,280 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -系统综合测试脚本 -用于验证各个模块是否正常工作 -""" - -import cv2 -import numpy as np -import sys -import traceback -import requests -import json -import time - -def test_opencv(): - """测试OpenCV是否正常工作""" - print("=" * 50) - print("测试 OpenCV...") - try: - print(f"OpenCV 版本: {cv2.__version__}") - - # 测试摄像头 - cap = cv2.VideoCapture(0) - if cap.isOpened(): - print("✓ 摄像头可以正常打开") - ret, frame = cap.read() - if ret: - print(f"✓ 摄像头可以正常读取画面，分辨率: {frame.shape[1]}x{frame.shape[0]}") - else: - print("✗ 无法从摄像头读取画面") - cap.release() - else: - print("✗ 无法打开摄像头") - - return True - except Exception as e: - print(f"✗ OpenCV 测试失败: {e}") - return False - -def test_yolo_model(): - """测试YOLO模型是否正常工作""" - print("=" * 50) - print("测试 YOLO 模型...") - try: - from ultralytics import YOLO - print("✓ ultralytics 库导入成功") - - # 尝试加载模型 - model = YOLO('yolov8n.pt') - print("✓ YOLOv8n 模型加载成功") - - # 创建一个测试图像 - test_image = np.zeros((640, 480, 3), dtype=np.uint8) - results = model(test_image, verbose=False) - print("✓ YOLO 推理测试成功") - - return True - except Exception as e: - print(f"✗ YOLO 模型测试失败: {e}") - traceback.print_exc() - return False - -def test_modules(): - """测试自定义模块""" - print("=" * 50) - print("测试自定义模块...") - try: - # 测试配置模块 - from src import config - print("✓ config 模块导入成功") - - # 测试距离计算模块 - from src import DistanceCalculator - calculator = DistanceCalculator() - test_bbox = [100, 100, 200, 400] # 测试边界框 - distance = calculator.get_distance(test_bbox) - print(f"✓ distance_calculator 模块测试成功，测试距离: {calculator.format_distance(distance)}") - - # 测试人体检测模块 - from src import PersonDetector - detector = PersonDetector() - print("✓ person_detector 模块导入成功") - - # 测试地图管理器 - from src import MapManager - map_manager = MapManager( - api_key=config.GAODE_API_KEY, - camera_lat=config.CAMERA_LATITUDE, - camera_lng=config.CAMERA_LONGITUDE - ) - print("✓ map_manager 模块导入成功") - - # 测试手机连接器 - from src import MobileConnector - mobile_connector = MobileConnector(port=8081) # 使用不同端口避免冲突 - print("✓ mobile_connector 模块导入成功") - - return True - except Exception as e: - print(f"✗ 自定义模块测试失败: {e}") - traceback.print_exc() - return False - -def test_flask(): - """测试Flask是否安装""" - print("=" * 50) - print("测试 Flask 环境...") - try: - import flask - print(f"✓ Flask 导入成功，版本: {flask.__version__}") - - # 测试Web服务器模块 - from src import WebServer - print("✓ WebServer 模块导入成功") - - return True - except ImportError: - print("✗ Flask 未安装，Web功能不可用") - return False - except Exception as e: - print(f"✗ Flask 测试失败: {e}") - return False - -def test_web_apis(base_url="http://127.0.0.1:5000"): - """测试Web API接口（仅在服务器运行时测试）""" - print("=" * 50) - print("测试Web API接口...") - - try: - # 测试主页面 - response = requests.get(f"{base_url}/", timeout=5) - if response.status_code == 200: - print("✓ 主页面访问正常") - - # 测试人员数据API - response = requests.get(f"{base_url}/api/get_persons_data", timeout=5) - if response.status_code == 200: - data = response.json() - print(f"✓ 人员数据API正常: {len(data)} 个人员") - - # 测试调试信息API - response = requests.get(f"{base_url}/api/debug_info", timeout=5) - if response.status_code == 200: - data = response.json() - print(f"✓ 调试信息API正常") - print(f" 摄像头状态: {'在线' if data.get('camera_active') else '离线'}") - - # 测试手机相关API - response = requests.get(f"{base_url}/api/mobile/devices", timeout=5) - if response.status_code == 200: - devices = response.json() - print(f"✓ 手机设备API正常: {len(devices)} 个设备") - - # 测试手机端页面 - response = requests.get(f"{base_url}/mobile/mobile_client.html", timeout=5) - if response.status_code == 200: - print(f"✓ 手机端页面可访问") - - return True - else: - print("✗ Web服务器未响应") - return False - - except requests.exceptions.ConnectionError: - print("⚠️ Web服务器未运行，跳过API测试") - return True # 不算失败，因为服务器可能没启动 - except Exception as e: - print(f"✗ Web API测试失败: {e}") - return False - -def main(): - """主测试函数""" - print("🔧 开始系统综合测试...") - print("测试将验证所有必要的组件是否正常工作") - - tests = [ - ("OpenCV", test_opencv), - ("YOLO模型", test_yolo_model), - ("自定义模块", test_modules), - ("Flask环境", test_flask), - ("Web API", test_web_apis), - ] - - results = {} - - for test_name, test_func in tests: - print(f"\n🧪 开始测试: {test_name}") - results[test_name] = test_func() - - # 显示测试结果摘要 - print("\n" + "=" * 50) - print("📊 测试结果摘要:") - print("=" * 50) - - passed = 0 - total = len(tests) - - for test_name, result in results.items(): - status = "✓ 通过" if result else "✗ 失败" - print(f"{test_name:<15}: {status}") - if result: - passed += 1 - - print(f"\n总体结果: {passed}/{total} 测试通过") - - if passed >= total - 1: # 允许Web API测试失败（因为可能没启动服务器） - print("🎉 系统基本功能正常！") - print("\n📖 使用建议:") - print(" 1. 运行 'python run.py' 选择运行模式") - print(" 2. 使用Web模式获得最佳体验") - print(" 3. 配置摄像头位置获得准确的地图显示") - else: - print("⚠️ 系统存在问题，请检查相关组件") - print("\n🔧 建议操作:") - print(" 1. 重新运行 'python tools/install.py' 安装依赖") - print(" 2. 检查requirements.txt中的依赖版本") - print(" 3. 确认摄像头设备连接正常") - - print("\n测试完成！") - -if __name__ == "__main__": +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +系统综合测试脚本 +用于验证各个模块是否正常工作 +""" + +import cv2 +import numpy as np +import sys +import traceback +import requests +import json +import time + +def test_opencv(): + """测试OpenCV是否正常工作""" + print("=" * 50) + print("测试 OpenCV...") + try: + print(f"OpenCV 版本: {cv2.__version__}") + + # 测试摄像头 + cap = cv2.VideoCapture(0) + if cap.isOpened(): + print("✓ 摄像头可以正常打开") + ret, frame = cap.read() + if ret: + print(f"✓ 摄像头可以正常读取画面，分辨率: {frame.shape[1]}x{frame.shape[0]}") + else: + print("✗ 无法从摄像头读取画面") + cap.release() + else: + print("✗ 无法打开摄像头") + + return True + except Exception as e: + print(f"✗ OpenCV 测试失败: {e}") + return False + +def test_yolo_model(): + """测试YOLO模型是否正常工作""" + print("=" * 50) + print("测试 YOLO 模型...") + try: + from ultralytics import YOLO + print("✓ ultralytics 库导入成功") + + # 尝试加载模型 + model = YOLO('yolov8n.pt') + print("✓ YOLOv8n 模型加载成功") + + # 创建一个测试图像 + test_image = np.zeros((640, 480, 3), dtype=np.uint8) + results = model(test_image, verbose=False) + print("✓ YOLO 推理测试成功") + + return True + except Exception as e: + print(f"✗ YOLO 模型测试失败: {e}") + traceback.print_exc() + return False + +def test_modules(): + """测试自定义模块""" + print("=" * 50) + print("测试自定义模块...") + try: + # 测试配置模块 + from src import config + print("✓ config 模块导入成功") + + # 测试距离计算模块 + from src import DistanceCalculator + calculator = DistanceCalculator() + test_bbox = [100, 100, 200, 400] # 测试边界框 + distance = calculator.get_distance(test_bbox) + print(f"✓ distance_calculator 模块测试成功，测试距离: {calculator.format_distance(distance)}") + + # 测试人体检测模块 + from src import PersonDetector + detector = PersonDetector() + print("✓ person_detector 模块导入成功") + + # 测试地图管理器 + from src import MapManager + map_manager = MapManager( + api_key=config.GAODE_API_KEY, + camera_lat=config.CAMERA_LATITUDE, + camera_lng=config.CAMERA_LONGITUDE + ) + print("✓ map_manager 模块导入成功") + + # 测试手机连接器 + from src import MobileConnector + mobile_connector = MobileConnector(port=8081) # 使用不同端口避免冲突 + print("✓ mobile_connector 模块导入成功") + + return True + except Exception as e: + print(f"✗ 自定义模块测试失败: {e}") + traceback.print_exc() + return False + +def test_flask(): + """测试Flask是否安装""" + print("=" * 50) + print("测试 Flask 环境...") + try: + import flask + print(f"✓ Flask 导入成功，版本: {flask.__version__}") + + # 测试Web服务器模块 + from src import WebServer + print("✓ WebServer 模块导入成功") + + return True + except ImportError: + print("✗ Flask 未安装，Web功能不可用") + return False + except Exception as e: + print(f"✗ Flask 测试失败: {e}") + return False + +def test_web_apis(base_url="http://127.0.0.1:5000"): + """测试Web API接口（仅在服务器运行时测试）""" + print("=" * 50) + print("测试Web API接口...") + + try: + # 测试主页面 + response = requests.get(f"{base_url}/", timeout=5) + if response.status_code == 200: + print("✓ 主页面访问正常") + + # 测试人员数据API + response = requests.get(f"{base_url}/api/get_persons_data", timeout=5) + if response.status_code == 200: + data = response.json() + print(f"✓ 人员数据API正常: {len(data)} 个人员") + + # 测试调试信息API + response = requests.get(f"{base_url}/api/debug_info", timeout=5) + if response.status_code == 200: + data = response.json() + print(f"✓ 调试信息API正常") + print(f" 摄像头状态: {'在线' if data.get('camera_active') else '离线'}") + + # 测试手机相关API + response = requests.get(f"{base_url}/api/mobile/devices", timeout=5) + if response.status_code == 200: + devices = response.json() + print(f"✓ 手机设备API正常: {len(devices)} 个设备") + + # 测试手机端页面 + response = requests.get(f"{base_url}/mobile/mobile_client.html", timeout=5) + if response.status_code == 200: + print(f"✓ 手机端页面可访问") + + # 🛤️ 测试轨迹模拟API + test_trajectory_simulation_apis(base_url) + + return True + else: + print("✗ Web服务器未响应") + return False + + except requests.exceptions.ConnectionError: + print("⚠️ Web服务器未运行，跳过API测试") + return True # 不算失败，因为服务器可能没启动 + except Exception as e: + print(f"✗ Web API测试失败: {e}") + return False + +def test_trajectory_simulation_apis(base_url): + """测试轨迹模拟相关API""" + print("\n🛤️ 测试轨迹模拟API...") + + try: + # 测试模拟状态API + response = requests.get(f"{base_url}/api/test/simulation_status", timeout=5) + if response.status_code == 200: + status_data = response.json() + print(f"✓ 模拟状态API正常: 状态={status_data.get('simulation_active', False)}") + + # 测试启动模拟API + simulation_data = { + "type": "circle", + "drone_count": 1, + "speed": 2 + } + response = requests.post( + f"{base_url}/api/test/start_simulation", + json=simulation_data, + timeout=5 + ) + if response.status_code == 200: + result = response.json() + print(f"✓ 启动模拟API正常: {result.get('message', '无消息')}") + + # 等待一下让模拟运行 + time.sleep(3) + + # 再次检查状态 + response = requests.get(f"{base_url}/api/test/simulation_status", timeout=5) + if response.status_code == 200: + status_data = response.json() + if status_data.get('simulation_active'): + print(f"✓ 模拟正在运行: {len(status_data.get('simulated_drones', []))} 架无人机") + else: + print("⚠️ 模拟未成功启动") + + # 测试停止模拟API + response = requests.post(f"{base_url}/api/test/stop_simulation", timeout=5) + if response.status_code == 200: + result = response.json() + print(f"✓ 停止模拟API正常: {result.get('message', '无消息')}") + + # 测试轨迹模拟测试页面 + response = requests.get(f"{base_url}/trajectory_simulation_test.html", timeout=5) + if response.status_code == 200: + print("✓ 轨迹模拟测试页面可访问") + + except Exception as e: + print(f"⚠️ 轨迹模拟API测试失败: {e}") + # 不抛出异常，因为这只是测试功能 + +def main(): + """主测试函数""" + print("🔧 开始系统综合测试...") + print("测试将验证所有必要的组件是否正常工作") + + tests = [ + ("OpenCV", test_opencv), + ("YOLO模型", test_yolo_model), + ("自定义模块", test_modules), + ("Flask环境", test_flask), + ("Web API", test_web_apis), + ] + + results = {} + + for test_name, test_func in tests: + print(f"\n🧪 开始测试: {test_name}") + results[test_name] = test_func() + + # 显示测试结果摘要 + print("\n" + "=" * 50) + print("📊 测试结果摘要:") + print("=" * 50) + + passed = 0 + total = len(tests) + + for test_name, result in results.items(): + status = "✓ 通过" if result else "✗ 失败" + print(f"{test_name:<15}: {status}") + if result: + passed += 1 + + print(f"\n总体结果: {passed}/{total} 测试通过") + + if passed >= total - 1: # 允许Web API测试失败（因为可能没启动服务器） + print("🎉 系统基本功能正常！") + print("\n📖 使用建议:") + print(" 1. 运行 'python run.py' 选择运行模式") + print(" 2. 使用Web模式获得最佳体验") + print(" 3. 配置摄像头位置获得准确的地图显示") + else: + print("⚠️ 系统存在问题，请检查相关组件") + print("\n🔧 建议操作:") + print(" 1. 重新运行 'python tools/install.py' 安装依赖") + print(" 2. 检查requirements.txt中的依赖版本") + print(" 3. 确认摄像头设备连接正常") + + print("\n测试完成！") + +if __name__ == "__main__": main() \ No newline at end of file diff --git a/distance-judgement/tools/auto_configure_camera.py b/distance-judgement/tools/auto_configure_camera.py index 5657c1db..b1e559e9 100644 --- a/distance-judgement/tools/auto_configure_camera.py +++ b/distance-judgement/tools/auto_configure_camera.py @@ -1,158 +1,158 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -摄像头自动配置工具 -自动获取设备位置和朝向，设置摄像头参数 -""" - -import sys -import os -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - -from src.orientation_detector import OrientationDetector - - -def main(): - """主函数""" - print("=" * 60) - print("🤖 摄像头自动配置工具") - print("=" * 60) - print() - - print("🎯 功能说明:") - print(" • 自动获取当前设备的GPS位置") - print(" • 自动检测设备朝向") - print(" • 计算摄像头应该面向用户的角度") - print(" • 自动更新系统配置文件") - print() - - print("⚠️ 注意事项:") - print(" • 请确保设备连接到互联网") - print(" • Windows系统可能需要开启位置服务") - print(" • 桌面设备朝向检测精度有限") - print() - - try: - # 创建朝向检测器 - detector = OrientationDetector() - - # 执行自动配置 - result = detector.auto_configure_camera_location() - - if result['success']: - print() - print("✅ 自动配置成功!") - print("📊 配置详情:") - print(f" 📍 GPS位置: {result['gps_location'][0]:.6f}, {result['gps_location'][1]:.6f}") - print(f" 🧭 设备朝向: {result['device_heading']:.1f}°") - print(f" 📷 摄像头朝向: {result['camera_heading']:.1f}°") - print(f" 🎯 定位方法: {result['method']}") - print(f" 📏 定位精度: ±{result['accuracy']:.0f}m") - print() - - # 询问是否应用配置 - while True: - choice = input("🔧 是否应用此配置? (y/n/r): ").strip().lower() - - if choice == 'y': - # 应用配置 - detector.update_camera_config( - result['gps_location'], - result['camera_heading'] - ) - print("✅ 配置已应用到系统!") - break - - elif choice == 'n': - print("⏭️ 配置未应用") - break - - elif choice == 'r': - # 重新检测 - print("\n🔄 重新检测...") - result = detector.auto_configure_camera_location() - if not result['success']: - print("❌ 重新检测失败") - break - - print("📊 新的配置详情:") - print(f" 📍 GPS位置: {result['gps_location'][0]:.6f}, {result['gps_location'][1]:.6f}") - print(f" 🧭 设备朝向: {result['device_heading']:.1f}°") - print(f" 📷 摄像头朝向: {result['camera_heading']:.1f}°") - print(f" 🎯 定位方法: {result['method']}") - print(f" 📏 定位精度: ±{result['accuracy']:.0f}m") - print() - - else: - print("❌ 请输入 y(应用)/n(取消)/r(重新检测)") - - else: - print("❌ 自动配置失败") - print("💡 建议:") - print(" 1. 检查网络连接") - print(" 2. 使用手动配置: python tools/setup_camera_location.py") - print(" 3. 或在Web界面中手动设置") - - except KeyboardInterrupt: - print("\n🔴 用户取消操作") - - except Exception as e: - print(f"❌ 配置过程出错: {e}") - print("💡 建议使用手动配置工具") - - finally: - print("\n👋 配置工具结束") - - -def test_gps_only(): - """仅测试GPS定位功能""" - print("🧪 GPS定位测试") - print("-" * 30) - - detector = OrientationDetector() - location = detector.get_current_gps_location() - - if location: - lat, lng, accuracy = location - print(f"✅ GPS测试成功:") - print(f" 📍 位置: {lat:.6f}, {lng:.6f}") - print(f" 📏 精度: ±{accuracy:.0f}m") - else: - print("❌ GPS测试失败") - - -def test_heading_only(): - """仅测试朝向检测功能""" - print("🧪 朝向检测测试") - print("-" * 30) - - detector = OrientationDetector() - heading = detector.get_device_heading() - - if heading is not None: - print(f"✅ 朝向测试成功:") - print(f" 🧭 设备朝向: {heading:.1f}°") - - # 计算摄像头朝向 - camera_heading = detector.calculate_camera_heading_facing_user(heading) - print(f" 📷 摄像头朝向: {camera_heading:.1f}°") - else: - print("❌ 朝向测试失败") - - -if __name__ == "__main__": - import argparse - - parser = argparse.ArgumentParser(description='摄像头自动配置工具') - parser.add_argument('--test-gps', action='store_true', help='仅测试GPS功能') - parser.add_argument('--test-heading', action='store_true', help='仅测试朝向功能') - - args = parser.parse_args() - - if args.test_gps: - test_gps_only() - elif args.test_heading: - test_heading_only() - else: +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +摄像头自动配置工具 +自动获取设备位置和朝向，设置摄像头参数 +""" + +import sys +import os +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +from src.orientation_detector import OrientationDetector + + +def main(): + """主函数""" + print("=" * 60) + print("🤖 摄像头自动配置工具") + print("=" * 60) + print() + + print("🎯 功能说明:") + print(" • 自动获取当前设备的GPS位置") + print(" • 自动检测设备朝向") + print(" • 计算摄像头应该面向用户的角度") + print(" • 自动更新系统配置文件") + print() + + print("⚠️ 注意事项:") + print(" • 请确保设备连接到互联网") + print(" • Windows系统可能需要开启位置服务") + print(" • 桌面设备朝向检测精度有限") + print() + + try: + # 创建朝向检测器 + detector = OrientationDetector() + + # 执行自动配置 + result = detector.auto_configure_camera_location() + + if result['success']: + print() + print("✅ 自动配置成功!") + print("📊 配置详情:") + print(f" 📍 GPS位置: {result['gps_location'][0]:.6f}, {result['gps_location'][1]:.6f}") + print(f" 🧭 设备朝向: {result['device_heading']:.1f}°") + print(f" 📷 摄像头朝向: {result['camera_heading']:.1f}°") + print(f" 🎯 定位方法: {result['method']}") + print(f" 📏 定位精度: ±{result['accuracy']:.0f}m") + print() + + # 询问是否应用配置 + while True: + choice = input("🔧 是否应用此配置? (y/n/r): ").strip().lower() + + if choice == 'y': + # 应用配置 + detector.update_camera_config( + result['gps_location'], + result['camera_heading'] + ) + print("✅ 配置已应用到系统!") + break + + elif choice == 'n': + print("⏭️ 配置未应用") + break + + elif choice == 'r': + # 重新检测 + print("\n🔄 重新检测...") + result = detector.auto_configure_camera_location() + if not result['success']: + print("❌ 重新检测失败") + break + + print("📊 新的配置详情:") + print(f" 📍 GPS位置: {result['gps_location'][0]:.6f}, {result['gps_location'][1]:.6f}") + print(f" 🧭 设备朝向: {result['device_heading']:.1f}°") + print(f" 📷 摄像头朝向: {result['camera_heading']:.1f}°") + print(f" 🎯 定位方法: {result['method']}") + print(f" 📏 定位精度: ±{result['accuracy']:.0f}m") + print() + + else: + print("❌ 请输入 y(应用)/n(取消)/r(重新检测)") + + else: + print("❌ 自动配置失败") + print("💡 建议:") + print(" 1. 检查网络连接") + print(" 2. 使用手动配置: python tools/setup_camera_location.py") + print(" 3. 或在Web界面中手动设置") + + except KeyboardInterrupt: + print("\n🔴 用户取消操作") + + except Exception as e: + print(f"❌ 配置过程出错: {e}") + print("💡 建议使用手动配置工具") + + finally: + print("\n👋 配置工具结束") + + +def test_gps_only(): + """仅测试GPS定位功能""" + print("🧪 GPS定位测试") + print("-" * 30) + + detector = OrientationDetector() + location = detector.get_current_gps_location() + + if location: + lat, lng, accuracy = location + print(f"✅ GPS测试成功:") + print(f" 📍 位置: {lat:.6f}, {lng:.6f}") + print(f" 📏 精度: ±{accuracy:.0f}m") + else: + print("❌ GPS测试失败") + + +def test_heading_only(): + """仅测试朝向检测功能""" + print("🧪 朝向检测测试") + print("-" * 30) + + detector = OrientationDetector() + heading = detector.get_device_heading() + + if heading is not None: + print(f"✅ 朝向测试成功:") + print(f" 🧭 设备朝向: {heading:.1f}°") + + # 计算摄像头朝向 + camera_heading = detector.calculate_camera_heading_facing_user(heading) + print(f" 📷 摄像头朝向: {camera_heading:.1f}°") + else: + print("❌ 朝向测试失败") + + +if __name__ == "__main__": + import argparse + + parser = argparse.ArgumentParser(description='摄像头自动配置工具') + parser.add_argument('--test-gps', action='store_true', help='仅测试GPS功能') + parser.add_argument('--test-heading', action='store_true', help='仅测试朝向功能') + + args = parser.parse_args() + + if args.test_gps: + test_gps_only() + elif args.test_heading: + test_heading_only() + else: main() \ No newline at end of file diff --git a/distance-judgement/tools/generate_ssl_cert.py b/distance-judgement/tools/generate_ssl_cert.py index 0180b0af..04488543 100644 --- a/distance-judgement/tools/generate_ssl_cert.py +++ b/distance-judgement/tools/generate_ssl_cert.py @@ -1,97 +1,97 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -生成自签名SSL证书用于HTTPS服务 -""" - -import os -import datetime -import ipaddress -from cryptography import x509 -from cryptography.x509.oid import NameOID -from cryptography.hazmat.primitives import hashes, serialization -from cryptography.hazmat.primitives.asymmetric import rsa - -def generate_ssl_certificate(): - """生成自签名SSL证书""" - - # 创建ssl目录 - ssl_dir = "ssl" - if not os.path.exists(ssl_dir): - os.makedirs(ssl_dir) - - print("🔑 正在生成SSL证书...") - - # 生成私钥 - private_key = rsa.generate_private_key( - public_exponent=65537, - key_size=2048, - ) - - # 创建证书主体 - subject = issuer = x509.Name([ - x509.NameAttribute(NameOID.COUNTRY_NAME, "CN"), - x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, "Beijing"), - x509.NameAttribute(NameOID.LOCALITY_NAME, "Beijing"), - x509.NameAttribute(NameOID.ORGANIZATION_NAME, "Distance Judgement System"), - x509.NameAttribute(NameOID.COMMON_NAME, "localhost"), - ]) - - # 生成证书 - cert = x509.CertificateBuilder().subject_name( - subject - ).issuer_name( - issuer - ).public_key( - private_key.public_key() - ).serial_number( - x509.random_serial_number() - ).not_valid_before( - datetime.datetime.utcnow() - ).not_valid_after( - datetime.datetime.utcnow() + datetime.timedelta(days=365) - ).add_extension( - x509.SubjectAlternativeName([ - x509.DNSName("localhost"), - x509.DNSName("127.0.0.1"), - x509.IPAddress(ipaddress.IPv4Address("127.0.0.1")), - x509.IPAddress(ipaddress.IPv4Address("0.0.0.0")), - ]), - critical=False, - ).sign(private_key, hashes.SHA256()) - - # 保存私钥 - key_path = os.path.join(ssl_dir, "key.pem") - with open(key_path, "wb") as f: - f.write(private_key.private_bytes( - encoding=serialization.Encoding.PEM, - format=serialization.PrivateFormat.PKCS8, - encryption_algorithm=serialization.NoEncryption() - )) - - # 保存证书 - cert_path = os.path.join(ssl_dir, "cert.pem") - with open(cert_path, "wb") as f: - f.write(cert.public_bytes(serialization.Encoding.PEM)) - - print(f"✅ SSL证书已生成:") - print(f" 🔑 私钥: {key_path}") - print(f" 📜 证书: {cert_path}") - print(f" 📅 有效期: 365天") - print() - print("⚠️ 注意: 这是自签名证书，浏览器会显示安全警告") - print(" 点击 '高级' -> '继续访问localhost(不安全)' 即可") - -if __name__ == "__main__": - try: - generate_ssl_certificate() - except ImportError: - print("❌ 缺少cryptography库，正在尝试安装...") - import subprocess - import sys - subprocess.check_call([sys.executable, "-m", "pip", "install", "cryptography"]) - print("✅ cryptography库安装完成，重新生成证书...") - generate_ssl_certificate() - except Exception as e: +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +生成自签名SSL证书用于HTTPS服务 +""" + +import os +import datetime +import ipaddress +from cryptography import x509 +from cryptography.x509.oid import NameOID +from cryptography.hazmat.primitives import hashes, serialization +from cryptography.hazmat.primitives.asymmetric import rsa + +def generate_ssl_certificate(): + """生成自签名SSL证书""" + + # 创建ssl目录 + ssl_dir = "ssl" + if not os.path.exists(ssl_dir): + os.makedirs(ssl_dir) + + print("🔑 正在生成SSL证书...") + + # 生成私钥 + private_key = rsa.generate_private_key( + public_exponent=65537, + key_size=2048, + ) + + # 创建证书主体 + subject = issuer = x509.Name([ + x509.NameAttribute(NameOID.COUNTRY_NAME, "CN"), + x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, "Beijing"), + x509.NameAttribute(NameOID.LOCALITY_NAME, "Beijing"), + x509.NameAttribute(NameOID.ORGANIZATION_NAME, "Distance Judgement System"), + x509.NameAttribute(NameOID.COMMON_NAME, "localhost"), + ]) + + # 生成证书 + cert = x509.CertificateBuilder().subject_name( + subject + ).issuer_name( + issuer + ).public_key( + private_key.public_key() + ).serial_number( + x509.random_serial_number() + ).not_valid_before( + datetime.datetime.utcnow() + ).not_valid_after( + datetime.datetime.utcnow() + datetime.timedelta(days=365) + ).add_extension( + x509.SubjectAlternativeName([ + x509.DNSName("localhost"), + x509.DNSName("127.0.0.1"), + x509.IPAddress(ipaddress.IPv4Address("127.0.0.1")), + x509.IPAddress(ipaddress.IPv4Address("0.0.0.0")), + ]), + critical=False, + ).sign(private_key, hashes.SHA256()) + + # 保存私钥 + key_path = os.path.join(ssl_dir, "key.pem") + with open(key_path, "wb") as f: + f.write(private_key.private_bytes( + encoding=serialization.Encoding.PEM, + format=serialization.PrivateFormat.PKCS8, + encryption_algorithm=serialization.NoEncryption() + )) + + # 保存证书 + cert_path = os.path.join(ssl_dir, "cert.pem") + with open(cert_path, "wb") as f: + f.write(cert.public_bytes(serialization.Encoding.PEM)) + + print(f"✅ SSL证书已生成:") + print(f" 🔑 私钥: {key_path}") + print(f" 📜 证书: {cert_path}") + print(f" 📅 有效期: 365天") + print() + print("⚠️ 注意: 这是自签名证书，浏览器会显示安全警告") + print(" 点击 '高级' -> '继续访问localhost(不安全)' 即可") + +if __name__ == "__main__": + try: + generate_ssl_certificate() + except ImportError: + print("❌ 缺少cryptography库，正在尝试安装...") + import subprocess + import sys + subprocess.check_call([sys.executable, "-m", "pip", "install", "cryptography"]) + print("✅ cryptography库安装完成，重新生成证书...") + generate_ssl_certificate() + except Exception as e: print(f"❌ 生成SSL证书失败: {e}") \ No newline at end of file diff --git a/distance-judgement/tools/install.py b/distance-judgement/tools/install.py index 2f83a295..ceb9d4b5 100644 --- a/distance-judgement/tools/install.py +++ b/distance-judgement/tools/install.py @@ -1,264 +1,264 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -自动安装脚本 -自动安装所需依赖并验证环境 -""" - -import subprocess -import sys -import time -import os - -def print_header(title): - """打印标题""" - print("\n" + "=" * 60) - print(f" {title}") - print("=" * 60) - -def run_command(command, description): - """运行命令并显示结果""" - print(f"\n🔄 {description}...") - try: - result = subprocess.run(command, shell=True, capture_output=True, text=True) - if result.returncode == 0: - print(f"✅ {description} 成功完成") - return True - else: - print(f"❌ {description} 失败") - print(f"错误信息: {result.stderr}") - return False - except Exception as e: - print(f"❌ {description} 执行异常: {e}") - return False - -def check_python_version(): - """检查Python版本""" - print_header("检查Python版本") - - version = sys.version_info - print(f"当前Python版本: {version.major}.{version.minor}.{version.micro}") - - if version.major < 3 or (version.major == 3 and version.minor < 8): - print("❌ Python版本过低，需要Python 3.8或更高版本") - return False - else: - print("✅ Python版本满足要求") - return True - -def install_requirements(): - """安装依赖包""" - print_header("安装依赖包") - - if not os.path.exists("requirements.txt"): - print("❌ requirements.txt 文件不存在") - return False - - # 升级pip - if not run_command(f"{sys.executable} -m pip install --upgrade pip", "升级pip"): - print("⚠️ pip升级失败，继续安装依赖") - - # 安装基础依赖 - success1 = run_command(f"{sys.executable} -m pip install -r requirements.txt", "安装基础依赖包") - - # 安装Flask（Web功能所需） - success2 = install_flask() - - return success1 and success2 - -def install_flask(): - """安装Flask及其依赖""" - print("\n🔧 安装Flask（Web功能支持）...") - - try: - # 检查是否已安装 - import flask - print(f"✅ Flask已安装，版本: {flask.__version__}") - return True - except ImportError: - pass - - # 尝试使用清华镜像源 - result = subprocess.run([ - sys.executable, "-m", "pip", "install", - "flask==2.3.3", - "-i", "https://pypi.tuna.tsinghua.edu.cn/simple/", - "--trusted-host", "pypi.tuna.tsinghua.edu.cn" - ], capture_output=True, text=True, timeout=300) - - if result.returncode == 0: - print("✅ Flask安装成功！") - return True - else: - # 尝试官方源 - result = subprocess.run([ - sys.executable, "-m", "pip", "install", "flask==2.3.3" - ], capture_output=True, text=True, timeout=300) - - if result.returncode == 0: - print("✅ Flask安装成功！") - return True - else: - print(f"❌ Flask安装失败: {result.stderr}") - return False - -def verify_installation(): - """验证安装""" - print_header("验证安装") - - modules_to_check = [ - ("cv2", "OpenCV"), - ("numpy", "NumPy"), - ("ultralytics", "Ultralytics"), - ("torch", "PyTorch"), - ("flask", "Flask"), - ] - - all_success = True - - for module, name in modules_to_check: - try: - __import__(module) - print(f"✅ {name} 安装成功") - except ImportError: - print(f"❌ {name} 安装失败") - all_success = False - - return all_success - -def download_yolo_model(): - """预下载YOLO模型""" - print_header("下载YOLO模型") - - try: - from ultralytics import YOLO - print("🔄 正在下载YOLOv8n模型，请稍候...") - model = YOLO('yolov8n.pt') - print("✅ YOLOv8n模型下载成功") - - # 测试模块结构 - try: - from src import PersonDetector, DistanceCalculator - print("✅ 重构后的模块结构测试成功") - except ImportError as e: - print(f"⚠️ 模块结构测试失败: {e}") - - return True - except Exception as e: - print(f"❌ YOLO模型下载失败: {e}") - return False - -def run_test(): - """运行测试""" - print_header("运行系统测试") - - if os.path.exists("test_modules.py"): - return run_command(f"{sys.executable} test_modules.py", "运行系统测试") - else: - print("⚠️ 测试脚本不存在，跳过测试") - return True - -def create_desktop_shortcut(): - """创建桌面快捷方式（Windows）""" - try: - import platform - if platform.system() == "Windows": - print_header("创建桌面快捷方式") - - desktop_path = os.path.join(os.path.expanduser("~"), "Desktop") - if os.path.exists(desktop_path): - shortcut_content = f""" -@echo off -cd /d "{os.getcwd()}" -python run.py -pause -""" - shortcut_path = os.path.join(desktop_path, "人体距离检测.bat") - with open(shortcut_path, "w", encoding="gbk") as f: - f.write(shortcut_content) - print(f"✅ 桌面快捷方式已创建: {shortcut_path}") - return True - else: - print("⚠️ 未找到桌面路径") - return False - except Exception as e: - print(f"⚠️ 创建快捷方式失败: {e}") - return False - -def main(): - """主安装函数""" - print("🚀 人体距离检测系统 - 自动安装程序") - print("此程序将自动安装所需依赖并配置环境") - - steps = [ - ("检查Python版本", check_python_version), - ("安装依赖包", install_requirements), - ("验证安装", verify_installation), - ("下载YOLO模型", download_yolo_model), - ("运行系统测试", run_test), - ] - - # 可选步骤 - optional_steps = [ - ("创建桌面快捷方式", create_desktop_shortcut), - ] - - print(f"\n📋 安装计划:") - for i, (name, _) in enumerate(steps, 1): - print(f" {i}. {name}") - - print(f"\n可选步骤:") - for i, (name, _) in enumerate(optional_steps, 1): - print(f" {i}. {name}") - - input("\n按Enter键开始安装...") - - start_time = time.time() - success_count = 0 - total_steps = len(steps) - - # 执行主要安装步骤 - for i, (name, func) in enumerate(steps, 1): - print(f"\n📦 步骤 {i}/{total_steps}: {name}") - - if func(): - success_count += 1 - print(f"✅ 步骤 {i} 完成") - else: - print(f"❌ 步骤 {i} 失败") - - # 询问是否继续 - choice = input("是否继续安装？(y/n): ").lower() - if choice != 'y': - print("安装已取消") - return - - # 执行可选步骤 - for name, func in optional_steps: - choice = input(f"\n是否执行: {name}？(y/n): ").lower() - if choice == 'y': - func() - - # 显示安装结果 - elapsed_time = time.time() - start_time - print_header("安装完成") - - print(f"✅ 安装步骤: {success_count}/{total_steps} 完成") - print(f"⏱️ 总耗时: {elapsed_time:.1f}秒") - - if success_count == total_steps: - print("🎉 所有步骤都已成功完成！") - print("\n📖 使用指南:") - print(" 1. 运行 'python run.py' 启动系统") - print(" 2. 选择运行模式（Web或传统模式）") - print(" 3. 如需配置摄像头位置，运行 setup_camera_location.py") - print(" 4. 如遇问题，运行 test_modules.py 进行诊断") - else: - print("⚠️ 部分步骤未成功，请检查错误信息") - print("💡 如需帮助，请查看README.md文档") - - print("\n安装程序结束！") - -if __name__ == "__main__": +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +自动安装脚本 +自动安装所需依赖并验证环境 +""" + +import subprocess +import sys +import time +import os + +def print_header(title): + """打印标题""" + print("\n" + "=" * 60) + print(f" {title}") + print("=" * 60) + +def run_command(command, description): + """运行命令并显示结果""" + print(f"\n🔄 {description}...") + try: + result = subprocess.run(command, shell=True, capture_output=True, text=True) + if result.returncode == 0: + print(f"✅ {description} 成功完成") + return True + else: + print(f"❌ {description} 失败") + print(f"错误信息: {result.stderr}") + return False + except Exception as e: + print(f"❌ {description} 执行异常: {e}") + return False + +def check_python_version(): + """检查Python版本""" + print_header("检查Python版本") + + version = sys.version_info + print(f"当前Python版本: {version.major}.{version.minor}.{version.micro}") + + if version.major < 3 or (version.major == 3 and version.minor < 8): + print("❌ Python版本过低，需要Python 3.8或更高版本") + return False + else: + print("✅ Python版本满足要求") + return True + +def install_requirements(): + """安装依赖包""" + print_header("安装依赖包") + + if not os.path.exists("requirements.txt"): + print("❌ requirements.txt 文件不存在") + return False + + # 升级pip + if not run_command(f"{sys.executable} -m pip install --upgrade pip", "升级pip"): + print("⚠️ pip升级失败，继续安装依赖") + + # 安装基础依赖 + success1 = run_command(f"{sys.executable} -m pip install -r requirements.txt", "安装基础依赖包") + + # 安装Flask（Web功能所需） + success2 = install_flask() + + return success1 and success2 + +def install_flask(): + """安装Flask及其依赖""" + print("\n🔧 安装Flask（Web功能支持）...") + + try: + # 检查是否已安装 + import flask + print(f"✅ Flask已安装，版本: {flask.__version__}") + return True + except ImportError: + pass + + # 尝试使用清华镜像源 + result = subprocess.run([ + sys.executable, "-m", "pip", "install", + "flask==2.3.3", + "-i", "https://pypi.tuna.tsinghua.edu.cn/simple/", + "--trusted-host", "pypi.tuna.tsinghua.edu.cn" + ], capture_output=True, text=True, timeout=300) + + if result.returncode == 0: + print("✅ Flask安装成功！") + return True + else: + # 尝试官方源 + result = subprocess.run([ + sys.executable, "-m", "pip", "install", "flask==2.3.3" + ], capture_output=True, text=True, timeout=300) + + if result.returncode == 0: + print("✅ Flask安装成功！") + return True + else: + print(f"❌ Flask安装失败: {result.stderr}") + return False + +def verify_installation(): + """验证安装""" + print_header("验证安装") + + modules_to_check = [ + ("cv2", "OpenCV"), + ("numpy", "NumPy"), + ("ultralytics", "Ultralytics"), + ("torch", "PyTorch"), + ("flask", "Flask"), + ] + + all_success = True + + for module, name in modules_to_check: + try: + __import__(module) + print(f"✅ {name} 安装成功") + except ImportError: + print(f"❌ {name} 安装失败") + all_success = False + + return all_success + +def download_yolo_model(): + """预下载YOLO模型""" + print_header("下载YOLO模型") + + try: + from ultralytics import YOLO + print("🔄 正在下载YOLOv8n模型，请稍候...") + model = YOLO('yolov8n.pt') + print("✅ YOLOv8n模型下载成功") + + # 测试模块结构 + try: + from src import PersonDetector, DistanceCalculator + print("✅ 重构后的模块结构测试成功") + except ImportError as e: + print(f"⚠️ 模块结构测试失败: {e}") + + return True + except Exception as e: + print(f"❌ YOLO模型下载失败: {e}") + return False + +def run_test(): + """运行测试""" + print_header("运行系统测试") + + if os.path.exists("test_modules.py"): + return run_command(f"{sys.executable} test_modules.py", "运行系统测试") + else: + print("⚠️ 测试脚本不存在，跳过测试") + return True + +def create_desktop_shortcut(): + """创建桌面快捷方式（Windows）""" + try: + import platform + if platform.system() == "Windows": + print_header("创建桌面快捷方式") + + desktop_path = os.path.join(os.path.expanduser("~"), "Desktop") + if os.path.exists(desktop_path): + shortcut_content = f""" +@echo off +cd /d "{os.getcwd()}" +python run.py +pause +""" + shortcut_path = os.path.join(desktop_path, "人体距离检测.bat") + with open(shortcut_path, "w", encoding="gbk") as f: + f.write(shortcut_content) + print(f"✅ 桌面快捷方式已创建: {shortcut_path}") + return True + else: + print("⚠️ 未找到桌面路径") + return False + except Exception as e: + print(f"⚠️ 创建快捷方式失败: {e}") + return False + +def main(): + """主安装函数""" + print("🚀 人体距离检测系统 - 自动安装程序") + print("此程序将自动安装所需依赖并配置环境") + + steps = [ + ("检查Python版本", check_python_version), + ("安装依赖包", install_requirements), + ("验证安装", verify_installation), + ("下载YOLO模型", download_yolo_model), + ("运行系统测试", run_test), + ] + + # 可选步骤 + optional_steps = [ + ("创建桌面快捷方式", create_desktop_shortcut), + ] + + print(f"\n📋 安装计划:") + for i, (name, _) in enumerate(steps, 1): + print(f" {i}. {name}") + + print(f"\n可选步骤:") + for i, (name, _) in enumerate(optional_steps, 1): + print(f" {i}. {name}") + + input("\n按Enter键开始安装...") + + start_time = time.time() + success_count = 0 + total_steps = len(steps) + + # 执行主要安装步骤 + for i, (name, func) in enumerate(steps, 1): + print(f"\n📦 步骤 {i}/{total_steps}: {name}") + + if func(): + success_count += 1 + print(f"✅ 步骤 {i} 完成") + else: + print(f"❌ 步骤 {i} 失败") + + # 询问是否继续 + choice = input("是否继续安装？(y/n): ").lower() + if choice != 'y': + print("安装已取消") + return + + # 执行可选步骤 + for name, func in optional_steps: + choice = input(f"\n是否执行: {name}？(y/n): ").lower() + if choice == 'y': + func() + + # 显示安装结果 + elapsed_time = time.time() - start_time + print_header("安装完成") + + print(f"✅ 安装步骤: {success_count}/{total_steps} 完成") + print(f"⏱️ 总耗时: {elapsed_time:.1f}秒") + + if success_count == total_steps: + print("🎉 所有步骤都已成功完成！") + print("\n📖 使用指南:") + print(" 1. 运行 'python run.py' 启动系统") + print(" 2. 选择运行模式（Web或传统模式）") + print(" 3. 如需配置摄像头位置，运行 setup_camera_location.py") + print(" 4. 如遇问题，运行 test_modules.py 进行诊断") + else: + print("⚠️ 部分步骤未成功，请检查错误信息") + print("💡 如需帮助，请查看README.md文档") + + print("\n安装程序结束！") + +if __name__ == "__main__": main() \ No newline at end of file diff --git a/distance-judgement/tools/setup_camera_location.py b/distance-judgement/tools/setup_camera_location.py index 31a7f0e0..b45545ee 100644 --- a/distance-judgement/tools/setup_camera_location.py +++ b/distance-judgement/tools/setup_camera_location.py @@ -1,115 +1,115 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -""" -摄像头地理位置配置工具 -用于设置摄像头的经纬度坐标和朝向角度 -""" - -import os -import sys - -def update_config_file(lat, lng, heading, api_key=None): - """更新配置文件中的摄像头位置信息""" - config_path = "src/config.py" - - # 读取配置文件 - with open(config_path, 'r', encoding='utf-8') as f: - content = f.read() - - # 更新纬度 - if "CAMERA_LATITUDE = " in content: - lines = content.split('\n') - for i, line in enumerate(lines): - if line.startswith('CAMERA_LATITUDE = '): - lines[i] = f'CAMERA_LATITUDE = {lat} # 摄像头纬度' - break - content = '\n'.join(lines) - - # 更新经度 - if "CAMERA_LONGITUDE = " in content: - lines = content.split('\n') - for i, line in enumerate(lines): - if line.startswith('CAMERA_LONGITUDE = '): - lines[i] = f'CAMERA_LONGITUDE = {lng} # 摄像头经度' - break - content = '\n'.join(lines) - - # 更新朝向 - if "CAMERA_HEADING = " in content: - lines = content.split('\n') - for i, line in enumerate(lines): - if line.startswith('CAMERA_HEADING = '): - lines[i] = f'CAMERA_HEADING = {heading} # 摄像头朝向角度' - break - content = '\n'.join(lines) - - # 更新API key（如果提供） - if api_key and 'GAODE_API_KEY = ' in content: - lines = content.split('\n') - for i, line in enumerate(lines): - if line.startswith('GAODE_API_KEY = '): - lines[i] = f'GAODE_API_KEY = "{api_key}" # 高德地图API密钥' - break - content = '\n'.join(lines) - - # 写回配置文件 - with open(config_path, 'w', encoding='utf-8') as f: - f.write(content) - -def main(): - print("=" * 60) - print("🚁 无人机摄像头地理位置配置工具") - print("=" * 60) - print() - - print("📍 请设置摄像头的地理位置信息") - print("提示: 可以通过高德地图等应用获取准确的经纬度坐标") - print() - - try: - # 获取纬度 - lat = float(input("请输入摄像头纬度 (例: 39.9042): ")) - if not (-90 <= lat <= 90): - raise ValueError("纬度必须在-90到90之间") - - # 获取经度 - lng = float(input("请输入摄像头经度 (例: 116.4074): ")) - if not (-180 <= lng <= 180): - raise ValueError("经度必须在-180到180之间") - - # 获取朝向 - heading = float(input("请输入摄像头朝向角度 (0-360°, 0为正北): ")) - if not (0 <= heading <= 360): - raise ValueError("朝向角度必须在0到360之间") - - # 可选：设置高德API Key - print("\n🔑 高德地图API Key设置 (可选)") - print("如果您有高德开放平台的API Key，请输入以获得更好的地图体验") - api_key = input("请输入高德API Key (留空跳过): ").strip() - - # 更新配置 - update_config_file(lat, lng, heading, api_key if api_key else None) - - print("\n✅ 配置更新成功!") - print(f"📍 摄像头位置: ({lat:.6f}, {lng:.6f})") - print(f"🧭 朝向角度: {heading}°") - if api_key: - print("🔑 API Key 已设置") - - print("\n🎯 建议使用步骤:") - print("1. 运行 python run.py 启动系统") - print("2. 选择Web模式获得最佳体验") - print("3. 按 'm' 键打开地图查看效果") - print("4. 按 'c' 键校准距离参数以提高精度") - - except ValueError as e: - print(f"❌ 输入错误: {e}") - print("请重新运行程序并输入正确的数值") - sys.exit(1) - except Exception as e: - print(f"❌ 配置失败: {e}") - sys.exit(1) - -if __name__ == "__main__": +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +""" +摄像头地理位置配置工具 +用于设置摄像头的经纬度坐标和朝向角度 +""" + +import os +import sys + +def update_config_file(lat, lng, heading, api_key=None): + """更新配置文件中的摄像头位置信息""" + config_path = "src/config.py" + + # 读取配置文件 + with open(config_path, 'r', encoding='utf-8') as f: + content = f.read() + + # 更新纬度 + if "CAMERA_LATITUDE = " in content: + lines = content.split('\n') + for i, line in enumerate(lines): + if line.startswith('CAMERA_LATITUDE = '): + lines[i] = f'CAMERA_LATITUDE = {lat} # 摄像头纬度' + break + content = '\n'.join(lines) + + # 更新经度 + if "CAMERA_LONGITUDE = " in content: + lines = content.split('\n') + for i, line in enumerate(lines): + if line.startswith('CAMERA_LONGITUDE = '): + lines[i] = f'CAMERA_LONGITUDE = {lng} # 摄像头经度' + break + content = '\n'.join(lines) + + # 更新朝向 + if "CAMERA_HEADING = " in content: + lines = content.split('\n') + for i, line in enumerate(lines): + if line.startswith('CAMERA_HEADING = '): + lines[i] = f'CAMERA_HEADING = {heading} # 摄像头朝向角度' + break + content = '\n'.join(lines) + + # 更新API key（如果提供） + if api_key and 'GAODE_API_KEY = ' in content: + lines = content.split('\n') + for i, line in enumerate(lines): + if line.startswith('GAODE_API_KEY = '): + lines[i] = f'GAODE_API_KEY = "{api_key}" # 高德地图API密钥' + break + content = '\n'.join(lines) + + # 写回配置文件 + with open(config_path, 'w', encoding='utf-8') as f: + f.write(content) + +def main(): + print("=" * 60) + print("🚁 无人机摄像头地理位置配置工具") + print("=" * 60) + print() + + print("📍 请设置摄像头的地理位置信息") + print("提示: 可以通过高德地图等应用获取准确的经纬度坐标") + print() + + try: + # 获取纬度 + lat = float(input("请输入摄像头纬度 (例: 39.9042): ")) + if not (-90 <= lat <= 90): + raise ValueError("纬度必须在-90到90之间") + + # 获取经度 + lng = float(input("请输入摄像头经度 (例: 116.4074): ")) + if not (-180 <= lng <= 180): + raise ValueError("经度必须在-180到180之间") + + # 获取朝向 + heading = float(input("请输入摄像头朝向角度 (0-360°, 0为正北): ")) + if not (0 <= heading <= 360): + raise ValueError("朝向角度必须在0到360之间") + + # 可选：设置高德API Key + print("\n🔑 高德地图API Key设置 (可选)") + print("如果您有高德开放平台的API Key，请输入以获得更好的地图体验") + api_key = input("请输入高德API Key (留空跳过): ").strip() + + # 更新配置 + update_config_file(lat, lng, heading, api_key if api_key else None) + + print("\n✅ 配置更新成功!") + print(f"📍 摄像头位置: ({lat:.6f}, {lng:.6f})") + print(f"🧭 朝向角度: {heading}°") + if api_key: + print("🔑 API Key 已设置") + + print("\n🎯 建议使用步骤:") + print("1. 运行 python run.py 启动系统") + print("2. 选择Web模式获得最佳体验") + print("3. 按 'm' 键打开地图查看效果") + print("4. 按 'c' 键校准距离参数以提高精度") + + except ValueError as e: + print(f"❌ 输入错误: {e}") + print("请重新运行程序并输入正确的数值") + sys.exit(1) + except Exception as e: + print(f"❌ 配置失败: {e}") + sys.exit(1) + +if __name__ == "__main__": main() \ No newline at end of file diff --git a/distance-judgement/trajectory_simulation_test.html b/distance-judgement/trajectory_simulation_test.html new file mode 100644 index 00000000..93e0140d --- /dev/null +++ b/distance-judgement/trajectory_simulation_test.html @@ -0,0 +1,470 @@ + + + + + + + 🛤️ 无人机轨迹模拟测试 + + + + +
    +
    +

    🛤️ 无人机轨迹模拟测试

    +

    测试无人机轨迹记录和可视化功能

    +
    + +
    + + +
    +
    +

    🚀 快速启动模拟

    +
    + + + + +
    +
    +
    + + +
    +
    +

    ⚙️ 高级配置

    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + + +
    +

    📊 模拟状态

    +
    + 模拟状态: + 未启动 +
    +
    + 轨迹类型: + 无 +
    +
    + 无人机数量: + 0 +
    +
    + 轨迹记录: + 开启 +
    +
    + + +
    +
    +

    🚁 模拟无人机列表

    +
    +
    暂无模拟无人机
    +
    +
    +
    + + +
    + 🎯 打开主系统查看轨迹 +
    +
    + + + + + \ No newline at end of file