|
|
@@ -28,6 +28,7 @@ import java.io.*;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
+import java.util.concurrent.TimeUnit;
|
|
|
import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -310,13 +311,14 @@ public class CameraUtil {
|
|
|
while ((rspLine = in.readLine()) != null) {
|
|
|
log.info("*****:{}", rspLine);
|
|
|
}
|
|
|
- int i = proc.waitFor();
|
|
|
+ proc.waitFor(5L, TimeUnit.MINUTES);
|
|
|
//删除生成的ts文件
|
|
|
File file1 = new File(substring);
|
|
|
if (file1.exists()) {
|
|
|
file1.delete();
|
|
|
}
|
|
|
} catch (InterruptedException e) {
|
|
|
+ log.error(e.getMessage());
|
|
|
e.printStackTrace();
|
|
|
} finally {
|
|
|
in.close();
|
