fix():ffmpeg命令更改

王鑫
1 parent b73e5e10
Showing 47 changed files with 3220 additions and 618 deletions
pom.xml
src/main/java/com/genersoft/iot/vmp/IntercomTestClient.java
src/main/java/com/genersoft/iot/vmp/common/AjaxResult.java
src/main/java/com/genersoft/iot/vmp/common/HttpStatus.java
src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
src/main/java/com/genersoft/iot/vmp/jtt1078/publisher/Channel.java
src/main/java/com/genersoft/iot/vmp/jtt1078/server/Jtt1078Decoder.java
src/main/java/com/genersoft/iot/vmp/jtt1078/server/Jtt1078Handler.java
src/main/java/com/genersoft/iot/vmp/jtt1078/server/SessionManager.java
src/main/java/com/genersoft/iot/vmp/jtt1078/subscriber/RTMPPublisher.java
src/main/java/com/genersoft/iot/vmp/jtt1078/subscriber/ZlmRtpPublisher.java
src/main/java/com/genersoft/iot/vmp/jtt1078/util/ALaw.java
src/main/java/com/genersoft/iot/vmp/jtt1078/util/AudioCodecUtil.java
src/main/java/com/genersoft/iot/vmp/jtt1078/util/ByteHolder.java
src/main/java/com/genersoft/iot/vmp/jtt1078/websocket/Jtt1078AudioBroadcastManager.java
src/main/java/com/genersoft/iot/vmp/jtt1078/websocket/Jtt1078AudioWebSocketServer.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
src/main/java/com/genersoft/iot/vmp/utils/G711Utils.java
@@ -144,6 +144,22 @@
             <version>1.0.5</version>
         </dependency>
  
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.java-websocket</groupId>
+            <artifactId>Java-WebSocket</artifactId>
+            <version>1.5.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.83</version>
+        </dependency>
+
  
         <dependency>
             <groupId>org.springframework.boot</groupId>
