AnlaAnla před 3 dny
rodič
revize
31fe1607ce
4 změnil soubory, kde provedl 12 přidání a 9 odebrání
  1. 6 0
      Test/test02.py
  2. 5 7
      app/api/camera.py
  3. 1 0
      app/utils/init_network.py
  4. 0 2
      run_MonitorCameraServer.py

+ 6 - 0
Test/test02.py

@@ -0,0 +1,6 @@
+import platform
+
+if platform.system() == 'Linux':
+    print(1)
+
+print(platform.system())

+ 5 - 7
app/api/camera.py

@@ -30,10 +30,6 @@ active_statuses = {"starting", "recording", "stopping", "uploading"}
 router = APIRouter()
 
 
-# !!!!!!!!!!!!!!!!!!!!!这个网络路由要走usb配置!!!!!!!!!!!!!!!!!!!!!!!
-
-
-
 class TaskRequest(BaseModel):
     camera_id: str
     task_name: str
@@ -284,9 +280,11 @@ def start_task(req: TaskRequest):
     camera_id = req.camera_id
     task_name = req.task_name
 
-    if platform.system() == 'Linux':
-        print("Linux 如果用usb转接网口, 就用这个")
-        init_network()
+    logger.info(f"当前平台: {platform.system()}")
+    # if platform.system() == 'Linux':
+    #     print("Linux 如果用usb转接网口, 就用这个")
+    #     logger.warning("!!!!!配置网络路由!!!!!")
+    #     init_network()
     logger.info("收到启动录像请求。摄像头: %s,任务: %s", camera_id, task_name)
 
     if camera_id not in settings.CAMERA_CONFIG:

+ 1 - 0
app/utils/init_network.py

@@ -1,5 +1,6 @@
 import subprocess
 
+# !!!!!!!!!!!!!!!!!!!!!这个网络路由要走usb配置!!!!!!!!!!!!!!!!!!!!!!!
 def init_network():
     # 设置路由,让 192.168.77.10 走 USB 网口
     '''

+ 0 - 2
run_MonitorCameraServer.py

@@ -4,10 +4,8 @@ import socket
 import uvicorn
 
 from app.core.logging_config import setup_logging
-from app.utils.init_network import init_network
 
 if __name__ == "__main__":
-    init_network()
     setup_logging()
     logger = logging.getLogger(__name__)