fix: 防止图片加载某些情况下无限制的FileLockedException重试

wyouflf · Apr 7, 2020 · 5296bc5 · 5296bc5
1 parent f1b8604
commit 5296bc5
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/xutils/src/main/java/org/xutils/image/ImageLoader.java b/xutils/src/main/java/org/xutils/image/ImageLoader.java
@@ -47,6 +47,7 @@
     private MemCacheKey key;
     private ImageOptions options;
     private WeakReference<ImageView> viewRef;
+    private int fileLockedExceptionRetryCount = 0;
 
     private final static AtomicLong SEQ_SEEK = new AtomicLong(0);
     private final long seq = SEQ_SEEK.incrementAndGet();
@@ -137,7 +138,7 @@ static Cancelable doLoadDrawable(final String url,
         }
 
         FakeImageView fakeImageView = new FakeImageView();
-        return doBind(fakeImageView, url, options, callback);
+        return doBind(fakeImageView, url, options, 0, callback);
     }
 
     /**
@@ -163,6 +164,7 @@ static Cancelable doLoadFile(final String url,
     static Cancelable doBind(final ImageView view,
                              final String url,
                              final ImageOptions options,
+                             final int fileLockedExceptionRetryCount,
                              final Callback.CommonCallback<Drawable> callback) {
 
         // check params
@@ -254,16 +256,18 @@ static Cancelable doBind(final ImageView view,
                     // not trust the cache
                     // load from Network or DiskCache
                     ImageLoader loader = new ImageLoader();
+                    loader.fileLockedExceptionRetryCount = fileLockedExceptionRetryCount;
                     loader.skipOnWaitingCallback = true;
-                    return loader.doLoad(view, url, localOptions, callback);
+                    return loader.doLoadRequest(view, url, localOptions, callback);
                 }
             } catch (Throwable ex) {
                 LogUtil.e(ex.getMessage(), ex);
                 // try load from Network or DiskCache
                 trustMemCache = false;
                 ImageLoader loader = new ImageLoader();
+                loader.fileLockedExceptionRetryCount = fileLockedExceptionRetryCount;
                 loader.skipOnWaitingCallback = true;
-                return loader.doLoad(view, url, localOptions, callback);
+                return loader.doLoadRequest(view, url, localOptions, callback);
             } finally {
                 if (trustMemCache && callback != null) {
                     try {
@@ -275,18 +279,20 @@ static Cancelable doBind(final ImageView view,
             }
         } else {  /* memDrawable == null */
             // load from Network or DiskCache
-            return new ImageLoader().doLoad(view, url, localOptions, callback);
+            ImageLoader loader = new ImageLoader();
+            loader.fileLockedExceptionRetryCount = fileLockedExceptionRetryCount;
+            return loader.doLoadRequest(view, url, localOptions, callback);
         }
         return null;
     }
 
     /**
      * load from Network or DiskCache
      */
-    private Cancelable doLoad(ImageView view,
-                              String url,
-                              ImageOptions options,
-                              Callback.CommonCallback<Drawable> callback) {
+    private Cancelable doLoadRequest(ImageView view,
+                                     String url,
+                                     ImageOptions options,
+                                     Callback.CommonCallback<Drawable> callback) {
 
         this.viewRef = new WeakReference<ImageView>(view);
         this.options = options;
@@ -429,27 +435,27 @@ public void onError(Throwable ex, boolean isOnCallback) {
         stopped = true;
         if (!validView4Callback(false)) return;
 
-        if (ex instanceof FileLockedException) {
+        fileLockedExceptionRetryCount++;
+        if (ex instanceof FileLockedException && fileLockedExceptionRetryCount < 5) {
             LogUtil.d("ImageFileLocked: " + key.url);
             x.task().postDelayed(new Runnable() {
                 @Override
                 public void run() {
                     ImageView imageView = viewRef.get();
                     if (imageView != null) {
-                        doBind(imageView, key.url, options, callback);
+                        doBind(imageView, key.url, options, fileLockedExceptionRetryCount, callback);
                     } else {
                         ImageLoader.this.onFinished();
                     }
                 }
-            }, 10);
+            }, 10 + (fileLockedExceptionRetryCount - 1) * 100);
             skipOnFinishedCallback = true;
-            return;
-        }
-
-        LogUtil.e(key.url, ex);
-        setErrorDrawable4Callback();
-        if (callback != null) {
-            callback.onError(ex, isOnCallback);
+        } else {
+            LogUtil.e(key.url, ex);
+            setErrorDrawable4Callback();
+            if (callback != null) {
+                callback.onError(ex, isOnCallback);
+            }
         }
     }
 

diff --git a/xutils/src/main/java/org/xutils/image/ImageManagerImpl.java b/xutils/src/main/java/org/xutils/image/ImageManagerImpl.java
@@ -37,7 +37,7 @@ public void bind(final ImageView view, final String url) {
         x.task().autoPost(new Runnable() {
             @Override
             public void run() {
-                ImageLoader.doBind(view, url, null, null);
+                ImageLoader.doBind(view, url, null, 0, null);
             }
         });
     }
@@ -47,7 +47,7 @@ public void bind(final ImageView view, final String url, final ImageOptions opti
         x.task().autoPost(new Runnable() {
             @Override
             public void run() {
-                ImageLoader.doBind(view, url, options, null);
+                ImageLoader.doBind(view, url, options, 0, null);
             }
         });
     }
@@ -57,7 +57,7 @@ public void bind(final ImageView view, final String url, final Callback.CommonCa
         x.task().autoPost(new Runnable() {
             @Override
             public void run() {
-                ImageLoader.doBind(view, url, null, callback);
+                ImageLoader.doBind(view, url, null, 0, callback);
             }
         });
     }
@@ -67,7 +67,7 @@ public void bind(final ImageView view, final String url, final ImageOptions opti
         x.task().autoPost(new Runnable() {
             @Override
             public void run() {
-                ImageLoader.doBind(view, url, options, callback);
+                ImageLoader.doBind(view, url, options, 0, callback);
             }
         });
     }