Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-07-06 61e5226122e7816dbaa18baec907d0e5934ee170

 src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -81,7 +81,7 @@
    private ZLMRESTfulUtils zlmresTfulUtils;

    @Autowired
    private ZLMServerFactory ZLMServerFactory;
    private ZLMServerFactory zlmServerFactory;

    @Autowired
    private AssistRESTfulUtils assistRESTfulUtils;
@@ -142,7 +142,7 @@
                String mediaServerId = streamInfo.getMediaServerId();
                MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);

                Boolean ready = ZLMServerFactory.isStreamReady(mediaInfo, "rtp", streamId);
                Boolean ready = zlmServerFactory.isStreamReady(mediaInfo, "rtp", streamId);
                if (ready != null && ready) {
                    callback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), streamInfo);
                    inviteStreamService.call(InviteSessionType.PLAY, device.getDeviceId(), channelId, null,