增加非空判断

xufuji456 · xufuji456 · commit a6cfd1a331eb · 2019-12-13T01:14:43.000+08:00
增加非空判断
diff --git a/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java b/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java
@@ -114,14 +114,18 @@ private void doHandleAudio(final String srcFile) {
         }
         switch (viewId) {
             case R.id.btn_transform://转码
-                String transformFile;
                 if (useFFmpeg) { //使用FFmpeg转码
-                    transformFile = PATH + File.separator + "transformAudio.mp3";
+                    String transformFile = PATH + File.separator + "transformAudio.mp3";
                     commandLine = FFmpegUtil.transformAudio(srcFile, transformFile);
                 } else { //使用MediaCodec与mp3lame转mp3
-                    transformFile = PATH + File.separator + "transformAudio.mp3";
-                    Mp3Converter mp3Converter = new Mp3Converter();
-                    mp3Converter.convertToMp3(srcFile, transformFile);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            String transformInput = PATH + File.separator + "transformAudio.mp3";
+                            Mp3Converter mp3Converter = new Mp3Converter();
+                            mp3Converter.convertToMp3(srcFile, transformInput);
+                        }
+                    }).start();
                 }
                 break;
             case R.id.btn_cut://剪切(注意原文件与剪切文件格式一致，文件绝对路径最好不包含中文、特殊字符)
@@ -191,7 +195,7 @@ public void run() {
             default:
                 break;
         }
-        if (ffmpegHandler != null) {
+        if (ffmpegHandler != null  && commandLine != null) {
             ffmpegHandler.executeFFmpegCmd(commandLine);
         }
     }
diff --git a/app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.java b/app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.java
@@ -253,7 +253,7 @@ private void doHandleVideo(String srcFile) {
             default:
                 break;
         }
-        if (ffmpegHandler != null) {
+        if (ffmpegHandler != null && commandLine != null) {
             ffmpegHandler.executeFFmpegCmd(commandLine);
         }
     }
@@ -264,7 +264,7 @@ private void doHandleVideo(String srcFile) {
     private void handlePhoto() {
         // 图片所在路径，图片命名格式img+number.jpg
         // 这里指定目录为根目录下img文件夹
-        String picturePath = PATH + "/frame/";
+        String picturePath = PATH + "/img/";
         if (!FileUtil.checkFileExist(picturePath)) {
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ private void doHandleVideo(String srcFile) {`
`253`	`253`	`default:`
`254`	`254`	`break;`
`255`	`255`	`}`
`256`		`- if (ffmpegHandler != null) {`
	`256`	`+ if (ffmpegHandler != null && commandLine != null) {`
`257`	`257`	`ffmpegHandler.executeFFmpegCmd(commandLine);`
`258`	`258`	`}`
`259`	`259`	`}`
`@@ -264,7 +264,7 @@ private void doHandleVideo(String srcFile) {`
`264`	`264`	`private void handlePhoto() {`
`265`	`265`	`// 图片所在路径，图片命名格式img+number.jpg`
`266`	`266`	`// 这里指定目录为根目录下img文件夹`
`267`		`- String picturePath = PATH + "/frame/";`
	`267`	`+ String picturePath = PATH + "/img/";`
`268`	`268`	`if (!FileUtil.checkFileExist(picturePath)) {`
`269`	`269`	`return;`
`270`	`270`	`}`