update glide version to 4.3.1

jdsjlzx · Jan 15, 2018 · b515f27 · b515f27
1 parent e7cf43c
commit b515f27
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 43 deletions.
diff --git a/PhotoPicker/build.gradle b/PhotoPicker/build.gradle
@@ -2,16 +2,16 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "26.0.2"
     resourcePrefix "__picker_"
     lintOptions {
         abortOnError false
         checkReleaseBuilds false
     }
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 25
+        minSdkVersion 15
+        targetSdkVersion 27
     }
     dexOptions {
         javaMaxHeapSize "4g"
@@ -26,12 +26,12 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:25.3.1"
-    provided "com.android.support:design:25.3.1"
-    provided "com.android.support:recyclerview-v7:25.3.1"
-    provided 'com.nineoldandroids:library:2.4.0'
+    compile "com.android.support:appcompat-v7:27.0.2"
+    compile "com.android.support:design:27.0.2"
+    compile "com.android.support:recyclerview-v7:27.0.2"
+    compile 'com.nineoldandroids:library:2.4.0'
     compile 'com.yalantis:ucrop:2.2.0'
-    provided 'com.github.bumptech.glide:glide:3.7.0'
+    compile 'com.github.bumptech.glide:glide:4.3.1'
 }
 
 // 指定编码

