fix():

1、修改rabbitmq不会影响项目主进程 2、修改ffmpeg推流音视频分两路

fix():
1、修改rabbitmq不会影响项目主进程 2、修改ffmpeg推流音视频分两路
王鑫
1 parent c84399ff
Showing 25 changed files with 1036 additions and 1186 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
src/main/java/com/genersoft/iot/vmp/jtt1078/app/VideoServerApp.java
src/main/java/com/genersoft/iot/vmp/jtt1078/flv/FlvEncoder.java
src/main/java/com/genersoft/iot/vmp/jtt1078/http/NettyHttpServerHandler.java
src/main/java/com/genersoft/iot/vmp/jtt1078/publisher/Channel.java
src/main/java/com/genersoft/iot/vmp/jtt1078/publisher/PublishManager.java
src/main/java/com/genersoft/iot/vmp/jtt1078/server/Jtt1078Handler.java
src/main/java/com/genersoft/iot/vmp/jtt1078/subscriber/RTMPPublisher.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/Jt1078OfCarController.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/GB28181MessageListener.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/Jt1078ConfigBean.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/controller/IntercomController.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/service/IntercomService.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/service/impl/IntercomServiceImpl.java
src/main/resources/app.properties
src/main/resources/application-local-100.yml
src/main/resources/application-wx-local.yml
@@ -59,7 +59,7 @@ public class SipLayer implements CommandLineRunner {
 				addListeningPoint(monitorIp, sipConfig.getPort());
 			}
 			if (udpSipProviderMap.size() + tcpSipProviderMap.size() == 0) {
-				System.exit(1);
+				logger.error("[SIP SERVER] SIP监听全部启动失败，系统进入降级模式继续运行，请检查sip.ip与sip.port配置");
 			}
 		}
 	}
@@ -140,6 +140,14 @@ public class SipLayer implements CommandLineRunner {
 		if (!ObjectUtils.isEmpty(deviceLocalIp)) {
 			return deviceLocalIp;
 		}
-		return getUdpSipProvider().getListeningPoint().getIPAddress();
+		SipProviderImpl udpProvider = getUdpSipProvider();
+		if (udpProvider != null && udpProvider.getListeningPoint() != null) {
+			return udpProvider.getListeningPoint().getIPAddress();
+		}
+		SipProviderImpl tcpProvider = getTcpSipProvider();
+		if (tcpProvider != null && tcpProvider.getListeningPoint() != null) {
+			return tcpProvider.getListeningPoint().getIPAddress();
+		}
+		return sipConfig.getIp();
 	}
 }
@@ -47,6 +47,7 @@ public class VideoServerApp
                     configProperties = "/app.properties";
                     break;
                 case "jt1078-dev100":
+                case "local-100":
                     configProperties = "/app-dev100.properties";
                     break;
                 case "jt1078-dev103":
@@ -33,7 +33,7 @@ public final class FlvEncoder
     public FlvEncoder(boolean haveVideo, boolean haveAudio)
     {
         this.haveVideo = haveVideo;
-        // this.haveAudio = haveAudio;
+        this.haveAudio = haveAudio;
         flvHeader = Packet.create(16);
         videoFrame = new ByteArrayOutputStream(2048 * 100);
         makeFlvHeader();
@@ -30,18 +30,28 @@ public class NettyHttpServerHandler extends ChannelInboundHandlerAdapter
     {
         FullHttpRequest fhr = (FullHttpRequest) msg;
         String uri = fhr.uri();
+        QueryStringDecoder decoder = new QueryStringDecoder(uri);
+        String path = decoder.path();
+        String origin = fhr.headers().get("Origin");
         Packet resp = Packet.create(1024);
         // uri的第二段，就是通道标签
-        if (uri.startsWith("/video/"))
+        if (path.startsWith("/video/"))
         {
-            String tag = uri.substring("/video/".length());
+            String tag = path.substring("/video/".length());
             resp.addBytes("HTTP/1.1 200 OK\r\n".getBytes(HEADER_ENCODING));
             resp.addBytes("Connection: keep-alive\r\n".getBytes(HEADER_ENCODING));
             resp.addBytes("Content-Type: video/x-flv\r\n".getBytes(HEADER_ENCODING));
             resp.addBytes("Transfer-Encoding: chunked\r\n".getBytes(HEADER_ENCODING));
             resp.addBytes("Cache-Control: no-cache\r\n".getBytes(HEADER_ENCODING));
-            resp.addBytes("Access-Control-Allow-Origin: *\r\n".getBytes(HEADER_ENCODING));
-            resp.addBytes("Access-Control-Allow-Credentials: true\r\n".getBytes(HEADER_ENCODING));
+            if (origin != null) {
+                resp.addBytes(("Access-Control-Allow-Origin: " + origin + "\r\n").getBytes(HEADER_ENCODING));
+                resp.addBytes("Access-Control-Allow-Credentials: true\r\n".getBytes(HEADER_ENCODING));
+                resp.addBytes("Vary: Origin\r\n".getBytes(HEADER_ENCODING));
+            } else {
+                resp.addBytes("Access-Control-Allow-Origin: *\r\n".getBytes(HEADER_ENCODING));
+            }
+            resp.addBytes("Access-Control-Allow-Methods: GET, OPTIONS\r\n".getBytes(HEADER_ENCODING));
+            resp.addBytes("Access-Control-Allow-Headers: *\r\n".getBytes(HEADER_ENCODING));
             resp.addBytes("\r\n".getBytes(HEADER_ENCODING));
             ctx.writeAndFlush(resp.getBytes()).await();
@@ -49,8 +59,34 @@ public class NettyHttpServerHandler extends ChannelInboundHandlerAdapter
             // 订阅视频数据
             long wid = PublishManager.getInstance().subscribe(tag, Media.Type.Video, ctx).getId();
             setSession(ctx, new Session().set("subscriber-id", wid).set("tag", tag));
+            logger.info("[HTTP_SUBSCRIBE] video tag={}, watcher={}, uri={}", tag, wid, uri);
         }
+        else if (path.startsWith("/audio/"))
+        {
+            String tag = path.substring("/audio/".length());
+            resp.addBytes("HTTP/1.1 200 OK\r\n".getBytes(HEADER_ENCODING));
+            resp.addBytes("Connection: keep-alive\r\n".getBytes(HEADER_ENCODING));
+            resp.addBytes("Content-Type: video/x-flv\r\n".getBytes(HEADER_ENCODING));
+            resp.addBytes("Transfer-Encoding: chunked\r\n".getBytes(HEADER_ENCODING));
+            resp.addBytes("Cache-Control: no-cache\r\n".getBytes(HEADER_ENCODING));
+            if (origin != null) {
+                resp.addBytes(("Access-Control-Allow-Origin: " + origin + "\r\n").getBytes(HEADER_ENCODING));
+                resp.addBytes("Access-Control-Allow-Credentials: true\r\n".getBytes(HEADER_ENCODING));
+                resp.addBytes("Vary: Origin\r\n".getBytes(HEADER_ENCODING));
+            } else {
+                resp.addBytes("Access-Control-Allow-Origin: *\r\n".getBytes(HEADER_ENCODING));
+            }
+            resp.addBytes("Access-Control-Allow-Methods: GET, OPTIONS\r\n".getBytes(HEADER_ENCODING));
+            resp.addBytes("Access-Control-Allow-Headers: *\r\n".getBytes(HEADER_ENCODING));
+            resp.addBytes("\r\n".getBytes(HEADER_ENCODING));
+
+            ctx.writeAndFlush(resp.getBytes()).await();
+
+            long wid = PublishManager.getInstance().subscribe(tag, Media.Type.Audio, ctx).getId();
+            setSession(ctx, new Session().set("subscriber-id", wid).set("tag", tag));
+            logger.info("[HTTP_SUBSCRIBE] audio tag={}, watcher={}, uri={}", tag, wid, uri);
+        }
         else if (uri.equals("/test/multimedia"))
         {
             responseHTMLFile("/multimedia.html", ctx);
@@ -76,6 +112,7 @@ public class NettyHttpServerHandler extends ChannelInboundHandlerAdapter
             String tag = session.get("tag");
             Long wid = session.get("subscriber-id");
             PublishManager.getInstance().unsubscribe(tag, wid);
+            logger.info("[HTTP_SUBSCRIBE] unsubscribe tag={}, watcher={}", tag, wid);
         }
     }
@@ -4,8 +4,10 @@ import com.genersoft.iot.vmp.jtt1078.codec.AudioCodec;
 import com.genersoft.iot.vmp.jtt1078.entity.Media;
 import com.genersoft.iot.vmp.jtt1078.entity.MediaEncoding;
 import com.genersoft.iot.vmp.jtt1078.flv.FlvEncoder;
+// [恢复] 引用 FFmpeg 进程管理类
 import com.genersoft.iot.vmp.jtt1078.subscriber.RTMPPublisher;
 import com.genersoft.iot.vmp.jtt1078.subscriber.Subscriber;
+import com.genersoft.iot.vmp.jtt1078.subscriber.AudioSubscriber;
 import com.genersoft.iot.vmp.jtt1078.subscriber.VideoSubscriber;
 import com.genersoft.iot.vmp.jtt1078.util.ByteHolder;
 import com.genersoft.iot.vmp.jtt1078.util.Configs;
@@ -14,11 +16,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
 public class Channel
 {
@@ -28,6 +27,8 @@ public class Channel
     // [恢复] FFmpeg 推流进程管理器
     RTMPPublisher rtmpPublisher;
+    RTMPPublisher audioRtmpPublisher;
+    // [删除] ZlmRtpPublisher rtpPublisher;
     String tag;
     boolean publishing;
@@ -36,39 +37,6 @@ public class Channel
     FlvEncoder flvEncoder;
     private long firstTimestamp = -1;
-    // ========== 新增：视频参数检测和FFmpeg自动重启相关 ==========
-
-    /** 上一次接收到的SPS哈希值，用于检测视频参数变化 */
-    private int lastSPSHash = 0;
-
-    /** FFmpeg是否需要重启的标志 */
-    private AtomicBoolean ffmpegNeedRestart = new AtomicBoolean(false);
-
-    /** 最后一次FFmpeg重启时间（毫秒），用于防止频繁重启 */
-    private AtomicLong lastRestartTime = new AtomicLong(0);
-
-    /** 重启冷却时间（毫秒），3秒内不重复重启 */
-    private static final long RESTART_COOLDOWN_MS = 3000;
-
-    /** 是否正在等待新的I帧（FFmpeg重启期间） */
-    private AtomicBoolean waitingForIFrame = new AtomicBoolean(false);
-
-    /** 视频参数信息 */
-    private volatile VideoParamInfo currentVideoParam = new VideoParamInfo();
-
-    /** 视频参数内部类 */
-    private static class VideoParamInfo {
-        int width = 0;
-        int height = 0;
-        int fps = 0;
-        String resolution = "unknown";
-
-        @Override
-        public String toString() {
-            return String.format("%dx%d@%dfps [%s]", width, height, fps, resolution);
-        }
-    }
-
     public Channel(String tag)
     {
         this.tag = tag;
@@ -84,6 +52,8 @@ public class Channel
             logger.info("[{}] 启动 FFmpeg 进程推流至: {}", tag, rtmpUrl);
             rtmpPublisher = new RTMPPublisher(tag);
             rtmpPublisher.start();
+            audioRtmpPublisher = new RTMPPublisher(tag, true);
+            audioRtmpPublisher.start();
         }
     }
@@ -92,9 +62,17 @@ public class Channel
         return publishing;
     }
-    public Subscriber subscribe(ChannelHandlerContext ctx)
+    public Subscriber subscribe(ChannelHandlerContext ctx, Media.Type type)
     {
-        Subscriber subscriber = new VideoSubscriber(this.tag, ctx);
+        Subscriber subscriber;
+        if (Media.Type.Audio.equals(type))
+        {
+            subscriber = new AudioSubscriber(this.tag, ctx);
+        }
+        else
+        {
+            subscriber = new VideoSubscriber(this.tag, ctx);
+        }
         this.subscribers.add(subscriber);
         return subscriber;
     }
@@ -105,10 +83,12 @@ public class Channel
         if (audioCodec == null)
         {
             audioCodec = AudioCodec.getCodec(pt);
-            logger.info("[{}] audio codec: {}", tag, MediaEncoding.getEncoding(Media.Type.Audio, pt));
+            logger.info("audio codec: {}", MediaEncoding.getEncoding(Media.Type.Audio, pt));
         }
         // 写入到内部广播，FFmpeg 通过 HTTP 拉取这个数据
         broadcastAudio(timestamp, audioCodec.toPCM(data));
+
+        // [删除] rtpPublisher.sendAudio(...)
     }
     public void writeVideo(long sequence, long timeoffset, int payloadType, byte[] h264)
@@ -123,28 +103,6 @@ public class Channel
             if (nalu == null) break;
             if (nalu.length < 4) continue;
-            // ========== 新增：检测视频参数变化 ==========
-            int nalType = nalu[4] & 0x1F;
-            boolean isIDR = (nalType == 5);  // IDR帧（I帧）
-
-            if (nalType == 7) {  // SPS (Sequence Parameter Set)
-                checkAndHandleSPSChange(nalu);
-            }
-
-            // 如果正在等待I帧，跳过所有数据直到收到新的I帧
-            if (waitingForIFrame.get()) {
-                if (isIDR) {
-                    logger.info("[{}] 收到新的I帧，停止等待，FFmpeg应已重启完成", tag);
-                    waitingForIFrame.set(false);
-                    // 重置FLV编码器
-                    this.flvEncoder = new FlvEncoder(true, true);
-                    firstTimestamp = timeoffset;
-                } else {
-                    // 跳过非I帧数据
-                    continue;
-                }
-            }
-
             // 1. 封装为 FLV Tag (必须)
             // FFmpeg 通过 HTTP 读取这些 FLV Tag
             byte[] flvTag = this.flvEncoder.write(nalu, (int) (timeoffset - firstTimestamp));
@@ -156,281 +114,6 @@ public class Channel
         }
     }
