修复通道刷新

648540858

2023-06-20 21a96ad20fd75e55d03c00af8df8adb039f0c77a

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

@@ -92,7 +92,7 @@
            result.put("error","device[ " + serial + " ]未找到");
            resultDeferredResult.setResult(result);
            return resultDeferredResult;
        }else if (device.getOnline() == 0) {
        }else if (!device.isOnLine()) {
            JSONObject result = new JSONObject();
            result.put("error","device[ " + code + " ]offline");
            resultDeferredResult.setResult(result);
@@ -113,56 +113,13 @@
            result.put("error","channel[ " + code + " ]未找到");
            resultDeferredResult.setResult(result);
            return resultDeferredResult;
        }else if (deviceChannel.getStatus() == 0) {
        }else if (!deviceChannel.isStatus()) {
            JSONObject result = new JSONObject();
            result.put("error","channel[ " + code + " ]offline");
            resultDeferredResult.setResult(result);
            return resultDeferredResult;
        }
        MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
//        playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{
//            InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
//            if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
//                JSONObject result = new JSONObject();
//                result.put("StreamID", inviteInfo.getStreamInfo().getStream());
//                result.put("DeviceID", device.getDeviceId());
//                result.put("ChannelID", code);
//                result.put("ChannelName", deviceChannel.getName());
//                result.put("ChannelCustomName", "");
//                result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
//                result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
//                result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
//                result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
//                result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
//                result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
//                result.put("CDN", "");
//                result.put("SnapURL", "");
//                result.put("Transport", device.getTransport());
//                result.put("StartAt", "");
//                result.put("Duration", "");
//                result.put("SourceVideoCodecName", "");
//                result.put("SourceVideoWidth", "");
//                result.put("SourceVideoHeight", "");
//                result.put("SourceVideoFrameRate", "");
//                result.put("SourceAudioCodecName", "");
//                result.put("SourceAudioSampleRate", "");
//                result.put("AudioEnable", "");
//                result.put("Ondemand", "");
//                result.put("InBytes", "");
//                result.put("InBitRate", "");
//                result.put("OutBytes", "");
//                result.put("NumOutputs", "");
//                result.put("CascadeSize", "");
//                result.put("RelaySize", "");
//                result.put("ChannelPTZType", "0");
//                resultDeferredResult.setResult(result);
//            }
//
//        }, (eventResult) -> {
//            JSONObject result = new JSONObject();
//            result.put("error", "channel[ " + code + " ] " + eventResult.msg);
//            resultDeferredResult.setResult(result);
//        }, null);


        playService.play(newMediaServerItem, serial, code, (errorCode, msg, data) -> {