Merge pull request #135 from namezhouyu/master

fix 鲁班压缩出现路径重复
crazycodeboy · Jan 18, 2017 · 6f48576 · 6f48576
2 parents 478cf70 + 2cdef52
commit 6f48576
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 152 deletions.
diff --git a/simple/build.gradle b/simple/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.jph.simple"
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"

diff --git a/simple/src/main/java/com/jph/simple/CustomHelper.java b/simple/src/main/java/com/jph/simple/CustomHelper.java
@@ -5,17 +5,13 @@
 import android.view.View;
 import android.widget.EditText;
 import android.widget.RadioGroup;
-
 import com.jph.takephoto.app.TakePhoto;
 import com.jph.takephoto.compress.CompressConfig;
 import com.jph.takephoto.model.CropOptions;
 import com.jph.takephoto.model.LubanOptions;
 import com.jph.takephoto.model.TakePhotoOptions;
-
 import java.io.File;
 
-import me.shaohui.advancedluban.Luban;
-
 
 /**
  * - 支持通过相机拍照获取图片
@@ -144,7 +140,6 @@ private void configCompress(TakePhoto takePhoto){
                     .create();
         }else {
             LubanOptions option=new LubanOptions.Builder()
-                    .setGear(Luban.CUSTOM_GEAR)
                     .setMaxHeight(height)
                     .setMaxWidth(width)
                     .setMaxSize(maxSize)

diff --git a/takephoto_library/build.gradle b/takephoto_library/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "25.0.0"
 
     defaultConfig {
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion 25
         versionCode 42
         versionName "4.0.2"
@@ -23,6 +23,6 @@ dependencies {
     compile 'com.android.support:support-v4:25.0.0'
     compile 'com.soundcloud.android.crop:lib_crop:1.0.0'
     compile 'com.darsh.multipleimageselect:multipleimageselect:1.0.4'
-    compile 'me.shaohui.advancedluban:library:1.2.8'
+    compile 'me.shaohui.advancedluban:library:1.3.2'
 }
 //apply from: "bintrayUpload.gradle"
diff --git a/takephoto_library/src/main/java/com/jph/takephoto/compress/CompressWithLuBan.java b/takephoto_library/src/main/java/com/jph/takephoto/compress/CompressWithLuBan.java
@@ -22,96 +22,91 @@
  * Eamil:crazycodeboy@gmail.com
  */
 public class CompressWithLuBan implements CompressImage {
-    private ArrayList<TImage> images;
-    private CompressListener listener;
-    private Context context;
-    private LubanOptions options;
-    private ArrayList<File> files = new ArrayList<>();
+  private ArrayList<TImage> images;
+  private CompressListener listener;
+  private Context context;
+  private LubanOptions options;
+  private ArrayList<File> files = new ArrayList<>();
 
-    public CompressWithLuBan(Context context, CompressConfig config, ArrayList<TImage> images, CompressListener listener) {
-        options=config.getLubanOptions();
-        this.images = images;
-        this.listener = listener;
-        this.context = context;
-    }
+  public CompressWithLuBan(Context context, CompressConfig config, ArrayList<TImage> images,
+      CompressListener listener) {
+    options = config.getLubanOptions();
+    this.images = images;
+    this.listener = listener;
+    this.context = context;
+  }
 
-    @Override
-    public void compress() {
-        if (images == null || images.isEmpty()) {
-            listener.onCompressFailed(images, " images is null");
-            return;
-        }
-        for (TImage image : images) {
-            if (image == null) {
-                listener.onCompressFailed(images, " There are pictures of compress  is null.");
-                return;
-            }
-            files.add(new File(image.getOriginalPath()));
-        }
-        if (images.size() == 1) {
-            compressOne();
-        } else {
-            compressMulti();
-        }
+  @Override public void compress() {
+    if (images == null || images.isEmpty()) {
+      listener.onCompressFailed(images, " images is null");
+      return;
+    }
+    for (TImage image : images) {
+      if (image == null) {
+        listener.onCompressFailed(images, " There are pictures of compress  is null.");
+        return;
+      }
+      files.add(new File(image.getOriginalPath()));
     }
+    if (images.size() == 1) {
+      compressOne();
+    } else {
+      compressMulti();
+    }
+  }
 
-    private void compressOne() {
-        Luban.get(context).putGear(options.getGear())
-                .load(files.get(0))
-                .setMaxHeight(options.getMaxHeight())
-                .setMaxWidth(options.getMaxWidth())
-                .setMaxSize(options.getMaxSize()/1000)
-                .launch(new OnCompressListener() {
-                    @Override
-                    public void onStart() {
+  private void compressOne() {
+    Luban.compress(context, files.get(0))
+        .putGear(Luban.CUSTOM_GEAR)
+        .setMaxHeight(options.getMaxHeight())
+        .setMaxWidth(options.getMaxWidth())
+        .setMaxSize(options.getMaxSize() / 1000)
+        .launch(new OnCompressListener() {
+          @Override public void onStart() {
 
-                    }
+          }
 
-                    @Override
-                    public void onSuccess(File file) {
-                        TImage image=images.get(0);
-                        image.setCompressPath(file.getPath());
-                        image.setCompressed(true);
-                        listener.onCompressSuccess(images);
-                    }
+          @Override public void onSuccess(File file) {
+            TImage image = images.get(0);
+            image.setCompressPath(file.getPath());
+            image.setCompressed(true);
+            listener.onCompressSuccess(images);
+          }
 
-                    @Override
-                    public void onError(Throwable e) {
-                        listener.onCompressFailed(images, e.getMessage() + " is compress failures");
-                    }
-                });
-    }
+          @Override public void onError(Throwable e) {
+            listener.onCompressFailed(images, e.getMessage() + " is compress failures");
+          }
+        });
+  }
 
-    private void compressMulti() {
-        Luban.get(context).putGear(options.getGear())
-                .load(files)
-                .setMaxSize(options.getMaxSize()/1000)                // limit the final image size（unit：Kb）
-                .setMaxHeight(options.getMaxHeight())             // limit image height
-                .setMaxWidth(options.getMaxWidth())
-                .launch(new OnMultiCompressListener() {
-                    @Override
-                    public void onStart() {
+  private void compressMulti() {
+    Luban.compress(context, files)
+        .putGear(Luban.CUSTOM_GEAR)
+        .setMaxSize(
+            options.getMaxSize() / 1000)                // limit the final image size（unit：Kb）
+        .setMaxHeight(options.getMaxHeight())             // limit image height
+        .setMaxWidth(options.getMaxWidth())
+        .launch(new OnMultiCompressListener() {
+          @Override public void onStart() {
 
-                    }
+          }
 
-                    @Override
-                    public void onSuccess(List<File> fileList) {
-                        handleCompressCallBack(fileList);
-                    }
+          @Override public void onSuccess(List<File> fileList) {
+            handleCompressCallBack(fileList);
+          }
 
-                    @Override
-                    public void onError(Throwable e) {
-                        listener.onCompressFailed(images, e.getMessage() + " is compress failures");
-                    }
-                });
-    }
+          @Override public void onError(Throwable e) {
+            listener.onCompressFailed(images, e.getMessage() + " is compress failures");
+          }
+        });
+  }
 
-    private void handleCompressCallBack(List<File> files) {
-        for (int i = 0, j = images.size(); i < j; i++) {
-            TImage image=images.get(i);
-            image.setCompressed(true);
-            image.setCompressPath(files.get(i).getPath());
-        }
-        listener.onCompressSuccess(images);
+  private void handleCompressCallBack(List<File> files) {
+    for (int i = 0, j = images.size(); i < j; i++) {
+      TImage image = images.get(i);
+      image.setCompressed(true);
+      image.setCompressPath(files.get(i).getPath());
     }
+    listener.onCompressSuccess(images);
+  }
 }
diff --git a/takephoto_library/src/main/java/com/jph/takephoto/model/LubanOptions.java b/takephoto_library/src/main/java/com/jph/takephoto/model/LubanOptions.java
@@ -2,8 +2,6 @@
 
 import java.io.Serializable;
 
-import me.shaohui.advancedluban.Luban;
-
 /**
  * Luban配置类
  * Author: crazycodeboy
@@ -13,76 +11,65 @@
  * GitHub:https://github.com/crazycodeboy
  * Eamil:crazycodeboy@gmail.com
  */
-public class LubanOptions implements Serializable{
-    /**
-     * 压缩到的最大大小，单位B
-     */
-    private int maxSize;
-    private int maxHeight;
-    private int maxWidth;
-    private int gear= Luban.CUSTOM_GEAR;
-    private LubanOptions(){}
-
-    public int getMaxSize() {
-        return maxSize;
-    }
-
-    public void setMaxSize(int maxSize) {
-        this.maxSize = maxSize;
-    }
-
-    public int getMaxHeight() {
-        return maxHeight;
-    }
-
-    public void setMaxHeight(int maxHeight) {
-        this.maxHeight = maxHeight;
+public class LubanOptions implements Serializable {
+  /**
+   * 压缩到的最大大小，单位B
+   */
+  private int maxSize;
+  private int maxHeight;
+  private int maxWidth;
+
+  private LubanOptions() {
+  }
+
+  public int getMaxSize() {
+    return maxSize;
+  }
+
+  public void setMaxSize(int maxSize) {
+    this.maxSize = maxSize;
+  }
+
+  public int getMaxHeight() {
+    return maxHeight;
+  }
+
+  public void setMaxHeight(int maxHeight) {
+    this.maxHeight = maxHeight;
+  }
+
+  public int getMaxWidth() {
+    return maxWidth;
+  }
+
+  public void setMaxWidth(int maxWidth) {
+    this.maxWidth = maxWidth;
+  }
+
+  public static class Builder {
+    private LubanOptions options;
+
+    public Builder() {
+      options = new LubanOptions();
     }
 
-    public int getMaxWidth() {
-        return maxWidth;
+    public Builder setMaxSize(int maxSize) {
+      options.setMaxSize(maxSize);
+      return this;
     }
 
-    public void setMaxWidth(int maxWidth) {
-        this.maxWidth = maxWidth;
+    public Builder setMaxHeight(int maxHeight) {
+      options.setMaxHeight(maxHeight);
+      return this;
     }
 
-    public int getGear() {
-        return gear;
+    public Builder setMaxWidth(int maxWidth) {
+      options.setMaxWidth(maxWidth);
+      return this;
     }
 
-    public void setGear(int gear) {
-        this.gear = gear;
-    }
-
-    public static class Builder{
-        private LubanOptions options;
-
-        public Builder() {
-            options=new LubanOptions();
-        }
-
-        public Builder setMaxSize(int maxSize) {
-            options.setMaxSize(maxSize);
-            return this;
-        }
-
-        public Builder setMaxHeight(int maxHeight) {
-            options.setMaxHeight(maxHeight);
-            return this;
-        }
-
-        public Builder setMaxWidth(int maxWidth) {
-            options.setMaxWidth(maxWidth);
-            return this;
-        }
-
-        public Builder setGear(int gear) {
-            options.setGear(gear);
-            return this;
-        }
-        public LubanOptions create(){
-            return options;
-        }
+    public LubanOptions create() {
+      return options;
     }
+  }
 }