视频预览修改

韩亚云
1 parent 771875a1
Showing 2 changed files with 20 additions and 15 deletions
core/imageload/src/main/java/com/cnlive/core/imagepreview/ImageDrawee.java
core/imageload/src/main/res/drawable/changtu.jpeg
@@ -13,12 +13,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.util.cache.PreloadManager;
-import com.libs.video.video.exoplayer.component.DefaultErrorView;
-import com.libs.video.video.exoplayer.component.DefaultYoukuPrepareView;
-import com.libs.video.video.exoplayer.controller.StandardVideoController;
-import com.libs.video.video.exoplayer.controller.TikTokController;
 import com.libs.video.video.exoplayer.play.CNVideoView;
+import com.libs.video.video.exoplayer.util.PlayerUtils;
  
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -28,9 +24,10 @@ import androidx.annotation.Nullable;
  * on 2020/1/20
  */
 public class ImageDrawee extends FrameLayout {
-    private PhotoView imageView;
+    private PhotoView imageView = null;
     private ProgressUI progressUI;
     private ViewData viewData;
+    private CNVideoView videoView;
  
     public ImageDrawee(@NonNull Context context,ViewData viewData,CNVideoView videoView) {
         super(context);
@@ -39,12 +36,12 @@ public class ImageDrawee extends FrameLayout {
     }
  
     private void init(CNVideoView videoView) {
-        // 添加 imageView
         if(viewData.getType() == 1){
             imageView = new PhotoView(getContext());
             addView(imageView);
         }else {
-            removeAllViews();
+            PlayerUtils.removeViewFormParent(videoView);
+            this.videoView = videoView;
             addView(videoView);
         }
     }
@@ -109,13 +106,21 @@ public class ImageDrawee extends FrameLayout {
         return imageView;
     }
  
-    public void setImage(Object obj, LoadImage.LoadCallback callback) {
-        if (obj == null) {
+    public CNVideoView getVideoView() {
+        return videoView;
+    }
+
+    public void setImage(ViewData data, LoadImage.LoadCallback callback) {
+        if (data == null) {
             return;
         }
-        if(viewData.getType() == 1){
+        if(videoView != null){
+            videoView.release();
+//                PlayerUtils.removeViewFormParent(videoView);
+        }
+        if(viewData.getType() == 1 && imageView != null){
             Glide.with(getContext())
-                    .load(obj)
+                    .load(data.getImageSrc())
                     .listener(new RequestListener<Drawable>() {
                         @Override
                         public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
@@ -131,10 +136,10 @@ public class ImageDrawee extends FrameLayout {
                     })
                     .error(R.drawable.preview_zwtp)
                     .into(imageView);
-        }else if(viewData.getType() == 2){
-
+        }else if(viewData.getType() == 2 && videoView != null){
+            videoView.setUrl("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
+            videoView.start();
         }
-
     }
  
     public float getScale() {