Skip to content

Commit 36280b2

Browse files
committed
修复一处callback可能为null的问题
1 parent 3f97387 commit 36280b2

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

library/src/com/lidroid/xutils/BitmapUtils.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,6 @@ public <T extends View> void display(T container, String uri, BitmapDisplayConfi
218218
return;
219219
}
220220

221-
if (TextUtils.isEmpty(uri)) {
222-
callBack.onLoadFailed(container, uri, displayConfig.getLoadFailedDrawable());
223-
return;
224-
}
225-
226-
container.clearAnimation();
227-
228221
if (callBack == null) {
229222
callBack = new DefaultBitmapLoadCallBack<T>();
230223
}
@@ -237,6 +230,14 @@ public <T extends View> void display(T container, String uri, BitmapDisplayConfi
237230
BitmapSize size = displayConfig.getBitmapMaxSize();
238231
displayConfig.setBitmapMaxSize(BitmapCommonUtils.optimizeMaxSizeByView(container, size.getWidth(), size.getHeight()));
239232

233+
container.clearAnimation();
234+
235+
if (TextUtils.isEmpty(uri)) {
236+
callBack.onLoadFailed(container, uri, displayConfig.getLoadFailedDrawable());
237+
return;
238+
}
239+
240+
// start loading
240241
callBack.onPreLoad(container, uri, displayConfig);
241242

242243
// find bitmap from mem cache.

0 commit comments

Comments
 (0)