fix #55 fix#20 压缩图片不再覆盖原截图

Author: ohbugs

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 //        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 //        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
         // NOTE: Do not place your application dependencies here; they belong

takephoto_library/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java

@@ -392,7 +392,7 @@ private void takeResult(final TResult result, final String...message) {
         } else {
             if (showCompressDialog)
                 wailLoadDialog = TUtils.showProgressDialog(contextWrap.getActivity(),contextWrap.getActivity().getResources().getString(R.string.tip_compress));
-            new CompressImageImpl(compressConfig,result.getImages(), new CompressImage.CompressListener() {
+            new CompressImageImpl(contextWrap.getActivity(),compressConfig,result.getImages(), new CompressImage.CompressListener() {
                 @Override
                 public void onCompressSuccess(ArrayList<TImage> images) {
                     handleTakeCallBack(result);

takephoto_library/src/main/java/com/jph/takephoto/compress/CompressImageImpl.java

@@ -1,5 +1,6 @@
 package com.jph.takephoto.compress;
 
+import android.content.Context;
 import android.text.TextUtils;
 import com.jph.takephoto.model.TImage;
 import java.io.File;
@@ -18,9 +19,8 @@ public class CompressImageImpl implements CompressImage {
     private CompressImageUtil compressImageUtil;
     private ArrayList<TImage> images;
     private CompressImage.CompressListener listener;
-
-    public CompressImageImpl(CompressConfig config, ArrayList<TImage> images, CompressImage.CompressListener listener) {
-        compressImageUtil = new CompressImageUtil(config);
+    public CompressImageImpl(Context context,CompressConfig config, ArrayList<TImage> images, CompressImage.CompressListener listener) {
+        compressImageUtil = new CompressImageUtil(context,config);
         this.images = images;
         this.listener = listener;
     }
@@ -52,6 +52,7 @@ private void compress(final TImage image) {
         compressImageUtil.compress(image.getPath(), new CompressImageUtil.CompressListener() {
             @Override
             public void onCompressSuccess(String imgPath) {
+                image.setPath(imgPath);
                 continueCompress(image,true);
             }
 

takephoto_library/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java

@@ -1,9 +1,13 @@
 package com.jph.takephoto.compress;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
 import android.graphics.BitmapFactory;
 import android.os.Handler;
+
+import com.jph.takephoto.uitl.TFileUtils;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -17,8 +21,10 @@
  */
 public class CompressImageUtil{
 	private CompressConfig config;
+	private Context context;
 	Handler mhHandler = new Handler();
-	public CompressImageUtil(CompressConfig config) {
+	public CompressImageUtil(Context context,CompressConfig config) {
+		this.context=context;
 		this.config=config==null?CompressConfig.getDefaultConfig():config;
 	}
 	public void compress(String imagePath, CompressListener listener) {
@@ -63,11 +69,12 @@ public void run() {
 //					bitmap.recycle();//回收内存中的图片
 //				}
 				try {
-					FileOutputStream fos = new FileOutputStream(new File(imgPath));//将压缩后的图片保存的本地上指定路径中
+					File thumbnailFile=getThumbnailFile(new File(imgPath));
+					FileOutputStream fos = new FileOutputStream(thumbnailFile);//将压缩后的图片保存的本地上指定路径中
 					fos.write(baos.toByteArray());
 					fos.flush();
 					fos.close();
-					sendMsg(true, imgPath,null,listener);
+					sendMsg(true, thumbnailFile.getPath(),null,listener);
 				} catch (Exception e) {
 					sendMsg(false,imgPath,"质量压缩失败",listener);
 					e.printStackTrace();
@@ -110,8 +117,10 @@ private void compressImageByPixel(String imgPath,CompressListener listener) thro
 		if (config.isEnableQualityCompress()){
 			compressImageByQuality(bitmap,imgPath,listener);//压缩好比例大小后再进行质量压缩
 		}else {
-			bitmap.compress(Bitmap.CompressFormat.JPEG,100,new FileOutputStream(new File(imgPath)));
-			listener.onCompressSuccess(imgPath);
+			File thumbnailFile=getThumbnailFile(new File(imgPath));
+			bitmap.compress(Bitmap.CompressFormat.JPEG,100,new FileOutputStream(thumbnailFile));
+
+			listener.onCompressSuccess(thumbnailFile.getPath());
 		}
 	}
 	/**
@@ -132,6 +141,10 @@ public void run() {
 			}
 		});
 	}
+	private File getThumbnailFile(File file){
+		if (file==null||!file.exists())return file;
+		return TFileUtils.getPhotoCacheDir(context,file);
+	}
 	/**
 	 * 压缩结果监听器
 	 */

takephoto_library/src/main/java/com/jph/takephoto/uitl/TFileUtils.java

@@ -0,0 +1,30 @@
+package com.jph.takephoto.uitl;
+
+import android.content.Context;
+import android.util.Log;
+
+import java.io.File;
+
+/**
+ * Author: crazycodeboy
+ * Date: 2016/11/5 0007 20:10
+ * Version:4.0.0
+ * 技术博文：http://www.devio.org/
+ * GitHub:https://github.com/crazycodeboy
+ * Eamil:crazycodeboy@gmail.com
+ */
+public class TFileUtils {
+    private static final String TAG="TFileUtils";
+
+    public static File getPhotoCacheDir(Context context, File file) {
+        File cacheDir = context.getCacheDir();
+        if (cacheDir != null) {
+            File result = new File(cacheDir, file.getName());
+            return result;
+        }
+        if (Log.isLoggable(TAG, Log.ERROR)) {
+            Log.e(TAG, "default disk cache dir is null");
+        }
+        return file;
+    }
+}