修复一处callback可能为null的问题

lohasle · Oct 21, 2014 · 36280b2 · 36280b2
1 parent 3f97387
commit 36280b2
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/library/src/com/lidroid/xutils/BitmapUtils.java b/library/src/com/lidroid/xutils/BitmapUtils.java
@@ -218,13 +218,6 @@ public <T extends View> void display(T container, String uri, BitmapDisplayConfi
             return;
         }
 
-        if (TextUtils.isEmpty(uri)) {
-            callBack.onLoadFailed(container, uri, displayConfig.getLoadFailedDrawable());
-            return;
-        }
-
-        container.clearAnimation();
-
         if (callBack == null) {
             callBack = new DefaultBitmapLoadCallBack<T>();
         }
@@ -237,6 +230,14 @@ public <T extends View> void display(T container, String uri, BitmapDisplayConfi
         BitmapSize size = displayConfig.getBitmapMaxSize();
         displayConfig.setBitmapMaxSize(BitmapCommonUtils.optimizeMaxSizeByView(container, size.getWidth(), size.getHeight()));
 
+        container.clearAnimation();
+
+        if (TextUtils.isEmpty(uri)) {
+            callBack.onLoadFailed(container, uri, displayConfig.getLoadFailedDrawable());
+            return;
+        }
+
+        // start loading
         callBack.onPreLoad(container, uri, displayConfig);
 
         // find bitmap from mem cache.