diff --git a/app/app.iml b/app/app.iml
index 2357ee1..7daf1d9 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -47,7 +46,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -55,7 +53,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -63,48 +60,25 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.11.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.11.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.11.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.11.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.11.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.lzy.net/okhttputils/1.5.2/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.lzy.widget/view-core/0.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/in.srain.cube/ultra-ptr/1.0.11/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.xutils/xutils/3.3.36/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -133,6 +107,7 @@
     <orderEntry type="library" exported="" name="okhttputils-1.5.2" level="project" />
     <orderEntry type="library" exported="" name="ultra-ptr-1.0.11" level="project" />
     <orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
+    <orderEntry type="library" exported="" name="library-1.2.4" level="project" />
     <orderEntry type="library" exported="" name="glide-3.7.0" level="project" />
     <orderEntry type="library" exported="" name="fbcore-0.11.0" level="project" />
     <orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
@@ -150,6 +125,5 @@
     <orderEntry type="library" exported="" name="view-core-0.2.1" level="project" />
     <orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
     <orderEntry type="module" module-name="ninegridview" exported="" />
-    <orderEntry type="library" exported="" name="library-1.2.4" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 33c9824..cd6906a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 14
@@ -34,6 +34,5 @@ dependencies {
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
 
-    //    compile 'com.lzy.widget:ninegridview:+'
     compile project(':ninegridview')
 }
diff --git a/app/src/main/java/com/lzy/ninegridview/MainActivity.java b/app/src/main/java/com/lzy/ninegridview/MainActivity.java
index 6d9a90e..6e8c2df 100644
--- a/app/src/main/java/com/lzy/ninegridview/MainActivity.java
+++ b/app/src/main/java/com/lzy/ninegridview/MainActivity.java
@@ -12,6 +12,7 @@
 import android.widget.ListView;
 import android.widget.RadioGroup;
 
+import com.bumptech.glide.DrawableRequestBuilder;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.lzy.ninegrid.NineGridView;
@@ -19,6 +20,7 @@
 import com.lzy.ninegridview.model.news.NewsActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.squareup.picasso.Picasso;
+import com.squareup.picasso.RequestCreator;
 
 import org.xutils.x;
 
