From cbb88109494ffc7916f6639c20ce05c0cec941a9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 07 四月 2021 15:07:45 +0800
Subject: [PATCH] 3.9.1bug修复

---
 BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryAdapter.java |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryAdapter.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryAdapter.java
index b1d24e7..a28e5f6 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryAdapter.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryAdapter.java
@@ -15,7 +15,10 @@
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.lcjian.library.util.common.StringUtils;
+import com.lcjian.library.util.glide.GlideRoundTransform;
+import com.lcjian.library.widget.RatioLayout;
 import com.weikou.beibeivideo.R;
 import com.weikou.beibeivideo.entity.VideoInfo;
 import com.weikou.beibeivideo.entity.vo.WatchHistoryVO;
@@ -47,7 +50,7 @@
 
     private void bindView(ViewHolder viewHolder, int position,
                           VideoInfo videoInfo) {
-        String subName = "";
+        String subName = (position + 1) + "";
         if (subName.equalsIgnoreCase(videoInfo.getName())) {
             viewHolder.tv_title.setSingleLine(true);
             viewHolder.tv_title.setEllipsize(TruncateAt.END);
@@ -65,19 +68,25 @@
 
         if (StringUtils.isEmpty(videoInfo.getPicture()))
             videoInfo.setPicture("");
-        try {
-            Glide.with(context).load(videoInfo.getPicture())
-                    .placeholder(R.drawable.ic_default_cover)
-                    .error(R.drawable.ic_default_cover).into(viewHolder.iv_cover);
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        }
+        viewHolder.rl_picture.setTag(videoInfo.getPicture());
+        viewHolder.rl_picture.post(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Glide.with(context).load(viewHolder.rl_picture.getTag() + "").apply(new RequestOptions().centerCrop()).transform(new GlideRoundTransform(context, 6))
+                            .placeholder(R.drawable.shape_video_list_cover_placeholder).into(viewHolder.iv_cover);
+                } catch (IllegalArgumentException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+
     }
 
     private void getVideoDetail(WatchHistoryVO vo,
                                 final ViewHolder viewHolder) {
         viewHolder.tv_title.setTag(vo.getId());
-        VideoInfo videoInfo = vo.getVideoInfo();
+        VideoInfo videoInfo = vo.getVideo();
         if (videoInfo != null) {
             bindView(viewHolder, vo.getPosition(), videoInfo);
         }
@@ -85,17 +94,17 @@
 
     @Override
     public int getCount() {
-        return 0;
+        return voList == null ? 0 : voList.size();
     }
 
     @Override
     public Object getItem(int position) {
-        return null;
+        return voList.get(position);
     }
 
     @Override
     public long getItemId(int position) {
-        return 0;
+        return position;
     }
 
     @Override
@@ -115,6 +124,8 @@
             holder.chb_delete = (CheckBox) view.findViewById(R.id.chb_delete);
             holder.fl_video_select = (FrameLayout) view
                     .findViewById(R.id.fl_video_select);
+            holder.rl_picture = view
+                    .findViewById(R.id.rl_picture);
             view.setTag(holder);
         }
 
@@ -126,7 +137,7 @@
             view.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    VideoInfo videoInfo = vo.getVideoInfo();
+                    VideoInfo videoInfo = vo.getVideo();
                     if (videoInfo != null) {
                         int playingPosition = vo.getPosition();
 
@@ -139,6 +150,7 @@
                         intent.putExtra("video_info", info);
                         intent.putExtra("playing_position", playingPosition);
                         intent.putExtra("isFromWatchHistory", true);
+                        intent.putExtra("from", "watchHistory");
                         v.getContext().startActivity(intent);
                     }
 
@@ -178,7 +190,6 @@
             });
             holder.chb_delete.setChecked(mSelectedIds.contains(vo.getId()));
         }
-        holder.iv_cover.setImageResource(R.drawable.ic_default_cover);
         holder.tv_title.setText("");
         getVideoDetail(vo,
                 holder);
@@ -194,6 +205,7 @@
         ImageButton btn_delete;
         CheckBox chb_delete;
         FrameLayout fl_video_select;
+        RatioLayout rl_picture;
     }
 
     public Set<String> getSelectedIds() {

--
Gitblit v1.8.0