-    /**
-     * 检查SPS变化并处理FFmpeg重启
-     */
-    private synchronized void checkAndHandleSPSChange(byte[] nalu) {
-        int currentHash = Arrays.hashCode(nalu);
-
-        if (lastSPSHash != 0 && currentHash != lastSPSHash) {
-            // SPS变化了，说明视频参数发生了变化
-            // 注意：即使解析出来的分辨率/帧率相同，SPS的其它变化（如profile、level、VUI参数等）也会导致解码问题
-            // 因此：只要SPS哈希变化，就重启FFmpeg
-
-            // 解析新的视频参数（仅用于日志显示）
-            VideoParamInfo newParam = parseVideoParam(nalu);
-            VideoParamInfo oldParam = currentVideoParam;
-
-            logger.info("[{}] ====== 检测到SPS变化，需要重启FFmpeg ======", tag);
-            logger.info("[{}] 旧参数: {}", tag, oldParam);
-            logger.info("[{}] 新参数: {}", tag, newParam);
-            logger.info("[{}] SPS哈希变化: {} -> {}", tag,
-                    Integer.toHexString(lastSPSHash),
-                    Integer.toHexString(currentHash));
-
-            // 检查冷却时间
-            long now = System.currentTimeMillis();
-            long timeSinceLastRestart = now - lastRestartTime.get();
-
-            if (timeSinceLastRestart < RESTART_COOLDOWN_MS) {
-                logger.warn("[{}] FFmpeg重启过于频繁（距上次{}ms），跳过本次重启",
-                        tag, timeSinceLastRestart);
-                // 即使跳过重启，仍需更新SPS哈希
-                lastSPSHash = currentHash;
-                currentVideoParam = newParam;
-                return;
-            }
-
-            logger.info("[{}] ====== 准备重启FFmpeg ======", tag);
-            logger.info("[{}] 原因: SPS参数变化（可能包含分辨率、帧率、profile、level等）", tag);
-            logger.info("[{}] 预计中断时间: 1-2秒", tag);
-
-            // 标记需要重启
-            ffmpegNeedRestart.set(true);
-
-            // 立即触发重启（异步执行，避免阻塞）
-            final String currentTag = tag;
-            Thread restartThread = new Thread(() -> {
-                try {
-                    logger.info("[{}] SPS变化检测到，立即触发FFmpeg重启...", currentTag);
-                    restartRtmpPublisher();
-                } catch (Exception e) {
-                    logger.error("[{}] 触发FFmpeg重启失败: {}", currentTag, e.getMessage(), e);
-                }
-            }, "FFmpeg-Restart-" + tag);
-            restartThread.setDaemon(true);
-            restartThread.start();
-        }
-
-        // 更新SPS哈希和视频参数
-        lastSPSHash = currentHash;
-        currentVideoParam = parseVideoParam(nalu);
-    }
-
-    /**
-     * 解析H.264 SPS获取视频参数
-     */
-    private VideoParamInfo parseVideoParam(byte[] sps) {
-        VideoParamInfo info = new VideoParamInfo();
-        try {
-            // H.264 SPS解析
-            // SPS格式: [NAL头(1字节) + profile_idc(1) + constraints(1) + level_idc(1) + 5字节对齐 + sps数据]
-
-            if (sps.length < 6) {
-                logger.warn("[{}] SPS数据长度不足，无法解析: {}", tag, sps.length);
-                return info;
-            }
-
-            int profile_idc = sps[4] & 0xFF;
-            int constraint_flags = sps[5] & 0xFF;
-            int level_idc = sps[6] & 0xFF;
-
-            // 查找SPS结束位置（开始于67或68）
-            int spsStart = -1;
-            for (int i = 4; i < Math.min(sps.length - 4, 10); i++) {
-                if ((sps[i] & 0x1F) == 7) {
-                    spsStart = i;
-                    break;
-                }
-            }
-
-            if (spsStart == -1) {
-                // 简化模式：直接使用SPS长度估算
-                int spsLen = (sps.length > 10) ? 4 : 1;
-                for (int i = 4; i < sps.length - 1; i++) {
-                    if (sps[i] == 0 && sps[i+1] == 0 && sps[i+2] == 0 && sps[i+3] == 1) {
-                        spsLen = i - 4;
-                        break;
-                    }
-                }
-
-                // 根据SPS长度估算分辨率（非常粗略）
-                int lenCategory = spsLen / 10;
-                if (spsLen < 20) {
-                    info.width = 352;
-                    info.height = 288;
-                    info.fps = 15;
-                } else if (spsLen < 40) {
-                    info.width = 704;
-                    info.height = 576;
-                    info.fps = 25;
-                } else {
-                    info.width = 1280;
-                    info.height = 720;
-                    info.fps = 25;
-                }
-            } else {
-                // 详细解析bitstream
-                // 这里简化处理，实际项目中可以使用完整的H.264解析库
-                info.width = 1280;  // 默认值
-                info.height = 720;
-                info.fps = 25;
-            }
-
-            // 根据SPS长度特征判断分辨率
-            // 这是一个简化的估算方法
-            int estimatedSize = sps.length;
-
-            // 子码流特征: CIF (352x288) -> SPS约8-15字节
-            // 主码流特征: 720P (1280x720) -> SPS约16-30字节
-            // 1080P (1920x1080) -> SPS约30+字节
-            if (estimatedSize < 20) {
-                // CIF 或类似分辨率
-                if (estimatedSize < 12) {
-                    info.width = 352;
-                    info.height = 288;
-                    info.fps = 15;
-                    info.resolution = "CIF";
-                } else {
-                    info.width = 704;
-                    info.height = 576;
-                    info.fps = 25;
-                    info.resolution = "4CIF";
-                }
-            } else if (estimatedSize < 35) {
-                // 720P 或类似
-                info.width = 1280;
-                info.height = 720;
-                info.fps = 25;
-                info.resolution = "720P";
-            } else {
-                // 1080P 或更高
-                info.width = 1920;
-                info.height = 1080;
-                info.fps = 30;
-                info.resolution = "1080P";
-            }
-
-        } catch (Exception e) {
-            logger.error("[{}] 解析SPS失败: {}", tag, e.getMessage());
-        }
-
-        return info;
-    }
-
-    /**
-     * 重启FFmpeg推流进程
-     */
-    public void restartRtmpPublisher() {
-        long now = System.currentTimeMillis();
-        lastRestartTime.set(now);
-
-        logger.info("[{}] ====== 开始重启FFmpeg推流 ======", tag);
-        logger.info("[{}] 当前时间: {}", tag, now);
-
-        try {
-            // 1. 标记等待I帧
-            waitingForIFrame.set(true);
-
-            // 2. 关闭旧的FFmpeg进程
-            logger.info("[{}] 步骤1: 关闭旧FFmpeg进程...", tag);
-            if (rtmpPublisher != null) {
-                try {
-                    rtmpPublisher.close();
-                } catch (Exception e) {
-                    logger.warn("[{}] 关闭旧FFmpeg进程时出错: {}", tag, e.getMessage());
-                }
-                rtmpPublisher = null;
-            }
-
-            // 3. 等待FFmpeg进程完全关闭
-            logger.info("[{}] 步骤2: 等待FFmpeg进程关闭...", tag);
-            Thread.sleep(500);
-
-            // 4. 清空缓冲区，准备接收新的视频数据
-            logger.info("[{}] 步骤3: 清空视频缓冲区...", tag);
-            buffer.clear();
-            firstTimestamp = -1;
-
-            // 5. 重置FLV编码器
-            logger.info("[{}] 步骤4: 重置FLV编码器...", tag);
-            flvEncoder = new FlvEncoder(true, true);
-
-            // 6. 重新启动FFmpeg进程
-            logger.info("[{}] 步骤5: 启动新FFmpeg进程...", tag);
-            String rtmpUrl = Configs.get("rtmp.url");
-            if (StringUtils.isNotBlank(rtmpUrl)) {
-                rtmpPublisher = new RTMPPublisher(tag);
-                rtmpPublisher.start();
-                logger.info("[{}] 新FFmpeg进程已启动", tag);
-            } else {
-                logger.warn("[{}] 未配置rtmp.url，跳过启动", tag);
-            }
-
-            // 7. 重置标志
-            ffmpegNeedRestart.set(false);
-
-            logger.info("[{}] ====== FFmpeg重启完成 ======", tag);
-            logger.info("[{}] 请等待1-2秒让FFmpeg完成初始化...", tag);
-
-        } catch (Exception e) {
-            logger.error("[{}] 重启FFmpeg失败: {}", tag, e.getMessage(), e);
-            waitingForIFrame.set(false);
-            ffmpegNeedRestart.set(false);
-            // 确保rtmpPublisher被清空
-            rtmpPublisher = null;
-        }
-    }
-
-    /**
-     * 外部调用：主动触发码流切换（对应1078的9102指令）
-     * 调用此方法后，FFmpeg会在检测到视频参数变化时自动重启
-     */
-    public void notifyStreamSwitch() {
-        logger.info("[{}] ====== 收到码流切换通知 ======", tag);
-        logger.info("[{}] 即将切换码流，请等待设备响应...", tag);
-
-        // 记录切换前的状态
-        VideoParamInfo beforeSwitch = currentVideoParam;
-        logger.info("[{}] 切换前视频参数: {}", tag, beforeSwitch);
-
-        // 重置SPS哈希，这样一旦设备发来新的SPS就能立即检测到
-        lastSPSHash = 0;
-
-        // 标记需要重启
-        ffmpegNeedRestart.set(true);
-
-        // 启动一个线程来处理后续的重启逻辑
-        new Thread(() -> {
-            try {
-                // 等待设备切换并发送新的I帧
-                Thread.sleep(2000);
-
-                // 如果还没有收到新的I帧，手动触发一次检查
-                if (waitingForIFrame.get()) {
-                    logger.warn("[{}] 未在2秒内收到新I帧，检查是否需要手动重启...", tag);
-                    // 这里不直接重启，而是等待下一个SPS自动触发
-                }
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            }
-        }, "StreamSwitch-Watcher-" + tag).start();
-    }
-
-    /**
-     * 获取当前视频参数（用于监控和调试）
-     */
-    public VideoParamInfo getCurrentVideoParam() {
-        return currentVideoParam;
-    }
-
-    /**
-     * 获取FFmpeg是否需要重启
-     */
-    public boolean isFFmpegNeedRestart() {
-        return ffmpegNeedRestart.get();
-    }
-
     public void broadcastVideo(long timeoffset, byte[] flvTag)
     {
         for (Subscriber subscriber : subscribers)
@@ -463,8 +146,6 @@ public class Channel
     public void close()
     {
-        logger.info("[{}] 关闭Channel，开始清理资源...", tag);
-
         for (Iterator<Subscriber> itr = subscribers.iterator(); itr.hasNext(); )
         {
             Subscriber subscriber = itr.next();
@@ -472,17 +153,41 @@ public class Channel
             itr.remove();
         }
-        // 关闭 FFmpeg 进程
+        // [恢复] 关闭 FFmpeg 进程
         if (rtmpPublisher != null) {
-            logger.info("[{}] 关闭FFmpeg推流进程...", tag);
             rtmpPublisher.close();
             rtmpPublisher = null;
         }
+        if (audioRtmpPublisher != null) {
+            audioRtmpPublisher.close();
+            audioRtmpPublisher = null;
+        }
+    }
-        logger.info("[{}] Channel已关闭", tag);
+    public synchronized boolean ensureAudioPublisherRunning()
+    {
+        String rtmpUrl = Configs.get("rtmp.url");
+        if (StringUtils.isBlank(rtmpUrl))
+        {
+            return false;
+        }
+        if (audioRtmpPublisher != null && audioRtmpPublisher.isAlive())
+        {
+            return true;
+        }
+        if (audioRtmpPublisher != null)
+        {
+            audioRtmpPublisher.close();
+            audioRtmpPublisher = null;
+        }
+        logger.info("[{}] 重启音频 FFmpeg 推流进程", tag);
+        audioRtmpPublisher = new RTMPPublisher(tag, true);
+        audioRtmpPublisher.start();
+        return true;
     }
     // [恢复] 原版 readNalu (FFmpeg 偏好带 StartCode 的数据，或者 FlvEncoder 需要)
+    // 之前为了 RTP 特意修改了切片逻辑，现在改回原版简单逻辑即可
     private byte[] readNalu()
     {
         // 寻找 00 00 00 01
@@ -29,9 +29,15 @@ public final class PublishManager
             chl = new Channel(tag);
             channels.put(tag, chl);
         }
-        Subscriber subscriber = null;
-        if (type.equals(Media.Type.Video)) subscriber = chl.subscribe(ctx);
-        else throw new RuntimeException("unknown media type: " + type);
+        Subscriber subscriber;
+        if (type.equals(Media.Type.Video) || type.equals(Media.Type.Audio))
+        {
+            subscriber = chl.subscribe(ctx, type);
+        }
+        else
+        {
+            throw new RuntimeException("unknown media type: " + type);
+        }
         subscriber.setName("subscriber-" + tag + "-" + subscriber.getId());
         subscriber.start();
@@ -68,6 +74,17 @@ public final class PublishManager
         if (chl != null) chl.close();
     }
