|
@@ -299,7 +299,7 @@ public class CameraUtil {
|
|
|
// 合并成一个临时文件
|
|
// 合并成一个临时文件
|
|
|
commands.add(commit);
|
|
commands.add(commit);
|
|
|
// 临时文件转化为 flv
|
|
// 临时文件转化为 flv
|
|
|
-// commands.add(commit1);
|
|
|
|
|
|
|
+ commands.add(commit1);
|
|
|
log.info("录像视频命令：{}", commands);
|
|
log.info("录像视频命令：{}", commands);
|
|
|
for (String line : commands) {
|
|
for (String line : commands) {
|
|
|
log.info("命令：{}", line);
|
|
log.info("命令：{}", line);
|
|
@@ -313,8 +313,7 @@ public class CameraUtil {
|
|
|
}
|
|
}
|
|
|
proc.waitFor(5L, TimeUnit.MINUTES);
|
|
proc.waitFor(5L, TimeUnit.MINUTES);
|
|
|
|
|
|
|
|
- log.info("命令：{}", commit1);
|
|
|
|
|
- execute(commit1);
|
|
|
|
|
|
|
+
|
|
|
//删除生成的ts文件
|
|
//删除生成的ts文件
|
|
|
File file1 = new File(pathStr + "/" + substring);
|
|
File file1 = new File(pathStr + "/" + substring);
|
|
|
if (file1.exists()) {
|
|
if (file1.exists()) {
|
