Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-07-24 7d3cbb8253ec3dc7f4004ae67371f852727909df

 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java

@@ -52,13 +52,13 @@
    private IRedisCatchStorage redisCatchStorage;

    @Autowired
    private IInviteStreamService inviteStreamService;

    @Autowired
    private IDeviceService deviceService;

    @Autowired
    private IPlayService playService;

    @Autowired
    private IInviteStreamService inviteStreamService;

    /**
     * 实时直播 - 开始直播
@@ -92,7 +92,7 @@
            result.put("error","device[ " + serial + " ]未找到");
            resultDeferredResult.setResult(result);
            return resultDeferredResult;
        }else if (!device.isOnLine()) {
        }else if (device.isOnLine()) {
            JSONObject result = new JSONObject();
            result.put("error","device[ " + code + " ]offline");
            resultDeferredResult.setResult(result);
@@ -133,11 +133,17 @@
                    result.put("ChannelName", deviceChannel.getName());
                    result.put("ChannelCustomName", "");
                    result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
                    result.put("HTTPS_FLV", inviteInfo.getStreamInfo().getHttps_flv().getUrl());
                    result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
                    result.put("WSS_FLV", inviteInfo.getStreamInfo().getWss_flv().getUrl());
                    result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
                    result.put("RTMPS", inviteInfo.getStreamInfo().getRtmps().getUrl());
                    result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
                    result.put("HTTPS_HLS", inviteInfo.getStreamInfo().getHttps_hls().getUrl());
                    result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
                    result.put("RTSPS", inviteInfo.getStreamInfo().getRtsps().getUrl());
                    result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
                    result.put("HTTPS_WEBRTC", inviteInfo.getStreamInfo().getRtcs().getUrl());
                    result.put("CDN", "");
                    result.put("SnapURL", "");
                    result.put("Transport", device.getTransport());