From 35f1a08b31531d971169403978cddf3328accb26 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 20 Feb 2025 16:01:06 +0800
Subject: [PATCH] 添加无人机控制权申请、处理、释放
---
ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyStreamHandler.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyStreamHandler.java b/ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyStreamHandler.java
index 1b132d2..e743676 100644
--- a/ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyStreamHandler.java
+++ b/ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyStreamHandler.java
@@ -11,8 +11,10 @@
import org.springframework.stereotype.Component;
import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketMessage;
import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.handler.TextWebSocketHandler;
+
import javax.annotation.Resource;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -48,7 +50,7 @@
}
log.info("【stream】Received message: {}", payload);
- log.info("【stream】size: " + WebSocketUtil.STREAM_ONLINE_USER_SESSIONS.size());
+ log.info("【stream】size: {}", WebSocketUtil.STREAM_ONLINE_USER_SESSIONS.size());
}
//开始拉流
@@ -62,7 +64,7 @@
} else {
BoxStreamUrlReceiver boxLiveUrl = tyService.getBoxLiveUrl(boxSn);
if (boxLiveUrl != null) {
- ArdVtdu vtdu = ArdVtdu.builder().name(boxSn).mode(0).isCode(0).rtspSource(boxLiveUrl.getRtmp()).build();
+ ArdVtdu vtdu = ArdVtdu.builder().name(boxSn).mode(0).isCode(0).rtspSource(boxLiveUrl.getRtsp()).build();
ArdVtdu ardVtdu = mediaService.addPath(vtdu);
BOX_STREAM_PULL_MAP.put(boxSn, ardVtdu.getWebrtcUrl());
messageReply = ardVtdu.getWebrtcUrl();
@@ -106,8 +108,8 @@
public void afterConnectionEstablished(WebSocketSession session) {
String userId = (String) session.getAttributes().get("userId");
WebSocketUtil.STREAM_ONLINE_USER_SESSIONS.put(userId, session);
- log.info("【stream】Connected: " + session.getId());
- log.info("【stream】size: " + WebSocketUtil.STREAM_ONLINE_USER_SESSIONS.size());
+ log.info("【stream】Connected: {}", session.getId());
+ log.info("【stream】size: {}", WebSocketUtil.STREAM_ONLINE_USER_SESSIONS.size());
}
@Override
--
Gitblit v1.9.3