Merge branch 'master' into master

648540858

2020-10-26 2fe9e519b42408c07630735ab76e86b999f72948

 src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java

@@ -71,7 +71,7 @@
            }else {
               streamInfo = storager.queryPlayByDevice(deviceId, channelId);
               JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
               if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo.getFlv() != null){
               if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null && streamInfo.getFlv() != null){
                  logger.info("RTP已推流，查询编码信息："+streamInfo.getFlv());
                  Thread.sleep(2000);
                  JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);