设备接入 优化

This commit is contained in:
mmc
2026-05-19 15:55:02 +08:00
parent 22f9890226
commit 5c21aded86
5 changed files with 432 additions and 137 deletions

View File

@@ -2,34 +2,70 @@ import React, { useEffect, useRef } from "react";
import { joinRoom, leaveRoom } from "./droneplayer";
import { postLiveHeartbeat } from "@/api/api";
export default function DroneLivePlayer({ streamData, videoMode = "NORMAL" }) {
console.log(streamData)
export default function DroneLivePlayer({
streamData,
videoMode = "NORMAL",
}) {
const containerRef = useRef(null);
// 心跳 timer
const timerRef = useRef(null);
// ------------ 核心修复:防止异步竞态 ------------
const isBusyRef = useRef(false); // 正在加入/离开,禁止重复操作
const mountedRef = useRef(true); // 组件是否挂载
// 当前 effect 是否有效(防止异步穿透)
const aliveRef = useRef(false);
// 防止 join / leave 并发
const busyRef = useRef(false);
useEffect(() => {
mountedRef.current = true;
const container = containerRef.current;
// 清空容器,防止 DOM 不为空
if (container) container.innerHTML = "";
// 当前 effect 生效
aliveRef.current = true;
if (!container || !streamData?.url) return;
if (!container) return;
// 强制清空旧 DOM
container.innerHTML = "";
// 没有流地址直接退出
if (!streamData?.url) {
return;
}
// ---------------- 解析 RTC 参数 ----------------
// 解析参数
const params = new URLSearchParams(streamData.url);
const appId = (params.get("app_id") || params.get("appid") || "").trim();
const roomId = (params.get("room_id") || params.get("roomid") || "").trim();
const token = decodeURIComponent((params.get("token") || "").trim());
const userId = (params.get("user_id") || params.get("uid") || "").trim();
if (!appId || !roomId || !token || !userId) return;
const appId = (
params.get("app_id") ||
params.get("appid") ||
""
).trim();
const roomId = (
params.get("room_id") ||
params.get("roomid") ||
""
).trim();
const token = decodeURIComponent(
(params.get("token") || "").trim()
);
const userId = (
params.get("user_id") ||
params.get("uid") ||
""
).trim();
if (!appId || !roomId || !token || !userId) {
console.error("RTC 参数缺失");
return;
}
// ---------------- 心跳 ----------------
// 心跳
const liveheartbeat = async () => {
try {
await postLiveHeartbeat({
@@ -41,46 +77,89 @@ export default function DroneLivePlayer({ streamData, videoMode = "NORMAL" }) {
}
};
// ---------------- 真正安全的初始化流程 ----------------
const safeInit = async () => {
// 1. 防止并发:正在忙就直接退出
if (isBusyRef.current) return;
isBusyRef.current = true;
// ---------------- 初始化 RTC ----------------
const initRTC = async () => {
// 防止重复进入
if (busyRef.current) return;
busyRef.current = true;
try {
// 2. 【强制顺序】先销毁旧房间 + 清心跳
// =========================
// 1. 先彻底关闭旧 RTC
// =========================
if (timerRef.current) {
clearInterval(timerRef.current);
timerRef.current = null;
}
leaveRoom(); // 先离开旧房间
await new Promise((resolve) => setTimeout(resolve, 100));
// 3. 组件已卸载,直接放弃
if (!mountedRef.current) {
isBusyRef.current = false;
// 必须 await
await leaveRoom();
// 给 SDK 一点释放时间
await new Promise((resolve) =>
setTimeout(resolve, 300)
);
// 组件已经卸载
if (!aliveRef.current) {
return;
}
// 4. 加入新房间(此时绝对安全)
await joinRoom(container, appId, roomId, token, userId, videoMode);
// =========================
// 2. 加入新房间
// =========================
// 5. 开启心跳
//timerRef.current = setInterval(liveheartbeat, 3000);
//liveheartbeat();
await joinRoom(
container,
appId,
roomId,
token,
userId,
videoMode
);
// 再次检查
if (!aliveRef.current) {
await leaveRoom();
return;
}
// =========================
// 3. 开启心跳
// =========================
/*
timerRef.current = setInterval(() => {
liveheartbeat();
}, 3000);
liveheartbeat();
*/
} catch (err) {
console.error("RTC 初始化失败", err);
console.error("RTC 初始化失败:", err);
// 出错强制释放
try {
await leaveRoom();
} catch (e) {
console.error(e);
}
} finally {
// 解锁
isBusyRef.current = false;
busyRef.current = false;
}
};
safeInit();
initRTC();
// =========================
// cleanup
// =========================
// ---------------- 清理函数 ----------------
return () => {
mountedRef.current = false;
aliveRef.current = false;
// 清理心跳
if (timerRef.current) {
@@ -88,8 +167,19 @@ export default function DroneLivePlayer({ streamData, videoMode = "NORMAL" }) {
timerRef.current = null;
}
// 离开房间
leaveRoom();
// 异步释放 RTC
(async () => {
try {
await leaveRoom();
// 清空 DOM
if (containerRef.current) {
containerRef.current.innerHTML = "";
}
} catch (err) {
console.error("leaveRoom error:", err);
}
})();
};
}, [
streamData?.url,
@@ -102,7 +192,12 @@ export default function DroneLivePlayer({ streamData, videoMode = "NORMAL" }) {
<div
ref={containerRef}
className="rounded"
style={{ width: "100%", height: "100%", background: "#000" }}
style={{
width: "100%",
height: "100%",
background: "#000",
overflow: "hidden",
}}
/>
);
}