视频图片预览切换逻辑优化

韩亚云
1 parent f009d636
Showing 7 changed files with 80 additions and 140 deletions
app/strike/src/main/java/com/cnlive/strike/imgutil/SimplePrevActivity.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
core/imageload/src/main/java/com/cnlive/core/imagepreview/ViewData.java
core/imageload/src/main/res/layout/item_lay.xml
@@ -14,7 +14,6 @@ import com.cnlive.core.gridview.GridImgUtil;
 import com.cnlive.core.gridview.adapter.BaseAutoGridHolder;
 import com.cnlive.core.gridview.adapter.SimpleAutoGridAdapter;
 import com.cnlive.core.imagepreview.ImagePreView;
-import com.cnlive.core.imagepreview.PhotoLoader;
 import com.cnlive.core.imagepreview.ViewerStatus;
 import com.cnlive.core.imagepreview.listener.OnBrowseStatusListener;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
@@ -2,6 +2,8 @@ package com.cnlive.core.imagepreview;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -13,8 +15,8 @@ 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 com.libs.video.video.exoplayer.controller.StandardVideoController;
 import com.libs.video.video.exoplayer.play.CNVideoView;
-import com.libs.video.video.exoplayer.util.PlayerUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -26,24 +28,23 @@ import androidx.annotation.Nullable;
 public class ImageDrawee extends FrameLayout {
     private PhotoView imageView = null;
     private ProgressUI progressUI;
-    private ViewData viewData;
     private CNVideoView videoView;
+    private StandardVideoController mController;
-    public ImageDrawee(@NonNull Context context,ViewData viewData,CNVideoView videoView) {
+    public ImageDrawee(@NonNull Context context,ViewData viewData) {
         super(context);
-        this.viewData = viewData;
-        init(videoView);
+        init(context);
     }
-    private void init(CNVideoView videoView) {
-        if(viewData.getType() == 1){
-            imageView = new PhotoView(getContext());
-            addView(imageView);
-        }else {
-            PlayerUtils.removeViewFormParent(videoView);
-            this.videoView = videoView;
-            addView(videoView);
-        }
+    private void init(Context context) {
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View view = inflater.inflate(R.layout.item_lay, null);
+        imageView = view.findViewById(R.id.photoview);
+        videoView = view.findViewById(R.id.veiew);
+        mController = new StandardVideoController(context);
+        mController.addDefaultControlComponent("", false);
+        videoView.setVideoController(mController);
+        addView(view);
     }
     public void setProgressUI(ProgressUI progressUI) {
@@ -116,9 +117,10 @@ public class ImageDrawee extends FrameLayout {
         }
         if(videoView != null){
             videoView.release();
-//                PlayerUtils.removeViewFormParent(videoView);
         }
-        if(viewData.getType() == 1 && imageView != null){
+        if(data.getType() == 1){
+            videoView.setVisibility(GONE);
+            imageView.setVisibility(VISIBLE);
             Glide.with(getContext())
                     .load(data.getImageSrc())
                     .listener(new RequestListener<Drawable>() {
@@ -136,7 +138,9 @@ public class ImageDrawee extends FrameLayout {
                     })
                     .error(R.drawable.preview_zwtp)
                     .into(imageView);
-        }else if(viewData.getType() == 2 && videoView != null){
+        } else if(data.getType() == 2 && videoView != null){
+            videoView.setVisibility(VISIBLE);
+            imageView.setVisibility(GONE);
             videoView.setUrl("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
             videoView.start();
         }
@@ -27,10 +27,6 @@ import com.cnlive.core.imagepreview.listener.OnItemClickListener;
 import com.cnlive.core.imagepreview.listener.OnItemLongPressListener;
 import com.cnlive.core.imagepreview.viewpager.ImagePagerAdapter;
 import com.cnlive.core.imagepreview.viewpager.ImageViewPager;
-import com.libs.video.video.exoplayer.controller.StandardVideoController;
-import com.libs.video.video.exoplayer.play.CNVideoView;
-import com.libs.video.video.exoplayer.util.L;
-import com.libs.video.video.exoplayer.util.PlayerUtils;
 import java.util.ArrayList;
 import java.util.List;
@@ -92,8 +88,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
     private OnItemChangedListener mItemChangedListener;
     private OnDragStatusListener mDragStatusListener;
     private OnBrowseStatusListener mBrowseStatusListener;
-    private CNVideoView videoView;
-    private StandardVideoController mController;
+    private boolean isFirst;
     public ImagePreView(@NonNull Context context) {
@@ -124,10 +119,6 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
                 a.recycle();
             }
         }
-        videoView = new CNVideoView(context);
-        mController = new StandardVideoController(getContext());
-        mController.addDefaultControlComponent("", false);
-        videoView.setVideoController(mController);
         initView();
     }
@@ -135,17 +126,14 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
         if (getBackground() == null) {
             setBackgroundColor(Color.BLACK);
         }
-
         // 添加 ViewPager
         viewPager = new ImageViewPager(getContext());
-        viewPager.setOffscreenPageLimit(1);
+        viewPager.setOffscreenPageLimit(0);
         viewPager.addOnPageChangeListener(this);
         addView(viewPager, new LayoutParams(
                 LayoutParams.MATCH_PARENT,
                 LayoutParams.MATCH_PARENT));
-
         setVisibility(View.INVISIBLE);
-
         progressUI = new DefaultProgressUI();
     }
@@ -157,7 +145,28 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
     @Override
     public void onPageSelected(int position) {
-        startPlay(position);
+        if(getCurrentItem() != null){
+            if(mSourceList.get(position).getType() != 2)getCurrentItem().handleProgress(0);
+            getCurrentItem().setImage(mSourceList.get(position),new LoadImage.LoadCallback(){
+                @Override
+                public void onLoadSucceed(Object source) {
+                    getCurrentItem().hideProgressUI();
+                    if (mSourceList.get(position).getImageWidth() == 0 ||
+                            mSourceList.get(position).getImageHeight() == 0) {
+                        Drawable drawable = getCurrentItem().getImageView().getDrawable();
+                        if (drawable != null) {
+                            mSourceList.get(position).setImageWidth(drawable.getIntrinsicWidth());
+                            mSourceList.get(position).setImageHeight(drawable.getIntrinsicHeight());
+                        }
+                    }
+                }
+                @Override
+                public void onLoadFailed() {
+                    getCurrentItem().hideProgressUI();
+                }
+            });
+        }
+
         if (showIndex && indexUI != null && mSourceList != null) {
             indexUI.handleItemChanged(position, mSourceList.size());
         }
@@ -171,20 +180,6 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
     }
-    private void startPlay(int position) {
-        Log.e(TAG, "startPlay: release");
-        videoView.release();
-        PlayerUtils.removeViewFormParent(videoView);
-        if(mSourceList.get(position).getType() == 1){
-
-        }else if(mSourceList.get(position).getType() == 2 && getCurrentItem().getImageView() == null){
-            Log.e(TAG, "startPlay: "+position);
-            getCurrentItem().removeAllViews();
-            getCurrentItem().addView(videoView);
-            videoView.setUrl("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
-            videoView.start();
-        }
-    }
     public ImagePreView imageData(@NonNull List list) {
         if (mSourceList == null) {
@@ -194,7 +189,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
         }
         for (int i = 0, len = list.size(); i < len; i++) {
             ViewData vd = new ViewData(list.get(i));
-            if (i == 0 || i == 2){
+            if(i == 3){
                 vd.setType(2);
             }else {
                 vd.setType(1);
@@ -223,6 +218,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
         return this;
     }
+
     public ImagePreView viewData(@NonNull List<ViewData> list) {
         this.mSourceList = list;
         return this;
@@ -362,6 +358,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
             @NonNull
             @Override
             public Object instantiateItem(@NonNull ViewGroup container, int position) {
+                Log.e(TAG, "instantiateItem: "+position );
                 return ImagePreView.this.instantiateItem(container, position, startPosition, callback);
             }
         };
@@ -378,8 +375,9 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
      * 取消浏览
      */
     public void cancel() {
-        videoView.release();
-        videoView.onDestroy();
+        if(getCurrentItem() != null && getCurrentItem().getVideoView() != null){
+            getCurrentItem().getVideoView().onDestroy();
+        }
         cancel(null);
     }
@@ -389,7 +387,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
      * @param callback 退场动画执行回调
      */
     public void cancel(final ImageTransfer.OnTransCallback callback) {
-        if(getCurrentItem().getImageView() == null) {
+        if(mSourceList.get(getCurrentPosition()).getType() != 1) {
             playEnterAnim = false;
             playExitAnim = false;
             draggable = false;
@@ -451,7 +449,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
             }
         }
         if (drawee == null) {
-            drawee = new ImageDrawee(container.getContext(),mSourceList.get(position),videoView);
+            drawee = new ImageDrawee(container.getContext(),mSourceList.get(position));
             drawee.setProgressUI(progressUI);
             mViewBox.add(drawee);
         }
@@ -536,18 +534,15 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
                     }
                 });
             }
-            drawee.setImage(mSourceList.get(position).getImageSrc(),new LoadImage.LoadCallback(){
-
-                @Override
-                public void onLoadStarted(Object placeholder) {
-
-                }
-
-                @Override
-                public void onLoading(float progress) {
-                    drawee.handleProgress(progress);
-                }
+        }else if(mSourceList.get(position).getType() == 2){
+            playEnterAnim = false;
+            playExitAnim = false;
+            draggable = false;
+        }
+        if(position == 0 && !isFirst){
+            isFirst = true;
+            drawee.setImage(mSourceList.get(position),new LoadImage.LoadCallback(){
                 @Override
                 public void onLoadSucceed(Object source) {
                     drawee.hideProgressUI();
@@ -566,26 +561,8 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
                     drawee.hideProgressUI();
                 }
             });
-        }else if(mSourceList.get(position).getType() == 2){
-            if(drawee.getImageView() == null){
-                videoView.setOnLongClickListener(new OnLongClickListener() {
-                    @Override
-                    public boolean onLongClick(View view) {
-                        if (!hasAnimRunning && mItemLongPressListener != null) {
-                            return mItemLongPressListener.onItemLongPress(position, videoView);
-                        }
-                        return false;
-                    }
-                });
-            }
-            playEnterAnim = false;
-            playExitAnim = false;
-            draggable = false;
-            if(position == 0){
-                videoView.setUrl("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
-                videoView.start();
-            }
         }
+
     }
     private void noteDragStatus(int status) {
@@ -13,12 +13,7 @@ public abstract class LoadImage {
     public abstract void displayImage(Object src, ImageView imageView, LoadCallback callback);
     public interface LoadCallback {
-        void onLoadStarted(Object placeholder);
-
-        void onLoading(float progress);
-
         void onLoadSucceed(Object source);
-
         void onLoadFailed();
     }
 }
-package com.cnlive.core.imagepreview;
-
-import android.graphics.drawable.Drawable;
-import android.widget.ImageView;
-
-import com.bumptech.glide.request.target.CustomViewTarget;
-import com.bumptech.glide.request.transition.Transition;
-import com.cnlive.core.libs.base.application.GlideApp;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-
-/**
- * created by hanyayun
- * on 2020/2/12
- */
-public class PhotoLoader extends LoadImage {
-    @Override
-    public void displayImage(Object src, ImageView imageView, LoadCallback callback) {
-        GlideApp.with(imageView.getContext())
-                .load(src)
-                .into(new CustomViewTarget<ImageView, Drawable>(imageView) {
-                    @Override
-                    public void onLoadFailed(@Nullable Drawable errorDrawable) {
-                        if(callback!=null) {
-                            callback.onLoadFailed();
-                        }
-                    }
-
-                    @Override
-                    public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
-                        if(callback!=null) {
-                            callback.onLoadSucceed(resource);
-                        }
-                    }
-
-                    @Override
-                    protected void onResourceLoading(@Nullable Drawable placeholder) {
-                        super.onResourceLoading(placeholder);
-                        if(callback!=null){
-                            callback.onLoadStarted(placeholder);
-                        }
-                    }
-
-                    @Override
-                    protected void onResourceCleared(@Nullable Drawable placeholder) {
-
-                    }
-                });
-    }
-}
@@ -19,7 +19,7 @@ public class ViewData {
     private int targetWidth;
     // 目标 view 的高度
     private int targetHeight;
-
+    //1图片   2视频
     private int type;
     public ViewData() {
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.github.chrisbanes.photoview.PhotoView
+        android:id="@+id/photoview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"/>
+
+    <com.libs.video.video.exoplayer.play.CNVideoView
+        android:id="@+id/veiew"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"/>
+</RelativeLayout>
 \ No newline at end of file