@@ -75,12 +77,18 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
     /** Glide 加载 */
     private class GlideImageLoader implements NineGridView.ImageLoader {
         @Override
-        public void onDisplayImage(Context context, ImageView imageView, String url) {
-            Glide.with(context).load(url)//
-                    .placeholder(R.drawable.ic_default_color)//
-                    .error(R.drawable.ic_default_color)//
-                    .diskCacheStrategy(DiskCacheStrategy.ALL)//
-                    .into(imageView);
+        public void onDisplayImage(Context context, ImageView imageView, int height, int width, String url) {
+            DrawableRequestBuilder drawableRequestBuilder = Glide.with(context)
+                    .load(url)
+                    .placeholder(R.drawable.ic_default_color)
+                    .error(R.drawable.ic_default_color)
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .thumbnail(0.2F)
+                    .dontAnimate();
+            if(height > 0 && width > 0)
+                drawableRequestBuilder.override(width, height);
+            drawableRequestBuilder.into(imageView);
+
         }
 
         @Override
@@ -92,7 +100,7 @@ public Bitmap getCacheImage(String url) {
     /** UniversalImageLoader加载 */
     private class UniversalImageLoader implements NineGridView.ImageLoader {
         @Override
-        public void onDisplayImage(Context context, ImageView imageView, String url) {
+        public void onDisplayImage(Context context, ImageView imageView, int height, int width, String url) {
             ImageLoader.getInstance().displayImage(url, imageView, GApp.imageLoaderOptions);
         }
 
@@ -106,7 +114,7 @@ public Bitmap getCacheImage(String url) {
     private class XUtilsImageLoader implements NineGridView.ImageLoader {
 
         @Override
-        public void onDisplayImage(Context context, ImageView imageView, String url) {
+        public void onDisplayImage(Context context, ImageView imageView, int height, int width, String url) {
             x.image().bind(imageView, url, GApp.xUtilsOptions);
         }
 
@@ -118,13 +126,14 @@ public Bitmap getCacheImage(String url) {
 
     /** Picasso 加载 */
     private class PicassoImageLoader implements NineGridView.ImageLoader {
-
         @Override
-        public void onDisplayImage(Context context, ImageView imageView, String url) {
-            Picasso.with(context).load(url)//
+        public void onDisplayImage(Context context, ImageView imageView, int height, int width, String url) {
+            RequestCreator requestCreator = Picasso.with(context).load(url)//
                     .placeholder(R.drawable.ic_default_color)//
-                    .error(R.drawable.ic_default_color)//
-                    .into(imageView);
+                    .error(R.drawable.ic_default_color);
+            if(height >0 && width > 0)
+                    requestCreator.resize(width, height);
+            requestCreator.into(imageView);
         }
 
         @Override
diff --git a/build.gradle b/build.gradle
index d40306e..034416f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
 
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8c0fb64..13372ae 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 230ee4e..677df83 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Oct 07 00:27:20 CST 2016
+#Fri May 19 15:23:32 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/ninegridview/build.gradle b/ninegridview/build.gradle
index fcc770a..e3fd8aa 100644
--- a/ninegridview/build.gradle
+++ b/ninegridview/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 11
diff --git a/ninegridview/ninegridview.iml b/ninegridview/ninegridview.iml
index 85fa603..ff674dd 100644
--- a/ninegridview/ninegridview.iml
+++ b/ninegridview/ninegridview.iml
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -20,7 +19,7 @@
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="PROJECT_TYPE" value="1" />
       </configuration>
     </facet>
   </component>
@@ -48,7 +47,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -56,7 +54,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -64,7 +61,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
@@ -72,7 +68,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
@@ -80,25 +75,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.chrisbanes.photoview/library/1.2.4/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -109,10 +91,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java
index 674a373..266108a 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java
@@ -11,9 +11,10 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import static android.view.View.MeasureSpec.EXACTLY;
+
 public class NineGridView extends ViewGroup {
 
     public static final int MODE_FILL = 0;          //填充模式，类似于微信
@@ -32,9 +33,9 @@ public class NineGridView extends ViewGroup {
     private int gridWidth;      // 宫格宽度
     private int gridHeight;     // 宫格高度
 
-    private List<ImageView> imageViews;
     private List<ImageInfo> mImageInfo;
     private NineGridViewAdapter mAdapter;
+    private boolean dataChange;
 
     public NineGridView(Context context) {
         this(context, null);
@@ -59,12 +60,10 @@ public NineGridView(Context context, AttributeSet attrs, int defStyleAttr) {
         mode = a.getInt(R.styleable.NineGridView_ngv_mode, mode);
         a.recycle();
 
-        imageViews = new ArrayList<>();
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
         int width = MeasureSpec.getSize(widthMeasureSpec);
         int height = 0;
         int totalWidth = width - getPaddingLeft() - getPaddingRight();
@@ -78,10 +77,13 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                     gridWidth = (int) (gridWidth * ratio);
                     gridHeight = singleImageSize;
                 }
+                getChildAt(0).measure(EXACTLY + gridWidth, EXACTLY + gridHeight);
             } else {
-//                gridWidth = gridHeight = (totalWidth - gridSpacing * (columnCount - 1)) / columnCount;
                 //这里无论是几张图片，宽高都按总宽度的 1/3
                 gridWidth = gridHeight = (totalWidth - gridSpacing * 2) / 3;
+                for (int i = 0; i < mImageInfo.size(); i++) {
+                    getChildAt(i).measure(EXACTLY + gridWidth, EXACTLY + gridHeight);
+                }
             }
             width = gridWidth * columnCount + gridSpacing * (columnCount - 1) + getPaddingLeft() + getPaddingRight();
             height = gridHeight * rowCount + gridSpacing * (rowCount - 1) + getPaddingTop() + getPaddingBottom();
@@ -91,28 +93,38 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        if (mImageInfo == null) return;
+        if (mImageInfo == null || !(changed || dataChange)) return;
         int childrenCount = mImageInfo.size();
         for (int i = 0; i < childrenCount; i++) {
             ImageView childrenView = (ImageView) getChildAt(i);
-            
+
+
             int rowNum = i / columnCount;
             int columnNum = i % columnCount;
             int left = (gridWidth + gridSpacing) * columnNum + getPaddingLeft();
             int top = (gridHeight + gridSpacing) * rowNum + getPaddingTop();
             int right = left + gridWidth;
             int bottom = top + gridHeight;
+
             childrenView.layout(left, top, right, bottom);
-            
-            if (mImageLoader != null) {
-                mImageLoader.onDisplayImage(getContext(), childrenView, mImageInfo.get(i).thumbnailUrl);
+
+
+            if (mImageLoader != null && dataChange){
+                mImageLoader.onDisplayImage(getContext(), childrenView, gridWidth, gridWidth, mImageInfo.get(i).getThumbnailUrl());
             }
+
         }
+
+        dataChange = false;
     }
 
-    /** 设置适配器 */
+
+    /**
+     * 设置适配器
+     */
     public void setAdapter(@NonNull NineGridViewAdapter adapter) {
         mAdapter = adapter;
+        dataChange = true;
         List<ImageInfo> imageInfo = adapter.getImageInfo();
 
         if (imageInfo == null || imageInfo.isEmpty()) {
@@ -121,7 +133,6 @@ public void setAdapter(@NonNull NineGridViewAdapter adapter) {
         } else {
             setVisibility(VISIBLE);
         }
-
         int imageCount = imageInfo.size();
         if (maxImageSize > 0 && imageCount > maxImageSize) {
             imageInfo = imageInfo.subList(0, maxImageSize);
@@ -131,6 +142,7 @@ public void setAdapter(@NonNull NineGridViewAdapter adapter) {
         //默认是3列显示，行数根据图片的数量决定
         rowCount = imageCount / 3 + (imageCount % 3 == 0 ? 0 : 1);
         columnCount = 3;
+
         //grid模式下，显示4张使用2X2模式
         if (mode == MODE_GRID) {
             if (imageCount == 4) {
@@ -139,7 +151,6 @@ public void setAdapter(@NonNull NineGridViewAdapter adapter) {
             }
         }
 
-        //保证View的复用，避免重复创建
         if (mImageInfo == null) {
             for (int i = 0; i < imageCount; i++) {
                 ImageView iv = getImageView(i);
@@ -159,6 +170,7 @@ public void setAdapter(@NonNull NineGridViewAdapter adapter) {
                 }
             }
         }
+        mImageInfo = imageInfo;
         //修改最后一个条目，决定是否显示更多
         if (adapter.getImageInfo().size() > maxImageSize) {
             View child = getChildAt(maxImageSize - 1);
@@ -167,25 +179,22 @@ public void setAdapter(@NonNull NineGridViewAdapter adapter) {
                 imageView.setMoreNum(adapter.getImageInfo().size() - maxImageSize);
             }
         }
-        mImageInfo = imageInfo;
+
+
+
+
         requestLayout();
+
     }
 
-    /** 获得 ImageView 保证了 ImageView 的重用 */
     private ImageView getImageView(final int position) {
-        ImageView imageView;
-        if (position < imageViews.size()) {
-            imageView = imageViews.get(position);
-        } else {
-            imageView = mAdapter.generateImageView(getContext());
-            imageView.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mAdapter.onImageItemClick(getContext(), NineGridView.this, position, mAdapter.getImageInfo());
-                }
-            });
-            imageViews.add(imageView);
-        }
+        ImageView imageView = mAdapter.generateImageView(getContext());
+        imageView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mAdapter.onImageItemClick(getContext(), NineGridView.this, position, mAdapter.getImageInfo());
+            }
+        });
         return imageView;
     }
 
@@ -227,9 +236,11 @@ public interface ImageLoader {
          *
          * @param context   上下文
          * @param imageView 需要展示图片的ImageView
+         * @param height    图片高
+         * @param width     图片宽
          * @param url       图片地址
          */
-        void onDisplayImage(Context context, ImageView imageView, String url);
+        void onDisplayImage(Context context, ImageView imageView, int height, int width, String url);
 
         /**
          * @param url 图片的地址
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewAdapter.java b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewAdapter.java
index 378aad9..7517df3 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewAdapter.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewAdapter.java
@@ -37,7 +37,6 @@ protected void onImageItemClick(Context context, NineGridView nineGridView, int
     protected ImageView generateImageView(Context context) {
         NineGridViewWrapper imageView = new NineGridViewWrapper(context);
         imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
-        imageView.setImageResource(R.drawable.ic_default_color);
         return imageView;
     }
 
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java
index c262aba..baade07 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java
@@ -7,13 +7,13 @@
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.support.v4.view.ViewCompat;
+import android.support.v7.widget.AppCompatImageView;
 import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.MotionEvent;
-import android.widget.ImageView;
 
-public class NineGridViewWrapper extends ImageView {
+public class NineGridViewWrapper extends AppCompatImageView {
 
     private int moreNum = 0;              //显示更多的数量
     private int maskColor = 0x88000000;   //默认的遮盖颜色
@@ -93,7 +93,6 @@ public boolean onTouchEvent(MotionEvent event) {
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        setImageDrawable(null);
     }
 
     public int getMoreNum() {
@@ -134,4 +133,9 @@ public void setTextColor(int textColor) {
         textPaint.setColor(textColor);
         invalidate();
     }
+
+    @Override
+    public void requestLayout() {
+        super.requestLayout();
+    }
 }
\ No newline at end of file
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java
index a7ac875..0bd2d1f 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java
@@ -110,6 +110,10 @@ public void onAnimationUpdate(ValueAnimator animation) {
     public void finishActivityAnim() {
         final View view = imagePreviewAdapter.getPrimaryItem();
         final ImageView imageView = imagePreviewAdapter.getPrimaryImageView();
+        if(imageView == null || imageView.getDrawable() == null){
+            finish();
+            return;
+        }
         computeImageWidthAndHeight(imageView);
 
         final ImageInfo imageData = imageInfo.get(currentItem);
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java
index e64e970..e599a56 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java
@@ -75,7 +75,7 @@ public Object instantiateItem(ViewGroup container, int position) {
         showExcessPic(info, imageView);
 
         //如果需要加载的loading,需要自己改写,不能使用这个方法
-        NineGridView.getImageLoader().onDisplayImage(view.getContext(), imageView, info.bigImageUrl);
+        NineGridView.getImageLoader().onDisplayImage(view.getContext(), imageView, imageView.getHeight(), imageView.getWidth(), info.bigImageUrl);
 
 //        pb.setVisibility(View.VISIBLE);
 //        Glide.with(context).load(info.bigImageUrl)//
@@ -102,6 +102,9 @@ public Object instantiateItem(ViewGroup container, int position) {
 
     /** 展示过度图片 */
     private void showExcessPic(ImageInfo imageInfo, PhotoView imageView) {
+        //防止地内存回收ImageLoader 导致空指针问题
+        if(NineGridView.getImageLoader() == null)
+            return;
         //先获取大图的缓存图片
         Bitmap cacheImage = NineGridView.getImageLoader().getCacheImage(imageInfo.bigImageUrl);
         //如果大图的缓存不存在,在获取小图的缓存
diff --git a/ninegridview/src/main/res/values/strings.xml b/ninegridview/src/main/res/values/strings.xml
index 4a1c152..35bfad6 100644
--- a/ninegridview/src/main/res/values/strings.xml
+++ b/ninegridview/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="select">%1$s/%2$s</string>
+    <string name="select">%1$d/%2$d</string>
 </resources>
\ No newline at end of file