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

648540858

2023-07-24 7d3cbb8253ec3dc7f4004ae67371f852727909df

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

@@ -440,7 +440,7 @@
                        InviteErrorCode.SUCCESS.getCode(),
                        InviteErrorCode.SUCCESS.getMsg(),
                        streamInfo);
                logger.info("[点播成功] deviceId: {}, channelId:{}, 码流类型：{}", device.getDeviceId(),
                logger.info("[点播成功] deviceId: {}, channelId:{}, 码流类型：{}", device.getDeviceId(), channelId,
                        device.isSwitchPrimarySubStream() ? "辅码流" : "主码流");
                snapOnPlay(mediaServerItemInuse, device.getDeviceId(), channelId, ssrcInfo.getStream());
            }, (event) -> {