兼容动图全屏预览

韩亚云
1 parent d56bc607
Showing 7 changed files with 92 additions and 36 deletions
app/strike/src/main/java/com/cnlive/strike/imgutil/SimplePrevActivity.java
core/imageload/src/main/java/com/cnlive/core/activity/PreviewImageActivity.java
core/imageload/src/main/java/com/cnlive/core/imageload/loader/GlideLoader.java
core/imageload/src/main/java/com/cnlive/core/imagepreview/ImageDrawee.java
core/imageload/src/main/java/com/cnlive/core/imagepreview/ImagePreView.java
core/imageload/src/main/java/com/cnlive/core/imagepreview/LoadImage.java
core/imageload/src/main/java/com/cnlive/core/imagepreview/PhotoLoader.java
@@ -50,8 +50,8 @@ public class SimplePrevActivity extends BaseActivity {
         list.add("https://b-ssl.duitang.com/uploads/item/201706/30/20170630181644_j4mh5.jpeg");
  
         preView.overlayStatusBar(false)
-                .imageData(list)
-                .imageLoader(new PhotoLoader());
+                .imageData(list);
+//                .imageLoader(new PhotoLoader());
  
         adapter = new SimpleAutoGridAdapter<String, BaseAutoGridHolder>(list);
         adapter.setImageLoader(new SimpleAutoGridAdapter.ImageLoader() {
@@ -5,9 +5,9 @@ import android.widget.ImageView;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.imageload.R;
 import com.cnlive.core.imagepreview.ImagePreView;
-import com.cnlive.core.imagepreview.PhotoLoader;
 import com.cnlive.core.imagepreview.ViewerStatus;
 import com.cnlive.core.imagepreview.listener.OnItemClickListener;
+import com.cnlive.core.imagepreview.listener.OnItemLongPressListener;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
  
 import java.util.ArrayList;
@@ -32,10 +32,10 @@ public class PreviewImageActivity extends BaseActivity {
  
         preView.overlayStatusBar(false)
                 .imageData(list)
-                .playExitAnim(false)
-                .imageLoader(new PhotoLoader());
-
+                .playExitAnim(false);
+//                .imageLoader(new PhotoLoader());
         preView.watch(0);
+
         preView.setOnItemClickListener(new OnItemClickListener() {
             @Override
             public boolean onItemClick(int position, ImageView imageView) {
@@ -44,6 +44,13 @@ public class PreviewImageActivity extends BaseActivity {
                 return true;
             }
         });
+
+        preView.setOnItemLongPressListener(new OnItemLongPressListener() {
+            @Override
+            public boolean onItemLongPress(int position, ImageView imageView) {
+                return false;
+            }
+        });
     }
  
     @Override
@@ -20,7 +20,6 @@ import com.bumptech.glide.RequestManager;
 import com.bumptech.glide.load.Transformation;
 import com.bumptech.glide.load.engine.cache.ExternalCacheDiskCacheFactory;
 import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
-import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.cnlive.core.imageload.config.AnimationMode;
@@ -142,6 +141,9 @@ public class GlideLoader implements ILoader{
             if (config.getErrorResId() > 0) {
                 request.error(config.getErrorResId());
             }
+//            else {
+//                request.error(R.drawable.preview_zwtp);
+//            }
  
 //            if(config.isGif()){
 //                request.asGif();
 package com.cnlive.core.imagepreview;
  
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.util.Log;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
  
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.cnlive.core.imageload.R;
 import com.cnlive.core.imagepreview.indexui.ProgressUI;
 import com.github.chrisbanes.photoview.PhotoView;
  
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
  
 /**
  * created by hanyayun
@@ -91,30 +96,38 @@ public class ImageDrawee extends FrameLayout {
         return imageView;
     }
  
-    public void setImage(Object obj) {
+    public void setImage(Object obj, LoadImage.LoadCallback callback) {
         if (obj == null) {
             return;
         }
  
-//        if (obj instanceof Drawable || obj instanceof Bitmap || obj instanceof Integer || obj instanceof String) {
-//            ImageLoader.with(getContext())
-//                    .url((String) obj)
-//                    .scale(ScaleMode.CENTER_CROP)
-//                    .into(imageView);
-////            Glide.with(getContext()).load(obj).into(imageView);
+        Glide.with(getContext())
+                .load(obj)
+                .listener(new RequestListener<Drawable>() {
+                    @Override
+                    public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
+                        callback.onLoadFailed();
+                        return false;
+                    }
+
+                    @Override
+                    public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
+                        callback.onLoadSucceed(resource);
+                        return false;
+                    }
+                })
+                .error(R.drawable.preview_zwtp)
+                .into(imageView);
+//        if (obj instanceof Drawable) {
+//            Glide.with(getContext()).load(obj).into(imageView);
+////            imageView.setImageDrawable((Drawable) obj);
+//        } else if (obj instanceof Bitmap) {
+//            imageView.setImageBitmap((Bitmap) obj);
+//        } else if (obj instanceof Integer) {
+//            imageView.setImageResource((Integer) obj);
 //        } else {
 //            Log.e("ImageDrawee", "Unable to identify picture resources.");
 //        }
-
-        if (obj instanceof Drawable) {
-            imageView.setImageDrawable((Drawable) obj);
-        } else if (obj instanceof Bitmap) {
-            imageView.setImageBitmap((Bitmap) obj);
-        } else if (obj instanceof Integer) {
-            imageView.setImageResource((Integer) obj);
-        } else {
-            Log.e("ImageDrawee", "Unable to identify picture resources.");
-        }
     }
  
     public float getScale() {
@@ -48,7 +48,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
     private ProgressUI progressUI;
     private ImageViewPager viewPager;
     private ImagePagerAdapter mAdapter;
-    private LoadImage mLoader;
+//    private LoadImage mLoader;
     private DragHandler mDragHandler;
  
     // 是否执行进场动画
@@ -197,7 +197,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
     }
  
     public ImagePreView imageLoader(@NonNull LoadImage loader) {
-        this.mLoader = loader;
+//        this.mLoader = loader;
         return this;
     }
  
@@ -467,10 +467,13 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
         if (mMinScale > 0) {
             drawee.setMinScale(mMinScale);
         }
-        mLoader.displayImage(mSourceList.get(position).getImageSrc(), drawee.getImageView(), new LoadImage.LoadCallback() {
+
+
+        drawee.setImage(mSourceList.get(position).getImageSrc(),new LoadImage.LoadCallback(){
+
             @Override
             public void onLoadStarted(Object placeholder) {
-                drawee.setImage(placeholder);
+
             }
  
             @Override
@@ -481,7 +484,6 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
             @Override
             public void onLoadSucceed(Object source) {
                 drawee.hideProgressUI();
-                drawee.setImage(source);
                 if (mSourceList.get(position).getImageWidth() == 0 ||
                         mSourceList.get(position).getImageHeight() == 0) {
                     Drawable drawable = drawee.getImageView().getDrawable();
@@ -493,11 +495,43 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
             }
  
             @Override
-            public void onLoadFailed(Object error) {
+            public void onLoadFailed() {
                 drawee.hideProgressUI();
-                drawee.setImage(error);
             }
         });
+
+
+//        mLoader.displayImage(mSourceList.get(position).getImageSrc(), drawee.getImageView(), new LoadImage.LoadCallback() {
+//            @Override
+//            public void onLoadStarted(Object placeholder) {
+//                drawee.setImage(placeholder);
+//            }
+//
+//            @Override
+//            public void onLoading(float progress) {
+//                drawee.handleProgress(progress);
+//            }
+//
+//            @Override
+//            public void onLoadSucceed(Object source) {
+//                drawee.hideProgressUI();
+//                drawee.setImage(source);
+//                if (mSourceList.get(position).getImageWidth() == 0 ||
+//                        mSourceList.get(position).getImageHeight() == 0) {
+//                    Drawable drawable = drawee.getImageView().getDrawable();
+//                    if (drawable != null) {
+//                        mSourceList.get(position).setImageWidth(drawable.getIntrinsicWidth());
+//                        mSourceList.get(position).setImageHeight(drawable.getIntrinsicHeight());
+//                    }
+//                }
+//            }
+//
+//            @Override
+//            public void onLoadFailed(Object error) {
+//                drawee.hideProgressUI();
+////                drawee.setImage(error);
+//            }
+//        });
         // 单击事件
         drawee.getImageView().setOnClickListener(new View.OnClickListener() {
             @Override
@@ -762,7 +796,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mSourceList = null;
-        mLoader = null;
+//        mLoader = null;
         reset();
     }
 }
@@ -19,7 +19,7 @@ public abstract class LoadImage {
  
         void onLoadSucceed(Object source);
  
-        void onLoadFailed(Object error);
+        void onLoadFailed();
     }
 }
  
@@ -26,7 +26,7 @@ public class PhotoLoader extends LoadImage {
                     @Override
                     public void onLoadFailed(@Nullable Drawable errorDrawable) {
                         if(callback!=null) {
-                            callback.onLoadFailed(errorDrawable);
+                            callback.onLoadFailed();
                         }
                     }