修复bug。临时提交

This commit is contained in:
zw
2025-08-20 13:48:32 +08:00
parent 019166f730
commit a8d8c8ee5d
6 changed files with 59 additions and 33 deletions

View File

@@ -6,6 +6,7 @@ import warnings
from queue import Queue
from typing import Any, Dict
from Utils.AiUtils import AiUtils
from Utils.LogManager import LogManager
from Utils.Requester import Requester
import tidevice
@@ -27,11 +28,12 @@ dataQueue = Queue()
def start_socket_listener():
port = int(os.getenv('FLASK_COMM_PORT', 0))
LogManager.info(f"Received port from environment: {port}")
print(f"Received port from environment: {port}")
if port <= 0:
print("⚠️ 未获取到通信端口跳过Socket监听")
LogManager.info("未获取到通信端口跳过Socket监听")
print("未获取到通信端口跳过Socket监听")
return
try:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
# 设置端口复用,避免端口被占用时无法绑定
@@ -41,30 +43,38 @@ def start_socket_listener():
try:
s.bind(('127.0.0.1', port))
print(f"[INFO] Socket successfully bound to port {port}")
LogManager.info(f"[INFO] Socket successfully bound to port {port}")
except Exception as bind_error:
print(f"[ERROR]端口绑定失败: {bind_error}")
print(f"[ERROR]端口绑定失败: {bind_error}")
LogManager.info(f"[ERROR]端口绑定失败: {bind_error}")
return
# 开始监听
s.listen()
LogManager.info(f"[INFO] Socket listener started on port {port}, waiting for connections...")
print(f"[INFO] Socket listener started on port {port}, waiting for connections...")
while True:
try:
LogManager.info(f"[INFO] Waiting for a new connection on port {port}...")
print(f"[INFO] Waiting for a new connection on port {port}...")
conn, addr = s.accept()
LogManager.info(f"[INFO] Connection accepted from: {addr}")
print(f"[INFO] Connection accepted from: {addr}")
raw_data = conn.recv(1024).decode('utf-8').strip()
LogManager.info(f"[INFO] Raw data received: {raw_data}")
print(f"[INFO] Raw data received: {raw_data}")
data = json.loads(raw_data)
LogManager.info(f"[INFO] Parsed data: {data}")
print(f"[INFO] Parsed data: {data}")
dataQueue.put(data)
except Exception as conn_error:
print(f"[ERROR]连接处理失败: {conn_error}")
LogManager.error(f"[ERROR]连接处理失败: {conn_error}")
print(f"[ERROR]连接处理失败: {conn_error}")
except Exception as e:
print(f"[ERROR]Socket服务启动失败: {e}")
LogManager.error(f"[ERROR]Socket服务启动失败: {e}")
print(f"[ERROR]Socket服务启动失败: {e}")
# 在独立线程中启动Socket服务
@@ -83,15 +93,6 @@ def passToken():
print(e)
return ResultData(data="").toJson()
@app.route('/getName', methods=['POST'])
def getName():
data = request.get_json()
accountToken = data['token']
print(accountToken)
return accountToken
# 获取设备列表
@app.route('/deviceList', methods=['GET'])
def deviceList():
@@ -108,6 +109,7 @@ def deviceList():
return ResultData(data=listData).toJson()
except Exception as e:
print(e)
LogManager.error("获取设备列表失败:", e)
return ResultData(data=[]).toJson()
# 获取设备应用列表