Merge branch 'usky-zyj' into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/VcDeviceServiceImpl.java

@@ -75,7 +75,7 @@ public class VcDeviceServiceImpl extends AbstractCrudService<VcDeviceMapper, VcD
         String videoPassword = one.getVideoPassword();
         String videoIp = one.getVideoIp();
         String videoPort = one.getVideoPort().toString();
-        String command = "ffmpeg -i rtsp://"+accountNumber+":"+videoPassword+"@"+videoIp+":"+videoPort+" -vcodec copy -acodec aac -ar 44100 -c:v libx264 -strict -2 -ac 1 -r 30 -s 640x480 -q 10 -f flv rtmp://"+rtmpIp+":1935/hls/"+deviceUuid;
+        String command = "ffmpeg -i rtsp://"+accountNumber+":"+videoPassword+"@"+videoIp+":"+videoPort+" -vcodec copy -acodec aac -ar 44100 -c:v libx264 -strict -2 -ac 1 -r 30 -s 640x480 -q 10 -f flv -hls_time 1 -hls_list_size 6 rtmp://"+rtmpIp+":1935/hls/"+deviceUuid;
         System.out.println(command);
 
         try {
@@ -95,12 +95,13 @@ public class VcDeviceServiceImpl extends AbstractCrudService<VcDeviceMapper, VcD
                     e.printStackTrace();
                 }
             }).start();
+            Thread.sleep(2000);
 
             String repDeviceVideo = rtmpIp+":80/hls/"+deviceUuid+".m3u8";
             return repDeviceVideo;
 
 
-        } catch (IOException e) {
+        } catch (IOException | InterruptedException e) {
             e.printStackTrace();
             return null;
         }