+package com.genersoft.iot.vmp;
+
+import com.alibaba.fastjson2.JSONObject;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
+
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Base64;
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class IntercomTestClient {
+
+    // 【配置】修改为你的测试 SIM 卡号 (注意补全12位)
+    private static final String SIM = "040028816490";
+    // 【配置】网关地址
+    private static final String WS_URL = "ws://118.113.164.50:10202?sim=" + SIM;
+
+    public static void main(String[] args) throws Exception {
+        System.out.println("正在连接 WebSocket: " + WS_URL);
+
+        WebSocketClient client = new WebSocketClient(new URI(WS_URL)) {
+            private Timer audioTimer;
+
+            @Override
+            public void onOpen(ServerHandshake handshakedata) {
+                System.out.println("✅ WebSocket 连接成功");
+
+                // 1. 发送注册包 (模拟前端逻辑)
+                JSONObject registerMsg = new JSONObject();
+                registerMsg.put("type", "register");
+                registerMsg.put("stream_id", SIM);
+                send(registerMsg.toJSONString());
+                System.out.println(">> 发送注册包: " + registerMsg.toJSONString());
+
+                // 2. 开启定时任务，模拟由麦克风产生的音频流 (每40ms发送一次)
+                startSendingAudio();
+            }
+
+            @Override
+            public void onMessage(String message) {
+                System.out.println("<< 收到消息: " + message);
+            }
+
+            @Override
+            public void onClose(int code, String reason, boolean remote) {
+                System.out.println("❌ 连接关闭: " + reason);
+                if (audioTimer != null) audioTimer.cancel();
+            }
+
+            @Override
+            public void onError(Exception ex) {
+                ex.printStackTrace();
+            }
+
+            // 模拟发送音频流
+            private void startSendingAudio() {
+                audioTimer = new Timer();
+                // 生成 8000Hz 的正弦波数据 (模拟 '滴-----' 的声音)
+                // 每次发送 320 字节 (160个采样点, 20ms数据，或者根据网关调整)
+                // 这里发送 40ms 数据 = 320采样点 * 2字节 = 640字节
+                final byte[] pcmData = generateSineWave(8000, 440, 320);
+
+                audioTimer.scheduleAtFixedRate(new TimerTask() {
+                    @Override
+                    public void run() {
+                        if (isOpen()) {
+                            try {
+                                // 1. Base64 编码
+                                String base64Audio = Base64.getEncoder().encodeToString(pcmData);
+
+                                // 2. 封装 JSON (完全模仿 Vue 代码结构)
+                                JSONObject audioMsg = new JSONObject();
+                                audioMsg.put("type", "audio_data");
+                                audioMsg.put("stream_id", SIM);
+                                audioMsg.put("audio_data", base64Audio);
+                                audioMsg.put("format", "pcm16");
+                                audioMsg.put("sample_rate", 8000);
+                                audioMsg.put("channels", 1);
+
+                                send(audioMsg.toJSONString());
+                                // System.out.print("."); // 打印点表示正在发送
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                }, 0, 40); // 每40ms发送一次
+                System.out.println(">> 开始持续发送音频流 (标准正弦波)...");
+            }
+        };
+
+        client.connect();
+    }
+
+    /**
+     * 生成 PCM16 正弦波音频数据 (标准的“滴”声)
+     * @param sampleRate 采样率 (8000)
+     * @param frequency 频率 (440Hz = 标准音A)
+     * @param samples 采样点数量
+     */
+    private static byte[] generateSineWave(int sampleRate, int frequency, int samples) {
+        ByteBuffer buffer = ByteBuffer.allocate(samples * 2);
+        buffer.order(ByteOrder.LITTLE_ENDIAN); // 对应前端 view.setInt16(..., true)
+
+        double period = (double) sampleRate / frequency;
+        for (int i = 0; i < samples; i++) {
+            double angle = 2.0 * Math.PI * i / period;
+            // 生成正弦波，振幅 0x4000 (稍微大一点声音)
+            short sample = (short) (Math.sin(angle) * 0x4000);
+            buffer.putShort(sample);
+        }
+        return buffer.array();
+    }
+}
+package com.genersoft.iot.vmp.common;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.HashMap;
+import java.util.Objects;
+
+/**
+ * 操作消息提醒
+ *
+ * @author wangXin
+ */
+public class AjaxResult extends HashMap<String, Object>
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 状态码 */
+    public static final String CODE_TAG = "code";
+
+    /** 返回内容 */
+    public static final String MSG_TAG = "msg";
+
+    /** 数据对象 */
+    public static final String DATA_TAG = "data";
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
+     */
+    public AjaxResult()
+    {
+    }
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象
+     *
+     * @param code 状态码
+     * @param msg 返回内容
+     */
+    public AjaxResult(int code, String msg)
+    {
+        super.put(CODE_TAG, code);
+        super.put(MSG_TAG, msg);
+    }
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象
+     *
+     * @param code 状态码
+     * @param msg 返回内容
+     * @param data 数据对象
+     */
+    public AjaxResult(int code, String msg, Object data)
+    {
+        super.put(CODE_TAG, code);
+        super.put(MSG_TAG, msg);
+        if (data != null)
+        {
+            super.put(DATA_TAG, data);
+        }
+    }
+
+    /**
+     * 返回成功消息
+     *
+     * @return 成功消息
+     */
+    public static AjaxResult success()
+    {
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 返回成功数据
+     *
+     * @return 成功消息
+     */
+    public static AjaxResult success(Object data)
+    {
+        return AjaxResult.success("操作成功", data);
+    }
+
+    /**
+     * 返回成功消息
+     *
+     * @param msg 返回内容
+     * @return 成功消息
+     */
+    public static AjaxResult success(String msg)
+    {
+        return AjaxResult.success(msg, null);
+    }
+
+    /**
+     * 返回成功消息
+     *
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 成功消息
+     */
+    public static AjaxResult success(String msg, Object data)
+    {
+        return new AjaxResult(HttpStatus.SUCCESS, msg, data);
+    }
+
+    /**
+     * 返回警告消息
+     *
+     * @param msg 返回内容
+     * @return 警告消息
+     */
+    public static AjaxResult warn(String msg)
+    {
+        return AjaxResult.warn(msg, null);
+    }
+
+    /**
+     * 返回警告消息
+     *
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 警告消息
+     */
+    public static AjaxResult warn(String msg, Object data)
+    {
+        return new AjaxResult(HttpStatus.WARN, msg, data);
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @return 错误消息
+     */
+    public static AjaxResult error()
+    {
+        return AjaxResult.error("操作失败");
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @param msg 返回内容
+     * @return 错误消息
+     */
+    public static AjaxResult error(String msg)
+    {
+        return AjaxResult.error(msg, null);
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 错误消息
+     */
+    public static AjaxResult error(String msg, Object data)
+    {
+        return new AjaxResult(HttpStatus.ERROR, msg, data);
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @param code 状态码
+     * @param msg 返回内容
+     * @return 错误消息
+     */
+    public static AjaxResult error(int code, String msg)
+    {
+        return new AjaxResult(code, msg, null);
+    }
+
+    /**
+     * 是否为成功消息
+     *
+     * @return 结果
+     */
+    public boolean isSuccess()
+    {
+        return Objects.equals(HttpStatus.SUCCESS, this.get(CODE_TAG));
+    }
+
+    /**
+     * 是否为警告消息
+     *
+     * @return 结果
+     */
+    public boolean isWarn()
+    {
+        return Objects.equals(HttpStatus.WARN, this.get(CODE_TAG));
+    }
+
+    /**
+     * 是否为错误消息
+     *
+     * @return 结果
+     */
+    public boolean isError()
+    {
+        return Objects.equals(HttpStatus.ERROR, this.get(CODE_TAG));
+    }
+
+    /**
+     * 方便链式调用
+     *
+     * @param key 键
+     * @param value 值
+     * @return 数据对象
+     */
+    @Override
+    public AjaxResult put(String key, Object value)
+    {
+        super.put(key, value);
+        return this;
+    }
+}
+package com.genersoft.iot.vmp.common;
+
+/**
+ * 返回状态码
+ *
+ * @author wangXin
+ */
+public class HttpStatus
+{
+    /**
+     * 操作成功
+     */
+    public static final int SUCCESS = 200;
+
+    /**
+     * 对象创建成功
+     */
+    public static final int CREATED = 201;
+
+    /**
+     * 请求已经被接受
+     */
+    public static final int ACCEPTED = 202;
+
+    /**
+     * 操作已经执行成功，但是没有返回数据
+     */
+    public static final int NO_CONTENT = 204;
+
+    /**
+     * 资源已被移除
+     */
+    public static final int MOVED_PERM = 301;
+
+    /**
+     * 重定向
+     */
+    public static final int SEE_OTHER = 303;
+
+    /**
+     * 资源没有被修改
+     */
+    public static final int NOT_MODIFIED = 304;
+
+    /**
+     * 参数列表错误（缺少，格式不匹配）
+     */
+    public static final int BAD_REQUEST = 400;
+
+    /**
+     * 未授权
+     */
+    public static final int UNAUTHORIZED = 401;
+
+    /**
+     * 访问受限，授权过期
+     */
+    public static final int FORBIDDEN = 403;
+
+    /**
+     * 资源，服务未找到
+     */
+    public static final int NOT_FOUND = 404;
+
+    /**
+     * 不允许的http方法
+     */
+    public static final int BAD_METHOD = 405;
+
+    /**
+     * 资源冲突，或者资源被锁
+     */
+    public static final int CONFLICT = 409;
+
+    /**
+     * 不支持的数据，媒体类型
+     */
+    public static final int UNSUPPORTED_TYPE = 415;
+
+    /**
+     * 系统内部错误
+     */
+    public static final int ERROR = 500;
+
+    /**
+     * 接口未实现
+     */
+    public static final int NOT_IMPLEMENTED = 501;
+
+    /**
+     * 系统警告消息
+     */
+    public static final int WARN = 601;
+}
@@ -128,6 +128,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .authorizeRequests()
                 .requestMatchers(CorsUtils::isPreFlightRequest).permitAll()
                 .antMatchers(userSetting.getInterfaceAuthenticationExcludes().toArray(new String[0])).permitAll()
+                .antMatchers("/ws/**").permitAll()
                 .antMatchers("/api/user/login","/api/user/getInfo", "/index/hook/**", "/swagger-ui/**", "/doc.html").permitAll()
                 .anyRequest().authenticated()
                 .and()
 package com.genersoft.iot.vmp.jtt1078.publisher;
  
-import com.genersoft.iot.vmp.jtt1078.app.VideoServerApp;
 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.VideoSubscriber;
@@ -18,15 +18,15 @@ import org.slf4j.LoggerFactory;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentLinkedQueue;
  
-/**
- * Created by matrixy on 2020/1/11.
- */
 public class Channel
 {
     static Logger logger = LoggerFactory.getLogger(Channel.class);
  
     ConcurrentLinkedQueue<Subscriber> subscribers;
+
+    // [恢复] FFmpeg 推流进程管理器
     RTMPPublisher rtmpPublisher;
+    // [删除] ZlmRtpPublisher rtpPublisher;
  
     String tag;
     boolean publishing;
@@ -38,12 +38,16 @@ public class Channel
     public Channel(String tag)
     {
         this.tag = tag;
-        this.subscribers = new ConcurrentLinkedQueue<Subscriber>();
+        this.subscribers = new ConcurrentLinkedQueue<>();
         this.flvEncoder = new FlvEncoder(true, true);
         this.buffer = new ByteHolder(2048 * 100);
  
-        if (!StringUtils.isEmpty(Configs.get("rtmp.url")))
+        // [恢复] 启动 FFmpeg 进程
+        // 只要配置了 rtmp.url，就启动 FFmpeg 去拉取当前的 HTTP 流并转码推送
+        String rtmpUrl = Configs.get("rtmp.url");
+        if (StringUtils.isNotBlank(rtmpUrl))
         {
+            logger.info("[{}] 启动 FFmpeg 进程推流至: {}", tag, rtmpUrl);
             rtmpPublisher = new RTMPPublisher(tag);
             rtmpPublisher.start();
         }
@@ -56,8 +60,6 @@ public class Channel
  
     public Subscriber subscribe(ChannelHandlerContext ctx)
     {
-        logger.info("channel: {} -> {}, subscriber: {}", Long.toHexString(hashCode() & 0xffffffffL), tag, ctx.channel().remoteAddress().toString());
-
         Subscriber subscriber = new VideoSubscriber(this.tag, ctx);
         this.subscribers.add(subscriber);
         return subscriber;
@@ -65,12 +67,16 @@ public class Channel
  
     public void writeAudio(long timestamp, int pt, byte[] data)
     {
+        // 1. 转码为 PCM (用于 FLV 封装，FFmpeg 会从 FLV 中读取 PCM 并转码为 AAC)
         if (audioCodec == null)
         {
             audioCodec = AudioCodec.getCodec(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)
@@ -78,12 +84,15 @@ public class Channel
         if (firstTimestamp == -1) firstTimestamp = timeoffset;
         this.publishing = true;
         this.buffer.write(h264);
+
         while (true)
         {
             byte[] nalu = readNalu();
             if (nalu == null) break;
             if (nalu.length < 4) continue;
  
+            // 1. 封装为 FLV Tag (必须)
+            // FFmpeg 通过 HTTP 读取这些 FLV Tag
             byte[] flvTag = this.flvEncoder.write(nalu, (int) (timeoffset - firstTimestamp));
  
             if (flvTag == null) continue;
@@ -131,11 +140,19 @@ public class Channel
             subscriber.close();
             itr.remove();
         }
-        if (rtmpPublisher != null) rtmpPublisher.close();
+
+        // [恢复] 关闭 FFmpeg 进程
+        if (rtmpPublisher != null) {
+            rtmpPublisher.close();
+            rtmpPublisher = null;
+        }
     }
  
+    // [恢复] 原版 readNalu (FFmpeg 偏好带 StartCode 的数据，或者 FlvEncoder 需要)
+    // 之前为了 RTP 特意修改了切片逻辑，现在改回原版简单逻辑即可
     private byte[] readNalu()
     {
+        // 寻找 00 00 00 01
         for (int i = 0; i < buffer.size() - 3; i++)
         {
             int a = buffer.get(i + 0) & 0xff;
 package com.genersoft.iot.vmp.jtt1078.server;
  
 import com.genersoft.iot.vmp.jtt1078.util.ByteHolder;
-import com.genersoft.iot.vmp.jtt1078.util.ByteUtils;
 import com.genersoft.iot.vmp.jtt1078.util.Packet;
  
-/**
- * Created by matrixy on 2019/4/9.
- */
-public class Jtt1078Decoder
-{
-    ByteHolder buffer = new ByteHolder(4096);
+public class Jtt1078Decoder {
  
-    public void write(byte[] block)
-    {
+    // 加大缓冲区，防止高清视频流溢出
+    ByteHolder buffer = new ByteHolder(4096 * 20);
+    private static final int HEADER_MAGIC = 0x30316364;
+
+    public void write(byte[] block) {
         buffer.write(block);
     }
  
-    public void write(byte[] block, int startIndex, int length)
-    {
+    public void write(byte[] block, int startIndex, int length) {
         byte[] buff = new byte[length];
         System.arraycopy(block, startIndex, buff, 0, length);
         write(buff);
     }
  
-    public Packet decode()
-    {
-        if (this.buffer.size() < 30) return null;
-
-        if ((buffer.getInt(0) & 0x7fffffff) != 0x30316364)
-        {
-            String header = ByteUtils.toString(buffer.array(30));
-            throw new RuntimeException("invalid protocol header: " + header);
+    public Packet decode() {
+        // 1. 搜寻包头 (关键改造)
+        while (this.buffer.size() >= 4) {
+            if ((buffer.getInt(0) & 0x7fffffff) == HEADER_MAGIC) {
+                break;
+            }
+            // 丢弃无效字节
+            byte[] trash = new byte[1];
+            buffer.read(trash);
         }
  
+        if (this.buffer.size() < 30) return null;
+
         int lengthOffset = 28;
         int dataType = (this.buffer.get(15) >> 4) & 0x0f;
-        // 透传数据类型：0100，没有后面的时间以及Last I Frame Interval和Last Frame Interval字段
+
         if (dataType == 0x04) lengthOffset = 28 - 8 - 2 - 2;
         else if (dataType == 0x03) lengthOffset = 28 - 4;
-        int bodyLength = this.buffer.getShort(lengthOffset);
  
+        int bodyLength = this.buffer.getShort(lengthOffset);
         int packetLength = bodyLength + lengthOffset + 2;
  
         if (this.buffer.size() < packetLength) return null;
+
         byte[] block = new byte[packetLength];
         this.buffer.sliceInto(block, packetLength);
         return Packet.create(block);
 package com.genersoft.iot.vmp.jtt1078.server;
  
+import com.genersoft.iot.vmp.VManageBootstrap;
 import com.genersoft.iot.vmp.jtt1078.publisher.Channel;
 import com.genersoft.iot.vmp.jtt1078.publisher.PublishManager;
 import com.genersoft.iot.vmp.jtt1078.util.Packet;
+import com.genersoft.iot.vmp.jtt1078.websocket.Jtt1078AudioBroadcastManager;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.Jt1078OfCarController;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.DataBuffer;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.SimFlow;
@@ -10,122 +12,181 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
-import io.netty.util.AttributeKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
 import org.springframework.data.redis.core.StringRedisTemplate;
  
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
  
-import static com.genersoft.iot.vmp.VManageBootstrap.getBean;
-
-/**
- * Created by matrixy on 2019/4/9.
- */
 public class Jtt1078Handler extends SimpleChannelInboundHandler<Packet> {
-    private static ApplicationContext applicationContext;
-    static Logger logger = LoggerFactory.getLogger(Jtt1078Handler.class);
-    private static final AttributeKey<Session> SESSION_KEY = AttributeKey.valueOf("session-key");
-    private Integer port;
  
-    private String time;
+    private static final Logger logger = LoggerFactory.getLogger(Jtt1078Handler.class);
+    private static DataBuffer simFlowDataBuffer;
+    private static StringRedisTemplate redisTemplate;
  
-    private static final DataBuffer simFlowDataBuffer = getBean(DataBuffer.class);
+    private Integer port;
+    private String currentTag;      // FFmpeg用 (可能带端口后缀)
+    private String currentSim;      // 纯SIM (日志用)
+    private int currentChannelId;   // 当前通道号
  
-    private static final ConcurrentHashMap<String, SimFlow> sizeMap = new ConcurrentHashMap<>();
+    private long lastStatTime = 0;
+    private long currentSecondFlow = 0;
+    private int currentSecondCount = 0;
+    private long lastRedisKeepAliveTime = 0;
  
     public Jtt1078Handler(Integer port) {
         this.port = port;
     }
+    public Jtt1078Handler() {}
  
-    public Jtt1078Handler() {
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        super.channelActive(ctx);
+        if (redisTemplate == null) redisTemplate = VManageBootstrap.getBean(StringRedisTemplate.class);
+        if (simFlowDataBuffer == null) simFlowDataBuffer = VManageBootstrap.getBean(DataBuffer.class);
     }
  
-    /**
-     * 流来
-     */
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, Packet packet) throws Exception {
         io.netty.channel.Channel nettyChannel = ctx.channel();
+
+        // 1. 协议解析
         packet.seek(8);
         String sim = packet.nextBCD() + packet.nextBCD() + packet.nextBCD() + packet.nextBCD() + packet.nextBCD() + packet.nextBCD();
         int channel = packet.nextByte() & 0xff;
-        String tag = sim + "-" + channel;
-        tag = tag.replaceAll("^0+", "");
+
+        String rawSim = sim;
+        // 生成标准 Key: 138000-1 (去除前导0)
+        String standardTag = rawSim.replaceAll("^0+", "") + "-" + channel;
+        String tag = standardTag;
+
+        this.currentSim = rawSim.replaceAll("^0+", "");
+        this.currentChannelId = channel;
+
+        // 2. 端口过滤与重命名 (保持原有逻辑，处理多端口映射)
         if (port != null) {
             Set<String> set = Jt1078OfCarController.map.get(port);
             String findSet = Jt1078OfCarController.getFindSet(set, tag);
             if (findSet != null) {
-                tag = findSet + "_" + port;
+                tag = findSet + "_" + port; // tag 变成了 138000-1_1078
             } else {
                 return;
             }
         }
-        StringRedisTemplate redisTemplate = getBean(StringRedisTemplate.class);
-        if (redisTemplate.opsForSet().add("tag:" + tag, tag) > 0) {
-            redisTemplate.expire("tag:" + tag, 60, TimeUnit.SECONDS);
-            logger.info("[ {} ] --> 流接收成功 ", tag);
-        } else {
-            redisTemplate.expire("tag:" + tag, 60, TimeUnit.SECONDS);
-        }
-        String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-
-        String key = sim + "-" + channel;
-        if (sizeMap.containsKey(key)){
-            SimFlow simFlow = sizeMap.get(key);
-            simFlow.setFlow(simFlow.getFlow() + packet.size());
-            simFlow.setCount(simFlow.getCount() + 1);
-        }else {
-            sizeMap.put(key, SimFlow.builder().sim(sim).count(1).flow((long) packet.size()).channel(channel).time(format).build());
+
+        this.currentTag = tag;
+
+        // 3. Redis保活
+        long now = System.currentTimeMillis();
+        if (now - lastRedisKeepAliveTime > 5000) {
+            String redisKey = "tag:" + tag;
+            if (Boolean.TRUE.equals(redisTemplate.hasKey(redisKey))) {
+                redisTemplate.expire(redisKey, 60, TimeUnit.SECONDS);
+            } else {
+                redisTemplate.opsForSet().add(redisKey, tag);
+                redisTemplate.expire(redisKey, 60, TimeUnit.SECONDS);
+                logger.info("[{}] Stream Online", tag);
+            }
+            lastRedisKeepAliveTime = now;
         }
-        if (time == null || !time.equals(format)) {
-            time = format;
-            sizeMap.entrySet().forEach(entry -> {
-                SimFlow value = entry.getValue();
-                logger.debug("{} === {}次 === {} 流来的大小 {} ", value.getTime(), value.getCount(), value.getSim() + "-" + value.getChannel(), value.getFlow());
-                if (simFlowDataBuffer != null) {
-                    simFlowDataBuffer.setValue(value);
-                }
-            });
-            sizeMap.clear();
+
+        // 4. 流量统计
+        long currentSecond = now / 1000;
+        long lastSecond = lastStatTime / 1000;
+        currentSecondFlow += packet.size();
+        currentSecondCount++;
+        if (currentSecond != lastSecond) {
+            if (lastStatTime != 0) {
+                String timeStr = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now());
+                SimFlow simFlow = SimFlow.builder().sim(rawSim).channel(channel).flow(currentSecondFlow).count(currentSecondCount).time(timeStr).build();
+                if (simFlowDataBuffer != null) simFlowDataBuffer.setValue(simFlow);
+            }
+            currentSecondFlow = 0;
+            currentSecondCount = 0;
+            lastStatTime = now;
         }
-        if (SessionManager.contains(nettyChannel, "tag") == false) {
+
+        // 5. 初始化组件 (核心修复点)
+        if (!SessionManager.contains(nettyChannel, "tag")) {
+            // A. 启动 FFmpeg 推流 (使用可能带后缀的 tag，用于视频直播)
             Channel chl = PublishManager.getInstance().open(tag);
+
+            // B. 双重注册：同时注册 tag 和 intercom_tag
+            // 这样视频直播用 tag，语音对讲用 intercom_tag，两者互不干扰
             SessionManager.set(nettyChannel, "tag", tag);
-            logger.info("start publishing: {} -> {}-{}", Long.toHexString(chl.hashCode() & 0xffffffffL), sim, channel);
+            SessionManager.set(nettyChannel, "intercom_tag", standardTag); // 供 WebSocket 查找
+
+            logger.info("Publish Start. VideoTag=[{}], IntercomTag=[{}]", tag, standardTag);
         }
  
+        // 6. 数据处理
+        processMediaPayload(nettyChannel, packet, tag, lengthOffset(packet));
+    }
+
+    /**
+     * 【重要】修正协议头长度计算
+     * DataType=3(音频) 和 2(对讲) 没有帧间隔字段(4字节)，所以偏移量要减4
+     */
+    private int lengthOffset(Packet packet) {
+        packet.seek(15);
+        int dataType = (packet.nextByte() >> 4) & 0x0f;
+
+        if (dataType == 0x04) {
+            return 28 - 8 - 2 - 2; // 透传
+        } else if (dataType == 0x03 || dataType == 0x02) {
+            return 28 - 4; // 音频 & 对讲
+        }
+        return 28; // 视频
+    }
+
+    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;
-        // 1. 做好序号
-        // 2. 音频需要转码后提供订阅
-        int lengthOffset = 28;
-        int dataType = (packet.seek(15).nextByte() >> 4) & 0x0f;
-        int pkType = packet.seek(15).nextByte() & 0x0f;
-        // 透传数据类型：0100，没有后面的时间以及Last I Frame Interval和Last Frame Interval字段
-        if (dataType == 0x04) lengthOffset = 28 - 8 - 2 - 2;
-        else if (dataType == 0x03) lengthOffset = 28 - 4;
-
-        int pt = packet.seek(5).nextByte() & 0x7f;
-
-        if (dataType == 0x00 || dataType == 0x01 || dataType == 0x02) {
-            // 碰到结束标记时，序号+1
+
+        packet.seek(15);
+        byte dataTypeByte = packet.nextByte();
+        int dataType = (dataTypeByte >> 4) & 0x0f; // 0=AV, 1=V, 2=Intercom, 3=Audio
+        int pkType = dataTypeByte & 0x0f;
+
+        packet.seek(5);
+        int pt = packet.nextByte() & 0x7f;
+
+        // --- 分支 A: 视频流 (0, 1) ---
+        // 视频流必须发给 PublishManager (FFmpeg)
+        if (dataType == 0x00 || dataType == 0x01) {
             if (pkType == 0 || pkType == 2) {
                 sequence += 1;
                 SessionManager.set(nettyChannel, "video-sequence", sequence);
             }
             long timestamp = packet.seek(16).nextLong();
-            PublishManager.getInstance().publishVideo(tag, sequence, timestamp, pt, packet.seek(lengthOffset + 2).nextBytes());
-        } else if (dataType == 0x03) {
-            long timestamp = packet.seek(16).nextLong();
-            byte[] data = packet.seek(lengthOffset + 2).nextBytes();
-            PublishManager.getInstance().publishAudio(tag, sequence, timestamp, pt, data);
+            byte[] videoData = packet.seek(lengthOffset + 2).nextBytes();
+
+            // 推流到 FFmpeg (直播)
+            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);
+                }
+            }
         }
     }
  
@@ -137,31 +198,34 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt; {
  
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        // super.exceptionCaught(ctx, cause);
-        cause.printStackTrace();
+        String msg = cause.getMessage();
+        if (msg != null && (msg.contains("invalid protocol header") || msg.contains("Connection reset"))) {
+            // ignore scan errors
+        } else {
+            logger.error("Jtt1078Handler Exception: {}", cause.getMessage());
+        }
         release(ctx.channel());
         ctx.close();
     }
  
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-        if (IdleStateEvent.class.isAssignableFrom(evt.getClass())) {
+        if (evt instanceof IdleStateEvent) {
             IdleStateEvent event = (IdleStateEvent) evt;
             if (event.state() == IdleState.READER_IDLE) {
-                String tag = SessionManager.get(ctx.channel(), "tag");
-                logger.info("read timeout: {}", tag);
-                release(ctx.channel());
+                logger.warn("Read Timeout: {}", currentTag);
+                ctx.close();
             }
+        } else {
+            super.userEventTriggered(ctx, evt);
         }
     }
  
     private void release(io.netty.channel.Channel channel) {
         String tag = SessionManager.get(channel, "tag");
         if (tag != null) {
-            logger.info("close netty channel: {}", tag);
+            SessionManager.remove(channel);
             PublishManager.getInstance().close(tag);
         }
     }
-
-
 }
 package com.genersoft.iot.vmp.jtt1078.server;
  
 import io.netty.channel.Channel;
-import org.apache.commons.collections4.map.HashedMap;
-
+import io.netty.util.AttributeKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
  
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 会话管理器
+ * 负责维护 Netty Channel 与 设备标识 的映射关系
+ */
+public class SessionManager {
+
+    private static final Logger logger = LoggerFactory.getLogger(SessionManager.class);
+
+    // 维护 Tag 到 Netty Channel 的映射
+    private static final Map<String, Channel> tagToChannelMap = new ConcurrentHashMap<>();
+
+    public static void init() {
+        tagToChannelMap.clear();
+        logger.info("SessionManager initialized.");
+    }
+
+    /**
+     * 绑定属性到 Channel，并建立反向索引
+     */
+    public static void set(Channel channel, String key, Object value) {
+        if (channel == null || key == null) return;
  
-public final class SessionManager
-{
-    private static final Map<String, Object> mappings = new HashedMap();
+        // 1. 设置 Channel 内部属性
+        channel.attr(AttributeKey.valueOf(key)).set(value);
  
-    public static void init()
-    {
-        // ...
+        // 2. 【核心修复】建立反向索引
+        // 同时支持 "tag" (视频流专用，可能带后缀) 和 "intercom_tag" (对讲专用，纯净SIM-通道)
+        // 这样 WebSocket 使用 "sim-channel" 也能查找到连接，互不影响
+        if (("tag".equals(key) || "intercom_tag".equals(key)) && value instanceof String) {
+            String tagValue = (String) value;
+            tagToChannelMap.put(tagValue, channel);
+        }
     }
  
-    public static <T> T get(Channel channel, String key)
-    {
-        return (T) mappings.get(channel.id().asLongText() + key);
+    @SuppressWarnings("unchecked")
+    public static <T> T get(Channel channel, String key) {
+        if (channel == null) return null;
+        return (T) channel.attr(AttributeKey.valueOf(key)).get();
     }
  
-    public static void set(Channel channel, String key, Object value)
-    {
-        mappings.put(channel.id().asLongText() + key, value);
+    public static boolean contains(Channel channel, String key) {
+        if (channel == null) return false;
+        return channel.attr(AttributeKey.valueOf(key)).get() != null;
+    }
+
+    /**
+     * WebSocket 调用此方法查找设备连接
+     */
+    public static Channel getChannelByTag(String tag) {
+        if (tag == null) return null;
+        return tagToChannelMap.get(tag);
+    }
+
+    public static void remove(Channel channel) {
+        if (channel == null) return;
+
+        // 清理关联的 tag
+        String tag = get(channel, "tag");
+        if (tag != null) tagToChannelMap.remove(tag);
+
+        // 清理关联的 intercom_tag
+        String intercomTag = get(channel, "intercom_tag");
+        if (intercomTag != null) tagToChannelMap.remove(intercomTag);
     }
  
-    public static boolean contains(Channel channel, String key)
-    {
-        return mappings.containsKey(channel.id().asLongText() + key);
+    public static int getSessionCount() {
+        return tagToChannelMap.size();
     }
 }
@@ -3,27 +3,34 @@ package com.genersoft.iot.vmp.jtt1078.subscriber;
 import com.genersoft.iot.vmp.jtt1078.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.redis.core.RedisTemplate;
  
-import javax.annotation.Resource;
+import java.io.Closeable;
 import java.io.InputStream;
+import java.util.concurrent.TimeUnit;
  
+/**
+ * FFmpeg 推流器 (仅处理视频直播流)
+ */
 public class RTMPPublisher extends Thread
 {
     static Logger logger = LoggerFactory.getLogger(RTMPPublisher.class);
  
     String tag = null;
     Process process = null;
+    private volatile boolean running = true;
  
     public RTMPPublisher(String tag)
     {
         this.tag = tag;
+        this.setName("RTMPPublisher-" + tag);
+        this.setDaemon(true);
     }
  
     @Override
     public void run()
     {
         InputStream stderr = null;
+        InputStream stdout = null;
         int len = -1;
         byte[] buff = new byte[512];
         boolean debugMode = "on".equalsIgnoreCase(Configs.get("debug.mode"));
@@ -32,29 +39,131 @@ public class RTMPPublisher extends Thread
         {
             String sign = "41db35390ddad33f83944f44b8b75ded";
             String rtmpUrl = Configs.get("rtmp.url").replaceAll("\\{TAG\\}", tag).replaceAll("\\{sign\\}",sign);
-            String cmd = String.format("%s -i http://127.0.0.1:%d/video/%s -vcodec copy -acodec aac -f rtsp %s",
-                        Configs.get("ffmpeg.path"),
-                        Configs.getInt("server.http.port", 3333),
-                        tag,
-                        rtmpUrl
-                    );
-            logger.info("推流命令 Execute: {}", cmd);
+
+            // 【修复】自动判断协议格式，避免硬编码 -f rtsp 导致 RTMP 推流失败
+            String formatFlag = "";
+            if (rtmpUrl.startsWith("rtsp://")) {
+                formatFlag = "-f rtsp";
+            } else if (rtmpUrl.startsWith("rtmp://")) {
+                formatFlag = "-f flv";
+            }
+
+            // 低延迟：缩短 HTTP-FLV 探测与缓冲，尽快向 ZLM 输出（仍受设备 GOP/关键帧限制）
+            String inputLowLatency =
+                    "-fflags +nobuffer+discardcorrupt -flags low_delay -probesize 32 -analyzeduration 0";
+            String outputLowLatency = "-flush_packets 1";
+
+            // 构造命令：只处理视频流和非对讲的音频流
+            String 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,
+                    Configs.getInt("server.http.port", 3333),
+                    tag,
+                    outputLowLatency,
+                    formatFlag,
+                    rtmpUrl
+            );
+
+            logger.info("FFmpeg Push Started. Tag: {}, CMD: {}", tag, cmd);
+
             process = Runtime.getRuntime().exec(cmd);
             stderr = process.getErrorStream();
-            while ((len = stderr.read(buff)) > -1)
+            stdout = process.getInputStream();
+
+            // 启动一个线程消费 stdout，防止缓冲区满导致进程阻塞
+            final InputStream finalStdout = stdout;
+            Thread stdoutConsumer = new Thread(() -> {
+                try {
+                    byte[] buffer = new byte[512];
+                    while (running && finalStdout.read(buffer) > -1) {
+                        // 只消费，不输出
+                    }
+                } catch (Exception e) {
+                    // 忽略异常
+                }
+            }, "FFmpeg-stdout-" + tag);
+            stdoutConsumer.setDaemon(true);
+            stdoutConsumer.start();
+
+            // 消费 stderr 日志流，防止阻塞
+            while (running && (len = stderr.read(buff)) > -1)
             {
-                if (debugMode) System.out.print(new String(buff, 0, len));
+                if (debugMode) {
+                    System.out.print(new String(buff, 0, len));
+                }
             }
-            logger.info("Process FFMPEG exited...");
+
+            // 进程退出处理
+            int exitCode = process.waitFor();
+            logger.warn("FFmpeg process exited. Code: {}, Tag: {}", exitCode, tag);
+        }
+        catch(InterruptedException ex)
+        {
+            logger.info("RTMPPublisher interrupted: {}", tag);
+            Thread.currentThread().interrupt();
         }
         catch(Exception ex)
         {
-            logger.error("publish failed", ex);
+            logger.error("RTMPPublisher Error: " + tag, ex);
+        }
+        finally
+        {
+            // 确保所有流都被关闭
+            closeQuietly(stderr);
+            closeQuietly(stdout);
+            if (process != null) {
+                closeQuietly(process.getInputStream());
+                closeQuietly(process.getOutputStream());
+                closeQuietly(process.getErrorStream());
+            }
         }
     }
  
     public void close()
     {
-        try { if (process != null) process.destroyForcibly(); } catch(Exception e) { }
+        try {
+            // 设置停止标志
+            running = false;
+
+            if (process != null) {
+                // 先尝试正常终止
+                process.destroy();
+
+                // 等待最多 3 秒
+                boolean exited = process.waitFor(3, TimeUnit.SECONDS);
+
+                if (!exited) {
+                    // 如果还没退出，强制终止
+                    logger.warn("FFmpeg process did not exit gracefully, forcing termination: {}", tag);
+                    process.destroyForcibly();
+                    process.waitFor(2, TimeUnit.SECONDS);
+                }
+
+                logger.info("FFmpeg process terminated: {}", tag);
+            }
+
+            // 中断线程（如果还在阻塞读取）
+            this.interrupt();
+
+            // 等待线程结束
+            this.join(2000);
+
+        } catch(Exception e) {
+            logger.error("Error closing RTMPPublisher: " + tag, e);
+        }
+    }
+
+    /**
+     * 安全关闭流，忽略异常
+     */
+    private void closeQuietly(Closeable stream) {
+        if (stream != null) {
+            try {
+                stream.close();
+            } catch (Exception e) {
+                // 忽略
+            }
+        }
     }
 }
+package com.genersoft.iot.vmp.jtt1078.subscriber;
+
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.genersoft.iot.vmp.jtt1078.util.Configs;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.channel.socket.nio.NioDatagramChannel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetSocketAddress;
+
+public class ZlmRtpPublisher {
+    private static final Logger logger = LoggerFactory.getLogger(ZlmRtpPublisher.class);
+    private static final EventLoopGroup group = new NioEventLoopGroup();
+
+    private Channel nettyChannel;
+    private InetSocketAddress zlmRtpAddress;
+    private String streamId;
+
+    // [核心修复1] 音视频分离的状态
+    private int audioSsrc;
+    private int videoSsrc;
+    private int audioSeq = 0;
+    private int videoSeq = 0;
+
+    public ZlmRtpPublisher(String streamId) {
+        this.streamId = streamId;
+    }
+
+    public void start() {
+        try {
+            String zlmHost = Configs.get("zlm.host");
+            int zlmHttpPort = Configs.getInt("zlm.http.port", 80);
+            String zlmSecret = Configs.get("zlm.secret");
+
+            // 生成 SSRC: 视频用 Hash，音频用 Hash+1，确保不冲突
+            int baseSsrc = (streamId.hashCode() & 0x7FFFFFFF);
+            this.videoSsrc = baseSsrc;
+            this.audioSsrc = baseSsrc + 1;
+
+            // 申请端口
+            String url = String.format("http://%s:%d/index/api/openRtpServer?secret=%s&stream_id=%s&ssrc=%s&port=0&enable_tcp=0&app=schedule",
+                    zlmHost, zlmHttpPort, zlmSecret, streamId, videoSsrc);
+
+            logger.info("[{}] 申请 RTP 端口: {}", streamId, url);
+            String response = HttpUtil.get(url);
+            JSONObject json = JSONUtil.parseObj(response);
+
+            if (json.getInt("code") != 0) {
+                throw new RuntimeException("ZLM openRtpServer error: " + response);
+            }
+
+            int rtpPort = json.getInt("port");
+            this.zlmRtpAddress = new InetSocketAddress(zlmHost, rtpPort);
+
+            Bootstrap b = new Bootstrap();
+            b.group(group)
+                    .channel(NioDatagramChannel.class)
+                    .option(ChannelOption.SO_SNDBUF, 1024 * 1024)
+                    .handler(new io.netty.channel.ChannelHandlerAdapter() {});
+
+            this.nettyChannel = b.bind(0).sync().channel();
+            logger.info("[{}] RTP 推流就绪 (UDP) -> {}:{}", streamId, zlmHost, rtpPort);
+
+        } catch (Exception e) {
+            logger.error("[{}] 启动 RTP 推流失败", streamId, e);
+        }
+    }
+
+    public void sendVideo(long timestampMs, byte[] nalu) {
+        if (nettyChannel == null || zlmRtpAddress == null) return;
+
+        // [核心修复2] 智能剔除 H.264 Start Code (00 00 00 01 或 00 00 01)
+        int offset = 0;
+        if (nalu.length > 4 && nalu[0] == 0 && nalu[1] == 0 && nalu[2] == 0 && nalu[3] == 1) {
+            offset = 4;
+        } else if (nalu.length > 3 && nalu[0] == 0 && nalu[1] == 0 && nalu[2] == 1) {
+            offset = 3;
+        }
+
+        int length = nalu.length - offset;
+        if (length <= 0) return; // 空包不发
+
+        long rtpTimestamp = timestampMs * 90; // 90kHz
+        int maxPacketSize = 1400;
+
+        if (length <= maxPacketSize) {
+            // 单包
+            ByteBuf packet = createRtpPacket(rtpTimestamp, true, 96, videoSsrc, videoSeq++);
+            packet.writeBytes(nalu, offset, length);
+            sendRtp(packet);
+        } else {
+            // FU-A 分片
+            byte naluHeader = nalu[offset];
+            int nri = naluHeader & 0x60;
+            int type = naluHeader & 0x1f;
+
+            offset += 1;
+            length -= 1;
+
+            boolean first = true;
+            while (length > 0) {
+                int currLen = Math.min(length, maxPacketSize);
+                boolean last = (length == currLen);
+
+                // 只有最后一包打 Marker
+                ByteBuf packet = createRtpPacket(rtpTimestamp, last, 96, videoSsrc, videoSeq++);
+
+                packet.writeByte(nri | 28); // FU Indicator
+
+                int fuHeader = type;
+                if (first) fuHeader |= 0x80;
+                if (last) fuHeader |= 0x40;
+                packet.writeByte(fuHeader); // FU Header
+
+                packet.writeBytes(nalu, offset, currLen);
+                sendRtp(packet);
+
+                offset += currLen;
+                length -= currLen;
+                first = false;
+            }
+        }
+    }
+
+    public void sendAudio(long timestampMs, byte[] data) {
+        if (nettyChannel == null || zlmRtpAddress == null) return;
+
+        // 音频必须使用独立的序列号 audioSeq
+        // RTP 音频时钟 8kHz
+        long rtpTimestamp = timestampMs * 8;
+
+        ByteBuf packet = createRtpPacket(rtpTimestamp, true, 8, audioSsrc, audioSeq++);
+        packet.writeBytes(data);
+        sendRtp(packet);
+    }
+
+    // 统一封装 RTP Header
+    private ByteBuf createRtpPacket(long timestamp, boolean marker, int pt, int ssrc, int seqNum) {
+        ByteBuf buf = Unpooled.buffer(1500);
+        buf.writeByte(0x80); // V=2
+        buf.writeByte((marker ? 0x80 : 0x00) | pt); // M | PT
+        buf.writeShort(seqNum); // Sequence
+        buf.writeInt((int) timestamp); // Timestamp
+        buf.writeInt(ssrc); // SSRC
+        return buf;
+    }
+
+    private void sendRtp(ByteBuf packet) {
+        nettyChannel.writeAndFlush(new DatagramPacket(packet, zlmRtpAddress));
+    }
+
+    public void close() {
+        if (nettyChannel != null) nettyChannel.close();
+    }
+}
+package com.genersoft.iot.vmp.jtt1078.util;
+
+/**
+ * G.711 A-Law 编解码工具类
+ */
+public class ALaw {
+
+    private static final byte[] ALAW_TABLE = new byte[65536]; // 线性 -> ALaw 查找表
+    private static final short[] LINEAR_TABLE = new short[256]; // ALaw -> 线性 查找表
+
+    static {
+        // 初始化 ALaw -> Linear 表
+        for (int i = 0; i < 256; i++) {
+            LINEAR_TABLE[i] = alaw2linear((byte) i);
+        }
+
+        // 初始化 Linear -> ALaw 表
+        for (int i = -32768; i <= 32767; i++) {
+            ALAW_TABLE[i & 0xFFFF] = linear2alaw((short) i);
+        }
+    }
+
+    /**
+     * 将 16bit PCM 压缩为 8bit A-Law (查表法，高性能)
+     */
+    public static byte encode(short pcm) {
+        return ALAW_TABLE[pcm & 0xFFFF];
+    }
+
+    /**
+     * 将 8bit A-Law 解压为 16bit PCM (查表法，高性能)
+     */
+    public static short decode(byte alaw) {
+        return LINEAR_TABLE[alaw & 0xFF];
+    }
+
+    // --- 以下是基础算法实现，用于静态块初始化 ---
+
+    private static final int MAX = 0x7FFF; // 32767
+
+    private static byte linear2alaw(short pcm_val) {
+        int mask;
+        int seg;
+        int aval;
+
+        if (pcm_val >= 0) {
+            mask = 0xD5;
+        } else {
+            mask = 0x55;
+            pcm_val = (short) (-pcm_val - 1); // 负数转正数
+            if (pcm_val < 0) {
+                pcm_val = MAX;
+            }
+        }
+
+        if (pcm_val < 256) {
+            aval = pcm_val >> 4;
+        } else {
+            seg = 0;
+            for (int i = pcm_val; i > 256; i >>= 1) {
+                seg++;
+            }
+            aval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0F);
+        }
+        return (byte) ((aval ^ mask) & 0xFF);
+    }
+
+    private static short alaw2linear(byte alaw_val) {
+        int t;
+        int seg;
+
+        alaw_val ^= 0x55;
+
+        t = (alaw_val & 0x0F) << 4;
+        seg = ((int) (alaw_val & 0x70)) >> 4;
+
+        switch (seg) {
+            case 0:
+                t += 8;
+                break;
+            case 1:
+                t += 0x108;
+                break;
+            default:
+                t += 0x108;
+                t <<= seg - 1;
+        }
+
+        return (short) ((alaw_val & 0x80) == 0 ? t : -t);
+    }
+}
+package com.genersoft.iot.vmp.jtt1078.util;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import java.util.Arrays;
+
+/**
+ * 音频转换与封包工具 (修复版)
+ */
+public class AudioCodecUtil {
+
+    // G.711A (byte) -> PCM (byte[])
+    public static byte[] g711aToPcm(byte[] g711Data) {
+        if (g711Data == null) return new byte[0];
+        byte[] pcmData = new byte[g711Data.length * 2];
+        for (int i = 0; i < g711Data.length; i++) {
+            short s = ALaw.decode(g711Data[i]);
+            pcmData[2 * i] = (byte) (s & 0xff);
+            pcmData[2 * i + 1] = (byte) ((s >> 8) & 0xff);
+        }
+        return pcmData;
+    }
+
+    // PCM -> G.711A (byte[])
+    public static byte[] pcmToG711a(byte[] pcmData) {
+        if (pcmData == null) return new byte[0];
+        byte[] g711Data = new byte[pcmData.length / 2];
+        for (int i = 0; i < g711Data.length; i++) {
+            int low = pcmData[2 * i] & 0xff;
+            int high = pcmData[2 * i + 1] & 0xff;
+            short s = (short) (low | (high << 8));
+            g711Data[i] = ALaw.encode(s);
+        }
+        return g711Data;
+    }
+
+    /**
+     * 【核心修复】更安全的封包逻辑
+     */
+    public static ByteBuf encodeJt1078AudioPacket(String sim, int channel, int sequence, byte[] audioBody) {
+        // 计算总长度：30字节头 + 音频体长度
+        int totalLen = 30 + (audioBody != null ? audioBody.length : 0);
+
+        // 创建 HeapBuffer
+        ByteBuf buffer = Unpooled.buffer(totalLen);
+
+        // --- 30字节头 ---
+        buffer.writeInt(0x30316364); // 0-3: Frame Header
+        buffer.writeByte(0x80);      // 4: RTP V=2, P=0, X=0, CC=0
+        buffer.writeByte(0x88);      // 5: M=1, PT=8 (PCMA)
+        buffer.writeShort(sequence); // 6-7: Sequence
+
+        // 8-13: SIM卡号 (BCD)
+        byte[] bcdSim = str2Bcd(sim);
+        buffer.writeBytes(bcdSim); // 写入6字节
+
+        buffer.writeByte(channel);   // 14: Channel
+        buffer.writeByte(0x30);      // 15: DataType (0011 0000 -> 音频I帧)
+
+        buffer.writeLong(System.currentTimeMillis()); // 16-23: Timestamp
+
+        // 24-27: Intervals
+        buffer.writeShort(0);
+        buffer.writeShort(0);
+
+        // 28-29: Body Length
+        int bodyLen = (audioBody != null ? audioBody.length : 0);
+        buffer.writeShort(bodyLen);
+
+        // --- 写入音频数据 ---
+        if (bodyLen > 0) {
+            buffer.writeBytes(audioBody);
+        }
+
+        return buffer;
+    }
+
+    /**
+     * 【修复】更健壮的 BCD 转码
+     * 确保必须返回 6 字节，不足补0，超过截断
+     */
+    public static byte[] str2Bcd(String asc) {
+        if (asc == null) return new byte[6];
+
+        // 1. 预处理：只保留数字，不足12位补0
+        String num = asc.replaceAll("[^0-9]", "");
+        if (num.length() > 12) num = num.substring(0, 12);
+        else while (num.length() < 12) num = "0" + num; // 左补0
+
+        // 2. 转换
+        byte[] bbt = new byte[6];
+        char[] chars = num.toCharArray();
+
+        for (int p = 0; p < 6; p++) {
+            int high = chars[2 * p] - '0';
+            int low = chars[2 * p + 1] - '0';
+            bbt[p] = (byte) ((high << 4) | low);
+        }
+        return bbt;
+    }
+}
@@ -3,92 +3,108 @@ package com.genersoft.iot.vmp.jtt1078.util;
 import java.util.Arrays;
  
 /**
+ * 字节缓冲区工具类
  * Created by matrixy on 2018-06-15.
  */
-public class ByteHolder
-{
+public class ByteHolder {
     int offset = 0;
     int size = 0;
     byte[] buffer = null;
  
-    public ByteHolder(int bufferSize)
-    {
+    public ByteHolder(int bufferSize) {
         this.buffer = new byte[bufferSize];
     }
  
-    public int size()
-    {
+    public int size() {
         return this.size;
     }
  
-    public void write(byte[] data)
-    {
+    public void write(byte[] data) {
         write(data, 0, data.length);
     }
  
-    public void write(byte[] data, int offset, int length)
-    {
-        while (this.offset + length >= buffer.length)
+    public void write(byte[] data, int offset, int length) {
+        // 防止溢出，简单的扩容策略或抛异常
+        if (this.offset + length > buffer.length) {
+            // 简单扩容策略：如果空间不够，扩大两倍 (可选)
+            // byte[] newBuffer = new byte[Math.max(buffer.length * 2, this.offset + length)];
+            // System.arraycopy(buffer, 0, newBuffer, 0, this.offset);
+            // this.buffer = newBuffer;
+
+            // 原有逻辑：直接抛异常
             throw new RuntimeException(String.format("exceed the max buffer size, max length: %d, data length: %d", buffer.length, length));
+        }
  
-        // 复制一下内容
         System.arraycopy(data, offset, buffer, this.offset, length);
-
         this.offset += length;
         this.size += length;
     }
  
-    public byte[] array()
-    {
+    public byte[] array() {
         return array(this.size);
     }
  
-    public byte[] array(int length)
-    {
+    public byte[] array(int length) {
         return Arrays.copyOf(this.buffer, length);
     }
  
-    public void write(byte b)
-    {
+    public void write(byte b) {
+        if (this.offset >= buffer.length) {
+            throw new RuntimeException("Buffer overflow");
+        }
         this.buffer[offset++] = b;
         this.size += 1;
     }
  
-    public void sliceInto(byte[] dest, int length)
-    {
+    /**
+     * 将数据读入 dest 数组，并从缓冲区移除这些数据
+     */
+    public void sliceInto(byte[] dest, int length) {
+        if (length > this.size) {
+            throw new RuntimeException("Buffer underflow: not enough bytes to read");
+        }
         System.arraycopy(this.buffer, 0, dest, 0, length);
-        // 往前挪length个位
+        // 往前挪 length 个位 (移除已读数据)
         System.arraycopy(this.buffer, length, this.buffer, 0, this.size - length);
         this.offset -= length;
         this.size -= length;
     }
  
-    public void slice(int length)
-    {
-        // 往前挪length个位
+    /**
+     * 【新增】读取字节到数组中，并从缓冲区移除
+     * 配合 Decoder 的搜寻包头逻辑使用
+     */
+    public void read(byte[] dest) {
+        sliceInto(dest, dest.length);
+    }
+
+    /**
+     * 丢弃前 length 个字节
+     */
+    public void slice(int length) {
+        if (length > this.size) {
+            length = this.size; // 容错处理，最多丢弃所有
+        }
         System.arraycopy(this.buffer, length, this.buffer, 0, this.size - length);
         this.offset -= length;
         this.size -= length;
     }
  
-    public byte get(int position)
-    {
+    public byte get(int position) {
         return this.buffer[position];
     }
  
-    public void clear()
-    {
+    public void clear() {
         this.offset = 0;
         this.size = 0;
     }
  
-    public int getInt(int offset)
-    {
+    public int getInt(int offset) {
+        // 需保证 ByteUtils 存在且逻辑正确
         return ByteUtils.getInt(this.buffer, offset, 4);
     }
  
-    public int getShort(int position)
-    {
+    public int getShort(int position) {
         int h = this.buffer[position] & 0xff;
         int l = this.buffer[position + 1] & 0xff;
         return ((h << 8) | l) & 0xffff;
+package com.genersoft.iot.vmp.jtt1078.websocket;
+
+import com.genersoft.iot.vmp.jtt1078.util.AudioCodecUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.Session;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+@Component
+public class Jtt1078AudioBroadcastManager {
+    private static final Logger logger = LoggerFactory.getLogger(Jtt1078AudioBroadcastManager.class);
+
+    private static final ConcurrentHashMap<String, Set<Session>> sessionMap = new ConcurrentHashMap<>();
+
+    public static void addSession(String sim, int channel, Session session) {
+        String key = sim + "_" + channel;
+        sessionMap.computeIfAbsent(key, k -> new CopyOnWriteArraySet<>()).add(session);
+        logger.info("Frontend joined audio stream: {}", key);
+    }
+
+    public static void removeSession(String sim, int channel, Session session) {
+        String key = sim + "_" + channel;
+        Set<Session> sessions = sessionMap.get(key);
+        if (sessions != null) {
+            sessions.remove(session);
+            if (sessions.isEmpty()) {
+                sessionMap.remove(key);
+            }
+        }
+    }
+
+    public static void broadcastAudio(String sim, int channel, byte[] g711Data) {
+        String key = sim + "_" + channel;
+        Set<Session> sessions = sessionMap.get(key);
+
+        if (sessions != null && !sessions.isEmpty()) {
+            // 转码: G.711A -> PCM (浏览器友好)
+            byte[] pcmData = AudioCodecUtil.g711aToPcm(g711Data);
+            ByteBuffer buffer = ByteBuffer.wrap(pcmData);
+
+            for (Session session : sessions) {
+                if (session.isOpen()) {
+                    try {
+                        synchronized (session) {
+                            session.getBasicRemote().sendBinary(buffer.duplicate());
+                        }
+                    } catch (IOException e) {
+                        logger.error("WebSocket send error", e);
+                    }
+                }
+            }
+        }
+    }
+}
+package com.genersoft.iot.vmp.jtt1078.websocket;
+
+import com.genersoft.iot.vmp.jtt1078.server.SessionManager;
+import com.genersoft.iot.vmp.jtt1078.util.AudioCodecUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Slf4j
+@Component
+@ServerEndpoint("/ws/audio/{sim}/{channel}")
+public class Jtt1078AudioWebSocketServer {
+
+    private String sim;
+    private int channel;
+    private final AtomicInteger sequence = new AtomicInteger(0);
+
+    @OnOpen
+    public void onOpen(Session session, @PathParam("sim") String sim, @PathParam("channel") int channel) {
+        this.sim = sim.replaceAll("^0+", "");
+        this.channel = channel;
+        Jtt1078AudioBroadcastManager.addSession(this.sim, channel, session);
+        log.info("Intercom Connect: {}", this.sim);
+    }
+
+    @OnClose
+    public void onClose(Session session) {
+        Jtt1078AudioBroadcastManager.removeSession(sim, channel, session);
+        log.info("Intercom Disconnect: {}", sim);
+    }
+
+    @OnError
+    public void onError(Session session, Throwable error) {
+        Jtt1078AudioBroadcastManager.removeSession(sim, channel, session);
+        log.error("Intercom Error: {}", error.getMessage());
+    }
+
+    @OnMessage
+    public void onMessage(byte[] pcmData, Session session) {
+        ByteBuf jt1078Packet = null;
+        try {
+            // 1. 校验数据
+            if (pcmData == null || pcmData.length == 0) return;
+
+            // 2. 转码
+            byte[] g711Data = AudioCodecUtil.pcmToG711a(pcmData);
+
+            // 3. 封包 (获取 ByteBuf)
+            int seq = sequence.getAndIncrement();
+            jt1078Packet = AudioCodecUtil.encodeJt1078AudioPacket(sim, channel, seq, g711Data);
+
+            // 4. 发送
+            String tag = sim + "-" + channel;
+            Channel nettyChannel = SessionManager.getChannelByTag(tag);
+
+            if (nettyChannel != null && nettyChannel.isActive()) {
+                // writeAndFlush 会自动处理 refCnt 的释放（无论成功失败）
+                // 我们不需要手动 release，除非发送操作根本没执行
+                nettyChannel.writeAndFlush(jt1078Packet);
+            } else {
+                // 如果没发送，必须释放，防止内存泄漏
+                if (jt1078Packet.refCnt() > 0) {
+                    jt1078Packet.release();
+                }
+                if (sequence.get() % 100 == 0) { // 减少日志频次
+                    log.warn("Device offline or channel missing. Tag: {}", tag);
+                }
+            }
+        } catch (Exception e) {
+            log.error("Send audio failed", e);
+            // 异常发生时，如果 packet 已经创建但未发送，需要释放
+            if (jt1078Packet != null && jt1078Packet.refCnt() > 0) {
+                try { jt1078Packet.release(); } catch (Exception ex) {}
+            }
+        }
+    }
+}
@@ -32,6 +32,7 @@ import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.*;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.Jt1078OfCarController;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.IntercomService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +45,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
  
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.sip.InvalidArgumentException;
 import javax.sip.SipException;
@@ -134,6 +136,8 @@ public class ZLMHttpHookListener {
  
     @Autowired
     private StremProxyService1078 stremProxyService1078;
+    @Resource
+    private IntercomService intercomService;
  
  
     /**
@@ -207,7 +211,7 @@ public class ZLMHttpHookListener {
             return new HookResultForOnPublish(200, "success");
         }
         // 推流鉴权的处理
-        if (!"rtp".equals(param.getApp())) {
+        if (!"rtp".equals(param.getApp()) && !"schedule".equals(param.getApp())) {
             StreamProxyItem stream = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
             if (stream != null) {
                 HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();
@@ -685,10 +689,15 @@ public class ZLMHttpHookListener {
             if (object == null) {
                 String[] split = param.getStream().split("_");
                 if (split != null && split.length == 2) {
-                    try {
-                        jt1078OfCarController.clearMap(split[1],split[0]);
-                    } catch (ServiceException e) {
-                        throw new RuntimeException(e);
+                    if (split[1].equals("voice")){
+                        intercomService.stopIntercom(split[0]);
+                        logger.info("{} 历史语音断流成功", split[0]);
+                    }else {
+                        try {
+                            jt1078OfCarController.clearMap(split[1],split[0]);
+                        } catch (ServiceException e) {
+                            throw new RuntimeException(e);
+                        }
                     }
                 }
             }
@@ -6,6 +6,7 @@ import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
 import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
 import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.StreamSwitch;
 import com.github.pagehelper.PageInfo;
 import org.springframework.scheduling.annotation.Scheduled;
  
@@ -116,7 +117,15 @@ public interface IStreamPushService {
      */
     ResourceBaseInfo getOverview();
  
+    /**
+     * 获取全部的app+Streanm 用于判断推流列表是新增还是修改
+     * @return app+Streanm
+     */
     Map<String, StreamPushItem> getAllAppAndStreamMap();
  
-
+    /**
+     * 推流切换
+     * @param streamSwitch 切换信息
+     */
+    void switchStream(StreamSwitch streamSwitch);
 }
@@ -22,8 +22,15 @@ import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 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.ThirdPartyHttpService;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.StreamSwitch;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.T9102;
+import com.genersoft.iot.vmp.vmanager.util.RedisCache;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,11 +40,13 @@ import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.util.ObjectUtils;
  
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
  
 @Service
 @DS("master")
+@Slf4j
 public class StreamPushServiceImpl implements IStreamPushService {
  
     private final static Logger logger = LoggerFactory.getLogger(StreamPushServiceImpl.class);
@@ -87,6 +96,13 @@ public class StreamPushServiceImpl implements IStreamPushService {
     @Autowired
     private MediaConfig mediaConfig;
  
+    @Resource
+    private Jt1078ConfigBean jt1078ConfigBean;
+    @Resource
+    private ThirdPartyHttpService httpService;
+    @Resource
+    private RedisCache redisCache;
+
  
     @Override
     public List<StreamPushItem> handleJSON(String jsonData, MediaServerItem mediaServerItem) {
@@ -553,4 +569,40 @@ public class StreamPushServiceImpl implements IStreamPushService {
     public Map<String, StreamPushItem> getAllAppAndStreamMap() {
         return streamPushMapper.getAllAppAndStreamMap();
     }
+
+    /**
+     * 终端切换码流
+     * @param streamSwitch 终端切换码流参数
+     */
+    @Override
+    public void switchStream(StreamSwitch streamSwitch) {
+
+        // 去除SIM号前面的所有0
+        String trimmedSim = streamSwitch.getSim().replaceFirst("^0+(?=\\d)", "");
+
+        // 1. 组装 9102 请求体
+        T9102 reqBody = T9102.builder()
+                .clientId(streamSwitch.getSim())
+                .messageId(0x9102)
+                .channelNo(streamSwitch.getChannel())
+                .command(1)
+                .streamType(streamSwitch.getType())
+                .build();
+
+        String jsonBody = JSON.toJSONString(reqBody);
+
+        // 2. 替换 URL 为 9102
+        String targetUrl = StringUtils.replace(jt1078ConfigBean.getJt1078Url(), "{0}", "9102");
+
+        log.info("下发9102切换码流. SIM: {}, URL: {}, stream: {}", trimmedSim, targetUrl, streamSwitch.getType());
+
+        // 3. 发送请求
+        try {
+            String responseStr = httpService.doPost(targetUrl, jsonBody, null);
+            log.info("设备[{}] 9102响应: {}", trimmedSim, responseStr);
+        } catch (Exception e) {
+            log.error("设备[{}] 下发9102失败", trimmedSim, e);
+        }
+
+    }
 }
+package com.genersoft.iot.vmp.utils;
+
+public class G711Utils {
+    private final static int SIGN_BIT = 0x80;
+    private final static int QUANT_MASK = 0xf;
+    private final static int NSEGS = 8;
+    private final static int SEG_MASK = 0x70;
+    private final static int SEG_SHIFT = 4;
+    private final static int[] seg_uend = {0x3F, 0x7F, 0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF};
+
+    public static byte[] encodeA(byte[] pcm) {
+        byte[] table = new byte[pcm.length / 2];
+        for (int i = 0, j = 0; i < pcm.length; i += 2, j++) {
+            // [核心修复] 尝试交换高低位 (杂音修复)
+            // 方案 A: 假设输入是 Little Endian (JTT1078标准) -> 这里的写法是对的
+            // 方案 B: 如果还是杂音，很可能你的 PCM 是 Big Endian，需要交换 pcm[i] 和 pcm[i+1]
+
+            // 下面这是 JTT1078 常见的 Little Endian 处理方式：
+            // pcm[i] 是低位, pcm[i+1] 是高位
+            short s = (short) ((pcm[i] & 0xff) | (pcm[i + 1] << 8));
+
+            // [调试] 如果依然杂音刺耳，请注释掉上面一行，换成下面这行测试：
+            // short s = (short) ((pcm[i] << 8) | (pcm[i + 1] & 0xff));
+
+            table[j] = linear2alaw(s);
+        }
+        return table;
+    }
+
+    private static byte linear2alaw(short pcm_val) {
+        int mask;
+        int seg;
+        byte aval;
+
+        if (pcm_val >= 0) {
+            mask = 0xD5;
+        } else {
+            mask = 0x55;
+            pcm_val = (short) (-pcm_val - 8);
+        }
+
+        if (pcm_val < 0) {
+            pcm_val = 32767;
+        }
+
+        seg = 8;
+        for (int i = 0; i < NSEGS; i++) {
+            if (pcm_val <= seg_uend[i]) {
+                seg = i;
+                break;
+            }
+        }
+
+        if (seg >= 8)
+            return (byte) (0x7F ^ mask);
+        else {
+            aval = (byte) (seg << SEG_SHIFT);
+            if (seg < 2)
+                aval |= (pcm_val >> 4) & QUANT_MASK;
+            else
+                aval |= (pcm_val >> (seg + 3)) & QUANT_MASK;
+            return (byte) (aval ^ mask);
+        }
+    }
+}
@@ -138,6 +138,12 @@ public class StreamContent {
     private String wss_ts;
  
     /**
+     * WebRTC流地址
+     */
+    @Schema(description = "WebRTC流地址")
+    private String webRtc;
+
+    /**
      * RTMP流地址
      */
     @Schema(description = "RTMP流地址")
@@ -530,6 +536,14 @@ public class StreamContent {
         this.startTime = startTime;
     }
  
+    public String getWebRtc() {
+        return webRtc;
+    }
+
+    public void setWebRtc(String webRtc) {
+        this.webRtc = webRtc;
+    }
+
     public String getEndTime() {
         return endTime;
     }
@@ -9,7 +9,6 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONException;
 import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.common.StreamInfo;
 import com.genersoft.iot.vmp.conf.MediaConfig;
 import com.genersoft.iot.vmp.conf.StreamProxyTask;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
@@ -18,9 +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.subscriber.RTMPPublisher;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
-import com.genersoft.iot.vmp.service.IMediaService;
 import com.genersoft.iot.vmp.service.IStreamPushService;
 import com.genersoft.iot.vmp.service.StremProxyService1078;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
@@ -31,13 +28,10 @@ import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.FtpConfigBean;
 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.TuohuaConfigBean;
-import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.CarData;
-import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.HistoryEnum;
-import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.HistoryRecord;
-import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.PatrolDataReq;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.*;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.handler.HttpClientUtil;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.HisToryRecordService;
-import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.Jt1078OfService;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.IntercomService;
 import com.genersoft.iot.vmp.vmanager.streamProxy.StreamProxyController;
 import com.genersoft.iot.vmp.vmanager.streamPush.StreamPushController;
 import com.genersoft.iot.vmp.vmanager.util.FtpUtils;
@@ -53,14 +47,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.util.Base64Utils;
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Signal;
@@ -134,6 +126,8 @@ public class Jt1078OfCarController {
     private String profilesActive;
     @Resource
     private FtpUtils ftpUtils;
+    @Resource
+    private IntercomService intercomService;
  
     private static final ConcurrentHashMap<String, String> CHANNEL1_MAP = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, String> CHANNEL2_MAP = new ConcurrentHashMap<>();
@@ -452,6 +446,16 @@ public class Jt1078OfCarController {
         return streamContent;
     }
  
+
+    @PostMapping("/switch/stream")
+    public int switchStream(@RequestBody StreamSwitch streamSwitch){
+        if (streamSwitch == null || streamSwitch.getSim() == null || streamSwitch.getChannel() == null || streamSwitch.getType() == null) {
+            throw new ControllerException(ErrorCode.ERROR400);
+        }
+        streamPushService.switchStream(streamSwitch);
+        return 0;
+    }
+
     /**
      * 批量请求设备推送流
      *
-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.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 30000;
        }
        return port;
    }

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

    private Integer getIntPort() {
        return profilesActive.equals("wx-local") ? 10000 : 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.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 lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.client.utils.URIBuilder;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.net.URI;
+
+@Slf4j
+@Component
+public class ThirdPartyHttpService {
+
+    private CloseableHttpClient httpClient;
+
+    // 初始化 HttpClient
+    @PostConstruct
+    public void init() {
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(5000)
+                .setConnectTimeout(5000)
+                .build();
+        this.httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+    }
+
+    /**
+     * 通用 POST 请求方法
+     */
+    public String doPost(String url, String requestBody, String jsessionid) {
+        long startTime = System.currentTimeMillis();
+        CloseableHttpResponse response = null;
+        try {
+            URIBuilder uriBuilder = new URIBuilder(url);
+            URI uri = uriBuilder.build();
+            HttpPost httpPost = new HttpPost(uri);
+
+            // 设置 Body
+            if (requestBody != null) {
+                StringEntity stringEntity = new StringEntity(requestBody, "UTF-8");
+                stringEntity.setContentType("application/json");
+                httpPost.setEntity(stringEntity);
+            }
+
+            // 使用 Context 传递 Cookie
+            HttpClientContext context = HttpClientContext.create();
+            // 如果需要 Cookie，在这里设置
+            if (jsessionid != null && !jsessionid.isEmpty()) {
+                BasicCookieStore cookieStore = new BasicCookieStore();
+                context.setCookieStore(cookieStore);
+            }
+
+            response = httpClient.execute(httpPost, context);
+
+            int statusCode = response.getStatusLine().getStatusCode();
+            if (statusCode == 200) {
+                // TODO: 这里替换为您原有的 combationReturnObj 逻辑
+                // 这里简单演示读取字符串
+                return org.apache.http.util.EntityUtils.toString(response.getEntity(), "UTF-8");
+            } else {
+                log.warn("POST请求非200状态: {}, Code: {}", url, statusCode);
+            }
+        } catch (Exception e) {
+            log.error("POST JSON请求异常, url: {}", url, e);
+        } finally {
+            try {
+                if (response != null) response.close();
+            } catch (Exception e) {
+                log.error("关闭响应流异常", e);
+            }
+        }
+        return null;
+    }
+}
@@ -111,7 +111,7 @@ public class TuohuaConfigBean {
     //private final String LINE_URL = "/line/all?timestamp={timestamp}&nonce={nonce}&password={password}&sign={sign}";
     private final String CAR_URL = "/car/{companyId}?timestamp={timestamp}&nonce={nonce}&password={password}&sign={sign}";
     private final String GPS_URL = "/gps/all?timestamp={timestamp}&nonce={nonce}&password={password}&sign={sign}";
-    private final String DEVICE_URL = "/all";
+    private final String DEVICE_URL = "all";
  
     public String requestLine(HttpClientUtil httpClientUtil, String companyId) throws Exception {
         String nonce = random(5);
@@ -364,8 +364,8 @@ public class TuohuaConfigBean {
  
         Optional<HashMap> optional = gpsList.stream().filter(g -> Objects.nonNull(g) && Objects.nonNull(g.get("deviceId")) &&
                 Objects.nonNull(ch.get("equipmentCode")) && Objects.equals(g.get("deviceId").toString(), ch.get("equipmentCode").toString())).findFirst();
-        if (StringUtils.isNotEmpty(sim) && CollectionUtils.isNotEmpty(deviceSet) && deviceSet.contains(sim.replaceAll("^0+(?!$)", "")) 
-                && optional.isPresent() && Objects.nonNull(optional.get().get("timestamp")) 
+        if (StringUtils.isNotEmpty(sim) && CollectionUtils.isNotEmpty(deviceSet) && deviceSet.contains(sim.replaceAll("^0+(?!$)", ""))
+                && optional.isPresent() && Objects.nonNull(optional.get().get("timestamp"))
                 && now - Convert.toLong(optional.get().get("timestamp")) <= 120000){
             name = "<view style='color:blue'>" + name + "</view>";
             abnormalStatus = 1;
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+@Configuration
+public class WebSocketConfig {
+
+    /**
+     * 必须注册这个 Bean，@ServerEndpoint 注解才会生效
+     * 注意：如果使用外置 Tomcat 部署，则不需要这个 Bean
+     */
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.controller;
+
+import com.genersoft.iot.vmp.common.AjaxResult;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.TextSendReq;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.DeviceCommandService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/api/external")
+public class CommandController {
+
+    @Resource
+    private DeviceCommandService commandService;
+
+    @PostMapping("/send_text")
+    public AjaxResult sendText(@RequestBody TextSendReq req) {
+        // 1. 再次校验长度（双重保险）
+        if (req.getText() == null || req.getText().length() > 50) {
+            return AjaxResult.error("内容长度超过限制");
+        }
+        // 2. 调用业务层发送
+        boolean success = commandService.sendTextCommand(req.getNbbm(), req.getText());
+        return success ? AjaxResult.success() : AjaxResult.error("设备离线或发送失败");
+    }
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.controller;
+
+import com.genersoft.iot.vmp.common.AjaxResult;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.IntercomService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+@RestController
+@RequestMapping("/api/jt1078/intercom")
+public class IntercomController {
+
+    @Resource
+    private IntercomService intercomService;
+
+    @GetMapping("/url/{sim}")
+    public AjaxResult getIntercomUrl(@PathVariable String sim) {
+        try {
+            return AjaxResult.success(intercomService.startIntercom(sim));
+        } catch (Exception e) {
+            return AjaxResult.error("建立连接失败: " + e.getMessage());
+        }
+    }
+    @PostMapping("/stop/{sim}")
+    public AjaxResult stopIntercomUrl(@PathVariable String sim) {
+        try {
+            intercomService.stopIntercom(sim);
+            return AjaxResult.success();
+        } catch (Exception e) {
+            return AjaxResult.error("建立连接失败: " + e.getMessage());
+        }
+    }
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 码流切换
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class StreamSwitch {
+    /**
+     * 设备号
+     */
+    private String sim;
+    /**
+     * 通道号
+     */
+    private Integer channel;
+    /**
+     * 切换类型（0：主码流  1：子码流）
+     */
+    private Integer type;
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class T9101 implements Serializable {
+
+    /**
+     * 终端手机号 (Required)
+     */
+    @JsonProperty("clientId")
+    private String clientId;
+
+    /**
+     * 服务器IP地址 (Required)
+     * 指挥设备将流推送到哪个媒体服务器IP
+     */
+    @JsonProperty("ip")
+    private String ip;
+
+    /**
+     * 实时视频服务器TCP端口号 (Required)
+     */
+    @JsonProperty("tcpPort")
+    private Integer tcpPort;
+
+    /**
+     * 实时视频服务器UDP端口号 (Required)
+     */
+    @JsonProperty("udpPort")
+    private Integer udpPort;
+
+    /**
+     * 逻辑通道号 (Required)
+     * 通常: 1-驾驶员, 2-车辆, etc.
+     */
+    @JsonProperty("channelNo")
+    private Integer channelNo;
+
+    /**
+     * 数据类型 (Required)
+     * 0.音视频 1.视频 2.双向对讲 3.监听 4.中心广播 5.透传
+     * 对讲这里固定传 2
+     */
+    @JsonProperty("mediaType")
+    private Integer mediaType;
+
+    /**
+     * 码流类型 (Required)
+     * 0.主码流 1.子码流
+     */
+    @JsonProperty("streamType")
+    private Integer streamType;
+
+    // --- 以下为非必填或辅助字段 ---
+
+    @JsonProperty("messageId")
+    private Integer messageId; // 消息ID (0x9101的十进制)
+
+    @JsonProperty("protocolVersion")
+    private Integer protocolVersion;
+
+    @JsonProperty("serialNo")
+    private Integer serialNo;
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class T9102 {
+    private String clientId;   // 设备SIM卡号
+    private Integer messageId; // 消息ID (0x9102)
+
+    private Integer channelNo; // 逻辑通道号
+    private Integer command;   // 控制指令：0-关闭，1-切换
+    private Integer closeType; // 关闭类型：0-关闭音视频，1-只关音频，2-只关视频
+    private Integer streamType; // 码流类型：0-主码流，1-子码流
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @Author WangXin
+ * @Data 2026/2/2
+ * @Version 1.0.0
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TextSendReq {
+
+    private String nbbm;
+    private String text;
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.domain;
+
+import lombok.Data;
+
+@Data
+public class ThirdPartyRes<T> {
+    private Integer code;
+    private String msg;
+    private String detailMsg;
+    private T data;
+
+    // 判断是否成功
+    public boolean isSuccess() {
+        return code != null && code == 200;
+    }
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.service;
+
+/**
+ * 文件下发接口
+ *
+ * @Author WangXin
+ * @Data 2026/2/2
+ * @Version 1.0.0
+ */
+public interface DeviceCommandService {
+
+    boolean sendTextCommand(String nbbm, String content);
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.service;
+
+import com.genersoft.iot.vmp.conf.exception.ServiceException;
+
+/**
+ * @Author WangXin
+ * @Data 2026/2/2
+ * @Version 1.0.0
+ */
+public interface IntercomService {
+
+    String startIntercom(String sim) throws ServiceException;
+
+    void stopIntercom(String sim);
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.service.impl;
+
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.ben.HttpClientPostEntity;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.TuohuaConfigBean;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.handler.HttpClientUtil;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.DeviceCommandService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+
+import static com.genersoft.iot.vmp.vmanager.util.SignatureGenerateUtil.createUrl;
+
+
+@Service
+public class DeviceCommandServiceImpl implements DeviceCommandService {
+    @Autowired
+    private TuohuaConfigBean tuohuaConfigBean;
+
+    public boolean sendTextCommand(String nbbm, String content) {
+        HttpClientUtil httpClientUtil = new HttpClientUtil();
+        HashMap<String, String> map = new HashMap<>();
+        map.put("nbbm", nbbm);
+        map.put("content", content);
+        HttpClientPostEntity httpClientPost = httpClientUtil.doPost(createUrl(StringUtils.join(tuohuaConfigBean.getBaseURL(), "/directive/send"),tuohuaConfigBean.getRestPassword()), map, null);
+        if (httpClientPost == null) {
+            return false;
+        }
+        return true;
+    }
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.service.impl;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
+import com.genersoft.iot.vmp.conf.exception.ServiceException;
+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.T9101;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.T9102;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.ThirdPartyRes;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.IntercomService;
+import com.genersoft.iot.vmp.vmanager.util.RedisCache;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Service
+public class IntercomServiceImpl implements IntercomService {
+
+    @Resource
+    private ThirdPartyHttpService httpService;
+    @Resource
+    private Jt1078ConfigBean jt1078ConfigBean;
+    @Resource
+    private RtspConfigBean rtspConfigBean;
+    @Resource
+    private RedisCache redisCache;
+
+    /**
+     * 开启语音对讲
+     */
+    public String startIntercom(String sim) throws ServiceException {
+
+        if (redisCache.hasKey("intercom:" + sim)) {
+            throw new ServiceException("对讲通道已被其他人占用");
+        }
+
+        // 去除SIM号前面的所有0
+        String trimmedSim = sim.replaceFirst("^0+(?!$)", "");
+
+        int wanPort = 40012;
+
+        // 3. 组装 9101 请求体
+        T9101 reqBody = T9101.builder()
+                .clientId(trimmedSim)
+                .ip("61.169.120.202")    // 媒体服务器公网IP
+                .tcpPort(wanPort)                  // 【关键】告诉设备连 40000
+                .channelNo(1)
+                .mediaType(2)
+                .streamType(1)
+                .messageId(0x9101)
+                .build();
+
+        String jsonBody = JSON.toJSONString(reqBody);
+        String targetUrl = StringUtils.replace(jt1078ConfigBean.getJt1078Url(), "{0}", "9101");
+
+        log.info("下发9101指令. 目标地址: {}:{} (映射自内部:{}), 原始SIM: {}, 处理后SIM: {}",
+                reqBody.getIp(), wanPort, wanPort, sim, trimmedSim);
+
+        String responseStr = httpService.doPost(targetUrl, jsonBody, null);
+
+        if (responseStr == null) {
+            throw new RuntimeException("第三方接口请求无响应");
+        }
+
+        ThirdPartyRes<Object> result = JSON.parseObject(responseStr, new TypeReference<ThirdPartyRes<Object>>(){});
+
+        if (result != null && result.isSuccess()) {
+            log.info("设备[{}] 9101指令下发成功", trimmedSim);
+            redisCache.setCacheObject("intercom:" + trimmedSim, "1",1, TimeUnit.DAYS);
+            // 返回 WebSocket 地址 (给前端用的，走 HTTP 端口)
+            return buildWebSocketUrl(sim);
+        } else {
+            String msg = result != null ? result.getMsg() : "未知错误";
+            log.error("设备[{}] 9101指令失败: {}", trimmedSim, msg);
+            redisCache.deleteObject("intercom:" + trimmedSim);
+            throw new RuntimeException("对讲开启失败: " + msg);
+        }
+    }
+
+    /**
+     * 关闭语音对讲 (下发 9102 指令)
+     * @param sim 设备SIM卡号
+     */
+    public void stopIntercom(String sim) {
+        // 去除SIM号前面的所有0
+        String trimmedSim = sim.replaceFirst("^0+(?=\\d)", "");
+
+        // 1. 组装 9102 请求体 (关闭指令)
+
+        T9102 reqBody = T9102.builder()
+                .clientId(trimmedSim)
+                .messageId(0x9102)
+                .channelNo(1)      // 通道1 (对应开启时的通道)
+                .command(4)        // 0: 关闭
+                .closeType(0)      // 0: 关闭语音对讲
+                .build();
+
+        String jsonBody = JSON.toJSONString(reqBody);
+
+        // 2. 替换 URL 为 9102
+        String targetUrl = StringUtils.replace(jt1078ConfigBean.getJt1078Url(), "{0}", "9102");
+
+        log.info("下发9102关闭指令. SIM: {}, URL: {}", trimmedSim, targetUrl);
+
+        // 3. 发送请求
+        try {
+            String responseStr = httpService.doPost(targetUrl, jsonBody, null);
+            redisCache.deleteObject("intercom:" + trimmedSim);
+            log.info("设备[{}] 9102响应: {}", trimmedSim, responseStr);
+        } catch (Exception e) {
+            redisCache.deleteObject("intercom:" + trimmedSim);
+            log.error("设备[{}] 下发9102失败", trimmedSim, e);
+        }
+    }
+
+    /**
+     * 构造 WebSocket 地址
+     * 目标网关: 118.113.164.50:10202
+     * 协议格式参考提供的 HTML: ws://IP:PORT?sim={sim}
+     */
+    private String buildWebSocketUrl(String sim) {
+
+        // 先去除SIM号前面的0，然后再补齐到12位
+        String trimmedSim = sim.replaceFirst("^0+(?=\\d)", "");
+        if (trimmedSim.isEmpty()) trimmedSim = "0";
+        String paddedSim = String.format("%012d", Long.parseLong(trimmedSim));
+        return String.format("ws://61.169.120.202:40013?sim=%s", paddedSim);
+    }
+}
@@ -130,5 +130,8 @@ public class SignatureGenerateUtil {
         System.out.println(StringUtils.join("http://61.169.120.202:40007/getInfo?password=",apiParamReq.getPassword(),"&nonce=",apiParamReq.getNonce(),"&sign=",apiParamReq.getSign(),"&timestamp=",apiParamReq.getTimestamp(),"&username=","wangxin","&deviceId=","00000000"));
     }
  
-
+    public static String createUrl(String url, String password){
+        ApiParamReq apiParamReq = getApiParamReq(password);
+        return StringUtils.join(url,"?password=",apiParamReq.getPassword(),"&nonce=",apiParamReq.getNonce(),"&sign=",apiParamReq.getSign(),"&timestamp=",apiParamReq.getTimestamp());
+    }
 }
-server.port = 30000
+server.port = 40000
 server.http.port = 3333
-server.history.port = 30001
+server.history.port = 40001
 server.backlog = 1024
  
 # ffmpegå¯æ§è¡æä»¶è·¯å¾ï¼å¯ä»¥çç©º
@@ -15,3 +15,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 = off
+
+zlm.host = 127.0.0.1
+zlm.http.port = 80
+zlm.secret= 8KMYsD5ItKkHN1CIcPI9VeLa6u4S8deU
 my:
-  ip: 127.0.0.1
+  ip: 192.168.168.21
 spring:
   rabbitmq:
     host: 10.10.2.21
@@ -28,7 +28,7 @@ spring:
     # [必须修改] 端口号
     port: 6380
     # [可选] 数据库 DB
-    database: 9
+    database: 15
     # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
     #    password: guzijian
     # [可选] 超时时间
@@ -67,8 +67,6 @@ server:
     key-store-type: JKS
  
 # 作为28181服务器的配置
-# 作为28181服务器的配置
-# 作为28181服务器的配置
 sip:
   # [必须修改] 本机的IP，对应你的网卡，监听什么ip就是使用什么网卡，
   # 如果要监听多张网卡，可以使用逗号分隔多个IP， 例如： 192.168.1.4,10.0.0.4
@@ -119,34 +117,6 @@ media:
     send-port-range: 30000,35000 # 端口范围
   # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用
   record-assist-port: 18081
-#zlm 默认服务器配置
-#media:
-#  id: guzijian
-#  # [必须修改] zlm服务器的内网IP
-#  ip: 10.10.2.22
-#  # [必须修改] zlm服务器的http.port
-#  http-port: 1090
-#  # [可选] 返回流地址时的ip，置空使用 media.ip 1
-#  stream-ip: 118.113.164.50
-#  # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip 1
-#  sdp-ip: 118.113.164.50
-#  # [可选] zlm服务器的hook所使用的IP, 默认使用sip.ip
-#  hook-ip: 10.10.2.22
-#  # [可选] zlm服务器的http.sslport, 置空使用zlm配置文件配置
-#  http-ssl-port: 8443
-#  # [可选] zlm服务器的hook.admin_params=secret
-#  secret: RPorcBlIw26uHGnEHYGesIYyFDXpgjkP
-#  pushKey: 41db35390ddad33f83944f44b8b75ded
-#  # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
-#  rtp:
-#    # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
-#    enable: true
-#    # [可选] 在此范围内选择端口用于媒体流传输, 必须提前在zlm上配置该属性，不然自动配置此属性可能不成功
-#    port-range: 7000,7500 # 端口范围
-#    # [可选] 国标级联在此范围内选择端口发送媒体流,
-#    send-port-range: 7000,7500 # 端口范围
-#  # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用
-#  record-assist-port: 18081
 # [根据业务需求配置]
 user-settings:
   # 点播/录像回放 等待超时时间,单位：毫秒
@@ -187,7 +157,8 @@ tuohua:
       rest:
 #        baseURL: http://10.10.2.20:9089/webservice/rest
 #        password: bafb2b44a07a02e5e9912f42cd197423884116a8
-          baseURL: http://113.249.109.139:9089/webservice/rest
+#          baseURL: http://113.249.109.139:9089/webservice/rest
+          baseURL: http://192.168.168.152:9089/webservice/rest
           password: bafb2b44a07a02e5e9912f42cd197423884116a8
     tree:
       url:
@@ -202,16 +173,19 @@ tuohua:
         historyUdpPort: 9999
         ip : 61.169.120.202
     jt1078:
-      ports: 30001,30001
-      port: 30000
+      ws-prefix: ws://192.168.1.117:18090
+      ports: 40001,40001
+      port: 40000
       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://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
@@ -227,6 +201,7 @@ tuohua:
  
 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
@@ -28,6 +28,7 @@
     "splitpanes": "^2.4.1",
     "uuid": "^8.3.2",
     "v-charts": "^1.19.0",
+    "video.js": "^8.23.4",
     "vue": "^2.6.11",
     "vue-clipboard2": "^0.3.1",
     "vue-clipboards": "^1.3.0",
@@ -20,6 +20,13 @@
       <div class="menu-item" @click="handleContextCommand('playback')">
         <i class="el-icon-video-play"></i> 一键播放该设备
       </div>
+      <div class="menu-item" @click="handleContextCommand('message')">
+        <i class="el-icon-chat-dot-round"></i> 文本信息下发
+      </div>
+      <div class="menu-item" @click="handleContextCommand('intercom')">
+        <i :class="(rightClickNode && rightClickNode.data && intercomTarget === rightClickNode.data.id) ? 'el-icon-microphone' : 'el-icon-phone-outline'"></i>
+        {{ (rightClickNode && rightClickNode.data && intercomTarget === rightClickNode.data.id) ? '停止语音对讲' : '开启语音对讲' }}
+      </div>
     </div>
  
     <el-container class="right-container">
@@ -31,6 +38,7 @@
         />
  
         <window-num-select v-model="windowNum"></window-num-select>
+
         <el-button type="danger" size="mini" @click="closeAllVideo">全部关闭</el-button>
         <el-button type="warning" size="mini" @click="closeVideo">关闭选中</el-button>
         <el-button type="primary" size="mini" icon="el-icon-full-screen" @click="toggleFullscreen"></el-button>
@@ -44,19 +52,25 @@
           {{ isCarouselRunning ? '停止轮播' : '轮播设置' }}
         </el-button>
  
-        <div v-if="isCarouselRunning" class="carousel-status">
+        <div v-if="isCarouselRunning" class="status-tag carousel-status">
           <template v-if="isWithinSchedule">
             <i class="el-icon-loading" style="margin-right:4px"></i>
-            <span style="color: #67C23A; font-weight: bold;">轮播运行中</span>
-            <span style="font-size: 10px; color: #909399; margin-left: 5px;">(缓冲: {{channelBuffer.length}}路)</span>
+            <span style="color: #67C23A; font-weight: bold;">轮播中</span>
+            <span style="font-size: 10px; color: #909399;">(缓冲:{{channelBuffer.length}})</span>
           </template>
           <template v-else>
             <i class="el-icon-time" style="margin-right:4px"></i>
-            <span style="color: #E6A23C;">等待时段生效</span>
+            <span style="color: #E6A23C;">等待时段</span>
           </template>
         </div>
  
-        <span class="header-right-info">选中窗口 : {{ windowClickIndex }}</span>
+        <div v-if="intercomTarget" class="status-tag intercom-status">
+          <div class="recording-dot"></div>
+          <span>正在与 [{{ intercomTargetName }}] 对讲</span>
+          <el-button type="text" class="stop-btn" size="mini" @click="stopIntercom">挂断</el-button>
+        </div>
+
+        <span class="header-right-info">窗口: {{ windowClickIndex }}</span>
       </el-header>
  
       <carousel-config
@@ -76,6 +90,32 @@
         ></player-list-component>
       </el-main>
     </el-container>
+    <el-dialog
+      title="文本信息下发"
+      :visible.sync="msgDialogVisible"
+      width="400px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <div style="margin-bottom: 15px;">
+        <span>下发目标：</span>
+        <el-tag size="small" v-if="msgTargetNode">{{ msgTargetNode.name }}</el-tag>
+      </div>
+
+      <el-input
+        type="textarea"
+        v-model="msgContent"
+        :rows="4"
+        placeholder="请输入文本内容..."
+        maxlength="50"
+        show-word-limit
+      ></el-input>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="msgDialogVisible = false" size="small">取 消</el-button>
+        <el-button type="primary" @click="confirmSendMessage" size="small" :disabled="!msgContent">发 送</el-button>
+      </span>
+    </el-dialog>
   </el-container>
 </template>
  
@@ -84,14 +124,24 @@ 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 VideoPlayer from './common/EasyPlayer.vue';
+const PCMA_TO_PCM = new Int16Array(256);
+for (let i = 0; i < 256; i++) {
+  let s = ~i;
+  let t = ((s & 0x0f) << 3) + 8;
+  let seg = (s & 0x70) >> 4;
+  if (seg > 0) t = (t + 0x100) << (seg - 1);
+  PCMA_TO_PCM[i] = (s & 0x80) ? -t : t;
+}
 export default {
+
   name: "live",
   components: {
     VehicleList,
     CarouselConfig,
     WindowNumSelect,
-    PlayerListComponent
+    PlayerListComponent,
+    VideoPlayer
   },
   data() {
     return {
@@ -107,6 +157,7 @@ export default {
       contextMenuTop: 0,
       rightClickNode: null,
  
+      // 播放器与轮播相关
       videoUrl: [],
       videoDataList: [],
       deviceTreeData: [],
@@ -117,12 +168,34 @@ export default {
       carouselDeviceList: [],
       channelBuffer: [],
       deviceCursor: 0,
+      //文本下发相关
+      msgDialogVisible: false,
+      msgContent: '',
+      msgTargetNode: null, // 记录当前要发送给哪辆车
+      // 对讲相关
+      intercomTarget: null,
+      intercomTargetName: '',
+      intercomSession: null,
+
+      // 音频处理对象
+      audioContext: null,      // 全局音频上下文
+      audioStream: null,       // 麦克风流
+      audioProcessor: null,    // 录音处理器
+      audioInput: null,        // 音频输入源
+      nextPlayTime: 0,         // 下一次播放的时间戳（用于平滑播放）
+
+      flvPlayer: null,
+      isTalking: false,
+      // 重试定时器
+      retryTimer: null,
+      // 对讲音频播放器
+      talkFlvPlayer: null,
+      talkAudioElement: null
     };
   },
   mounted() {
     document.addEventListener('fullscreenchange', this.handleFullscreenChange);
     window.addEventListener('beforeunload', this.handleBeforeUnload);
-    // 全局点击隐藏右键菜单
     document.addEventListener('click', this.hideContextMenu);
   },
   beforeDestroy() {
@@ -130,6 +203,7 @@ export default {
     window.removeEventListener('beforeunload', this.handleBeforeUnload);
     document.removeEventListener('click', this.hideContextMenu);
     this.stopCarousel();
+    this.stopIntercom(); // 确保组件销毁时停止对讲
   },
   // 路由离开守卫
   beforeRouteLeave(to, from, next) {
@@ -145,27 +219,23 @@ export default {
     }
   },
   methods: {
-    // --- 侧边栏折叠逻辑 ---
+    // ===========================
+    // 1. 界面与基础交互
+    // ===========================
     updateSidebarState() {
       this.sidebarState = !this.sidebarState;
-      // 触发 resize 事件让播放器自适应
       setTimeout(() => {
         const event = new Event('resize');
         window.dispatchEvent(event);
       }, 310);
     },
-
-    // --- 数据同步 ---
     handleTreeLoaded(data) {
       this.deviceTreeData = data;
     },
-
-    // --- 播放器交互 ---
     handleClick(data, index) {
       this.windowClickIndex = index + 1;
       this.windowClickData = data;
     },
-
     toggleFullscreen() {
       const element = this.$refs.videoMain.$el;
       if (!this.isFullscreen) {
@@ -180,42 +250,564 @@ export default {
       this.isFullscreen = !!document.fullscreenElement;
     },
  
-    // ==========================================
-    // 1. 左键点击播放逻辑
-    // ==========================================
+    // ===========================
+    // 2. 右键菜单与指令下发
+    // ===========================
+    nodeContextmenu(event, data, node) {
+      if (data.children && data.children.length > 0) {
+        this.rightClickNode = node;
+        this.contextMenuVisible = true;
+        this.contextMenuLeft = event.clientX;
+        this.contextMenuTop = event.clientY;
+      }
+    },
+    hideContextMenu() {
+      this.contextMenuVisible = false;
+    },
+    handleContextCommand(command) {
+      this.hideContextMenu();
+      // 安全检查
+      if (!this.rightClickNode || !this.rightClickNode.data) return;
+      const nodeData = this.rightClickNode.data;
+
+      if (command === 'playback') {
+        this.batchPlayback(nodeData);
+      } else if (command === 'message') {
+        this.openMessageDialog(nodeData);
+      } else if (command === 'intercom') {
+        this.toggleIntercom(nodeData);
+      }
+    },
+
+    // 打开弹窗
+    openMessageDialog(data) {
+      this.msgTargetNode = data;   // 记录目标车辆
+      this.msgContent = '';        // 清空输入框
+      this.msgDialogVisible = true; // 显示自定义弹窗
+    },
+
+    // 确认发送
+    confirmSendMessage() {
+      if (!this.msgContent) {
+        return this.$message.warning("内容不能为空");
+      }
+      // 调用之前的发送逻辑
+      this.sendTextToDevice(this.msgTargetNode, this.msgContent);
+      // 关闭弹窗
+      this.msgDialogVisible = false;
+    },
+
+    sendTextToDevice(data, content) {
+      const params = {
+        vehicleNo: data.name,
+        sim: data.sim,
+        text: content
+      };
+      this.$axios.post('/api/external/send_text', params).then(res => {
+        if (res.data.code === 200) {
+          this.$message.success("指令下发成功");
+        } else {
+          this.$message.error(res.data.msg || "下发失败");
+        }
+      });
+    },
+
+    // 1. 点击对讲按钮入口
+    async toggleIntercom(data) {
+      // 如果点击的是当前正在对讲的车辆 -> 停止
+      if (this.intercomTarget === data.id) {
+        this.stopIntercom();
+        return;
+      }
+      // 如果正在和其他车对讲 -> 提示互斥
+      if (this.intercomTarget) {
+        this.$message.warning(`请先挂断当前与 [${this.intercomTargetName}] 的对讲`);
+        return;
+      }
+
+      // 权限预检查
+      try {
+        await navigator.mediaDevices.getUserMedia({ audio: true });
+      } catch (err) {
+        console.error("麦克风权限错误:", err);
+        this.$message.error("无法获取麦克风权限，请检查浏览器设置或HTTPS环境");
+        return;
+      }
+
+      // 【新增】在用户点击瞬间初始化或恢复音频播放上下文
+      if (!this.audioPlayContext) {
+        this.audioPlayContext = new (window.AudioContext || window.webkitAudioContext)({ sampleRate: 8000 });
+      }
+      if (this.audioPlayContext.state === 'suspended') {
+        await this.audioPlayContext.resume();
+      }
+      // 开始流程
+      this.startIntercom(data);
+    },
+
+    // 2. 请求后端获取网关地址
+    startIntercom(data) {
+      const loading = this.$loading({
+        lock: true,
+        text: `正在连接 [${data.name}] ...`,
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+
+      this.$axios.get(`/api/jt1078/intercom/url/${data.sim}`)
+        .then(res => {
+          if (res.data.code === 0 || res.data.code === 200) {
+            // 兼容性处理：后端返回的结构可能不同
+            let wssUrl = "";
+            const responseData = res.data.data;
+
+            if (typeof responseData === 'string') {
+              wssUrl = responseData;
+            } else if (responseData && responseData.url) {
+              wssUrl = responseData.url;
+            } else if (responseData && responseData.msg) {
+              // 有时候 msg 字段会被误用来放 url
+              wssUrl = responseData.msg;
+            }
+
+            console.log("获取到网关地址:", wssUrl);
+
+            if (!wssUrl || !wssUrl.startsWith('ws')) {
+              loading.close();
+              this.$message.error("后端返回的 WebSocket 地址无效");
+              return;
+            }
+
+            this.initIntercomSession(data, wssUrl, loading);
+          } else {
+            loading.close();
+            this.$message.error(res.data.msg || "获取对讲地址失败");
+          }
+        })
+        .catch(err => {
+          loading.close();
+          console.error(err);
+          this.$message.error("请求超时或网络异常");
+        });
+    },
+
+    // 3. 初始化 WebSocket (信令交互)
+    initIntercomSession(data, url, loadingInstance) {
+      try {
+        const socket = new WebSocket(url);
+        // 【关键】使用默认文本模式发送 JSON，不要设置 binaryType
+
+        socket.onopen = () => {
+          this.intercomTarget = data.id;
+          this.intercomTargetName = data.name;
+          this.intercomSession = socket;
+          this.currentIntercomSim = data.sim.toString().padStart(12, '0');
+          this.isTalking = true;
+
+          // A. 发送注册包 (必须先发这个，网关才认)
+          const registerMsg = { type: 'register', stream_id: this.currentIntercomSim };
+          socket.send(JSON.stringify(registerMsg));
+
+          // B. 先启动播放器 (下行 - 收听)，等待连接成功后再启动麦克风
+          // 使用 nextTick 确保 DOM 元素已经渲染
+          this.$nextTick(() => {
+            this.playTalkAudioStream(this.currentIntercomSim, loadingInstance);
+          });
+        };
+
+        socket.onmessage = (event) => {
+          // 该网关下行通常不走 WebSocket，这里只打印信令日志
+          try {
+            const msg = JSON.parse(event.data);
+            if(msg.type === 'registered') console.log("网关注册确认成功");
+          } catch(e) {}
+        };
+
+        socket.onerror = (e) => {
+          loadingInstance.close();
+          console.error("WS Error", e);
+          this.stopIntercom();
+          this.$message.error("对讲连接中断");
+        };
+
+        socket.onclose = () => {
+          if (this.isTalking) {
+            console.warn("WebSocket 意外断开");
+            this.stopIntercom();
+          }
+        };
+
+      } catch (e) {
+        loadingInstance.close();
+        this.$message.error("初始化失败: " + e.message);
+      }
+    },
+
+    // 4. 采集麦克风 -> 降采样 -> 发送 (上行核心)
+    // 启动音频采集 (上行)
+    async startAudioCapture(sim) {
+      try {
+        const stream = await navigator.mediaDevices.getUserMedia({
+          audio: {
+            channelCount: 1,
+            echoCancellation: true,
+            noiseSuppression: true,
+            autoGainControl: true
+          }
+        });
+        this.audioStream = stream;
+
+        const AudioContext = window.AudioContext || window.webkitAudioContext;
+        this.audioContext = new AudioContext();
+        // 获取浏览器真实的采样率 (例如 48000 或 44100)
+        const sourceSampleRate = this.audioContext.sampleRate;
+        console.log("麦克风真实采样率:", sourceSampleRate);
+
+        const source = this.audioContext.createMediaStreamSource(stream);
+        const gainNode = this.audioContext.createGain();
+        gainNode.gain.value = 2.0; // 音量适度放大（从5.0降低到2.0）
+
+        // 使用 ScriptProcessor（较小的缓冲区以减少延迟）
+        this.audioProcessor = this.audioContext.createScriptProcessor(2048, 1, 1);
+
+        this.audioProcessor.onaudioprocess = (e) => {
+          if (!this.intercomSession || this.intercomSession.readyState !== WebSocket.OPEN) return;
+
+          // 1. 获取原始数据 (Float32, 48000Hz)
+          const inputBuffer = e.inputBuffer.getChannelData(0);
+
+          // 2. 【核心修复】强制降采样到 8000Hz + 转 PCM16
+          // 这一步解决了 "声音杂乱" 和 "格式不支持" 的问题
+          const pcm16Buffer = this.downsampleBuffer(inputBuffer, sourceSampleRate, 8000);
+
+          // 3. 【核心修复】防止发送空数据
+          if (pcm16Buffer.byteLength === 0) {
+            return;
+          }
+
+          // 4. 转 Base64
+          const base64Str = this.arrayBufferToBase64(pcm16Buffer);
+
+          // 5. 【核心修复】防止 Base64 为空
+          if (!base64Str) {
+            return;
+          }
+
+          // 6. 发送数据 (注意 sample_rate 必须是 8000)
+          const msg = {
+            type: 'audio_data',
+            stream_id: sim,
+            audio_data: base64Str,
+            format: 'pcm16',
+            sample_rate: 8000, // 必须告诉网关这是 8k 数据
+            channels: 1
+          };
+
+          this.intercomSession.send(JSON.stringify(msg));
+        };
+
+        source.connect(gainNode);
+        gainNode.connect(this.audioProcessor);
+        this.audioProcessor.connect(this.audioContext.destination);
+
+      } catch (err) {
+        console.error("麦克风启动错误", err);
+        this.$message.error("麦克风启动失败");
+        this.stopIntercom();
+      }
+    },
+
+    playTalkAudioStream(sim, loadingInstance) {
+      const paddedSim = sim.toString().padStart(12, '0');
+      const flvUrl = `ws://127.0.0.1:80/schedule/${paddedSim}_voice.live.flv?callId=41db35390ddad33f83944f44b8b75ded`;
+
+      // 创建隐藏的audio元素用于播放
+      if (!this.talkAudioElement) {
+        this.talkAudioElement = document.createElement('audio');
+        this.talkAudioElement.autoplay = true;
+        this.talkAudioElement.controls = false;
+        this.talkAudioElement.volume = 1.0;
+      }
+
+      // 使用flv.js播放音频流
+      if (window.flvjs && window.flvjs.isSupported()) {
+        try {
+          // 销毁旧的播放器
+          if (this.talkFlvPlayer) {
+            this.talkFlvPlayer.pause();
+            this.talkFlvPlayer.unload();
+            this.talkFlvPlayer.detachMediaElement();
+            this.talkFlvPlayer.destroy();
+            this.talkFlvPlayer = null;
+          }
+
+          this.talkFlvPlayer = window.flvjs.createPlayer({
+            type: 'flv',
+            url: flvUrl,
+            isLive: true,
+            hasAudio: true,
+            hasVideo: false
+          }, {
+            enableWorker: true,
+            enableStashBuffer: true,
+            stashInitialSize: 384,
+            autoCleanupSourceBuffer: true,
+            autoCleanupMaxBackwardDuration: 3,
+            autoCleanupMinBackwardDuration: 2,
+            fixAudioTimestampGap: true,
+            liveBufferLatencyChasing: true,
+            liveBufferLatencyChasingOnPaused: false,
+            liveBufferLatencyMaxLatency: 3,
+            liveBufferLatencyMinRemain: 0.8
+          });
+
+          // 监听播放器错误事件
+          this.talkFlvPlayer.on(window.flvjs.Events.ERROR, (errorType, errorDetail, errorInfo) => {
+            console.error('FLV播放器错误:', errorType, errorDetail, errorInfo);
+            if (loadingInstance) {
+              loadingInstance.close();
+            }
+            this.$message.error('连接ZLM音频流失败，对讲已终止');
+            // 连接失败，停止对讲
+            this.stopIntercom();
+          });
+
+          // 监听加载成功事件 - 只有在这里才启动麦克风
+          this.talkFlvPlayer.on(window.flvjs.Events.MEDIA_INFO, () => {
+            console.log('ZLM音频流连接成功，开始启动麦克风');
+            if (loadingInstance) {
+              loadingInstance.close();
+            }
+            // 连接成功后才启动麦克风采集
+            this.startAudioCapture(this.currentIntercomSim);
+            this.$message.success("对讲通道已建立，可以开始说话");
+          });
+
+          this.talkFlvPlayer.attachMediaElement(this.talkAudioElement);
+          this.talkFlvPlayer.load();
+          this.talkFlvPlayer.play().catch(err => {
+            console.error('播放音频失败:', err);
+            if (loadingInstance) {
+              loadingInstance.close();
+            }
+            this.$message.error('播放音频失败，对讲已终止');
+            // 播放失败，停止对讲
+            this.stopIntercom();
+          });
+
+          console.log('对讲音频播放器已启动，等待连接ZLM...');
+        } catch (e) {
+          console.error('创建FLV播放器失败:', e);
+          if (loadingInstance) {
+            loadingInstance.close();
+          }
+          this.$message.error('创建音频播放器失败，对讲已终止');
+          // 创建失败，停止对讲
+          this.stopIntercom();
+        }
+      } else {
+        console.error('浏览器不支持flv.js');
+        if (loadingInstance) {
+          loadingInstance.close();
+        }
+        this.$message.error('浏览器不支持FLV播放，对讲已终止');
+        // 不支持，停止对讲
+        this.stopIntercom();
+      }
+    },
+
+    // 辅助：彻底销毁播放器
+    destroyFlvPlayer() {
+      if (this.retryTimer) {
+        clearInterval(this.retryTimer);
+        clearTimeout(this.retryTimer); // 兼容 setTimeout
+        this.retryTimer = null;
+      }
+
+      if (this.flvPlayer) {
+        try {
+          this.flvPlayer.pause();
+          this.flvPlayer.unload();
+          this.flvPlayer.detachMediaElement();
+          this.flvPlayer.destroy();
+        } catch (e) {}
+        this.flvPlayer = null;
+      }
+    },
+
+    // 6. 停止对讲
+    stopIntercom() {
+      console.log("正在停止对讲流程...");
+
+      // A. 通知后端停止
+      if (this.currentIntercomSim) {
+        this.$axios.post(`/api/jt1078/intercom/stop/${this.currentIntercomSim}`).catch(()=>{});
+      }
+
+      this.isTalking = false;
+
+      // B. 停止对讲音频播放器
+      if (this.talkFlvPlayer) {
+        try {
+          this.talkFlvPlayer.pause();
+          this.talkFlvPlayer.unload();
+          this.talkFlvPlayer.detachMediaElement();
+          this.talkFlvPlayer.destroy();
+        } catch (e) {
+          console.error('销毁对讲播放器失败:', e);
+        }
+        this.talkFlvPlayer = null;
+      }
+
+      if (this.talkAudioElement) {
+        try {
+          this.talkAudioElement.pause();
+          this.talkAudioElement.src = '';
+        } catch (e) {}
+      }
+
+      // C. 关闭WebSocket连接
+      if (this.audioSocket) {
+        this.audioSocket.close();
+        this.audioSocket = null;
+      }
+      if (this.audioPlayContext) {
+        this.audioPlayContext.close().then(() => {
+          console.log("播放器上下文已释放");
+        });
+        this.audioPlayContext = null;
+      }
+
+      // D. 停止上行采集 (喊话)
+      if (this.audioStream) {
+        this.audioStream.getTracks().forEach(track => track.stop());
+        this.audioStream = null;
+      }
+      if (this.audioProcessor) {
+        this.audioProcessor.disconnect();
+        this.audioProcessor = null;
+      }
+      if (this.audioContext) {
+        this.audioContext.close();
+        this.audioContext = null;
+      }
+
+      // E. 关闭与Python的WebSocket信令连接（intercomSession）
+      if (this.intercomSession) {
+        try {
+          this.intercomSession.send(JSON.stringify({ type: 'close_talk' }));
+          console.log("已发送关闭信令到Python WebSocket");
+        } catch(e){
+          console.error("发送关闭信令失败:", e);
+        }
+        try {
+          this.intercomSession.close();
+          console.log("Python WebSocket连接已关闭");
+        } catch(e) {
+          console.error("关闭Python WebSocket失败:", e);
+        }
+        this.intercomSession = null;
+      }
+
+      // F. 重置状态
+      this.intercomTarget = null;
+      this.intercomTargetName = '';
+      this.currentIntercomSim = null;
+      this.$message.info("对讲已挂断");
+    },
+
+    // 工具：降采样 (Float32 -> Int16)
+    downsampleBuffer(buffer, sampleRate, outSampleRate) {
+      if (outSampleRate === sampleRate) {
+        return this.floatTo16BitPCM(buffer);
+      }
+
+      const sampleRateRatio = sampleRate / outSampleRate;
+      const newLength = Math.round(buffer.length / sampleRateRatio);
+
+      // 如果计算出的长度无效，返回空 buffer
+      if (newLength <= 0) return new ArrayBuffer(0);
+
+      const result = new Int16Array(newLength);
+      let offsetResult = 0;
+      let offsetBuffer = 0;
+
+      while (offsetResult < newLength) {
+        const nextOffsetBuffer = Math.round((offsetResult + 1) * sampleRateRatio);
+
+        let accum = 0, count = 0;
+        // 简单的均值算法，防止声音有毛刺
+        for (let i = offsetBuffer; i < nextOffsetBuffer && i < buffer.length; i++) {
+          accum += buffer[i];
+          count++;
+        }
+
+        if (count > 0) {
+          let s = accum / count;
+          // 可以在这里再次放大音量
+          // s = s * 2.0;
+          s = Math.max(-1, Math.min(1, s));
+          result[offsetResult] = s < 0 ? s * 0x8000 : s * 0x7FFF;
+        } else {
+          result[offsetResult] = 0;
+        }
+
+        offsetResult++;
+        offsetBuffer = nextOffsetBuffer;
+      }
+      return result.buffer;
+    },
+
+    // 工具: Float32 -> Int16 (保留备用)
+    floatTo16BitPCM(input) {
+      let output = new Int16Array(input.length);
+      for (let i = 0; i < input.length; i++) {
+        let s = Math.max(-1, Math.min(1, input[i]));
+        output[i] = s < 0 ? s * 0x8000 : s * 0x7FFF;
+      }
+      return output;
+    },
+
+    // 工具：Base64 转换 (必须处理 .buffer)
+    arrayBufferToBase64(buffer) {
+      let binary = '';
+      // 注意：buffer 可能是 ArrayBuffer，需要转 Uint8Array 才能读取
+      const bytes = new Uint8Array(buffer);
+      const len = bytes.byteLength;
+
+      if (len === 0) return ""; // 此时返回空字符串
+
+      for (let i = 0; i < len; i++) {
+        binary += String.fromCharCode(bytes[i]);
+      }
+      return window.btoa(binary);
+    },
+
+    // ===========================
+    // 3. 播放逻辑 (单路/批量)
+    // ===========================
     nodeClick(data, node) {
       if (this.isCarouselRunning) {
         this.$message.warning("请先停止轮播再手动播放");
         return;
       }
-      // 判断是否为叶子节点（通道）
       if (!data.children || data.children.length === 0) {
         this.playSingleChannel(data);
       }
     },
  
     playSingleChannel(data) {
-      // data.code 格式假设为 "deviceId_sim_channel"
-      let stream = data.code.replace('-', '_'); // 容错处理
+      let stream = data.code.replace('-', '_');
       let arr = stream.split("_");
-
-      // 容错: 确保能解析出 sim 和 channel
       if (arr.length < 3) {
         console.warn("Invalid channel code:", data.code);
         return;
       }
-
       this.$axios.get(`/api/jt1078/query/send/request/io/${arr[1]}/${arr[2]}`).then(res => {
         if (res.data.code === 0 || res.data.code === 200) {
-          // 兼容 http/https 协议
           const url = (location.protocol === "https:") ? res.data.data.wss_flv : res.data.data.ws_flv;
           const idx = this.windowClickIndex - 1;
-
-          // 使用 $set 确保数组响应式更新
           this.$set(this.videoUrl, idx, url);
           this.$set(this.videoDataList, idx, {...data, videoUrl: url});
-
-          // 自动跳到下一个窗口
           const maxWindow = parseInt(this.windowNum) || 4;
           this.windowClickIndex = (this.windowClickIndex % maxWindow) + 1;
         } else {
@@ -226,87 +818,57 @@ export default {
       });
     },
  
-    // ==========================================
-    // 2. 右键菜单逻辑
-    // ==========================================
-    nodeContextmenu(event, data, node) {
-      // 只有父设备节点(有子级)才显示菜单
-      if (data.children && data.children.length > 0) {
-        this.rightClickNode = node;
-        this.contextMenuVisible = true;
-        this.contextMenuLeft = event.clientX;
-        this.contextMenuTop = event.clientY;
-      }
-    },
-
-    hideContextMenu() {
-      this.contextMenuVisible = false;
-    },
-
-    handleContextCommand(command) {
-      this.hideContextMenu();
-      if (command === 'playback') {
-        if (this.isCarouselRunning) return this.$message.warning("轮播中无法操作");
-
-        const channels = this.rightClickNode.data.children;
-        if (channels && channels.length > 0) {
-          // 1. 清屏
-          this.videoUrl = [];
-          this.videoDataList = [];
-
-          // 2. 自动切换分屏布局
-          if (channels.length > 16) this.windowNum = '25';
-          else if (channels.length > 9) this.windowNum = '16';
-          else if (channels.length > 4) this.windowNum = '9';
-          else this.windowNum = '4';
-
-          // 3. 构造批量请求参数
-          const ids = channels.map(c => {
-            // 假设 code 是 id_sim_channel，后端需要 sim-channel
-            const parts = c.code.replaceAll('_', '-').split('-');
-            return parts.slice(1).join('-');
-          });
+    batchPlayback(nodeData) {
+      if (this.isCarouselRunning) return this.$message.warning("轮播中无法操作");
+      const channels = nodeData.children;
+      if (channels && channels.length > 0) {
+        this.videoUrl = [];
+        this.videoDataList = [];
+        if (channels.length > 16) this.windowNum = '25';
+        else if (channels.length > 9) this.windowNum = '16';
+        else if (channels.length > 4) this.windowNum = '9';
+        else this.windowNum = '4';
+
+        const ids = channels.map(c => {
+          const parts = c.code.replaceAll('_', '-').split('-');
+          return parts.slice(1).join('-');
+        });
  
-          this.$axios.post('/api/jt1078/query/beachSend/request/io', ids).then(res => {
-            if (res.data && res.data.data) {
-              const list = res.data.data || [];
-              list.forEach((item, i) => {
-                if (channels[i]) {
-                  const url = (location.protocol === "https:") ? item.wss_flv : item.ws_flv;
-                  this.$set(this.videoUrl, i, url);
-                  this.$set(this.videoDataList, i, {...channels[i], videoUrl: url});
-                }
-              });
-            } else {
-              this.$message.warning("批量获取流地址为空");
-            }
-          }).catch(e => {
-            this.$message.error("批量播放失败");
-          });
-        } else {
-          this.$message.warning("该设备下没有通道");
-        }
+        this.$axios.post('/api/jt1078/query/beachSend/request/io', ids).then(res => {
+          if (res.data && res.data.data) {
+            const list = res.data.data || [];
+            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 });
+              }
+            });
+          } else {
+            this.$message.warning("批量获取流地址为空");
+          }
+        }).catch(e => {
+          this.$message.error("批量播放失败");
+        });
+      } else {
+        this.$message.warning("该设备下没有通道");
       }
     },
  
-    // ==========================================
-    // 3. 视频关闭逻辑
-    // ==========================================
+    // ===========================
+    // 4. 关闭视频逻辑
+    // ===========================
     async checkCarouselPermission(actionName) {
       if (!this.isCarouselRunning) return true;
       try {
         await this.$confirm(`正在轮播，"${actionName}"将停止轮播，是否继续？`, '提示', {type: 'warning'});
         this.stopCarousel();
         return true;
-      } catch (e) {
-        return false;
-      }
+      } catch (e) { return false; }
     },
  
     async closeAllVideo() {
       if (!(await this.checkCarouselPermission('关闭所有视频'))) return;
-      this.videoUrl = new Array(parseInt(this.windowNum)).fill(null);
-      this.videoDataList = new Array(parseInt(this.windowNum)).fill(null);
+      this.closeAllVideoNoConfirm();
     },
  
     async closeVideo() {
@@ -317,14 +879,18 @@ export default {
           .then(() => {
             this.$set(this.videoUrl, idx, null);
             this.$set(this.videoDataList, idx, null);
-          }).catch(() => {
-        });
+          }).catch(()=>{});
       }
     },
  
-    // ==========================================
-    // 4. 轮播逻辑 (补全部分)
-    // ==========================================
+    closeAllVideoNoConfirm() {
+      this.videoUrl = new Array(parseInt(this.windowNum)).fill(null);
+      this.videoDataList = new Array(parseInt(this.windowNum)).fill(null);
+    },
+
+    // ===========================
+    // 5. 轮播逻辑
+    // ===========================
     openCarouselConfig() {
       if (this.isCarouselRunning) {
         this.$confirm('确定要停止轮播吗？', '提示').then(() => this.stopCarousel());
@@ -344,7 +910,6 @@ export default {
  
     async startCarousel(config) {
       this.carouselConfig = config;
-
       // 1. 筛选目标设备
       let targetNodes = [];
       if (config.sourceType === 'all_online') {
@@ -372,8 +937,6 @@ export default {
       this.isWithinSchedule = true;
  
       this.$message.success(`轮播已启动，共 ${targetNodes.length} 台在线设备`);
-
-      // 3. 立即执行第一轮
       await this.executeFirstRound();
     },
  
@@ -381,7 +944,6 @@ export default {
       if (this.windowNum !== this.carouselConfig.layout) {
         this.windowNum = this.carouselConfig.layout;
       }
-
       const batch = await this.fetchNextBatchData();
       if (batch) {
         this.applyVideoBatch(batch);
@@ -394,7 +956,6 @@ export default {
  
     runCarouselLoop() {
       if (!this.isCarouselRunning) return;
-
       const {runMode, timeRange, interval} = this.carouselConfig;
  
       // 1. 检查定时
@@ -416,7 +977,6 @@ export default {
       // 3. 计时循环
       this.carouselTimer = setTimeout(async () => {
         if (!this.isCarouselRunning) return;
-
         const nextBatch = await this.fetchNextBatchData();
  
         this.carouselTimer = setTimeout(() => {
@@ -443,14 +1003,10 @@ export default {
     async fetchNextBatchData() {
       let pageSize = parseInt(this.windowNum) || 4;
       if (isNaN(pageSize)) pageSize = 4;
-
-      // 填充缓冲区
       let safetyCounter = 0;
       while (this.channelBuffer.length < pageSize && safetyCounter < 100) {
         safetyCounter++;
-        if (this.deviceCursor >= this.carouselDeviceList.length) {
-          this.deviceCursor = 0;
-        }
+        if (this.deviceCursor >= this.carouselDeviceList.length) this.deviceCursor = 0;
  
         const device = this.carouselDeviceList[this.deviceCursor];
         if (device && device.children && device.children.length > 0) {
@@ -507,43 +1063,34 @@ export default {
       return current >= start && current <= end;
     },
  
-    closeAllVideoNoConfirm() {
-      this.videoUrl = new Array(parseInt(this.windowNum)).fill(null);
-      this.videoDataList = new Array(parseInt(this.windowNum)).fill(null);
-    },
-
     handleBeforeUnload(e) {
       if (this.isCarouselRunning) {
         e.preventDefault();
         e.returnValue = '';
       }
+      this.stopIntercom();
     },
   }
 };
 </script>
  
 <style scoped>
-/* 1. 容器高度设为 100%，由 App.vue 的 el-main 决定高度
-  这样就不会出现双重滚动条，Header 也不会被遮挡
-*/
 .live-container {
   height: 100%;
   width: 100%;
-  overflow: hidden; /* 防止内部溢出 */
+  overflow: hidden;
 }
  
-/* 2. 侧边栏样式优化 */
 .el-aside {
   background-color: #fff;
   color: #333;
   text-align: center;
   height: 100%;
-  overflow: hidden; /* 隐藏收起时的内容 */
+  overflow: hidden;
   border-right: 1px solid #dcdfe6;
-  transition: width 0.3s ease-in-out; /* 添加平滑过渡动画 */
+  transition: width 0.3s ease-in-out;
 }
  
-/* 侧边栏内容包裹层，保持宽度固定，防止文字挤压 */
 .sidebar-content {
   width: 280px;
   height: 100%;
@@ -551,16 +1098,15 @@ export default {
   box-sizing: border-box;
 }
  
-/* 3. 右侧容器 */
 .right-container {
   height: 100%;
   display: flex;
   flex-direction: column;
 }
  
-/* 4. 播放器头部控制栏 */
+/* Header 样式 */
 .player-header {
-  background-color: #e9eef3; /* 与 App 背景色协调 */
+  background-color: #e9eef3;
   color: #333;
   display: flex;
   align-items: center;
@@ -569,6 +1115,7 @@ export default {
   padding: 0 15px;
   border-bottom: 1px solid #dcdfe6;
   box-sizing: border-box;
+  overflow: hidden; /* 防止内容过多撑开 */
 }
  
 .fold-btn {
@@ -577,25 +1124,22 @@ export default {
   cursor: pointer;
   color: #606266;
 }
-
-.fold-btn:hover {
-  color: #409EFF;
-}
+.fold-btn:hover { color: #409EFF; }
  
 .header-right-info {
   margin-left: auto;
   font-weight: bold;
   font-size: 14px;
   color: #606266;
+  white-space: nowrap;
 }
  
-/* 5. 播放器主体区域 */
 .player-main {
-  background-color: #000; /* 黑色背景 */
-  padding: 0 !important; /* 去掉 Element UI 默认 padding */
+  background-color: #000;
+  padding: 0 !important;
   margin: 0;
   overflow: hidden;
-  flex: 1; /* 占据剩余高度 */
+  flex: 1;
 }
  
 /* 右键菜单 */
@@ -609,27 +1153,64 @@ export default {
   padding: 5px 0;
   min-width: 120px;
 }
-
 .menu-item {
   padding: 8px 15px;
   font-size: 14px;
   color: #606266;
   cursor: pointer;
 }
+.menu-item:hover { background: #ecf5ff; color: #409EFF; }
  
-.menu-item:hover {
-  background: #ecf5ff;
-  color: #409EFF;
-}
-
-.carousel-status {
-  margin-left: 15px;
+/* 状态标签通用样式 */
+.status-tag {
   font-size: 12px;
   display: flex;
   align-items: center;
   background: #fff;
-  padding: 2px 8px;
-  border-radius: 10px;
+  padding: 2px 10px;
+  border-radius: 12px;
   border: 1px solid #dcdfe6;
+  white-space: nowrap;
+}
+
+/* 轮播状态 */
+.carousel-status {
+  margin-left: 10px;
+}
+
+/* 对讲状态 */
+.intercom-status {
+  background-color: #fef0f0;
+  color: #f56c6c;
+  border: 1px solid #fde2e2;
+  margin-left: 10px;
+  animation: slideIn 0.3s ease;
+}
+
+.recording-dot {
+  width: 8px;
+  height: 8px;
+  background-color: #f56c6c;
+  border-radius: 50%;
+  margin-right: 8px;
+  animation: breathe 1s infinite;
+}
+
+.stop-btn {
+  margin-left: 8px;
+  color: #f56c6c;
+  font-weight: bold;
+  padding: 0;
+}
+
+@keyframes breathe {
+  0% { opacity: 1; transform: scale(1); }
+  50% { opacity: 0.5; transform: scale(1.2); }
+  100% { opacity: 1; transform: scale(1); }
+}
+
+@keyframes slideIn {
+  from { opacity: 0; transform: translateY(-10px); }
+  to { opacity: 1; transform: translateY(0); }
 }
 </style>
@@ -62,6 +62,9 @@
                 <span v-if="data.abnormalStatus === undefined && data.children === undefined ">
                     <i class="el-icon-video-camera-solid">&nbsp;&nbsp;</i>{{ `${data.name}` }}
                 </span>
+                <span v-if="$parent.intercomTarget === data.id" class="intercom-tag">
+                    <i class="el-icon-microphone"></i> 对讲中
+                </span>
           </el-tooltip>
         </span>
       </vue-easy-tree>
@@ -107,7 +110,7 @@ export default {
         "601104",
         "CS-010",
       ],
-      enableTestSim: false // 新增：控制测试SIM卡功能的开关，默认关闭
+      enableTestSim: true // 新增：控制测试SIM卡功能的开关，默认关闭
     }
   },
   methods: {
@@ -164,8 +167,9 @@ export default {
  
         // 只有在启用测试SIM模式时才应用测试逻辑
         if (this.enableTestSim) {
-          const fixedSims = ['40028816490', '39045172840'];
-          const toggleSim = '39045172800';
+          //, '39045172840',39045172800
+          const fixedSims = ['40028816490'];
+          const toggleSim = '';
  
           // 计算当前时间处于哪个10分钟区间，用于实现 toggleSim 的状态切换
           // Math.floor(Date.now() / (10 * 60 * 1000)) 得到的是从1970年开始的第几个10分钟
@@ -441,4 +445,28 @@ export default {
 .green .dot { background-color: #28a745; }
 .red .dot { background-color: #dc3545; }
 .node-content { display: flex; align-items: center; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+
+.intercom-tag {
+  display: inline-flex;
+  align-items: center;
+  margin-left: 8px;
+  color: #F56C6C; /* 红色醒目 */
+  font-weight: bold;
+  font-size: 12px;
+  border: 1px solid #F56C6C;
+  padding: 0 4px;
+  border-radius: 4px;
+  background-color: #fff;
+  animation: flashBorder 1.5s infinite;
+}
+
+.intercom-tag i {
+  margin-right: 2px;
+}
+
+@keyframes flashBorder {
+  0% { box-shadow: 0 0 0 0 rgba(245, 108, 108, 0.7); transform: scale(1); }
+  70% { box-shadow: 0 0 0 4px rgba(245, 108, 108, 0); transform: scale(1.05); }
+  100% { box-shadow: 0 0 0 0 rgba(245, 108, 108, 0); transform: scale(1); }
+}
 </style>
@@ -17,26 +17,7 @@
       </div>
     </div>
  
-    <div :id="uniqueId" :key="uniqueId" ref="container" class="player-box"></div>
-
-    <div v-show="!hasUrl" class="idle-mask">
-      <div class="idle-text">无信号</div>
-    </div>
-
-    <div v-show="hasUrl && isLoading && !isError" class="status-mask loading-mask">
-      <div class="spinner-box">
-        <div class="simple-spinner"></div>
-      </div>
-      <div class="status-text">视频连接中...</div>
-    </div>
-
-    <div v-if="hasUrl && isError" class="status-mask error-mask">
-      <div class="error-content">
-        <i class="el-icon-warning-outline" style="font-size: 30px; color: #ff6d6d; margin-bottom: 10px;"></i>
-        <div class="status-text error-text">{{ errorMessage }}</div>
-        <el-button type="primary" size="mini" icon="el-icon-refresh-right" @click.stop="handleRetry" style="margin-top: 10px;">重试</el-button>
-      </div>
-    </div>
+    <div :id="uniqueId" ref="container" class="player-box"></div>
   </div>
 </template>
  
@@ -44,58 +25,45 @@
 export default {
   name: 'VideoPlayer',
   props: {
-    initialPlayUrl: { type: [String, Object], default: '' },
-    videoTitle: { type: String, default: '' },
+    initialPlayUrl: { type: String, default: '' },
     isResize: { type: Boolean, default: true },
-    hasAudio: { type: Boolean, default: true },
-    loadTimeout: { type: Number, default: 20000 },
-    showCustomMask: { type: Boolean, default: true }
+    videoTitle: { type: String, default: '' },
+    hasAudio: { type: Boolean, default: false }
   },
   data() {
     return {
-      // 初始 ID
       uniqueId: `player-box-${Date.now()}-${Math.floor(Math.random() * 1000)}`,
       playerInstance: null,
-
-      // 状态
-      isLoading: false,
-      isError: false,
-      errorMessage: '',
-      hasStarted: false,
-
-      // 交互
       netSpeed: '0KB/s',
+      hasStarted: false,
       showControls: false,
       controlTimer: null,
-      retryCount: 0,
  
+      // 【配置控制表】
       controlsConfig: {
-        showBottomBar: true,
-        showSpeed: false,
-        showCodeSelect: false,
-        showPlay: true,
-        showAudio: true,
-        showStretch: true,
-        showScreenshot: true,
-        showRecord: true,
-        showZoom: true,
-        showFullscreen: true,
+        showBottomBar: true,   // 是否显示底栏
+        showSpeed: false,      // 是否显示底部原生的网速 (建议 false，因为顶部已经有了)
+        showCodeSelect: false, // 是否显示解码器/分辨率切换
+
+        showPlay: true,        // 播放暂停
+        showAudio: true,       // 音量
+        showStretch: true,     // 拉伸
+        showScreenshot: true,  // 截图
+        showRecord: true,      // 录制
+        showZoom: true,        // 电子放大
+        showFullscreen: true,  // 全屏
       }
     };
   },
   computed: {
-    hasUrl() {
-      const url = this.initialPlayUrl;
-      if (!url) return false;
-      if (typeof url === 'string') return url.length > 0;
-      return !!url.videoUrl;
-    },
+    // 根据配置生成 CSS 类名
     playerClassOptions() {
       const c = this.controlsConfig;
       return {
         'hide-bottom-bar': !c.showBottomBar,
-        'hide-speed': !c.showSpeed,
-        'hide-code-select': !c.showCodeSelect,
+        'hide-speed': !c.showSpeed,            // 对应下方 CSS
+        'hide-code-select': !c.showCodeSelect, // 对应下方 CSS
+
         'hide-btn-play': !c.showPlay,
         'hide-btn-audio': !c.showAudio,
         'hide-btn-stretch': !c.showStretch,
@@ -107,40 +75,26 @@ export default {
     }
   },
   watch: {
-    initialPlayUrl: {
-      handler(newUrl) {
-        const url = typeof newUrl === 'string' ? newUrl : (newUrl && newUrl.videoUrl) || '';
-
-        if (url) {
-          // 有地址：准备播放
-          this.isLoading = true;
-          this.isError = false;
-
-          if (this.playerInstance) {
-            // 实例已存在（比如轮播切换下一路），直接切换地址，不要销毁
-            this.play(url);
-          } else {
-            // 实例不存在（比如从全部关闭状态恢复），创建并播放
-            this.$nextTick(() => {
-              this.create();
-              setTimeout(() => this.play(url), 100);
-            });
-          }
-        } else {
-          // 地址为空（全部关闭）：彻底销毁
-          this.destroy();
-          this.isLoading = false;
-          this.isError = false;
-        }
-      },
-      immediate: true
-    },
-    hasAudio() {
-      if (this.hasUrl && this.playerInstance) {
-        this.destroyAndReplay(this.initialPlayUrl);
+    initialPlayUrl(newUrl, oldUrl) {
+      if (newUrl && newUrl !== oldUrl) {
+        this.destroyAndReplay(newUrl);
+      } else if (!newUrl) {
+        this.destroy();
       }
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      setTimeout(() => {
+        if (this.$refs.container) {
+          this.create();
+          if (this.initialPlayUrl) {
+            this.play(this.initialPlayUrl);
+          }
+        }
+      }, 500);
+    });
+  },
   beforeDestroy() {
     this.destroy();
     if (this.controlTimer) clearTimeout(this.controlTimer);
@@ -157,31 +111,15 @@ export default {
     onMouseLeave() {
       this.showControls = false;
     },
-    onPlayerClick() {
-      this.$emit('click');
-    },
  
     create() {
       if (this.playerInstance) return;
-
       const container = this.$refs.container;
-      // 容错：如果容器不存在，或者刚才被销毁还没渲染出来，延迟重试
-      if (!container || container.clientWidth === 0) {
-        if (this.retryCount < 10) { // 增加重试次数
-          this.retryCount++;
-          setTimeout(() => this.create(), 100);
-        }
-        return;
-      }
-
-      // 再次确保清空内容
-      container.innerHTML = '';
-
-      if (!window.EasyPlayerPro) return;
+      if (!container || !window.EasyPlayerPro) return;
+      if (container.clientWidth === 0) return;
  
       try {
-        const c = this.controlsConfig;
-
+        // 保持原有的创建逻辑不变
         this.playerInstance = new window.EasyPlayerPro(container, {
           bufferTime: 0.2,
           stretch: !this.isResize,
@@ -189,31 +127,26 @@ export default {
           WCS: true,
           hasAudio: this.hasAudio,
           isLive: true,
-          loading: false, // 使用我们的自定义 loading
-          isBand: true,
+          loading: true,
+          isBand: true, // 必须为 true 才能获取网速回调
+          // js配置全开，实际显隐由 CSS 控制
           btns: {
-            play: c.showPlay,
-            audio: c.showAudio,
-            fullscreen: c.showFullscreen,
-            screenshot: c.showScreenshot,
-            record: c.showRecord,
-            stretch: c.showStretch,
-            zoom: c.showZoom,
+            fullscreen: true,
+            screenshot: true,
+            play: true,
+            audio: true,
+            record: true,
+            stretch: true,
+            zoom: true,
           }
         });
  
-        this.retryCount = 0;
-
         this.playerInstance.on('kBps', (speed) => {
           this.netSpeed = speed + '/S';
         });
  
         this.playerInstance.on('play', () => {
-          console.log(`[${this.uniqueId}] 播放成功`);
           this.hasStarted = true;
-          this.isLoading = false;
-          this.isError = false;
-          // 播放成功后显示一下控制栏
           this.showControls = true;
           if (this.controlTimer) clearTimeout(this.controlTimer);
           this.controlTimer = setTimeout(() => {
@@ -222,183 +155,300 @@ export default {
         });
  
         this.playerInstance.on('error', (err) => {
-          console.error('Player Error:', err);
-          this.triggerError('视频流连接异常');
+          console.warn('Player Error:', err);
         });
  
       } catch (e) {
-        console.error("Create Instance Error:", e);
-        // 如果创建报错，可能是容器脏了，执行销毁逻辑刷新DOM
-        this.destroy();
+        console.error("Create Error:", e);
       }
     },
  
     play(url) {
-      if (!url) return;
-
+      const playUrl = url || this.initialPlayUrl;
+      if (!playUrl) return;
       if (!this.playerInstance) {
         this.create();
-        setTimeout(() => this.play(url), 200);
+        setTimeout(() => this.play(playUrl), 200);
         return;
       }
-
-      this.isLoading = true;
-      this.isError = false;
-      this.errorMessage = '';
-
-      // 设置超时检测
-      setTimeout(() => {
-        if (this.isLoading) this.triggerError('连接超时，请重试');
-      }, this.loadTimeout);
-
-      this.playerInstance.play(url).catch(e => {
-        console.warn("Play error:", e);
-        this.triggerError('请求播放失败');
+      this.playerInstance.play(playUrl).catch(e => {
+        console.warn('Play Error:', e);
       });
     },
  
-    // 【核心修复】彻底销毁并刷新DOM ID
     destroy() {
-      // 1. 重置状态
       this.hasStarted = false;
       this.showControls = false;
-      this.netSpeed = '0KB/s';
-      this.isLoading = false;
-      this.isError = false;
-
-      const container = this.$refs.container;
-
-      // 2. 销毁实例
       if (this.playerInstance) {
-        try {
-          this.playerInstance.destroy();
-        } catch(e) {}
+        this.playerInstance.destroy();
         this.playerInstance = null;
       }
-
-      // 3. 暴力清理旧 DOM
-      if (container) {
-        container.innerHTML = '';
-      }
-
-      // 4. 【关键】更新 uniqueId
-      // 这会强制 Vue 在下一次渲染时移除当前的 div，并创建一个全新的 div
-      // 从而彻底解决 "EasyPlayerPro err container" 错误
-      this.uniqueId = `player-box-${Date.now()}-${Math.floor(Math.random() * 1000)}`;
     },
  
     destroyAndReplay(url) {
       this.destroy();
-      this.isLoading = true;
       this.$nextTick(() => {
         this.create();
-        if (url) {
-          const u = typeof url === 'string' ? url : url.videoUrl;
-          this.play(u);
-        }
+        if (url) this.play(url);
       });
     },
  
-    handleRetry() {
-      this.destroyAndReplay(this.initialPlayUrl);
-    },
-
-    triggerError(msg) {
-      if (this.hasUrl) {
-        this.isLoading = false;
-        this.isError = true;
-        this.errorMessage = msg;
-      }
+    onPlayerClick() {
+      this.$emit('click');
     },
  
     setControls(config) {
       this.controlsConfig = { ...this.controlsConfig, ...config };
     }
-  }
+  },
 };
 </script>
  
 <style scoped>
-/* 基础布局 */
+/* 组件自身的 Scoped 样式 */
 .player-wrapper {
-  width: 100%; height: 100%; display: flex; flex-direction: column;
-  position: relative; background: #000; overflow: hidden;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  background: #000;
+  overflow: hidden;
 }
+
 .player-box {
-  flex: 1; width: 100%; height: 100%; background: #000; position: relative; z-index: 1;
+  flex: 1;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  z-index: 1;
 }
  
-/* 顶部栏 */
 .custom-top-bar {
-  position: absolute; top: 0; left: 0; width: 100%; height: 40px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 40px;
   background: linear-gradient(to bottom, rgba(0,0,0,0.8), rgba(0,0,0,0));
-  z-index: 200; display: flex; justify-content: space-between; align-items: center;
-  padding: 0 15px; box-sizing: border-box; pointer-events: none; transition: opacity 0.3s ease;
+  z-index: 200;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 15px;
+  box-sizing: border-box;
+  pointer-events: none;
+  transition: opacity 0.3s ease;
 }
 .custom-top-bar.hide-bar { opacity: 0; }
 .top-bar-left .video-title { color: #fff; font-size: 14px; font-weight: bold; }
 .top-bar-right .net-speed { color: #00ff00; font-size: 12px; font-family: monospace; }
+</style>
  
-/* 无信号遮罩
-   z-index 必须高于 player-box (z-index 1)
-   并且背景设为纯黑，以盖住可能残留的画面
-*/
-.idle-mask {
-  position: absolute; top: 0; left: 0; width: 100%; height: 100%;
-  background-color: #000; z-index: 10;
-  display: flex; align-items: center; justify-content: center;
+<style>
+/* =========================================
+   1. 基础显隐控制 (映射 controlsConfig)
+   ========================================= */
+
+/* 网速显示 */
+.player-wrapper.hide-speed .easyplayer-speed {
+  display: none !important;
 }
-.idle-text { color: #555; font-size: 14px; }
  
-/* 状态蒙层 */
-.status-mask {
-  position: absolute; top: 0; left: 0; width: 100%; height: 100%;
-  background-color: #000; z-index: 50;
-  display: flex; flex-direction: column; align-items: center; justify-content: center;
+/* 解码器/清晰度选择面板 */
+.player-wrapper.hide-code-select .easyplayer-controls-code-wrap {
+  display: none !important;
 }
-.status-text { color: #fff; margin-top: 15px; font-size: 14px; letter-spacing: 1px; }
-.error-content { display: flex; flex-direction: column; align-items: center; justify-content: center; }
-.error-text { color: #ff6d6d; }
-
-/* Loading */
-.spinner-box { width: 50px; height: 50px; display: flex; justify-content: center; align-items: center; }
-.simple-spinner {
-  width: 40px; height: 40px; border: 3px solid rgba(255, 255, 255, 0.2);
-  border-radius: 50%; border-top-color: #409EFF; animation: spin 0.8s linear infinite;
+
+/* 整个底部栏 */
+.player-wrapper.hide-bottom-bar .easyplayer-controls {
+  display: none !important;
 }
-@keyframes spin { to { transform: rotate(360deg); } }
-</style>
  
-<style>
-.player-wrapper.hide-speed .easyplayer-speed { display: none !important; }
-.player-wrapper.hide-code-select .easyplayer-controls-code-wrap { display: none !important; }
-.player-wrapper.hide-bottom-bar .easyplayer-controls { display: none !important; }
-.player-wrapper.hide-btn-play .easyplayer-play, .player-wrapper.hide-btn-play .easyplayer-pause { display: none !important; }
-.player-wrapper.hide-btn-audio .easyplayer-audio-box { display: none !important; }
-.player-wrapper.hide-btn-screenshot .easyplayer-screenshot { display: none !important; }
-.player-wrapper.hide-btn-fullscreen .easyplayer-fullscreen, .player-wrapper.hide-btn-fullscreen .easyplayer-fullscreen-exit { display: none !important; }
-.player-wrapper.hide-btn-record .easyplayer-record, .player-wrapper.hide-btn-record .easyplayer-record-stop { display: none !important; }
+/* 播放/暂停按钮 */
+.player-wrapper.hide-btn-play .easyplayer-play,
+.player-wrapper.hide-btn-play .easyplayer-pause {
+  display: none !important;
+}
+
+/* 音量按钮 */
+.player-wrapper.hide-btn-audio .easyplayer-audio-box {
+  display: none !important;
+}
+
+/* 截图按钮 */
+.player-wrapper.hide-btn-screenshot .easyplayer-screenshot {
+  display: none !important;
+}
+
+/* 全屏按钮 */
+.player-wrapper.hide-btn-fullscreen .easyplayer-fullscreen,
+.player-wrapper.hide-btn-fullscreen .easyplayer-fullscreen-exit {
+  display: none !important;
+}
+
+/* 录制按钮 (原生图标) */
+.player-wrapper.hide-btn-record .easyplayer-record,
+.player-wrapper.hide-btn-record .easyplayer-record-stop {
+  display: none !important;
+}
+
+/* 拉伸按钮 (原生图标) */
+.player-wrapper.hide-btn-stretch .easyplayer-stretch {
+  display: none !important;
+}
+
+/* 电子放大按钮 */
+.player-wrapper.hide-btn-zoom .easyplayer-zoom,
+.player-wrapper.hide-btn-zoom .easyplayer-zoom-stop {
+  display: none !important;
+}
+
+/* =========================================
+   2. 样式修正与美化
+   ========================================= */
+
+/* 强制隐藏整个控制栏 (当鼠标移出且 force-hide-controls 为 true 时) */
+.player-wrapper.force-hide-controls .easyplayer-controls {
+  opacity: 0 !important;
+  visibility: hidden !important;
+  transition: opacity 0.3s ease;
+}
+
+/* --- 录制状态栏位置修正 --- */
+
+/* 默认隐藏，防止初始闪烁 */
 .player-wrapper .easyplayer-recording {
-  display: none; position: absolute !important; top: 50px !important; left: 50% !important;
-  transform: translateX(-50%) !important; z-index: 200 !important;
-  background: rgba(255, 0, 0, 0.6); border-radius: 4px; padding: 4px 12px;
+  display: none;
+  position: absolute !important;
+  top: 50px !important;
+  left: 50% !important;
+  transform: translateX(-50%) !important;
+  z-index: 200 !important;
+  background: rgba(255, 0, 0, 0.6);
+  border-radius: 4px;
+  padding: 4px 12px;
+}
+
+/* 当播放器将其设为 block 时，强制改为 flex 布局 */
+.player-wrapper .easyplayer-recording[style*="block"] {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+}
+
+.player-wrapper .easyplayer-recording-time {
+  margin: 0 8px;
+  font-size: 14px;
+  color: #fff;
+  line-height: 1;
+}
+
+.player-wrapper .easyplayer-recording-stop {
+  height: auto !important;
+  display: flex !important;
+  align-items: center !important;
+  cursor: pointer;
 }
-.player-wrapper .easyplayer-recording[style*="block"] { display: flex !important; align-items: center !important; justify-content: center !important; }
-.player-wrapper .easyplayer-recording-time { margin: 0 8px; font-size: 14px; color: #fff; }
-.player-wrapper .easyplayer-recording-stop { height: auto !important; cursor: pointer; }
-.player-wrapper.hide-btn-stretch .easyplayer-stretch { display: none !important; }
-.player-wrapper .easyplayer-stretch { font-size: 0 !important; width: 34px !important; height: 100% !important; display: flex !important; align-items: center; justify-content: center; cursor: pointer; }
+
+/* --- 拉伸按钮图标修正 (使用 SVG) --- */
+.player-wrapper .easyplayer-stretch {
+  font-size: 0 !important;
+  width: 34px !important;
+  height: 100% !important;
+  display: flex !important;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
 .player-wrapper .easyplayer-stretch::after {
-  content: ''; display: block; width: 20px; height: 20px;
+  content: '';
+  display: block;
+  width: 20px;
+  height: 20px;
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='200' height='200'%3E%3Cpath d='M128 128h298.667v85.333H195.2l201.6 201.6-60.373 60.374-201.6-201.6v231.466H49.067V49.067h78.933V128zM896 896H597.333v-85.333H828.8l-201.6-201.6 60.373-60.374 201.6 201.6V518.933h85.334v377.067h-78.934V896z' fill='%23ffffff'/%3E%3C/svg%3E");
-  background-repeat: no-repeat; background-position: center; background-size: contain; opacity: 0.8;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: contain;
+  opacity: 0.8;
 }
-.player-wrapper .easyplayer-stretch:hover::after { opacity: 1; }
-.player-wrapper.hide-btn-zoom .easyplayer-zoom, .player-wrapper.hide-btn-zoom .easyplayer-zoom-stop { display: none !important; }
+
+.player-wrapper .easyplayer-stretch:hover::after {
+  opacity: 1;
+}
+
+/* --- 电子放大控制栏位置修正 --- */
 .player-wrapper .easyplayer-zoom-controls {
-  position: absolute !important; top: 50px !important; left: 50% !important;
-  transform: translateX(-50%); z-index: 199 !important;
-  background: rgba(0,0,0,0.6); border-radius: 20px; padding: 0 10px;
+  position: absolute !important;
+  top: 50px !important;
+  left: 50% !important;
+  transform: translateX(-50%);
+  z-index: 199 !important;
+  background: rgba(0, 0, 0, 0.6);
+  border-radius: 20px;
+  padding: 0 10px;
+}
+
+/* 加载动画层样式 - 双环渐变旋转（柔和蓝色版） */
+.player-wrapper .easyplayer-loading-img {
+  background-color: #000 !important; /* 黑色背景 */
+  background-image: none !important; /* 清除外部GIF */
+  width: 100%;
+  height: 100%;
+  display: block;
+  position: relative;
+  animation: none !important; /* 取消原生动画 */
+}
+
+/* 外层圆环（带渐变光效）- 核心修改：柔和科技蓝 */
+.player-wrapper .easyplayer-loading-img::before {
+  content: "";
+  width: 70px;
+  height: 70px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  border: 4px solid transparent;
+  border-top-color: #1e90ff; /* 柔和科技蓝（不刺眼的天蓝色） */
+  border-right-color: #1e90ff;
+  border-radius: 50%;
+  animation: spin 1.2s linear infinite;
+  z-index: 1;
+  box-shadow: 0 0 15px rgba(30, 144, 255, 0.3); /* 匹配蓝色的柔和光晕 */
+}
+
+/* 内层圆环（白色半透明）- 保留不变，保证层次感 */
+.player-wrapper .easyplayer-loading-img::after {
+  content: "";
+  width: 50px;
+  height: 50px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  border: 3px solid rgba(255, 255, 255, 0.3); /* 白色半透明 */
+  border-bottom-color: rgba(255, 255, 255, 0.8); /* 底部高亮 */
+  border-radius: 50%;
+  animation: spin-reverse 0.8s linear infinite;
+  z-index: 2;
+}
+
+/* 旋转动画（顺时针） */
+@keyframes spin {
+  0% { transform: translate(-50%, -50%) rotate(0deg); }
+  100% { transform: translate(-50%, -50%) rotate(360deg); }
+}
+
+/* 旋转动画（逆时针） */
+@keyframes spin-reverse {
+  0% { transform: translate(-50%, -50%) rotate(0deg); }
+  100% { transform: translate(-50%, -50%) rotate(-360deg); }
+}
+
+/* 隐藏加载文字 */
+.player-wrapper .easyplayer-loading-text {
+  display: none !important;
 }
-.player-wrapper.force-hide-controls .easyplayer-controls { opacity: 0 !important; visibility: hidden !important; transition: opacity 0.3s ease; }
 </style>
@@ -14,6 +14,7 @@
         :initial-play-url="videoUrl[i]"
         :initial-buffer-time="0.1"
         :show-custom-mask="false"
+        :has-audio="true"
         style="width: 100%;height: 100%;"
         @click="playerClick(item, i, items.length)"
       ></easyPlayer>
+// G.711A (PCMA) 解码查找表
+const PCMA_TO_PCM = new Int16Array(256);
+for (let i = 0; i < 256; i++) {
+  let s = ~i;
+  let t = ((s & 0x0f) << 3) + 8;
+  let seg = (s & 0x70) >> 4;
+  if (seg > 0) t = (t + 0x100) << (seg - 1);
+  PCMA_TO_PCM[i] = (s & 0x80) ? -t : t;
+}
+/**
+ * 音频处理工具类
+ * 用于语音对讲功能的 PCM 格式转换与编码
+ */
+
+// 【修改】降采样并转换函数：Float32(44.1k/48k) -> Int16(8k)
+export function resampleTo8kInt16(audioData, sampleRate) {
+  const targetSampleRate = 8000; // 目标采样率
+  const ratio = sampleRate / targetSampleRate;
+  const newLength = Math.round(audioData.length / ratio);
+  const result = new Int16Array(newLength);
+
+  for (let i = 0; i < newLength; i++) {
+    // 简单的线性插值或直接抽取
+    const index = Math.floor(i * ratio);
+    let s = audioData[index];
+
+    // 限幅处理，防止爆音
+    s = Math.max(-1, Math.min(1, s));
+
+    // 转换到 Int16 范围: s < 0 ? s * 0x8000 : s * 0x7FFF
+    result[i] = s < 0 ? s * 0x8000 : s * 0x7FFF;
+  }
+  return result;
+}
+
+/**
+ * 将 Web Audio API 的 Float32Array (采样率 44.1k/48k/8k) 转换为 PCM Int16
+ * @param {Float32Array} float32Array - 原始音频数据
+ * @returns {Int16Array} - 转换后的 16位 PCM 数据
+ */
+export function floatTo16BitPCM(float32Array) {
+  var l = float32Array.length
+  var buffer = new ArrayBuffer(l * 2)
+  var view = new DataView(buffer)
+  for (var i = 0; i < l; i++) {
+    // 限制范围在 -1 到 1 之间
+    var s = Math.max(-1, Math.min(1, float32Array[i]))
+    // 转换公式：负数 * 0x8000，正数 * 0x7FFF，并使用小端序 (little-endian)
+    view.setInt16(i * 2, s < 0 ? s * 0x8000 : s * 0x7fff, true)
+  }
+  return new Int16Array(buffer)
+}
+
+/**
+ * 将 Uint8Array 二进制数据转换为 Base64 字符串
+ * @param {Uint8Array} u8 - 二进制数据
+ * @returns {string} - Base64 字符串
+ */
+export function uint8ArrayToBase64(u8) {
+  var CHUNK_SIZE = 0x8000 // 32768
+  var index = 0
+  var length = u8.length
+  var result = ''
+  var slice
+  // 分块处理防止栈溢出
+  while (index < length) {
+    slice = u8.subarray(index, Math.min(index + CHUNK_SIZE, length))
+    result += String.fromCharCode.apply(null, slice)
+    index += CHUNK_SIZE
+  }
+  return btoa(result)
+}
+
+/**
+ * 快捷组合函数：直接将 Float32Array 音频数据转为 Base64 字符串
+ * (常用于语音对讲发送)
+ * @param {Float32Array} float32Array
+ * @returns {string}
+ */
+export function pcmToG711Base64(float32Array) {
+  const pcm16 = floatTo16BitPCM(float32Array)
+  const u8 = new Uint8Array(pcm16.buffer)
+  return uint8ArrayToBase64(u8)
+}
+
+export default {
+  floatTo16BitPCM,
+  uint8ArrayToBase64,
+  pcmToG711Base64
+}