648540858
2024-06-19 f5abf8df4c05439a288a88dedad0f7065901ca21
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -120,23 +120,39 @@
            if (errorCode == InviteErrorCode.SUCCESS.getCode()) {
                if (data != null) {
                    StreamInfo streamInfo = (StreamInfo)data;
                    if (streamInfo.getTranscodeStream() != null) {
                        streamInfo = streamInfo.getTranscodeStream();
                    }
                    JSONObject resultJjson = new JSONObject();
                    resultJjson.put("StreamID", streamInfo.getStream());
                    resultJjson.put("DeviceID", serial);
                    resultJjson.put("ChannelID", code);
                    resultJjson.put("ChannelName", deviceChannel.getName());
                    resultJjson.put("ChannelCustomName", "");
                    if (streamInfo.getTranscodeStream() != null) {
                        resultJjson.put("FLV", streamInfo.getTranscodeStream().getFlv().getUrl());
                    }else {
                    resultJjson.put("FLV", streamInfo.getFlv().getUrl());
                    }
                    if(streamInfo.getHttps_flv() != null) {
                        if (streamInfo.getTranscodeStream() != null) {
                            resultJjson.put("HTTPS_FLV", streamInfo.getTranscodeStream().getHttps_flv().getUrl());
                        }else {
                        resultJjson.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
                    }
                    }
                    if (streamInfo.getTranscodeStream() != null) {
                        resultJjson.put("WS_FLV", streamInfo.getTranscodeStream().getWs_flv().getUrl());
                    }else {
                    resultJjson.put("WS_FLV", streamInfo.getWs_flv().getUrl());
                    }
                    if(streamInfo.getWss_flv() != null) {
                        if (streamInfo.getTranscodeStream() != null) {
                            resultJjson.put("WSS_FLV", streamInfo.getTranscodeStream().getWss_flv().getUrl());
                        }else {
                        resultJjson.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
                    }
                    }
                    resultJjson.put("RTMP", streamInfo.getRtmp().getUrl());
                    if (streamInfo.getRtmps() != null) {
                        resultJjson.put("RTMPS", streamInfo.getRtmps().getUrl());