+    public boolean ensureAudioPublisher(String tag)
+    {
+        Channel chl = channels.get(tag);
+        if (chl == null)
+        {
+            logger.warn("ensureAudioPublisher skipped, channel not found: {}", tag);
+            return false;
+        }
+        return chl.ensureAudioPublisherRunning();
+    }
+
     public void unsubscribe(String tag, long watcherId)
     {
         Channel chl = channels.get(tag);
@@ -36,6 +36,9 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt; {
     private long currentSecondFlow = 0;
     private int currentSecondCount = 0;
     private long lastRedisKeepAliveTime = 0;
+    private long lastAudioTraceTime = 0;
+    private long audioPacketCount = 0;
+    private long audioPublishCount = 0;
     public Jtt1078Handler(Integer port) {
         this.port = port;
@@ -142,6 +145,19 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt; {
         return 28; // 视频
     }
+    private boolean canPublishAudio() {
+        if (redisTemplate == null) {
+            return false;
+        }
+        String key = Jt1078OfCarController.buildAudioSubscribeRedisKey(this.currentSim, String.valueOf(this.currentChannelId));
+        Boolean subscribed = redisTemplate.hasKey(key);
+        if (Boolean.TRUE.equals(subscribed)) {
+            redisTemplate.expire(key, 120, TimeUnit.SECONDS);
+            return true;
+        }
+        return false;
+    }
+
     private void processMediaPayload(io.netty.channel.Channel nettyChannel, Packet packet, String tag, int lengthOffset) {
         Integer sequence = SessionManager.get(nettyChannel, "video-sequence");
         if (sequence == null) sequence = 0;
@@ -154,9 +170,13 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt; {
         packet.seek(5);
         int pt = packet.nextByte() & 0x7f;
-        // --- 分支 A: 视频流 (0, 1) ---
-        // 视频流必须发给 PublishManager (FFmpeg)
-        if (dataType == 0x00 || dataType == 0x01) {
+        boolean isAudioPt = pt >= 0 && pt <= 28;
+        boolean isVideoPt = pt >= 98 && pt <= 101;
+        boolean canParseAsAudio = dataType == 0x03 || dataType == 0x02 || (dataType == 0x00 && (isAudioPt || !isVideoPt));
+        boolean canParseAsVideo = dataType == 0x01 || (dataType == 0x00 && isVideoPt);
+
+        // --- 分支 A: 视频流 ---
+        if (canParseAsVideo) {
             if (pkType == 0 || pkType == 2) {
                 sequence += 1;
                 SessionManager.set(nettyChannel, "video-sequence", sequence);
@@ -168,24 +188,26 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt; {
             PublishManager.getInstance().publishVideo(tag, sequence, timestamp, pt, videoData);
         }
-        // --- 分支 B: 音频流 (0, 2, 3) ---
-        else if (dataType == 0x03 || dataType == 0x02 || dataType == 0x00) {
-
-            // 只有明确是音频/对讲包时才处理
-            if (dataType == 0x03 || dataType == 0x02) {
-                long timestamp = packet.seek(16).nextLong();
-                byte[] audioData = packet.seek(lengthOffset + 2).nextBytes();
-                // 1. 发送给 WebSocket (前端监听 - 对讲核心)
-                // 无论是什么音频，只要上来了，就发给 WebSocket，保证对讲能听到
-                Jtt1078AudioBroadcastManager.broadcastAudio(this.currentSim, this.currentChannelId, audioData);
-
-                // 2. 发送给 FFmpeg (直播/录像)
-                // 【核心分流逻辑】
-                // 如果是双向对讲(0x02)，严格禁止发给 FFmpeg！
-                // 只有 0x03 (环境监听) 才发给 FFmpeg 进行混流录制
-                if (dataType != 0x02) {
-                    PublishManager.getInstance().publishAudio(tag, sequence, timestamp, pt, audioData);
-                }
+        // --- 分支 B: 音频流 ---
+        if (canParseAsAudio) {
+            long timestamp = packet.seek(16).nextLong();
+            byte[] audioData = packet.seek(lengthOffset + 2).nextBytes();
+            audioPacketCount++;
+            // 对讲下行广播维持原行为
+            Jtt1078AudioBroadcastManager.broadcastAudio(this.currentSim, this.currentChannelId, audioData);
+
+            // 0x02 对讲音频不送 ffmpeg；其他音频按订阅状态放行
+            boolean willPublish = dataType != 0x02;
+            if (willPublish) {
+                PublishManager.getInstance().publishAudio(tag, sequence, timestamp, pt, audioData);
+                audioPublishCount++;
+            }
+
+            long now = System.currentTimeMillis();
+            if (now - lastAudioTraceTime > 2000) {
+                logger.debug("[AUDIO_TRACE] tag={}, sim={}, channel={}, dataType={}, pt={}, pkType={}, packetBytes={},  publish={}, packetCount={}, publishCount={}",
+                        tag, currentSim, currentChannelId, dataType, pt, pkType, audioData == null ? 0 : audioData.length,  willPublish, audioPacketCount, audioPublishCount);
+                lastAudioTraceTime = now;
             }
         }
     }
@@ -10,37 +10,26 @@ import java.util.concurrent.TimeUnit;
 /**
  * FFmpeg 推流器 (仅处理视频直播流)
- *
- * 修改记录：
- * 1. 添加详细的启动和关闭日志，便于排查问题
- * 2. 优化关闭逻辑，确保FFmpeg进程被正确终止
- * 3. 添加FFmpeg输出日志监控
- * 4. 兼容Java 8
  */
 public class RTMPPublisher extends Thread
 {
     static Logger logger = LoggerFactory.getLogger(RTMPPublisher.class);
     String tag = null;
+    boolean audioOnly = false;
     Process process = null;
     private volatile boolean running = true;
-    /** FFmpeg路径 */
-    private String ffmpegPath = null;
-
-    /** 目标RTMP地址 */
-    private String rtmpUrl = null;
-
-    /** FFmpeg命令格式标志 */
-    private String formatFlag = null;
-
-    /** 进程启动时间 */
-    private long processStartTime = 0;
-
     public RTMPPublisher(String tag)
     {
+        this(tag, false);
+    }
+
+    public RTMPPublisher(String tag, boolean audioOnly)
+    {
         this.tag = tag;
-        this.setName("RTMPPublisher-" + tag);
+        this.audioOnly = audioOnly;
+        this.setName((audioOnly ? "RTMPPublisher-Audio-" : "RTMPPublisher-") + tag);
         this.setDaemon(true);
     }
@@ -55,45 +44,52 @@ public class RTMPPublisher extends Thread
         try
         {
-            // 获取FFmpeg配置
             String sign = "41db35390ddad33f83944f44b8b75ded";
-            rtmpUrl = Configs.get("rtmp.url").replaceAll("\\{TAG\\}", tag).replaceAll("\\{sign\\}",sign);
-            ffmpegPath = Configs.get("ffmpeg.path");
+            String outputTag = audioOnly ? tag + "-audio" : tag;
+            String rtmpUrl = Configs.get("rtmp.url").replaceAll("\\{TAG\\}", outputTag).replaceAll("\\{sign\\}",sign);
-            // 自动判断协议格式
-            formatFlag = "";
+            // 【修复】自动判断协议格式，避免硬编码 -f rtsp 导致 RTMP 推流失败
+            String formatFlag = "";
             if (rtmpUrl.startsWith("rtsp://")) {
                 formatFlag = "-f rtsp";
             } else if (rtmpUrl.startsWith("rtmp://")) {
                 formatFlag = "-f flv";
             }
-            // 构造FFmpeg命令
-            String cmd = String.format("%s -i http://127.0.0.1:%d/video/%s -vcodec copy -acodec aac %s %s",
-                    ffmpegPath,
-                    Configs.getInt("server.http.port", 3333),
-                    tag,
-                    formatFlag,
-                    rtmpUrl
-            );
+            // 低延迟：缩短 HTTP-FLV 探测与缓冲，尽快向 ZLM 输出（仍受设备 GOP/关键帧限制）
+            String inputLowLatency =
+                    "-fflags +nobuffer+discardcorrupt -flags low_delay -probesize 32 -analyzeduration 0";
+            String outputLowLatency = "-flush_packets 1";
+
+            int httpPort = Configs.getInt("server.http.port", 3333);
+            String cmd;
+            if (audioOnly) {
+                cmd = String.format(
+                        "%s %s -i http://127.0.0.1:%d/audio/%s -vn -acodec aac %s %s %s",
+                        Configs.get("ffmpeg.path"),
+                        inputLowLatency,
+                        httpPort,
+                        tag,
+                        outputLowLatency,
+                        formatFlag,
+                        rtmpUrl
+                );
+            } else {
+                cmd = String.format(
+                        "%s %s -i http://127.0.0.1:%d/video/%s -vcodec copy -acodec aac %s %s %s",
+                        Configs.get("ffmpeg.path"),
+                        inputLowLatency,
+                        httpPort,
+                        tag,
+                        outputLowLatency,
+                        formatFlag,
+                        rtmpUrl
+                );
+            }
-            logger.info("===========================================");
-            logger.info("[{}] ====== FFmpeg推流任务启动 ======", tag);
-            logger.info("[{}] FFmpeg路径: {}", tag, ffmpegPath);
-            logger.info("[{}] 目标地址: {}", tag, rtmpUrl);
-            logger.info("[{}] 完整命令: {}", tag, cmd);
-            logger.info("[{}] HTTP端口: {}", tag, Configs.getInt("server.http.port", 3333));
-            logger.info("[{}] 源流地址: http://127.0.0.1:{}/video/{}", tag, Configs.getInt("server.http.port", 3333), tag);
-            logger.info("[{}] 启动时间: {}", tag, new java.util.Date());
-            logger.info("===========================================");
+            logger.info("FFmpeg Push Started. tag={}, outputTag={}, audioOnly={}, cmd={}", tag, outputTag, audioOnly, cmd);
-            // 执行FFmpeg命令
             process = Runtime.getRuntime().exec(cmd);
-            processStartTime = System.currentTimeMillis();
-
-            // 记录进程启动信息（Java 8兼容方式）
-            logger.info("[{}] FFmpeg进程已启动", tag);
-
             stderr = process.getErrorStream();
             stdout = process.getInputStream();
@@ -102,15 +98,9 @@ public class RTMPPublisher extends Thread
             Thread stdoutConsumer = new Thread(() -> {
                 try {
                     byte[] buffer = new byte[512];
-                    int count = 0;
                     while (running && finalStdout.read(buffer) > -1) {
-                        count++;
-                        // 每1000次读取才打印一次（避免刷屏）
-                        if (debugMode && count % 1000 == 0) {
-                            logger.debug("[{}] FFmpeg stdout消费中... count: {}", tag, count);
-                        }
+                        // 只消费，不输出
                     }
-                    logger.info("[{}] FFmpeg stdout消费结束, 共消费{}次", tag, count);
                 } catch (Exception e) {
                     // 忽略异常
                 }
@@ -118,60 +108,26 @@ public class RTMPPublisher extends Thread
             stdoutConsumer.setDaemon(true);
             stdoutConsumer.start();
-            // 消费 stderr 日志流
-            StringBuilder errorLog = new StringBuilder();
-            int errorCount = 0;
+            // 消费 stderr 日志流，防止阻塞
             while (running && (len = stderr.read(buff)) > -1)
             {
                 if (debugMode) {
                     System.out.print(new String(buff, 0, len));
                 }
-
-                // 收集错误日志（便于排查问题）
-                errorLog.append(new String(buff, 0, len));
-                errorCount++;
-
-                // 每100条错误日志打印一次摘要
-                if (errorCount % 100 == 0) {
-                    String lastError = errorLog.length() > 500
-                        ? errorLog.substring(errorLog.length() - 500)
-                        : errorLog.toString();
-                    logger.debug("[{}] FFmpeg错误日志摘要: {}", tag, lastError);
-                }
             }
             // 进程退出处理
             int exitCode = process.waitFor();
-            long runDuration = System.currentTimeMillis() - processStartTime;
-            logger.warn("===========================================");
-            logger.warn("[{}] ====== FFmpeg推流任务结束 ======", tag);
-            logger.warn("[{}] 退出代码: {}", tag, exitCode);
-            logger.warn("[{}] 运行时间: {} ms", tag, runDuration);
-            logger.warn("[{}] 错误日志条数: {}", tag, errorCount);
-
-            // 分析退出原因
-            if (exitCode == 0) {
-                logger.info("[{}] FFmpeg正常退出", tag);
-            } else if (exitCode == -1 || exitCode == 255) {
-                logger.warn("[{}] FFmpeg被信号终止 (exitCode={})", tag, exitCode);
-            } else {
-                // 保存最后一段错误日志
-                String lastError = errorLog.length() > 1000
-                    ? errorLog.substring(errorLog.length() - 1000)
-                    : errorLog.toString();
-                logger.error("[{}] FFmpeg异常退出, 最后错误日志:\n{}", tag, lastError);
-            }
-            logger.warn("===========================================");
-
+            logger.warn("FFmpeg process exited. Code: {}, Tag: {}", exitCode, tag);
         }
         catch(InterruptedException ex)
         {
-            logger.info("[{}] RTMPPublisher被中断: {}", tag, ex.getMessage());
+            logger.info("RTMPPublisher interrupted: {}", tag);
             Thread.currentThread().interrupt();
         }
         catch(Exception ex)
         {
-            logger.error("[{}] RTMPPublisher异常: {}", tag, ex);
+            logger.error("RTMPPublisher Error: " + tag, ex);
         }
         finally
         {
@@ -183,184 +139,40 @@ public class RTMPPublisher extends Thread
                 closeQuietly(process.getOutputStream());
                 closeQuietly(process.getErrorStream());
             }
-            logger.info("[{}] RTMPPublisher资源已释放", tag);
         }
     }
-    /**
-     * 关闭FFmpeg推流
-     * 优化关闭逻辑，确保进程被正确终止（Java 8兼容）
-     */
     public void close()
     {
-        logger.info("[{}] ====== 开始关闭FFmpeg推流 ======", tag);
-        logger.info("[{}] 关闭请求时间: {}", tag, new java.util.Date());
-
         try {
             // 设置停止标志
             running = false;
             if (process != null) {
-                long runDuration = processStartTime > 0 ? System.currentTimeMillis() - processStartTime : 0;
-                logger.info("[{}] 正在终止FFmpeg进程... (已运行{}ms)", tag, runDuration);
-
                 // 先尝试正常终止
                 process.destroy();
-                // 等待最多3秒
+                // 等待最多 3 秒
                 boolean exited = process.waitFor(3, TimeUnit.SECONDS);
                 if (!exited) {
-                    logger.warn("[{}] FFmpeg进程未能在3秒内正常退出，开始强制终止...", tag);
-
-                    // 强制终止（Java 8的方式）
+                    // 如果还没退出，强制终止
+                    logger.warn("FFmpeg process did not exit gracefully, forcing termination: {}", tag);
                     process.destroyForcibly();
-
-                    // 再等待2秒
-                    try {
-                        exited = process.waitFor(2, TimeUnit.SECONDS);
-                    } catch (InterruptedException e) {
-                        Thread.currentThread().interrupt();
-                    }
-                    if (!exited) {
-                        logger.error("[{}] FFmpeg进程强制终止失败，可能存在资源泄漏", tag);
-                    } else {
-                        logger.info("[{}] FFmpeg进程已强制终止", tag);
-                    }
-                } else {
-                    int exitCode = process.exitValue();
-                    logger.info("[{}] FFmpeg进程已正常终止, 退出代码: {}", tag, exitCode);
+                    process.waitFor(2, TimeUnit.SECONDS);
                 }
-                // 检查是否需要杀掉残留进程
-                checkAndKillOrphanedProcesses();
-
-            } else {
-                logger.info("[{}] FFmpeg进程为空，无需关闭", tag);
+                logger.info("FFmpeg process terminated: {}", tag);
             }
-            logger.info("[{}] ====== FFmpeg推流已关闭 ======", tag);
-
             // 中断线程（如果还在阻塞读取）
             this.interrupt();
             // 等待线程结束
             this.join(2000);
-            if (this.isAlive()) {
-                logger.warn("[{}] RTMPPublisher线程未能正常结束", tag);
-            }
         } catch(Exception e) {
-            logger.error("[{}] 关闭RTMPPublisher时出错: {}", tag, e);
-        }
-    }
-
-    /**
-     * 检查并杀掉可能残留的FFmpeg进程
-     * Java 8兼容实现，使用系统命令查找和终止进程
-     */
-    private void checkAndKillOrphanedProcesses() {
-        try {
-            logger.debug("[{}] 检查是否有FFmpeg残留进程...", tag);
-            // 判断操作系统类型
-            String os = System.getProperty("os.name").toLowerCase();
-            boolean isWindows = os.contains("win");
-
-            if (isWindows) {
-                // Windows: 使用tasklist和taskkill
-                killOrphanedProcessesWindows();
-            } else {
-                // Linux/Unix: 使用ps和kill
-                killOrphanedProcessesUnix();
-            }
-        } catch (Exception e) {
-            logger.error("[{}] 检查残留进程时出错: {}", tag, e.getMessage());
-        }
-    }
-
-    /**
-     * Windows环境下查找并终止残留的FFmpeg进程
-     */
-    private void killOrphanedProcessesWindows() {
-        try {
-            // 查找包含ffmpeg的进程
-            ProcessBuilder pb = new ProcessBuilder("tasklist", "/FI", "IMAGENAME eq ffmpeg.exe", "/FO", "CSV", "/NH");
-            Process process = pb.start();
-            java.io.BufferedReader reader = new java.io.BufferedReader(
-                    new java.io.InputStreamReader(process.getInputStream()));
-
-            String line;
-            while ((line = reader.readLine()) != null) {
-                // CSV格式: "Image Name","PID","Session Name","Session#","Mem Usage"
-                String[] parts = line.split(",");
-                if (parts.length > 1) {
-                    String pidStr = parts[1].replaceAll("\"", "").trim();
-                    try {
-                        long pid = Long.parseLong(pidStr);
-                        // 检查命令行是否包含当前tag或wvp-jt1078
-                        ProcessBuilder cmdPb = new ProcessBuilder("wmic", "process", "where", "ProcessId=" + pid, "get", "CommandLine");
-                        Process cmdProcess = cmdPb.start();
-                        java.io.BufferedReader cmdReader = new java.io.BufferedReader(
-                                new java.io.InputStreamReader(cmdProcess.getInputStream()));
-
-                        String cmdLine;
-                        boolean shouldKill = false;
-                        while ((cmdLine = cmdReader.readLine()) != null) {
-                            if (cmdLine.toLowerCase().contains("ffmpeg")
-                                    && (cmdLine.contains(tag) || cmdLine.contains("wvp-jt1078"))) {
-                                shouldKill = true;
-                                break;
-                            }
-                        }
-
-                        if (shouldKill) {
-                            logger.warn("[{}] 发现残留FFmpeg进程[PID:{}]，正在终止...", tag, pid);
-                            Process killProcess = Runtime.getRuntime().exec("taskkill /PID " + pid + " /F");
-                            killProcess.waitFor();
-                            logger.info("[{}] 残留FFmpeg进程已终止[PID:{}]", tag, pid);
-                        }
-                    } catch (NumberFormatException e) {
-                        // 忽略非数字PID
-                    }
-                }
-            }
-        } catch (Exception e) {
-            logger.error("[{}] Windows检查残留进程时出错: {}", tag, e.getMessage());
-        }
-    }
-
-    /**
-     * Linux/Unix环境下查找并终止残留的FFmpeg进程
-     */
-    private void killOrphanedProcessesUnix() {
-        try {
-            // 查找包含ffmpeg的进程
-            ProcessBuilder pb = new ProcessBuilder("ps", "-ef");
-            Process process = pb.start();
-            java.io.BufferedReader reader = new java.io.BufferedReader(
-                    new java.io.InputStreamReader(process.getInputStream()));
-
-            String line;
-            while ((line = reader.readLine()) != null) {
-                // ps -ef 输出格式: UID PID PPID C STIME TTY TIME CMD
-                if (line.toLowerCase().contains("ffmpeg") && line.contains(tag)) {
-                    String[] parts = line.split("\\s+");
-                    if (parts.length > 1) {
-                        String pidStr = parts[1];
-                        try {
-                            long pid = Long.parseLong(pidStr);
-                            logger.warn("[{}] 发现残留FFmpeg进程[PID:{}]，正在终止...", tag, pid);
-                            Process killProcess = Runtime.getRuntime().exec("kill -9 " + pid);
-                            killProcess.waitFor();
-                            logger.info("[{}] 残留FFmpeg进程已终止[PID:{}]", tag, pid);
-                        } catch (NumberFormatException e) {
-                            // 忽略非数字PID
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            logger.error("[{}] Unix检查残留进程时出错: {}", tag, e.getMessage());
+            logger.error("Error closing RTMPPublisher: " + tag, e);
         }
     }
@@ -376,27 +188,4 @@ public class RTMPPublisher extends Thread
             }
         }
     }
-
-    /**
-     * 获取推流状态
-     */
-    public boolean isRunning() {
-        return running && this.isAlive() && process != null;
-    }
-
-    /**
-     * 获取FFmpeg进程信息（用于调试）
-     */
-    public String getProcessInfo() {
-        if (process == null) {
-            return "process is null";
-        }
-        try {
-            long runDuration = processStartTime > 0 ? System.currentTimeMillis() - processStartTime : 0;
-            return String.format("FFmpeg进程, 已运行%dms, alive=%s",
-                    runDuration, process.isAlive());
-        } catch (Exception e) {
-            return "获取进程信息失败: " + e.getMessage();
-        }
-    }
 }
@@ -211,7 +211,7 @@ public class ZLMHttpHookListener {
             return new HookResultForOnPublish(200, "success");
         }
         // 推流鉴权的处理
-        if (!"rtp".equals(param.getApp()) && !"schedule".equals(param.getApp())) {
+        if (!"rtp".equals(param.getApp()) && !"schedule".equals(param.getApp()) && !"rtp".equals(param.getSchema())) {
             StreamProxyItem stream = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
             if (stream != null) {
                 HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();
@@ -10,7 +10,6 @@ import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.bean.*;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
 import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
-import com.genersoft.iot.vmp.jtt1078.util.Configs;
 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
 import com.genersoft.iot.vmp.media.zlm.dto.*;
 import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
@@ -24,10 +23,8 @@ import com.genersoft.iot.vmp.storager.mapper.*;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.Jt1078ConfigBean;
-import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.RtspConfigBean;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.ThirdPartyHttpService;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.StreamSwitch;
-import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.T9101;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.T9102;
 import com.genersoft.iot.vmp.vmanager.util.RedisCache;
 import com.github.pagehelper.PageHelper;
@@ -58,9 +55,6 @@ public class StreamPushServiceImpl implements IStreamPushService {
     private GbStreamMapper gbStreamMapper;
     @Autowired
-    private RtspConfigBean rtspConfigBean;
-
-    @Autowired
     private StreamPushMapper streamPushMapper;
     @Autowired
@@ -65,6 +65,18 @@ public class StreamContent {
     @Schema(description = "Websockets-FLV流地址")
     private String wss_flv;
+    @Schema(description = "音频HTTP-FLV流地址")
+    private String audio_flv;
+
+    @Schema(description = "音频HTTPS-FLV流地址")
+    private String audio_https_flv;
+
+    @Schema(description = "音频Websocket-FLV流地址")
+    private String audio_ws_flv;
+
+    @Schema(description = "音频Websockets-FLV流地址")
+    private String audio_wss_flv;
+
     /**
      * HTTP-FMP4流地址
      */
@@ -368,6 +380,38 @@ public class StreamContent {
         this.wss_flv = wss_flv;
     }
+    public String getAudio_flv() {
+        return audio_flv;
+    }
+
+    public void setAudio_flv(String audio_flv) {
+        this.audio_flv = audio_flv;
+    }
+
+    public String getAudio_https_flv() {
+        return audio_https_flv;
+    }
+
+    public void setAudio_https_flv(String audio_https_flv) {
+        this.audio_https_flv = audio_https_flv;
+    }
+
+    public String getAudio_ws_flv() {
+        return audio_ws_flv;
+    }
+
+    public void setAudio_ws_flv(String audio_ws_flv) {
+        this.audio_ws_flv = audio_ws_flv;
+    }
+
+    public String getAudio_wss_flv() {
+        return audio_wss_flv;
+    }
+
+    public void setAudio_wss_flv(String audio_wss_flv) {
+        this.audio_wss_flv = audio_wss_flv;
+    }
+
     public String getFmp4() {
         return fmp4;
     }
@@ -17,6 +17,7 @@ import com.genersoft.iot.vmp.conf.security.JwtUtils;
 import com.genersoft.iot.vmp.conf.security.dto.JwtUser;
 import com.genersoft.iot.vmp.jtt1078.app.VideoServerApp;
 import com.genersoft.iot.vmp.jtt1078.publisher.PublishManager;
+import com.genersoft.iot.vmp.jtt1078.util.Configs;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
 import com.genersoft.iot.vmp.service.IStreamPushService;
 import com.genersoft.iot.vmp.service.StremProxyService1078;
@@ -66,6 +67,7 @@ import javax.validation.constraints.NotBlank;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.Key;
 import java.security.KeyFactory;
@@ -132,6 +134,10 @@ public class Jt1078OfCarController {
     private static final ConcurrentHashMap<String, String> CHANNEL1_MAP = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, String> CHANNEL2_MAP = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, String> CHANNEL3_MAP = new ConcurrentHashMap<>();
+    private static final String AUDIO_SUBSCRIBE_PREFIX = "jt1078:audio:subscribe:";
+    private static final long AUDIO_SUBSCRIBE_TTL_SECONDS = 120L;
+    private static final int AUDIO_RETRY_TIMES = 6;
+    private static final long AUDIO_RETRY_INTERVAL_MS = 300L;
     static {
         //'ADAS', 'DSM', '路况', '司机', '整车前', '中门', '倒车', '前门客流', '后面客流'
@@ -428,7 +434,7 @@ public class Jt1078OfCarController {
      * @return
      */
     @GetMapping({"/send/request/io/{sim}/{channel}"})
-    public StreamContent sendIORequest(@PathVariable String sim, @PathVariable String channel) {
+    public StreamContent sendIORequest(@PathVariable String sim, @PathVariable String channel, HttpServletRequest request) {
         if (StringUtils.isBlank(sim)) {
             throw new ControllerException(-100, "sim 不能为空");
         }
@@ -440,12 +446,61 @@ public class Jt1078OfCarController {
         if (Objects.isNull(streamContent) || StringUtils.isBlank(streamContent.getWs_flv())) {
             sendIORequest(stream);
         }
-        streamContent = getStreamContent(stream);
+        streamContent = getStreamContent(stream, request);
         streamContent.setPort(jt1078ConfigBean.getPort());
-        streamContent.setHttpPort(jt1078ConfigBean.getHttpPort());
+        streamContent.setHttpPort(getJttHttpPort());
         return streamContent;
     }
+    @PostMapping("/audio/subscribe/{sim}/{channel}")
+    public Map<String, Object> subscribeAudio(@PathVariable String sim, @PathVariable String channel) {
+        if (StringUtils.isBlank(sim) || StringUtils.isBlank(channel)) {
+            throw new ControllerException(ErrorCode.ERROR400);
+        }
+        String stream = buildAudioStream(sim, channel);
+        String key = buildAudioSubscribeRedisKeyByStream(stream);
+        redisTemplate.opsForValue().set(key, "1", AUDIO_SUBSCRIBE_TTL_SECONDS, TimeUnit.SECONDS);
+        Map<String, Object> result = new HashMap<>();
+        result.put("stream", stream);
+        result.put("enabled", true);
+        result.put("ttl", AUDIO_SUBSCRIBE_TTL_SECONDS);
+        StreamContent audioStreamContent = ensureAudioStreamReady(stream);
+        if (audioStreamContent != null) {
+            result.put("audio_flv", audioStreamContent.getAudio_flv());
+            result.put("audio_https_flv", audioStreamContent.getAudio_https_flv());
+            result.put("audio_ws_flv", audioStreamContent.getAudio_ws_flv());
+            result.put("audio_wss_flv", audioStreamContent.getAudio_wss_flv());
+        }
+        return result;
+    }
+
+    @DeleteMapping("/audio/subscribe/{sim}/{channel}")
+    public Map<String, Object> unsubscribeAudio(@PathVariable String sim, @PathVariable String channel) {
+        if (StringUtils.isBlank(sim) || StringUtils.isBlank(channel)) {
+            throw new ControllerException(ErrorCode.ERROR400);
+        }
+        String stream = buildAudioStream(sim, channel);
+        String key = buildAudioSubscribeRedisKeyByStream(stream);
+        redisTemplate.delete(key);
+        Map<String, Object> result = new HashMap<>();
+        result.put("stream", stream);
+        result.put("enabled", false);
+        return result;
+    }
+
+    @DeleteMapping("/audio/subscribe/all")
+    public Map<String, Object> clearAudioSubscribe() {
+        Set<Object> keys = redisTemplate.keys(AUDIO_SUBSCRIBE_PREFIX + "*");
+        int deleted = 0;
+        if (CollectionUtils.isNotEmpty(keys)) {
+            deleted = keys.size();
+            redisTemplate.delete(keys);
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("deleted", deleted);
+        return result;
+    }
+
     @PostMapping("/switch/stream")
     public int switchStream(@RequestBody StreamSwitch streamSwitch){
@@ -462,14 +517,14 @@ public class Jt1078OfCarController {
      * @param streamList 流唯一值集合 {sim-channel}
      */
     @PostMapping({"/beachSend/request/io"})
-    public List<StreamContent> beachSendIORequest(@RequestBody List<String> streamList) {
+    public List<StreamContent> beachSendIORequest(@RequestBody List<String> streamList, HttpServletRequest request) {
         if (CollectionUtils.isEmpty(streamList)) {
             throw new ControllerException(ErrorCode.ERROR400);
         }
         List<StreamContent> list = new ArrayList<>();
         for (String stream : streamList) {
             sendIORequest(stream);
-            list.add(getStreamContent(stream));
+            list.add(getStreamContent(stream, request));
         }
         return list;
     }
@@ -492,7 +547,7 @@ public class Jt1078OfCarController {
             redisTemplate.opsForValue().set("patrol:stream:" + stream, patrolDataReq);
             return stream;
         }).distinct().collect(Collectors.toList());
-        return beachSendIORequest(simList);
+        return beachSendIORequest(simList, null);
     }
     /**
@@ -504,6 +559,26 @@ public class Jt1078OfCarController {
         redisTemplate.delete(keys);
     }
+    public static String normalizeSim(String sim) {
+        if (StringUtils.isBlank(sim)) {
+            return sim;
+        }
+        String normalized = sim.replaceAll("^0+", "");
+        return StringUtils.isBlank(normalized) ? "0" : normalized;
+    }
+
+    public static String buildAudioStream(String sim, String channel) {
+        return StringUtils.join(normalizeSim(sim), "-", StringUtils.trim(channel));
+    }
+
+    public static String buildAudioSubscribeRedisKey(String sim, String channel) {
+        return AUDIO_SUBSCRIBE_PREFIX + buildAudioStream(sim, channel);
+    }
+
+    public static String buildAudioSubscribeRedisKeyByStream(String stream) {
+        return AUDIO_SUBSCRIBE_PREFIX + stream;
+    }
+
     /**
      * 获取播放地址对外接口
      *
@@ -1019,7 +1094,7 @@ public class Jt1078OfCarController {
                 HttpClientPostEntity entity1 = this.httpClientUtil.doPost(url, msg, (String) null);
                 //chooseEntity(entity1, url, true);
                 resultMap.put("code", "1");
-                streamContent = this.getStreamContent(channelMapping);
+                streamContent = this.getStreamContent(channelMapping, request);
                 log.info("StreamContent:[{}]", streamContent);
                 resultMap.put("data", streamContent);
                 return resultMap;
@@ -1155,7 +1230,7 @@ public class Jt1078OfCarController {
     @Nullable
-    private StreamContent getStreamContent(String stream) {
+    private StreamContent getStreamContent(String stream, HttpServletRequest request) {
         StreamContent streamContent = getStreamContentPlayURL(stream);
         if (Objects.isNull(streamContent) || StringUtils.isEmpty(streamContent.getWs_flv())) {
             streamContent = new StreamContent();
@@ -1164,6 +1239,7 @@ public class Jt1078OfCarController {
             streamContent.setWss_flv(StringUtils.replace(jt1078ConfigBean.getWss() + authKey, "{stream}", stream));
             streamContent.setFlv(StringUtils.replace(jt1078ConfigBean.getDownloadFlv() + authKey, "{stream}", stream));
         }
+        appendAudioPlayUrl(streamContent, stream, request);
         return streamContent;
     }
@@ -1180,6 +1256,106 @@ public class Jt1078OfCarController {
         return streamContent;
     }
+    private void appendAudioPlayUrl(StreamContent streamContent, String stream, HttpServletRequest request) {
+        if (streamContent == null || StringUtils.isBlank(stream)) {
+            return;
+        }
+        StreamContent audioStreamContent = getAudioStreamContent(stream);
+        if (audioStreamContent == null) {
+            return;
+        }
+        streamContent.setAudio_flv(audioStreamContent.getAudio_flv());
+        streamContent.setAudio_https_flv(audioStreamContent.getAudio_https_flv());
+        streamContent.setAudio_ws_flv(audioStreamContent.getAudio_ws_flv());
+        streamContent.setAudio_wss_flv(audioStreamContent.getAudio_wss_flv());
+    }
+
+    private StreamContent ensureAudioStreamReady(String stream) {
+        StreamContent streamContent = getRegisteredAudioStreamContent(stream);
+        if (streamContent != null) {
+            return streamContent;
+        }
+        boolean restarted = PublishManager.getInstance().ensureAudioPublisher(stream);
+        if (restarted) {
+            log.info("音频流未注册，已触发音频 FFmpeg 重启: {}", stream);
+        } else {
+            log.warn("音频流未注册，且未找到可重启的推流通道: {}", stream);
+        }
+        for (int i = 0; i < AUDIO_RETRY_TIMES; i++) {
+            try {
+                Thread.sleep(AUDIO_RETRY_INTERVAL_MS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                break;
+            }
+            streamContent = getRegisteredAudioStreamContent(stream);
+            if (streamContent != null) {
+                return streamContent;
+            }
+        }
+        log.warn("音频流重注册超时，返回回退地址: {}", stream);
+        return getAudioStreamContent(stream);
+    }
+
+    private StreamContent getRegisteredAudioStreamContent(String stream) {
+        String audioStream = stream + "-audio";
+        StreamContent streamContent = getStreamContentPlayURL(audioStream);
+        if (streamContent == null || StringUtils.isBlank(streamContent.getWs_flv())) {
+            return null;
+        }
+        streamContent.setAudio_flv(streamContent.getFlv());
+        streamContent.setAudio_https_flv(streamContent.getHttps_flv());
+        streamContent.setAudio_ws_flv(streamContent.getWs_flv());
+        streamContent.setAudio_wss_flv(streamContent.getWss_flv());
+        return streamContent;
+    }
+
+    private StreamContent getAudioStreamContent(String stream) {
+        StreamContent streamContent = getRegisteredAudioStreamContent(stream);
+        if (streamContent != null) {
+            return streamContent;
+        }
+
+        String audioStream = stream + "-audio";
+        StreamContent fallback = new StreamContent();
+        String authKey = jt1078ConfigBean.getPushKey();
+        fallback.setAudio_flv(StringUtils.replace(jt1078ConfigBean.getDownloadFlv() + authKey, "{stream}", audioStream));
+        fallback.setAudio_ws_flv(StringUtils.replace(jt1078ConfigBean.getWs() + authKey, "{stream}", audioStream));
+        fallback.setAudio_wss_flv(StringUtils.replace(jt1078ConfigBean.getWss() + authKey, "{stream}", audioStream));
+        try {
+            URI wssUri = new URI(fallback.getAudio_wss_flv());
+            fallback.setAudio_https_flv("https://" + wssUri.getRawAuthority() + "/schedule/" + audioStream + ".live.flv" + authKey);
+        } catch (Exception e) {
+            fallback.setAudio_https_flv(fallback.getAudio_wss_flv());
+        }
+        return fallback;
+    }
+
+    private String buildAudioUrlByVideoUrl(String videoUrl, String audioPath) {
+        if (StringUtils.isBlank(videoUrl) || StringUtils.isBlank(audioPath)) {
+            return null;
+        }
+        try {
+            URI uri = new URI(videoUrl);
+            String scheme = uri.getScheme();
+            String authority = uri.getRawAuthority();
+            if (StringUtils.isBlank(scheme) || StringUtils.isBlank(authority)) {
+                return null;
+            }
+            String query = uri.getRawQuery();
+            if (StringUtils.isNotBlank(query)) {
+                return String.format("%s://%s%s?%s", scheme, authority, audioPath, query);
+            }
+            return String.format("%s://%s%s", scheme, authority, audioPath);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private int getJttHttpPort() {
+        return Configs.getInt("server.http.port", jt1078ConfigBean.getHttpPort());
+    }
+
     /**
      * 获取视频播放地址
      *
@@ -32,7 +32,7 @@ public class GB28181MessageListener {
     @Resource
     private HisToryRecordService hisToryRecordService;
-    @RabbitListener(queues = RabbitMQConfig.QUEUE_NAME)
+    @RabbitListener(queues = RabbitMQConfig.QUEUE_NAME, autoStartup = "false")
     public void receiveMessage(String convert, Channel channel, Message message) {
         // 处理消息逻辑（示例：打印消息内容）
         log.info("rabbitmq  接收 [{}] 队列消息 : {}",RabbitMQConfig.QUEUE_NAME, message);
-package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;

import com.genersoft.iot.vmp.vmanager.jt1078.platform.Jt1078OfCarController;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.*;

@Data
@Component
public class Jt1078ConfigBean {
    @Value("${tuohua.bsth.jt1078.url}")
    private String jt1078Url;

    @Value("${tuohua.bsth.jt1078.sendPort}")
    private String jt1078SendPort;

    @Value("${tuohua.bsth.jt1078.stopSendPort}")
    private String stopSendPort;

    @Value("${tuohua.bsth.jt1078.historyListPort}")
    private String historyListPort;

    @Value("${tuohua.bsth.jt1078.history_upload}")
    private String historyUpload = "9206";

    @Value("${tuohua.bsth.jt1078.playHistoryPort}")
    private String playHistoryPort;

    @Value("${tuohua.bsth.jt1078.ports}")
    private String portsOf1078;

    @Value("${tuohua.bsth.jt1078.pushURL}")
    private String pushURL;

    @Value("${tuohua.bsth.jt1078.stopPushURL}")
    private String stopPUshURL;

    private Integer start1078Port;

    private Integer end1078Port;

    @Value("${tuohua.bsth.jt1078.get.url}")
    private String getURL;

    @Value("${tuohua.bsth.jt1078.addPortVal}")
    private Integer addPort;

    @Value("${tuohua.bsth.jt1078.ws}")
    private String ws;

    @Value("${tuohua.bsth.jt1078.ws-prefix}")
    private String wsPrefix;

    @Value("${tuohua.bsth.jt1078.wss}")
    private String wss;

    @Value("${tuohua.bsth.jt1078.downloadFLV}")
    private String downloadFlv;

    @Value("${tuohua.bsth.jt1078.port}")
    private Integer port;

    @Value("${tuohua.bsth.jt1078.httpPort}")
    private Integer httpPort;

    @Value("${spring.profiles.active}")
    private String profilesActive;

    @Value("${media.pushKey}")
    private String pushKey;

    @Resource
    private RedisTemplate<String, Integer> redisTemplate;

    @Resource
    private FtpConfigBean ftpConfigBean;

    public Integer getPort() {
        if (port == null) {
            return 40000;
        }
        return port;
    }

    public Integer getHttpPort() {
        if (httpPort == null) {
            return 40000;
        }
        return httpPort;
    }

    private Integer getIntPort() {
        //return profilesActive.equals("wx-local") ? 10000 : 0;
        return 0;
    }

    @PostConstruct
    public void initMap() {
        Set<String> historyPortKeys = redisTemplate.keys("history:port:*");
        Set<String> keys = redisTemplate.keys("tag:*");
        Set<String> patrolKeys = redisTemplate.keys("patrol:stream:*");
        Set<String> historyListKeys = redisTemplate.keys("history-list:*");
        if (!historyPortKeys.isEmpty()) {
            keys.addAll(historyPortKeys);
        }
        if (!patrolKeys.isEmpty()) {
            keys.addAll(patrolKeys);
        }
        if (!historyListKeys.isEmpty()) {
            keys.addAll(historyListKeys);
        }
        if (keys != null) {
            redisTemplate.delete(keys);
        }
        Map<Integer, Set<String>> hashMap = new HashMap<>();
        for (int number = getStart1078Port(); number <= getEnd1078Port(); number++) {
            hashMap.put(number, new HashSet<>());
        }
        Jt1078OfCarController.map.putAll(hashMap);
    }

    private static final String SEND_IO_MESSAGE_RTSP = "{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}";

    private static final String SEND_IO_MESSAGE_RTSP_STOP = "{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}";

    private static final String SEND_IO_HISTORY_RTSP = "{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"channelId\":{channelNo}}";

    private static final String SEND_IO_PLAY_RTSP = "{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}";

    public String formatMessageId(String sim, String channel, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"0\", \"streamType\": \"1\"}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{tcpPort}", (port + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageStop(String sim, String channel) {
        String msg = StringUtils.replace("{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}", "{clientId}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryListRTSP(String sim, String channel, String startTime, String endTime) {
        String msg = StringUtils.replace("{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":1,\"storageType\":0,\"channelNo\":{channelNo}}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryPlayRTSP(String sim, String channel, String startTime, String endTime, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getIntPort() +getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{sim}", sim);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageHistoryUpload(String stream) {
        if (StringUtils.isBlank(stream)) {
            throw new RuntimeException("上传参数不能为空");
        }
        String[] split = stream.split("_");
        if (split.length < 4){
            throw new RuntimeException("上传参数异常, 请联系管理员");
        }
        String sim = split[0];
        String channel = split[1];
        String startTime = split[2];
        String endTime = split[3];
        String msg = StringUtils.replace("{\n" +
                "  \"clientId\": \"{clientId}\",\n" +
                "  \"ip\": \"{ip}\",\n" +
                "  \"port\": {port},\n" +
                "  \"username\": \"{username}\",\n" +
                "  \"password\": \"{password}\",\n" +
                "  \"path\": \"{path}\",\n" +
                "  \"channelNo\": {channel},\n" +
                "  \"startTime\": \"{startTime}\",\n" +
                "  \"endTime\": \"{endTime}\",\n" +
                "  \"mediaType\": 0,\n" +
                "  \"streamType\": 1,\n" +
                "  \"storageType\": 1,\n" +
                "  \"condition\": 6\n" +
                "}","{clientId}",sim);
        msg = StringUtils.replace(msg, "{ip}", ftpConfigBean.getHost());
        msg = StringUtils.replace(msg, "{port}", ftpConfigBean.getPort().toString());
        msg = StringUtils.replace(msg, "{username}", ftpConfigBean.getUsername());
        msg = StringUtils.replace(msg, "{password}", ftpConfigBean.getPassword());
        msg = StringUtils.replace(msg, "{path}", StringUtils.join(ftpConfigBean.getBasePath(),"/",sim,"/channel_",channel,"/",stream));
        msg = StringUtils.replace(msg, "{channel}", channel);
        msg = StringUtils.replace(msg, "{startTime}", Jt1078OfCarController.timeCover(startTime));
        return StringUtils.replace(msg, "{endTime}", Jt1078OfCarController.timeCover(endTime));
    }

    public String formatMessageHistoryStopRTSP(String sim, String channel, RtspConfigBean configBean) {
        String msg = StringUtils.replace("{\"playbackMode\":2,\"channelNo\":{channelNo},\"playbackSpeed\":0,\"clientId\":\"{sim}\"}", "{sim}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.pushURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatStopPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.stopPUshURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatVideoURL(String stream) {
        String url = StringUtils.replace(getGetURL(), "{stream}", stream);
        if (!StringUtils.endsWith(url, ".flv")) {
            url = url + ".flv";
        }
        return url;
    }

    public String getJt1078Url() {
        return this.jt1078Url;
    }

    public String getJt1078SendPort() {
        return this.jt1078SendPort;
    }

    public String getStopSendPort() {
        return this.stopSendPort;
    }

    public String getHistoryListPort() {
        return this.historyListPort;
    }

    public String getPlayHistoryPort() {
        return this.playHistoryPort;
    }

    public String getPushURL() {
        return this.pushURL;
    }

    public Integer getStart1078Port() {
        if (Objects.isNull(this.start1078Port))
            this.start1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringBefore(this.portsOf1078, ",")));
        return this.start1078Port;
    }

    public Integer getEnd1078Port() {
        if (Objects.isNull(this.end1078Port))
            this.end1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringAfter(this.portsOf1078, ",")));
        return this.end1078Port;
    }

    public String getPushKey(){
        if (Objects.isNull(this.pushKey)){
            this.pushKey = "?callId=41db35390ddad33f83944f44b8b75ded";
        }
        return "?callId="+this.pushKey;
    }
    public String getStopPUshURL() {
        return this.stopPUshURL;
    }

    public String getGetURL() {
        return this.getURL;
    }

    public Integer getAddPort() {
        return this.addPort;
    }

    public String getWs() {
        return this.ws;
    }

    public String getWss() {
        return this.wss;
    }


    public String getDownloadFlv() {
        return downloadFlv;
    }

    public String getPortsOf1078() {
        return portsOf1078;
    }
}
 \ No newline at end of file
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;

import com.genersoft.iot.vmp.jtt1078.util.Configs;
import com.genersoft.iot.vmp.vmanager.jt1078.platform.Jt1078OfCarController;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.*;

@Data
@Component
public class Jt1078ConfigBean {
    @Value("${tuohua.bsth.jt1078.url}")
    private String jt1078Url;

    @Value("${tuohua.bsth.jt1078.sendPort}")
    private String jt1078SendPort;

    @Value("${tuohua.bsth.jt1078.stopSendPort}")
    private String stopSendPort;

    @Value("${tuohua.bsth.jt1078.historyListPort}")
    private String historyListPort;

    @Value("${tuohua.bsth.jt1078.history_upload}")
    private String historyUpload = "9206";

    @Value("${tuohua.bsth.jt1078.playHistoryPort}")
    private String playHistoryPort;

    @Value("${tuohua.bsth.jt1078.ports}")
    private String portsOf1078;

    @Value("${tuohua.bsth.jt1078.pushURL}")
    private String pushURL;

    @Value("${tuohua.bsth.jt1078.stopPushURL}")
    private String stopPUshURL;

    private Integer start1078Port;

    private Integer end1078Port;

    @Value("${tuohua.bsth.jt1078.get.url}")
    private String getURL;

    @Value("${tuohua.bsth.jt1078.addPortVal}")
    private Integer addPort;

    @Value("${tuohua.bsth.jt1078.ws}")
    private String ws;

    @Value("${tuohua.bsth.jt1078.ws-prefix}")
    private String wsPrefix;

    @Value("${tuohua.bsth.jt1078.wss}")
    private String wss;

    @Value("${tuohua.bsth.jt1078.downloadFLV}")
    private String downloadFlv;

    @Value("${tuohua.bsth.jt1078.port}")
    private Integer port;

    @Value("${tuohua.bsth.jt1078.httpPort}")
    private Integer httpPort;

    @Value("${spring.profiles.active}")
    private String profilesActive;

    @Value("${media.pushKey}")
    private String pushKey;

    @Resource
    private RedisTemplate<String, Integer> redisTemplate;

    @Resource
    private FtpConfigBean ftpConfigBean;

    public Integer getPort() {
        if (port == null) {
            return 40000;
        }
        return port;
    }

    public Integer getHttpPort() {
        if (httpPort == null) {
            return 40000;
        }
        return httpPort;
    }

    private Integer getIntPort() {
        //return profilesActive.equals("wx-local") ? 10000 : 0;
        return 0;
    }

    @PostConstruct
    public void initMap() {
        Set<String> historyPortKeys = redisTemplate.keys("history:port:*");
        Set<String> keys = redisTemplate.keys("tag:*");
        Set<String> patrolKeys = redisTemplate.keys("patrol:stream:*");
        Set<String> historyListKeys = redisTemplate.keys("history-list:*");
        if (!historyPortKeys.isEmpty()) {
            keys.addAll(historyPortKeys);
        }
        if (!patrolKeys.isEmpty()) {
            keys.addAll(patrolKeys);
        }
        if (!historyListKeys.isEmpty()) {
            keys.addAll(historyListKeys);
        }
        if (keys != null) {
            redisTemplate.delete(keys);
        }
        Map<Integer, Set<String>> hashMap = new HashMap<>();
        for (int number = getStart1078Port(); number <= getEnd1078Port(); number++) {
            hashMap.put(number, new HashSet<>());
        }
        Jt1078OfCarController.map.putAll(hashMap);
    }

    private static final String SEND_IO_MESSAGE_RTSP = "{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}";

    private static final String SEND_IO_MESSAGE_RTSP_STOP = "{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}";

    private static final String SEND_IO_HISTORY_RTSP = "{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"channelId\":{channelNo}}";

    private static final String SEND_IO_PLAY_RTSP = "{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}";

    public String formatMessageId(String sim, String channel, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"0\", \"streamType\": \"1\"}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{tcpPort}", (port + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageStop(String sim, String channel) {
        String msg = StringUtils.replace("{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}", "{clientId}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryListRTSP(String sim, String channel, String startTime, String endTime) {
        String msg = StringUtils.replace("{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":1,\"storageType\":0,\"channelNo\":{channelNo}}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryPlayRTSP(String sim, String channel, String startTime, String endTime, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getIntPort() +getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{sim}", sim);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageHistoryUpload(String stream) {
        if (StringUtils.isBlank(stream)) {
            throw new RuntimeException("上传参数不能为空");
        }
        String[] split = stream.split("_");
        if (split.length < 4){
            throw new RuntimeException("上传参数异常, 请联系管理员");
        }
        String sim = split[0];
        String channel = split[1];
        String startTime = split[2];
        String endTime = split[3];
        String msg = StringUtils.replace("{\n" +
                "  \"clientId\": \"{clientId}\",\n" +
                "  \"ip\": \"{ip}\",\n" +
                "  \"port\": {port},\n" +
                "  \"username\": \"{username}\",\n" +
                "  \"password\": \"{password}\",\n" +
                "  \"path\": \"{path}\",\n" +
                "  \"channelNo\": {channel},\n" +
                "  \"startTime\": \"{startTime}\",\n" +
                "  \"endTime\": \"{endTime}\",\n" +
                "  \"mediaType\": 0,\n" +
                "  \"streamType\": 1,\n" +
                "  \"storageType\": 1,\n" +
                "  \"condition\": 6\n" +
                "}","{clientId}",sim);
        msg = StringUtils.replace(msg, "{ip}", ftpConfigBean.getHost());
        msg = StringUtils.replace(msg, "{port}", ftpConfigBean.getPort().toString());
        msg = StringUtils.replace(msg, "{username}", ftpConfigBean.getUsername());
        msg = StringUtils.replace(msg, "{password}", ftpConfigBean.getPassword());
        msg = StringUtils.replace(msg, "{path}", StringUtils.join(ftpConfigBean.getBasePath(),"/",sim,"/channel_",channel,"/",stream));
        msg = StringUtils.replace(msg, "{channel}", channel);
        msg = StringUtils.replace(msg, "{startTime}", Jt1078OfCarController.timeCover(startTime));
        return StringUtils.replace(msg, "{endTime}", Jt1078OfCarController.timeCover(endTime));
    }

    public String formatMessageHistoryStopRTSP(String sim, String channel, RtspConfigBean configBean) {
        String msg = StringUtils.replace("{\"playbackMode\":2,\"channelNo\":{channelNo},\"playbackSpeed\":0,\"clientId\":\"{sim}\"}", "{sim}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.pushURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatStopPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.stopPUshURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatVideoURL(String stream) {
        String url = StringUtils.replace(getGetURL(), "{stream}", stream);
        if (!StringUtils.endsWith(url, ".flv")) {
            url = url + ".flv";
        }
        return url;
    }

    public String getJt1078Url() {
        return this.jt1078Url;
    }

    public String getJt1078SendPort() {
        return this.jt1078SendPort;
    }

    public String getStopSendPort() {
        return this.stopSendPort;
    }

    public String getHistoryListPort() {
        return this.historyListPort;
    }

    public String getPlayHistoryPort() {
        return this.playHistoryPort;
    }

    public String getPushURL() {
        return this.pushURL;
    }

    public Integer getStart1078Port() {
        if (Objects.isNull(this.start1078Port))
            this.start1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringBefore(this.portsOf1078, ",")));
        return this.start1078Port;
    }

    public Integer getEnd1078Port() {
        if (Objects.isNull(this.end1078Port))
            this.end1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringAfter(this.portsOf1078, ",")));
        return this.end1078Port;
    }

    public String getPushKey(){
        if (Objects.isNull(this.pushKey)){
            this.pushKey = "?callId=41db35390ddad33f83944f44b8b75ded";
        }
        return "?callId="+this.pushKey;
    }
    public String getStopPUshURL() {
        return this.stopPUshURL;
    }

    public String getGetURL() {
        return this.getURL;
    }

    public Integer getAddPort() {
        return this.addPort;
    }

    public String getWs() {
        return this.ws;
    }

    public String getWss() {
        return this.wss;
    }


    public String getDownloadFlv() {
        return downloadFlv;
    }

    public String getPortsOf1078() {
        return portsOf1078;
    }
}
 \ No newline at end of file
@@ -31,4 +31,14 @@ public class IntercomController {
             return AjaxResult.error("建立连接失败: " + e.getMessage());
         }
     }
+
+    @PostMapping("/fail/{sim}")
+    public AjaxResult intercomStartFail(@PathVariable String sim) {
+        try {
+            intercomService.releaseIntercomLock(sim);
+            return AjaxResult.success();
+        } catch (Exception e) {
+            return AjaxResult.error("释放对讲占用锁失败: " + e.getMessage());
+        }
+    }
 }
@@ -12,4 +12,10 @@ public interface IntercomService {
     String startIntercom(String sim) throws ServiceException;
     void stopIntercom(String sim);
+
+    /**
+     * 对讲启动失败时释放占用锁(仅清理Redis锁，不下发9102)
+     * @param sim 设备SIM卡号
+     */
+    void releaseIntercomLock(String sim);
 }
@@ -120,6 +120,19 @@ public class IntercomServiceImpl implements IntercomService {
     }
     /**
+     * 对讲初始化失败时，释放Redis占用锁，避免后续被误判占用
+     */
+    @Override
+    public void releaseIntercomLock(String sim) {
+        if (StringUtils.isBlank(sim)) {
+            return;
+        }
+        String trimmedSim = sim.replaceFirst("^0+(?=\\d)", "");
+        redisCache.deleteObject("intercom:" + trimmedSim);
+        log.info("已释放对讲占用锁: intercom:{}", trimmedSim);
+    }
+
+    /**
      * 构造 WebSocket 地址
      * 目标网关: 118.113.164.50:10202
      * 协议格式参考提供的 HTML: ws://IP:PORT?sim={sim}
@@ -14,7 +14,7 @@ rtmp.url = rtsp://127.0.0.1:554/schedule/{TAG}?sign={sign}
 #rtmp.url = rtsp://192.168.169.100:19555/schedule/{TAG}?sign={sign}
 # è®¾ç½®ä¸ºonæ¶ï¼æ§å¶å°å°è¾åºffmpegçè¾åº
-debug.mode = on
+debug.mode = off
 zlm.host = 127.0.0.1
 zlm.http.port = 80
+my:
+  ip: 61.169.120.202
+spring:
+  rabbitmq:
+    host: 10.10.2.21
+    port: 5672
+    username: bsth
+    password: bsth001
+    virtual-host: /dsm
+    listener:
+      simple:
+        acknowledge-mode: manual # 设置为手动确认
+  # 设置接口超时时间
+  mvc:
+    async:
+      request-timeout: 20000
+  thymeleaf:
+    cache: false
+  # [可选]上传文件大小限制
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 100MB
+  # REDIS数据库配置
+  redis:
+    # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
+    host: 192.168.169.100
+    # [必须修改] 端口号
+    port: 6879
+    # [可选] 数据库 DB
+    database: 7
+    # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
+    password: wvp4@444
+    # [可选] 超时时间
+    timeout: 10000
+    jedis:
+      pool:
+        max-active: 32
+        max-wait: 10000
+        max-idle: 16
+        min-idle: 8
+  # mysql数据源
+  datasource:
+    dynamic:
+      primary: master
+      datasource:
+        master:
+          type: com.zaxxer.hikari.HikariDataSource
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://192.168.169.100:3306/wvp4?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=TRUE&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&sessionVariables=sql_mode='NO_ENGINE_SUBSTITUTION'&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
+          username: root
+          password: guzijian
+          hikari:
+            connection-timeout: 20000             # 是客户端等待连接池连接的最大毫秒数
+            initialSize: 50                       # 连接池初始化连接数
+            maximum-pool-size: 200                # 连接池最大连接数
+            minimum-idle: 10                       # 连接池最小空闲连接数
+            idle-timeout: 300000                  # 允许连接在连接池中空闲的最长时间（以毫秒为单位）
+            max-lifetime: 1200000                 # 是池中连接关闭后的最长生命周期（以毫秒为单位)
+#[可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
+server:
+  port: 18090
+  # [可选] HTTPS配置， 默认不开启
+  ssl:
+    # [可选] 是否开启HTTPS访问
+    enabled: false
+    # [可选] 证书文件路径，放置在resource/目录下即可，修改xxx为文件名
+    key-store: classpath:Aserver.keystore
+    # [可选] 证书密码
+    key-store-password: guzijian
+    # [可选] 证书类型， 默认为jks，根据实际修改
+    key-store-type: JKS
+
+# 作为28181服务器的配置
+sip:
+  # [必须修改] 本机的IP，对应你的网卡，监听什么ip就是使用什么网卡，
+  # 如果要监听多张网卡，可以使用逗号分隔多个IP， 例如： 192.168.1.4,10.0.0.4
+  # 如果不明白，就使用0.0.0.0，大部分情况都是可以的
+  # 请不要使用127.0.0.1，任何包括localhost在内的域名都是不可以的。
+  ip: ${my.ip}
+  #  wanIp: 61.169.120.202 # zlm所在服务器的公网IP
+  # [可选] 28181服务监听的端口
+  port: 17008
+
+  # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007）
+  # 后两位为行业编码，定义参照附录D.3
+  # 3701020049标识山东济南历下区 信息行业接入
+  # [可选]
+  domain: 4401000000
+  # [可选]
+  id: 44010000001110008003
+  # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验
+  password: 12345678
+  # 是否存储alarm信息
+  alarm: true
+
+#zlm 默认服务器配置
+#zlm 默认服务器配置
+media:
+  id: guzijian1
+  # [必须修改] zlm服务器的内网IP
+  ip: 192.168.169.100
+  # [必须修改] zlm服务器的http.port
+  http-port: 1909
+  # [可选] 返回流地址时的ip，置空使用 media.ip 1
+  stream-ip: 61.169.120.202
+  # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip 1
+  sdp-ip: 61.169.120.202
+  # [可选] zlm服务器的hook所使用的IP, 默认使用sip.ip
+  hook-ip: 192.168.169.100
+  # [可选] zlm服务器的http.sslport, 置空使用zlm配置文件配置
+  http-ssl-port: 2939
+  # [可选] zlm服务器的hook.admin_params=secret
+  secret: 8KMYsD5ItKkHN1CIcPI9VeLa6u4S8deU
+  pushKey: 41db35390ddad33f83944f44b8b75ded
+  # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
+  rtp:
+    # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
+    enable: true
+    # [可选] 在此范围内选择端口用于媒体流传输, 必须提前在zlm上配置该属性，不然自动配置此属性可能不成功
+    port-range: 52000,52500 # 端口范围
+    # [可选] 国标级联在此范围内选择端口发送媒体流,
+    send-port-range: 52000,52500 # 端口范围
+  # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用
+  record-assist-port: 18081
+# [根据业务需求配置]
+user-settings:
+  # 点播/录像回放 等待超时时间,单位：毫秒
+  play-timeout: 180000
+  # [可选] 自动点播， 使用固定流地址进行播放时，如果未点播则自动进行点播, 需要rtp.enable=true
+  auto-apply-play: true
+  # 设备/通道状态变化时发送消息
+  device-status-notify: true
+  # 推流直播是否录制
+  #  record-push-live: true
+  # 是否开启接口鉴权
+  #  interface-authentication: false
+  # 国标是否录制
+  #  record-sip: true
+  # 等待音视频编码信息再返回， true： 可以根据编码选择合适的播放器，false： 可以更快点播
+#  wait-track: true
+# [可选] 日志配置, 一般不需要改
+logging:
+  config: classpath:logback-spring.xml
+jt1078:
+  enable: true
+  port: 9998
+
+# MyBatis配置
+mybatis-plus:
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  #mapperLocations: classpath*:mapper/**/*Mapper.xml
+tuohua:
+  bsth:
+    login:
+      pageURL: http://${my.ip}:9088/user/login/jCryptionKey
+      url: http://${my.ip}:9088/user/login
+
+      userName: yuanxiaohu
+      password: Yxiaohu1.0
+      rest:
+        #        baseURL: http://10.10.2.20:9089/webservice/rest
+        #        password: bafb2b44a07a02e5e9912f42cd197423884116a8
+        #          baseURL: http://113.249.109.139:9089/webservice/rest
+        baseURL: http://192.168.168.152:9089/webservice/rest
+        password: bafb2b44a07a02e5e9912f42cd197423884116a8
+    tree:
+      url:
+        company: http://${my.ip}:9088/video/tree
+        car: http://${my.ip}:9088/video/tree/carNo/{0}
+        sim: http://${my.ip}:9088/video/tree/caNO/sim/{0}
+    wvp28181:
+      rtsp:
+        tcpPort: 11078
+        udpPort: 11078
+        historyTcpPort: 9999
+        historyUdpPort: 9999
+        ip : 61.169.120.202
+    jt1078:
+      ws-prefix: ws://192.168.1.117:18090
+      ports: 49101,49101
+      port: 9100
+      httpPort: 3333
+      addPortVal: 0
+      pushURL: http://${my.ip}:3333/new/server/{pushKey}/{port}/{httpPort}
+      stopPushURL: http://${my.ip}:3333/stop/channel/{pushKey}/{port}/{httpPort}
+      #      url: http://10.10.2.20:8100/device/{0}
+      #      new_url: http://10.10.2.20:8100/device
+      #      url: http://113.249.109.139:8100/device/{0}
+      #      new_url: http://113.249.109.139:8100/device
+      url: http://192.168.168.152:8100/device/{0}
+      new_url: http://192.168.168.152:8100/device
+      historyListPort: 9205
+      history_upload: 9206
+      playHistoryPort: 9201
+      sendPort: 9101
+      stopSendPort: 9102
+      ws: ws://61.169.120.202:1909/schedule/{stream}.live.flv
+      wss: wss://61.169.120.202:443/schedule/{stream}.live.flv
+      downloadFLV: http://61.169.120.202/schedule/{stream}.live.flv
+      get:
+        #url: http://192.169.1.92:{port}/video/{stream}.flv
+        url: http://192.168.169.100:3333/video/{stream}
+      playURL: /play/wasm/ws%3A%2F%2F{ip}%3A{port}%2Fschedule%2F{sim}-{channel}.live.flv%3FcallId%{publickey}
+
+ftp:
+  basePath: /wvp-local
+  within_host: 61.169.120.202
+  host: 61.169.120.202
+  httpPath: ftp://61.169.120.202
+  filePathPrefix: http://61.169.120.202:10021/wvp-local
+  password: ftp@123
+  port: 10021
+  username: ftpadmin
+  retryTimes: 5
+  retryWaitTimes: 3000
+  # 视频过期时间 单位：天
+  expirationTime: 7
+  # 未上传成功超时时间 单位：秒
+  timeOut: 300
+
+forest:
+  backend: okhttp3             # 后端HTTP框架（默认为 okhttp3）
+  max-connections: 1000        # 连接池最大连接数（默认为 500）
+  max-route-connections: 500   # 每个路由的最大连接数（默认为 500）
+  max-request-queue-size: 100  # [自v1.5.22版本起可用] 最大请求等待队列大小
+  max-async-thread-size: 300   # [自v1.5.21版本起可用] 最大异步线程数
+  max-async-queue-size: 16     # [自v1.5.22版本起可用] 最大异步线程池队列大小
+  timeout: 3000                # [已不推荐使用] 请求超时时间，单位为毫秒（默认为 3000）
+  connect-timeout: 3000        # 连接超时时间，单位为毫秒（默认为 timeout）
+  read-timeout: 3000           # 数据读取超时时间，单位为毫秒（默认为 timeout）
+  max-retry-count: 0           # 请求失败后重试次数（默认为 0 次不重试）
+  #  ssl-protocol: TLS            # 单向验证的HTTPS的默认TLS协议（默认为 TLS）
+  log-enabled: true            # 打开或关闭日志（默认为 true）
+  log-request: true            # 打开/关闭Forest请求日志（默认为 true）
+  log-response-status: true    # 打开/关闭Forest响应状态日志（默认为 true）
+  log-response-content: true   # 打开/关闭Forest响应内容日志（默认为 false）
+#  async-mode: platform         # [自v1.5.27版本起可用] 异步模式（默认为 platform）
+
+
+
@@ -174,8 +174,8 @@ tuohua:
         ip : 61.169.120.202
     jt1078:
       ws-prefix: ws://192.168.1.117:18090
-      ports: 40001,40001
-      port: 40000
+      ports: 40011,40011
+      port: 40010
       httpPort: 3333
       addPortVal: 0
       pushURL: http://${my.ip}:3333/new/server/{pushKey}/{port}/{httpPort}
@@ -27,9 +27,9 @@ module.exports = {
     },
     // Various Dev Server settings
-    host: "127.0.0.1",
+    host: "192.168.168.21",
     useLocalIp: false, // can be overwritten by process.env.HOST
-    port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port: 40018, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
     notifyOnErrors: true,
@@ -84,12 +84,14 @@
         <player-list-component
           ref="playListComponent"
           @playerClick="handleClick"
+          @audio-toggle="handlePlayerAudioToggle"
           :video-url="videoUrl"
           :videoDataList="videoDataList"
           :has-audio="true"
           v-model="windowNum"
           style="width: 100%; height: 100%;"
         ></player-list-component>
+        <audio-player1078 ref="audioPlayer1078"></audio-player1078>
       </el-main>
     </el-container>
     <el-dialog
@@ -126,6 +128,7 @@ import VehicleList from &quot;./JT1078Components/deviceList/VehicleList.vue&quot;;
 import CarouselConfig from "./CarouselConfig.vue";
 import WindowNumSelect from "./WindowNumSelect.vue";
 import PlayerListComponent from './common/PlayerListComponent.vue';
+import AudioPlayer1078 from './common/AudioPlayer1078.vue';
 import VideoPlayer from './common/EasyPlayer.vue';
 const PCMA_TO_PCM = new Int16Array(256);
 for (let i = 0; i < 256; i++) {
@@ -143,6 +146,7 @@ export default {
     CarouselConfig,
     WindowNumSelect,
     PlayerListComponent,
+    AudioPlayer1078,
     VideoPlayer
   },
   data() {
@@ -192,7 +196,13 @@ export default {
       retryTimer: null,
       // 对讲音频播放器
       talkFlvPlayer: null,
-      talkAudioElement: null
+      talkAudioElement: null,
+
+      activeAudioPlayerIndex: -1,
+      activeAudioStream: '',
+      activeAudioSim: '',
+      activeAudioChannel: '',
+      isAudioSwitching: false
     };
   },
   mounted() {
@@ -206,6 +216,8 @@ export default {
     document.removeEventListener('click', this.hideContextMenu);
     this.stopCarousel();
     this.stopIntercom(); // 确保组件销毁时停止对讲
+    this.stopActiveAudio(true);
+    this.clearAudioSubscribe();
   },
   // 路由离开守卫
   beforeRouteLeave(to, from, next) {
@@ -214,9 +226,13 @@ export default {
         type: 'warning'
       }).then(() => {
         this.stopCarousel();
+        this.stopActiveAudio(true);
+        this.clearAudioSubscribe();
         next();
       }).catch(() => next(false));
     } else {
+      this.stopActiveAudio(true);
+      this.clearAudioSubscribe();
       next();
     }
   },
@@ -238,6 +254,123 @@ export default {
       this.windowClickIndex = index + 1;
       this.windowClickData = data;
     },
+    resolveAudioUrl(channelInfo) {
+      if (!channelInfo) return '';
+      if (location.protocol === 'https:') {
+        return channelInfo.audio_wss_flv || channelInfo.audio_https_flv || channelInfo.audio_ws_flv || channelInfo.audio_flv || '';
+      }
+      return channelInfo.audio_ws_flv || channelInfo.audio_flv || channelInfo.audio_wss_flv || channelInfo.audio_https_flv || '';
+    },
+    resolveAudioUrlFromSubscribeData(data) {
+      if (!data) return '';
+      if (location.protocol === 'https:') {
+        return data.audio_wss_flv || data.audio_https_flv || data.audio_ws_flv || data.audio_flv || '';
+      }
+      return data.audio_ws_flv || data.audio_flv || data.audio_wss_flv || data.audio_https_flv || '';
+    },
+    subscribeAudio(sim, channel) {
+      return this.$axios.post(`/api/jt1078/query/audio/subscribe/${sim}/${channel}`);
+    },
+    unsubscribeAudio(sim, channel) {
+      return this.$axios.delete(`/api/jt1078/query/audio/subscribe/${sim}/${channel}`);
+    },
+    clearAudioSubscribe() {
+      return this.$axios.delete('/api/jt1078/query/audio/subscribe/all').catch(() => {});
+    },
+    async resetAudioToDefaultMute() {
+      if (this.activeAudioSim && this.activeAudioChannel) {
+        await this.unsubscribeAudio(this.activeAudioSim, this.activeAudioChannel).catch(() => {});
+      }
+      this.stopActiveAudio(true);
+    },
+    stopActiveAudio(clearState = false) {
+      const audioPlayer = this.$refs.audioPlayer1078;
+      if (audioPlayer && typeof audioPlayer.stopAudio === 'function') {
+        audioPlayer.stopAudio();
+      }
+      if (clearState) {
+        this.activeAudioPlayerIndex = -1;
+        this.activeAudioStream = '';
+        this.activeAudioSim = '';
+        this.activeAudioChannel = '';
+      }
+    },
+    async handlePlayerAudioToggle(payload) {
+      if (!payload || payload.playerIndex === undefined || this.isAudioSwitching) return;
+
+      const { playerIndex, muted, sim, channel, channelInfo } = payload;
+      const fallbackAudioUrl = this.resolveAudioUrl(channelInfo);
+      console.info('[DeviceList1078] audio-toggle payload', payload, 'audioUrl=', fallbackAudioUrl);
+      const playList = this.$refs.playListComponent;
+      this.isAudioSwitching = true;
+
+      try {
+        if (muted) {
+          if (this.activeAudioPlayerIndex === playerIndex) {
+            if (sim && channel) {
+              const res = await this.unsubscribeAudio(sim, channel);
+              console.info('[DeviceList1078] unsubscribe response', res && res.data);
+            }
+            this.stopActiveAudio(true);
+          }
+          return;
+        }
+
+        if (!sim || !channel) {
+          this.$message.warning('当前通道标识不可用');
+          if (playList && typeof playList.setPlayerMuted === 'function') {
+            playList.setPlayerMuted(playerIndex, true);
+          }
+          return;
+        }
+
+        const isSameActiveStream = this.activeAudioSim === sim && this.activeAudioChannel === channel;
+        if (isSameActiveStream) {
+          if (playList && typeof playList.muteAllPlayersExcept === 'function') {
+            playList.muteAllPlayersExcept(playerIndex);
+          }
+          this.activeAudioPlayerIndex = playerIndex;
+          return;
+        }
+
+        if (playList && typeof playList.muteAllPlayersExcept === 'function') {
+          playList.muteAllPlayersExcept(playerIndex);
+        }
+
+        if (this.activeAudioSim && this.activeAudioChannel &&
+          (this.activeAudioSim !== sim || this.activeAudioChannel !== channel)) {
+          await this.unsubscribeAudio(this.activeAudioSim, this.activeAudioChannel).catch(() => {});
+        }
+
+        const subRes = await this.subscribeAudio(sim, channel);
+        console.info('[DeviceList1078] subscribe response', subRes && subRes.data);
+        const subscribeData = subRes && subRes.data ? subRes.data.data : null;
+        const audioUrl = this.resolveAudioUrlFromSubscribeData(subscribeData) || fallbackAudioUrl;
+        if (!audioUrl) {
+          this.$message.warning('后端未返回音频播放地址');
+          if (playList && typeof playList.setPlayerMuted === 'function') {
+            playList.setPlayerMuted(playerIndex, true);
+          }
+          return;
+        }
+        const audioPlayer = this.$refs.audioPlayer1078;
+        if (audioPlayer && typeof audioPlayer.playAudio === 'function') {
+          audioPlayer.playAudio(audioUrl);
+        }
+
+        this.activeAudioPlayerIndex = playerIndex;
+        this.activeAudioStream = audioUrl;
+        this.activeAudioSim = sim;
+        this.activeAudioChannel = channel;
+      } catch (e) {
+        this.$message.error('切换音频失败');
+        if (playList && typeof playList.setPlayerMuted === 'function') {
+          playList.setPlayerMuted(playerIndex, true);
+        }
+      } finally {
+        this.isAudioSwitching = false;
+      }
+    },
     toggleFullscreen() {
       const element = this.$refs.videoMain.$el;
       if (!this.isFullscreen) {
@@ -375,6 +508,7 @@ export default {
             if (!wssUrl || !wssUrl.startsWith('ws')) {
               loading.close();
+              this.notifyIntercomStartFailed(data.sim, 'invalid_ws_url');
               this.$message.error("后端返回的 WebSocket 地址无效");
               return;
             }
@@ -392,6 +526,15 @@ export default {
         });
     },
+    notifyIntercomStartFailed(sim, reason = '') {
+      if (sim === undefined || sim === null || sim === '') return;
+      const simStr = String(sim);
+      this.$axios.post(`/api/jt1078/intercom/fail/${simStr}`).catch(() => {});
+      if (reason) {
+        console.warn('[intercom] start failed, lock released:', simStr, reason);
+      }
+    },
+
     // 3. 初始化 WebSocket (信令交互)
     initIntercomSession(data, url, loadingInstance) {
       try {
@@ -427,12 +570,15 @@ export default {
         socket.onerror = (e) => {
           loadingInstance.close();
           console.error("WS Error", e);
+          this.notifyIntercomStartFailed(this.currentIntercomSim || data.sim, 'ws_error');
           this.stopIntercom();
           this.$message.error("对讲连接中断");
         };
         socket.onclose = () => {
-          if (this.isTalking) {
+          if (!this.isTalking) {
+            this.notifyIntercomStartFailed(data.sim, 'ws_close_before_talking');
+          } else {
             console.warn("WebSocket 意外断开");
             this.stopIntercom();
           }
@@ -440,6 +586,7 @@ export default {
       } catch (e) {
         loadingInstance.close();
+        this.notifyIntercomStartFailed(data.sim, 'ws_init_exception');
         this.$message.error("初始化失败: " + e.message);
       }
     },
@@ -803,19 +950,34 @@ export default {
       this.batchPlayback(data);
     },
-    playSingleChannel(data) {
+    async playSingleChannel(data) {
       let stream = data.code.replace('-', '_');
       let arr = stream.split("_");
       if (arr.length < 3) {
         console.warn("Invalid channel code:", data.code);
         return;
       }
+      if(arr[1] === undefined || arr[1] === null || arr[1] === "" || arr[1] === '001'){
+        this.$message.error("车辆没有sim");
+        return;
+      }
+      if(arr[2] === undefined || arr[2] === null || arr[2] === ""){
+        this.$message.error("车辆通道异常");
+        return;
+      }
+      await this.resetAudioToDefaultMute();
       this.$axios.get(`/api/jt1078/query/send/request/io/${arr[1]}/${arr[2]}`).then(res => {
         if (res.data.code === 0 || res.data.code === 200) {
-          const url = (location.protocol === "https:") ? res.data.data.wss_flv : res.data.data.ws_flv;
+          const streamData = res.data.data || {};
+          const url = (location.protocol === "https:") ? streamData.wss_flv : streamData.ws_flv;
           const idx = this.windowClickIndex - 1;
           this.$set(this.videoUrl, idx, url);
-          this.$set(this.videoDataList, idx, {...data, videoUrl: url});
+          this.$set(this.videoDataList, idx, {
+            ...data,
+            videoUrl: url,
+            audio_flv: streamData.audio_flv,
+            audio_https_flv: streamData.audio_https_flv
+          });
           const maxWindow = parseInt(this.windowNum) || 4;
           this.windowClickIndex = (this.windowClickIndex % maxWindow) + 1;
         } else {
@@ -826,10 +988,11 @@ export default {
       });
     },
-    batchPlayback(nodeData) {
+    async batchPlayback(nodeData) {
       if (this.isCarouselRunning) return this.$message.warning("轮播中无法操作");
       const channels = nodeData.children;
       if (channels && channels.length > 0) {
+        await this.resetAudioToDefaultMute();
         this.videoUrl = [];
         this.videoDataList = [];
         if (channels.length > 16) this.windowNum = '25';
@@ -848,7 +1011,12 @@ export default {
             list.forEach((item, i) => {
               if (channels[i]) {
                 this.$set(this.videoUrl, i, item.ws_flv);
-                this.$set(this.videoDataList, i, { ...channels[i], videoUrl: item.ws_flv });
+                this.$set(this.videoDataList, i, {
+                  ...channels[i],
+                  videoUrl: item.ws_flv,
+                  audio_flv: item.audio_flv,
+                  audio_https_flv: item.audio_https_flv
+                });
               }
             });
           } else {
@@ -885,6 +1053,12 @@ export default {
       if (this.videoUrl && this.videoUrl[idx]) {
         this.$confirm(`确认关闭窗口 [${this.windowClickIndex}] ？`, '提示', {type: 'warning'})
           .then(() => {
+            if (this.activeAudioPlayerIndex === idx) {
+              if (this.activeAudioSim && this.activeAudioChannel) {
+                this.unsubscribeAudio(this.activeAudioSim, this.activeAudioChannel).catch(() => {});
+              }
+              this.stopActiveAudio(true);
+            }
             this.$set(this.videoUrl, idx, null);
             this.$set(this.videoDataList, idx, null);
           }).catch(()=>{});
@@ -892,6 +1066,10 @@ export default {
     },
     closeAllVideoNoConfirm() {
+      if (this.activeAudioSim && this.activeAudioChannel) {
+        this.unsubscribeAudio(this.activeAudioSim, this.activeAudioChannel).catch(() => {});
+      }
+      this.stopActiveAudio(true);
       this.videoUrl = new Array(parseInt(this.windowNum)).fill(null);
       this.videoDataList = new Array(parseInt(this.windowNum)).fill(null);
     },
@@ -997,6 +1175,10 @@ export default {
     },
     applyVideoBatch({urls, infos}) {
+      if (this.activeAudioSim && this.activeAudioChannel) {
+        this.unsubscribeAudio(this.activeAudioSim, this.activeAudioChannel).catch(() => {});
+      }
+      this.stopActiveAudio(true);
       this.videoUrl = new Array(parseInt(this.windowNum)).fill(null);
       setTimeout(() => {
         urls.forEach((url, index) => {
@@ -1045,7 +1227,9 @@ export default {
               infos[i] = {
                 code: currentCodes[i],
                 name: `通道 ${i + 1}`,
-                videoUrl: url
+                videoUrl: url,
+                audio_flv: item.audio_flv,
+                audio_https_flv: item.audio_https_flv
               };
             }
           });
@@ -1077,6 +1261,8 @@ export default {
         e.returnValue = '';
       }
       this.stopIntercom();
+      this.stopActiveAudio(true);
+      this.clearAudioSubscribe();
     },
   }
 };
@@ -5,7 +5,6 @@
     @click="onPlayerClick"
     @mousemove="onMouseMove"
     @mouseleave="onMouseLeave"
-    @contextmenu="onContextMenuWrapper"
   >
     <div class="custom-top-bar" :class="{ 'hide-bar': !showControls }">
       <div class="top-bar-left">
@@ -19,21 +18,6 @@
     </div>
     <div :id="uniqueId" ref="container" class="player-box"></div>
-
-    <!-- 自定义右键菜单 - 全屏时附加到 body -->
-    <div
-      v-if="showContextMenu"
-      ref="contextMenu"
-      class="custom-contextmenu"
-      :class="{ 'menu-fixed': isFullscreen }"
-      :style="{ top: contextMenuY + 'px', left: contextMenuX + 'px' }"
-      @click.stop
-    >
-      <div class="contextmenu-item" @click.stop="onShowVideoInfo">视频信息</div>
-      <div class="contextmenu-divider"></div>
-      <div class="contextmenu-item" @click.stop="onSwitchMainStream">主码流</div>
-      <div class="contextmenu-item" @click.stop="onSwitchSubStream">子码流</div>
-    </div>
   </div>
 </template>
@@ -45,9 +29,8 @@ export default {
     isResize: { type: Boolean, default: true },
     videoTitle: { type: String, default: '' },
     hasAudio: { type: Boolean, default: false },
-    // 码流切换所需参数
-    sim: { type: String, default: '' },
-    channel: { type: [String, Number], default: '' }
+    channelInfo: { type: Object, default: null },
+    playerIndex: { type: Number, default: -1 }
   },
   data() {
     return {
@@ -57,15 +40,8 @@ export default {
       hasStarted: false,
       showControls: false,
       controlTimer: null,
-      isFullscreen: false, // 全屏状态
-
-      // 自定义右键菜单
-      showContextMenu: false,
-      contextMenuX: 0,
-      contextMenuY: 0,
-      contextMenuHandler: null, // 保存右键菜单监听器函数
-      docContextMenuHandler: null, // 保存文档级右键菜单监听器函数
-      containerContextMenuHandler: null, // 保存容器级右键菜单监听器函数
+      audioButtonClickHandler: null,
+      muteEventHandler: null,
       // 【配置控制表】
       controlsConfig: {
@@ -122,77 +98,11 @@ export default {
         }
       }, 500);
     });
-    // 添加全局点击事件监听，用于隐藏右键菜单
-    document.addEventListener('click', this.hideContextMenu);
-    // 添加全屏变化监听
-    document.addEventListener('fullscreenchange', this.onFullscreenChange);
-    document.addEventListener('webkitfullscreenchange', this.onFullscreenChange);
-    // 在 document 级别使用 capture 模式拦截 contextmenu 事件
-    this.docContextMenuHandler = (e) => {
-      // 检查播放器是否在播放
-      if (!this.hasStarted) {
-        return;
-      }
-
-      // 优先使用 this.isFullscreen（通过 onFullscreenChange 更新的），因为 EasyPlayerPro 可能不会更新 document.fullscreenElement
-      const isFullscreen = !!(document.fullscreenElement || document.webkitFullscreenElement || this.isFullscreen);
-      console.log('Contextmenu event - isFullscreen:', isFullscreen, 'docFullscreen:', !!(document.fullscreenElement || document.webkitFullscreenElement), 'this.isFullscreen:', this.isFullscreen, 'target:', e.target);
-
-      // 全屏模式下，使用 DOM 遍历方式检测
-      if (isFullscreen) {
-        console.log('Entering fullscreen branch');
-        let target = e.target;
-
-        // 简化检测：直接检查点击目标是否在当前播放器元素内
-        const isInPlayer = this.$el.contains(target);
-        console.log('isInPlayer (this.$el.contains):', isInPlayer, 'target:', target, 'this.$el:', this.$el);
-
-        if (isInPlayer) {
-          e.preventDefault();
-          setTimeout(() => {
-            this.hideNativeContextMenu();
-            this.onContextMenu(e);
-          }, 10);
-        }
-        return;
-      }
-
-      // 非全屏模式下，使用坐标检测
-      const rect = this.$el.getBoundingClientRect();
-      const isClickInPlayer = (
-        e.clientX >= rect.left &&
-        e.clientX <= rect.right &&
-        e.clientY >= rect.top &&
-        e.clientY <= rect.bottom
-      );
-
-      // 如果点击不在当前播放器内，不处理
-      if (!isClickInPlayer) {
-        return;
-      }
-
-      // 点击在当前播放器内，阻止原生菜单并显示自定义菜单
-      e.preventDefault();
-      // 延迟一点执行，确保我们的菜单能显示
-      setTimeout(() => {
-        this.hideNativeContextMenu();
-        this.onContextMenu(e);
-      }, 10);
-    };
-    document.addEventListener('contextmenu', this.docContextMenuHandler, true);
   },
   beforeDestroy() {
+    this.unbindAudioButtonEvent();
     this.destroy();
     if (this.controlTimer) clearTimeout(this.controlTimer);
-    // 移除全局点击事件监听
-    document.removeEventListener('click', this.hideContextMenu);
-    // 移除全屏变化监听
-    document.removeEventListener('fullscreenchange', this.onFullscreenChange);
-    document.removeEventListener('webkitfullscreenchange', this.onFullscreenChange);
-    // 移除 document 级别的 contextmenu 监听
-    if (this.docContextMenuHandler) {
-      document.removeEventListener('contextmenu', this.docContextMenuHandler, true);
-    }
   },
   methods: {
     onMouseMove() {
@@ -221,6 +131,7 @@ export default {
           MSE: true,
           WCS: true,
           hasAudio: this.hasAudio,
+          isMute: true,
           isLive: true,
           loading: true,
           isBand: true, // 必须为 true 才能获取网速回调
@@ -235,13 +146,14 @@ export default {
             zoom: true,
           }
         });
-
         this.playerInstance.on('kBps', (speed) => {
           this.netSpeed = speed + '/S';
         });
         this.playerInstance.on('play', () => {
           this.hasStarted = true;
+          // 强制同步一次初始静音状态，确保默认关闭音频
+          this.setMuted(true, false);
           this.showControls = true;
           if (this.controlTimer) clearTimeout(this.controlTimer);
           this.controlTimer = setTimeout(() => {
@@ -253,31 +165,18 @@ export default {
           console.warn('Player Error:', err);
         });
-        // 监听播放器的 contextmenu 事件，防止显示原生菜单
-        this.playerInstance.on('contextmenu', (e) => {
-          e.preventDefault();
-        });
-
-        // 添加原生 contextmenu 监听器到容器元素和 wrapper 元素，作为 document 级监听器的备份
-        // 在 fullscreen 模式下，事件可能不会冒泡到 document
-        this.containerContextMenuHandler = (e) => {
-          console.log('Container contextmenu fired (native listener), hasStarted:', this.hasStarted);
-          if (!this.hasStarted) {
-            console.log('hasStarted check failed');
-            return;
-          }
-          e.preventDefault();
-          console.log('About to call onContextMenu');
-          this.hideNativeContextMenu();
-          this.onContextMenu(e);
-          console.log('onContextMenu called, showContextMenu should be:', this.showContextMenu);
+        // 官方事件：音量按钮切换时触发
+        this.muteEventHandler = () => {
+          // 统一读取最终状态，避免不同版本回调参数语义不一致
+          setTimeout(() => {
+            this.emitAudioToggle();
+          }, 0);
         };
-        container.addEventListener('contextmenu', this.containerContextMenuHandler, true);
-        // 也在 wrapper (this.$el) 上添加监听，fullscreen 时 this.$el 可能是全屏元素
-        this.$el.addEventListener('contextmenu', this.containerContextMenuHandler, true);
-
-        // 注意：document 级别的 contextmenu 监听器已在 mounted 中添加，这里不需要重复添加
+        this.playerInstance.on('mute', this.muteEventHandler);
+        this.$nextTick(() => {
+          this.bindAudioButtonEvent();
+        });
       } catch (e) {
         console.error("Create Error:", e);
@@ -300,21 +199,16 @@ export default {
     destroy() {
       this.hasStarted = false;
       this.showControls = false;
-      // 移除 document 级别的 contextmenu 监听
-      if (this.docContextMenuHandler) {
-        document.removeEventListener('contextmenu', this.docContextMenuHandler, true);
-        this.docContextMenuHandler = null;
-      }
-      // 移除容器级别的 contextmenu 监听
-      if (this.containerContextMenuHandler && this.$refs.container) {
-        this.$refs.container.removeEventListener('contextmenu', this.containerContextMenuHandler, true);
-        this.$el.removeEventListener('contextmenu', this.containerContextMenuHandler, true);
-        this.containerContextMenuHandler = null;
-      }
       if (this.playerInstance) {
+        if (this.muteEventHandler && typeof this.playerInstance.off === 'function') {
+          try {
+            this.playerInstance.off('mute', this.muteEventHandler);
+          } catch (e) {}
+        }
         this.playerInstance.destroy();
         this.playerInstance = null;
       }
+      this.muteEventHandler = null;
     },
     destroyAndReplay(url) {
@@ -329,328 +223,90 @@ export default {
       this.$emit('click');
     },
-    // 右键菜单处理 - 直接在 wrapper 上拦截
-    onContextMenuWrapper(e) {
-      // 阻止事件冒泡到 EasyPlayerPro
-      e.stopPropagation();
-      // document 级别的监听器会处理阻止默认行为
+    setControls(config) {
+      this.controlsConfig = { ...this.controlsConfig, ...config };
     },
-
-    // 右键菜单 - 用于 capture 模式拦截
-    onContextMenuCapture(e) {
-      // 阻止原生右键菜单
-      e.preventDefault();
-      e.stopPropagation();
-
-      // 调用正常的右键菜单处理
-      this.onContextMenu(e);
+    getMediaElement() {
+      const container = this.$refs.container;
+      if (!container) return null;
+      return container.querySelector('video');
     },
-
-    // 右键菜单
-    onContextMenu(e) {
-      console.log('onContextMenu called, hasStarted:', this.hasStarted);
-      // 只有在播放器已启动后才显示菜单
-      if (!this.hasStarted) return;
-
-      // 计算菜单位置，确保不超出播放器边界
-      const menuWidth = 150;
-      const menuHeight = 140;
-
-      // 检查是否是全屏模式
-      const isFs = !!(document.fullscreenElement || document.webkitFullscreenElement || this.isFullscreen);
-
-      // 全屏模式：使用 viewport 坐标
-      // 非全屏模式：使用播放器容器坐标
-      let x, y;
-      if (isFs) {
-        // 全屏时使用绝对坐标
-        x = e.clientX;
-        y = e.clientY;
-        console.log('Fullscreen mode - using viewport coords:', x, y);
-      } else {
-        // 非全屏时使用相对于 player-wrapper 的坐标
-        const containerRect = this.$el.getBoundingClientRect();
-        x = e.clientX - containerRect.left;
-        y = e.clientY - containerRect.top;
-        console.log('Normal mode - using relative coords:', x, y, 'containerRect:', containerRect);
-      }
-
-      // 边界检测
-      const maxX = isFs ? window.innerWidth : (isFs ? window.innerWidth : this.$el.getBoundingClientRect().width);
-      const maxY = isFs ? window.innerHeight : (isFs ? window.innerHeight : this.$el.getBoundingClientRect().height);
-
-      if (x + menuWidth > maxX) {
-        x = maxX - menuWidth;
-      }
-      if (y + menuHeight > maxY) {
-        y = maxY - menuHeight;
-      }
-
-      // 确保最小值
-      x = Math.max(0, x);
-      y = Math.max(0, y);
-
-      this.contextMenuX = x;
-      this.contextMenuY = y;
-      console.log('Setting showContextMenu=true, x:', x, 'y:', y);
-
-      // 阻止事件冒泡
-      e.stopPropagation();
-
-      // 先隐藏原生菜单（多次调用确保隐藏）
-      this.hideNativeContextMenu();
-
-      this.showContextMenu = true;
-      this.$forceUpdate();
-      console.log('showContextMenu is now:', this.showContextMenu);
-
-      // 全屏时将菜单附加到 body
-      if (isFs && this.$refs.contextMenu) {
-        console.log('Appending menu to body for fullscreen');
-        document.body.appendChild(this.$refs.contextMenu);
-        // 强制设置 position: fixed 和 top/left
-        this.$refs.contextMenu.style.position = 'fixed';
-        this.$refs.contextMenu.style.top = y + 'px';
-        this.$refs.contextMenu.style.left = x + 'px';
+    setMuted(muted, emitEvent = false) {
+      if (this.playerInstance && typeof this.playerInstance.setMute === 'function') {
+        try {
+          this.playerInstance.setMute(!!muted);
+        } catch (e) {}
       }
-
-      // 检查 DOM
-      this.$nextTick(() => {
-        const menu = this.$refs.contextMenu || this.$el.querySelector('.custom-contextmenu');
-        console.log('DOM check - menu exists:', !!menu, 'parent:', menu ? menu.parentElement : 'N/A');
-        console.log('isFullscreen data property:', this.isFullscreen);
-        console.log('menu-fixed class applied:', menu ? menu.classList.contains('menu-fixed') : 'N/A');
-        if (menu) {
-          console.log('Menu computed position:', getComputedStyle(menu).position);
-          console.log('Menu rect:', menu.getBoundingClientRect(), 'viewport:', window.innerWidth, window.innerHeight);
-          // 检查原生菜单状态
-          const nativeMenus = document.querySelectorAll('[class*="easyplayer-contextmenu"]');
-          console.log('Native menus count:', nativeMenus.length);
-
-          // 检查是否有其他元素覆盖在菜单上面
-          const elemBelow = document.elementFromPoint(x, y);
-          console.log('Element at menu position (x,y):', x, y, 'is:', elemBelow);
-
-          // 使用 requestAnimationFrame 确保菜单在原生菜单之后渲染
-          requestAnimationFrame(() => {
-            requestAnimationFrame(() => {
-              this.hideNativeContextMenu();
-              // 强制确保菜单可见
-              menu.style.setProperty('display', 'block', 'important');
-              menu.style.setProperty('visibility', 'visible', 'important');
-              menu.style.setProperty('opacity', '1', 'important');
-              console.log('After rAF forcing styles - display:', getComputedStyle(menu).display, 'visibility:', getComputedStyle(menu).visibility, 'opacity:', getComputedStyle(menu).opacity, 'position:', getComputedStyle(menu).position);
-              // 再次检查覆盖元素
-              const elemBelowAfter = document.elementFromPoint(x, y);
-              console.log('Element at menu position AFTER forcing:', x, y, 'is:', elemBelowAfter);
-            });
-          });
+      const media = this.getMediaElement();
+      if (media) {
+        media.muted = !!muted;
+        if (muted) {
+          media.volume = 0;
+        } else if (media.volume === 0) {
+          media.volume = 1;
         }
-      });
-    },
-
-    // 隐藏右键菜单
-    hideContextMenu() {
-      // 如果菜单被附加到 body，将其移回 player-wrapper
-      if (this.$refs.contextMenu && this.$refs.contextMenu.parentElement !== this.$el) {
-        this.$el.appendChild(this.$refs.contextMenu);
       }
-      this.showContextMenu = false;
-      // 同时隐藏原生菜单
-      this.hideNativeContextMenu();
-    },
-
-    // 隐藏原生右键菜单
-    hideNativeContextMenu() {
-      const menus = document.querySelectorAll('[class*="easyplayer-contextmenu"]');
-      menus.forEach(menu => {
-        if (!menu.classList.contains('custom-contextmenu')) {
-          menu.style.display = 'none';
-        }
-      });
-    },
-
-    // 全屏状态变化处理
-    onFullscreenChange() {
-      this.isFullscreen = !!(document.fullscreenElement || document.webkitFullscreenElement);
-      // 全屏时隐藏右键菜单
-      if (!this.isFullscreen) {
-        this.hideContextMenu();
+      if (emitEvent) {
+        this.emitAudioToggle(!!muted);
       }
     },
-
-    // 视频信息
-    onShowVideoInfo() {
-      const instance = this.playerInstance;
-
-      // 方法1: 直接调用
-      if (instance && typeof instance.showVideoInfo === 'function') {
-        instance.showVideoInfo();
-        this.hideContextMenu();
-        return;
+    resolveSimChannel() {
+      if (!this.channelInfo || !this.channelInfo.code) {
+        return { sim: '', channel: '' };
       }
-
-      // 方法2: 通过 player 调用
-      if (instance && instance.player && typeof instance.player.showVideoInfo === 'function') {
-        instance.player.showVideoInfo();
-        this.hideContextMenu();
-        return;
-      }
-
-      // 方法3: 调用 _videoinfo 方法
-      if (instance && typeof instance._videoinfo === 'function') {
-        instance._videoinfo();
-        this.hideContextMenu();
-        return;
+      const code = String(this.channelInfo.code).replace(/_/g, '-');
+      const arr = code.split('-');
+      if (arr.length < 3) {
+        return { sim: '', channel: '' };
       }
-
-      // 方法4: 尝试通过 events 触发
-      if (instance && instance.events && instance.events.emit) {
-        instance.events.emit('showVideoInfo');
-        this.hideContextMenu();
-        return;
+      return { sim: arr[1], channel: arr[2] };
+    },
+    resolveMutedState() {
+      if (this.playerInstance && typeof this.playerInstance.isMute === 'function') {
+        try {
+          return !!this.playerInstance.isMute();
+        } catch (e) {}
       }
-
-      // 方法5: 触发原生菜单中的视频信息按钮
-      // 先隐藏我们的自定义菜单，然后让原生菜单显示，再点击其视频信息按钮
-      const customMenu = this.$el.querySelector('.custom-contextmenu');
-      if (customMenu) {
-        customMenu.style.display = 'none';
+      const media = this.getMediaElement();
+      if (media) {
+        return media.muted || media.volume === 0;
       }
-
-      // 强制显示原生菜单（移除我们的隐藏样式）
-      const allMenus = document.querySelectorAll('.easyplayer-contextmenu-btn');
-      allMenus.forEach(menu => {
-        menu.style.display = '';
-        menu.style.opacity = '';
-        menu.style.visibility = '';
-      });
-
-      // 延迟一点让原生菜单显示
-      setTimeout(() => {
-        // 在当前播放器容器内查找原生菜单
-        const container = this.$refs.container;
-        let infoBtn = null;
-
-        if (container) {
-          const nativeMenu = container.querySelector('.easyplayer-contextmenu-btn');
-          if (nativeMenu) {
-            infoBtn = nativeMenu.querySelector('.easyplayer-contextmenu-info');
-          }
-        }
-
-        // 如果没找到，尝试基于位置匹配
-        if (!infoBtn) {
-          const playerRect = this.$el.getBoundingClientRect();
-          for (let i = 0; i < allMenus.length; i++) {
-            const menu = allMenus[i];
-            const menuRect = menu.getBoundingClientRect();
-            const isOverlapping =
-              Math.abs(menuRect.left - playerRect.left) < 100 &&
-              Math.abs(menuRect.top - playerRect.top) < 100;
-            if (isOverlapping) {
-              infoBtn = menu.querySelector('.easyplayer-contextmenu-info');
-              break;
-            }
-          }
-        }
-
-        if (infoBtn) {
-          infoBtn.click();
-        }
-
-        // 隐藏原生菜单
-        allMenus.forEach(menu => {
-          menu.style.display = 'none';
-        });
-      }, 50);
-    },
-
-    // 切换主码流
-    onSwitchMainStream() {
-      this.hideContextMenu();
-      this.switchStream(0);
-    },
-
-    // 切换子码流
-    onSwitchSubStream() {
-      this.hideContextMenu();
-      this.switchStream(1);
+      return true;
     },
-
-    setControls(config) {
-      this.controlsConfig = { ...this.controlsConfig, ...config };
+    emitAudioToggle(forcedMuted) {
+      const muted = typeof forcedMuted === 'boolean' ? forcedMuted : this.resolveMutedState();
+      const simChannel = this.resolveSimChannel();
+      this.$emit('audio-toggle', {
+        muted,
+        playerIndex: this.playerIndex,
+        stream: this.channelInfo && this.channelInfo.videoUrl ? this.channelInfo.videoUrl : this.initialPlayUrl,
+        channelInfo: this.channelInfo,
+        sim: simChannel.sim,
+        channel: simChannel.channel
+      });
     },
-
-    // 切换码流
-    switchStream(type) {
-      // 如果没有sim和channel参数，则不发送请求
-      if (!this.sim || !this.channel) {
-        console.log('码流切换跳过: 缺少sim或channel参数');
-        return;
-      }
-
-      const params = {
-        sim: this.sim,
-        channel: parseInt(this.channel),
-        type: type
-      };
-
-      console.log(`码流切换: sim=${params.sim}, channel=${params.channel}, type=${type} (0=主码流, 1=子码流)`);
-
-      // 使用箭头函数保存this引用
-      const doSwitch = (axiosInstance) => {
-        axiosInstance.post('/api/jt1078/query/switch/stream', params)
-          .then(res => {
-            if (res.data.code === 200 || res.data.code === 0) {
-              console.log('码流切换成功，等待设备切换...');
-            } else {
-              console.warn('码流切换失败:', res.data.msg || res.data);
-            }
-          })
-          .catch(err => {
-            console.error('码流切换请求失败:', err);
-          });
+    bindAudioButtonEvent() {
+      const container = this.$refs.container;
+      if (!container) return;
+      this.unbindAudioButtonEvent();
+      const audioBtn = container.querySelector('.easyplayer-audio-box');
+      if (!audioBtn) return;
+      this.audioButtonClickHandler = () => {
+        // DOM 兜底：避免个别版本不抛 mute 事件
+        setTimeout(() => {
+          this.emitAudioToggle();
+        }, 0);
       };
-
-      if (this.$axios) {
-        doSwitch(this.$axios);
-      } else if (window.axios) {
-        doSwitch(window.axios);
-      }
+      audioBtn.addEventListener('click', this.audioButtonClickHandler);
     },
-
-    // 刷新播放地址并重新播放
-    refreshPlayUrl() {
-      if (!this.sim || !this.channel) return;
-
-      const axiosInstance = this.$axios || window.axios;
-      if (!axiosInstance) return;
-
-      axiosInstance.get(`/api/jt1078/query/send/request/io/${this.sim}/${this.channel}`)
-        .then(res => {
-          if (res.data.code === 200 || res.data.code === 0) {
-            const newUrl = res.data.data.ws_flv || res.data.data.wss_flv;
-            console.log('获取新播放地址:', newUrl);
-
-            if (newUrl) {
-              // 重新创建播放器并播放新地址
-              // 分步执行：先销毁，等待，再重建，确保播放器完全重置
-              this.destroy();
-
-              // 等待一段时间后重新创建播放器
-              setTimeout(() => {
-                this.create();
-                this.play(newUrl);
-              }, 500); // 等待500ms确保完全销毁后再重建
-            }
-          } else {
-            console.warn('获取播放地址失败:', res.data.msg || res.data);
-          }
-        })
-        .catch(err => {
-          console.error('获取播放地址失败:', err);
-        });
+    unbindAudioButtonEvent() {
+      const container = this.$refs.container;
+      if (!container || !this.audioButtonClickHandler) return;
+      const audioBtn = container.querySelector('.easyplayer-audio-box');
+      if (audioBtn) {
+        audioBtn.removeEventListener('click', this.audioButtonClickHandler);
+      }
+      this.audioButtonClickHandler = null;
     }
   },
 };
@@ -724,7 +380,7 @@ export default {
 }
 /* 音量按钮 */
-.player-wrapper.hide-btn-audio .easyplayer-volume {
+.player-wrapper.hide-btn-audio .easyplayer-audio-box {
   display: none !important;
 }
@@ -903,52 +559,4 @@ export default {
 .player-wrapper .easyplayer-loading-text {
   display: none !important;
 }
-
-/* =========================================
-   3. 自定义右键菜单
-   ========================================= */
-
-/* 隐藏原生右键菜单 - 使用更高优先级 */
-[class*="easyplayer-contextmenu"] {
-  display: none !important;
-  visibility: hidden !important;
-}
-
-/* 自定义右键菜单样式 */
-.custom-contextmenu {
-  position: absolute;
-  z-index: 2147483647 !important;
-  background: rgba(30, 30, 30, 0.95);
-  border: 1px solid rgba(80, 80, 80, 0.8);
-  border-radius: 6px;
-  padding: 6px 0;
-  min-width: 140px;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4);
-}
-
-/* 全屏模式下使用 fixed 定位，并强制使用视口作为定位上下文 */
-.custom-contextmenu.menu-fixed {
-  position: fixed !important;
-  top: var(--menu-top, 0) !important;
-  left: var(--menu-left, 0) !important;
-  transform: none !important;
-}
-
-.custom-contextmenu .contextmenu-divider {
-  height: 1px;
-  background: rgba(80, 80, 80, 0.6);
-  margin: 4px 0;
-}
-
-.custom-contextmenu .contextmenu-item {
-  padding: 8px 16px;
-  color: #fff;
-  font-size: 13px;
-  cursor: pointer;
-  transition: background 0.2s;
-}
-
-.custom-contextmenu .contextmenu-item:hover {
-  background: rgba(30, 144, 255, 0.6);
-}
 </style>
@@ -12,13 +12,14 @@
         :class="`video${i}`"
         :ref="`player${i}`"
         :initial-play-url="videoUrl[i]"
+        :channel-info="videoDataList[i]"
+        :player-index="i"
         :initial-buffer-time="0.1"
         :show-custom-mask="false"
         :has-audio="true"
-        :sim="playerDataList[i] ? playerDataList[i].sim : ''"
-        :channel="playerDataList[i] ? playerDataList[i].channel : ''"
         style="width: 100%;height: 100%;"
         @click="playerClick(item, i, items.length)"
+        @audio-toggle="handleAudioToggle"
       ></easyPlayer>
       <!-- 选中/悬停的高亮框 (使用绝对定位覆盖，不影响布局) -->
@@ -40,10 +41,6 @@ export default {
       type: String,
       default: '9'
     },
-    hasAudio: {
-      type: Boolean,
-      default: true
-    },
     videoUrl: {
       type: Array,
       default: []
@@ -63,16 +60,6 @@ export default {
   },
   //计算属性 类似于data概念",
   computed: {
-    // 生成播放器数据列表，包含 sim 和 channel
-    playerDataList() {
-      return this.items.map((item, i) => {
-        const data = this.videoDataList[i] || {};
-        return {
-          sim: this.getSim(data),
-          channel: this.getChannel(data)
-        };
-      });
-    },
   },
   //监控data中的数据变化",
   watch: {
@@ -212,6 +199,26 @@ export default {
       // 通知父组件，注意：如果布局变了（比如切到1+5），len可能变了
       this.$emit('playerClick', data, index, this.items.length);
     },
+    handleAudioToggle(payload) {
+      if (!payload || payload.playerIndex === undefined || payload.playerIndex === null) {
+        return;
+      }
+      this.$emit('audio-toggle', payload);
+    },
+    setPlayerMuted(index, muted) {
+      const playerRef = this.$refs[`player${index}`];
+      const player = Array.isArray(playerRef) ? playerRef[0] : playerRef;
+      if (player && typeof player.setMuted === 'function') {
+        player.setMuted(muted);
+      }
+    },
+    muteAllPlayersExcept(activeIndex) {
+      for (let i = 0; i < this.items.length; i++) {
+        if (i !== activeIndex) {
+          this.setPlayerMuted(i, true);
+        }
+      }
+    },
     setDivStyle(idx, len) {
       // 保持兼容，如果 len 变化了才更新布局
@@ -288,22 +295,6 @@ export default {
         }
       });
     },
-
-    // 获取SIM卡号 (从parent对象中获取)
-    getSim(data) {
-      if (!data) return '';
-      // 优先从自身获取，否则从parent对象获取
-      return data.sim || (data.parent && data.parent.sim) || '';
-    },
-
-    // 获取通道号 (从code中提取，格式: id_sim_channelNumber)
-    getChannel(data) {
-      console.log(data)
-      if (!data || !data.code) return '';
-      const parts = data.code.split('_');
-      // code格式: id_sim_channelNumber, channel是最后一部分
-      return parts.length >= 3 ? parts[parts.length - 1] : '';
-    }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
@@ -86,7 +86,7 @@ udpTTL=64
 [protocol]
 add_mute_audio=1
-continue_push_ms=3000
+continue_push_ms=8000
 enable_audio=1
 enable_fmp4=1
 enable_hls=1