diff --git a/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoGridAdapter.java b/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoGridAdapter.java
@@ -11,6 +11,7 @@
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestManager;
+import com.bumptech.glide.request.RequestOptions;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -115,14 +116,16 @@ public void onBindViewHolder(final PhotoViewHolder holder, int position) {
             boolean canLoadImage = AndroidLifecycleUtils.canLoadImage(holder.ivPhoto.getContext());
 
             if (canLoadImage) {
-                glide
-                        .load(new File(photo.getPath()))
-                        .centerCrop()
+                final RequestOptions options = new RequestOptions();
+                options.centerCrop()
                         .dontAnimate()
-                        .thumbnail(0.5f)
                         .override(imageSize, imageSize)
                         .placeholder(R.drawable.__picker_ic_photo_black_48dp)
-                        .error(R.drawable.__picker_ic_broken_image_black_48dp)
+                        .error(R.drawable.__picker_ic_broken_image_black_48dp);
+
+                glide.setDefaultRequestOptions(options)
+                        .load(new File(photo.getPath()))
+                        .thumbnail(0.5f)
                         .into(holder.ivPhoto);
             }
 
@@ -230,7 +233,7 @@ public boolean showCamera() {
 
     @Override
     public void onViewRecycled(PhotoViewHolder holder) {
-        Glide.clear(holder.ivPhoto);
+        glide.clear(holder.ivPhoto);
         super.onViewRecycled(holder);
     }
 }
diff --git a/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoPagerAdapter.java b/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoPagerAdapter.java
@@ -17,6 +17,7 @@
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestManager;
+import com.bumptech.glide.request.RequestOptions;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -65,13 +66,14 @@ public Object instantiateItem(ViewGroup container, final int position) {
         boolean canLoadImage = AndroidLifecycleUtils.canLoadImage(context);
 
         if (canLoadImage) {
-            mGlide.load(uri)
-                    .thumbnail(0.1f)
-                    .dontAnimate()
+            final RequestOptions options = new RequestOptions();
+            options.dontAnimate()
                     .dontTransform()
                     .override(800, 800)
                     .placeholder(R.drawable.__picker_ic_photo_black_48dp)
-                    .error(R.drawable.__picker_ic_broken_image_black_48dp)
+                    .error(R.drawable.__picker_ic_broken_image_black_48dp);
+            mGlide.setDefaultRequestOptions(options).load(uri)
+                    .thumbnail(0.1f)
                     .into(imageView);
         }
 
@@ -145,7 +147,7 @@ public boolean isViewFromObject(View view, Object object) {
     @Override
     public void destroyItem(ViewGroup container, int position, Object object) {
         container.removeView((View) object);
-        Glide.clear((View) object);
+        mGlide.clear((View) object);
     }
 
     @Override

diff --git a/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PopupDirectoryListAdapter.java b/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PopupDirectoryListAdapter.java
@@ -7,6 +7,8 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.bumptech.glide.RequestManager;
+import com.bumptech.glide.request.RequestOptions;
+
 import java.util.ArrayList;
 import java.util.List;
 import me.iwf.photopicker.R;
@@ -71,10 +73,16 @@ public ViewHolder(View rootView) {
     }
 
     public void bindData(PhotoDirectory directory) {
-      glide.load(directory.getCoverPath())
-          .dontAnimate()
-          .thumbnail(0.1f)
-          .into(ivCover);
+      final RequestOptions options = new RequestOptions();
+      options.dontAnimate()
+              .dontTransform()
+              .override(800, 800)
+              .placeholder(R.drawable.__picker_ic_photo_black_48dp)
+              .error(R.drawable.__picker_ic_broken_image_black_48dp);
+      glide.setDefaultRequestOptions(options)
+              .load(directory.getCoverPath())
+              .thumbnail(0.1f)
+              .into(ivCover);
       tvName.setText(directory.getName());
       tvCount.setText(tvCount.getContext().getString(R.string.__picker_image_count, directory.getPhotos().size()));
     }

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,16 +2,16 @@ apply plugin: 'com.android.application'
 
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "26.0.2"
     lintOptions {
         abortOnError false
         checkReleaseBuilds false
     }
     defaultConfig {
         applicationId "me.iwf.PhotoPickerDemo"
-        minSdkVersion 14
-        targetSdkVersion 25
+        minSdkVersion 15
+        targetSdkVersion 27
         versionCode 15
         versionName "0.0.1"
     }
@@ -31,10 +31,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':PhotoPicker')
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile "com.nineoldandroids:library:2.4.0"
-    compile "com.github.bumptech.glide:glide:3.7.0"
-    compile 'com.android.support:appcompat-v7:25.3.1'
 }
 
diff --git a/app/src/main/java/me/iwf/PhotoPickerDemo/PhotoAdapter.java b/app/src/main/java/me/iwf/PhotoPickerDemo/PhotoAdapter.java
@@ -1,22 +1,20 @@
 package me.iwf.PhotoPickerDemo;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.net.Uri;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+
 import java.io.File;
 import java.util.ArrayList;
 import me.iwf.photopicker.R;
 import me.iwf.photopicker.utils.AndroidLifecycleUtils;
 
-/**
- * Created by donglua on 15/5/31.
- */
 public class PhotoAdapter extends RecyclerView.Adapter<PhotoAdapter.PhotoViewHolder> {
 
   private ArrayList<String> photoPaths = new ArrayList<String>();
@@ -60,12 +58,14 @@ public void onBindViewHolder(final PhotoViewHolder holder, final int position) {
       boolean canLoadImage = AndroidLifecycleUtils.canLoadImage(holder.ivPhoto.getContext());
 
       if (canLoadImage) {
+        final RequestOptions options = new RequestOptions();
+        options.centerCrop()
+                .placeholder(R.drawable.__picker_ic_photo_black_48dp)
+                .error(R.drawable.__picker_ic_broken_image_black_48dp);
         Glide.with(mContext)
                 .load(uri)
-                .centerCrop()
+                .apply(options)
                 .thumbnail(0.1f)
-                .placeholder(R.drawable.__picker_ic_photo_black_48dp)
-                .error(R.drawable.__picker_ic_broken_image_black_48dp)
                 .into(holder.ivPhoto);
       }
     }

diff --git a/app/src/main/java/me/iwf/PhotoPickerDemo/PreViewGridAdapter.java b/app/src/main/java/me/iwf/PhotoPickerDemo/PreViewGridAdapter.java
@@ -8,6 +8,7 @@
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 
 import java.util.List;
 
@@ -50,12 +51,14 @@ public View getView(int position, View view, ViewGroup parent) {
             viewHolder = (ViewHolder) view.getTag();
         }
 
+        final RequestOptions options = new RequestOptions();
+        options.centerCrop()
+                .placeholder(me.iwf.photopicker.R.drawable.__picker_ic_photo_black_48dp)
+                .error(me.iwf.photopicker.R.drawable.__picker_ic_broken_image_black_48dp);
         Glide.with(mContext)
                 .load(lstImageItem.get(position))
-                .centerCrop()
+                .apply(options)
                 .thumbnail(0.1f)
-                .placeholder(R.drawable.__picker_ic_photo_black_48dp)
-                .error(R.drawable.__picker_ic_broken_image_black_48dp)
                 .into(viewHolder.img);
 
         return view;

diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,10 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.0'
@@ -13,6 +17,10 @@ allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     tasks.withType(Javadoc) {
         options.addStringOption('Xdoclint:none', '-quiet')