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/video/VideoColumn2Adapter.java |   32 +++++++++-----------------------
 1 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/video/VideoColumn2Adapter.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/video/VideoColumn2Adapter.java
index fae4524..8a8f8f0 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/video/VideoColumn2Adapter.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/video/VideoColumn2Adapter.java
@@ -5,9 +5,6 @@
 import android.content.Intent;
 import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -17,15 +14,10 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.bumptech.glide.request.target.DrawableImageViewTarget;
-import com.bumptech.glide.request.target.SimpleTarget;
-import com.bumptech.glide.request.transition.Transition;
 import com.lcjian.library.util.common.DimenUtils;
-import com.lcjian.library.util.common.StringUtils;
 import com.qq.e.ads.nativ.NativeUnifiedADData;
 import com.qq.e.ads.nativ.widget.NativeAdContainer;
+import com.weikou.beibeivideo.R;
 import com.weikou.beibeivideo.entity.VideoInfo;
 import com.weikou.beibeivideo.entity.ad.ExpressAdContainer;
 import com.weikou.beibeivideo.entity.recommend.holder.RecommendVideoAdHolder;
@@ -33,20 +25,14 @@
 import com.weikou.beibeivideo.entity.video.holder.FooterViewHolder;
 import com.weikou.beibeivideo.entity.video.holder.HeaderViewHolder;
 import com.weikou.beibeivideo.entity.video.holder.VideoHolder;
-import com.weikou.beibeivideo.ui.media.VideoDetailActivity;
 import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
-import com.weikou.beibeivideo.util.VideoUtil;
 import com.weikou.beibeivideo.util.ad.ExpressAdManager;
 import com.weikou.beibeivideo.util.ad.GDTConstant;
 import com.weikou.beibeivideo.util.ad.GDTNativeADUnifiedManager;
-import com.weikou.beibeivideo.R;
 import com.weikou.beibeivideo.util.video.VideoUIUtil;
 
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
-
-import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
 
 public class VideoColumn2Adapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private Context mContext;
@@ -124,7 +110,7 @@
             super.getItemOffsets(outRect, view, parent, state);
             int index = parent.getChildAdapterPosition(view);
             int total = parent.getAdapter().getItemCount();
-            int minWidth = DimenUtils.dipToPixels(2, view.getContext());
+            int minWidth = DimenUtils.dipToPixels(3, view.getContext());
             if (index % 2 == 0) {
                 outRect.left = 0; //绗竴鍒楀乏杈硅创杈�
                 outRect.right = minWidth;
@@ -204,9 +190,9 @@
     public static int getItemWidth(Activity activity, int column, int padding) {
         int deviceWidth = DimenUtils.getScreenWidth(activity);
         if (column == 3)
-            return (deviceWidth - DimenUtils.dip2px(activity, 3 * 2) - padding) / 3;
+            return (deviceWidth - DimenUtils.dip2px(activity, 9 * 2) - padding) / 3;
         else if (column == 2)
-            return (deviceWidth - DimenUtils.dip2px(activity, 3) - padding) / 2;
+            return (deviceWidth - DimenUtils.dip2px(activity, 8) - padding) / 2;
         else
             return (int) (deviceWidth / 2.5f);
     }
@@ -242,7 +228,7 @@
         padding += rv.getPaddingLeft();
         padding += rv.getPaddingRight();
 
-        itemWidth = getItemWidth(activity, 2, padding);
+        //itemWidth = getItemWidth(activity, 2, padding);
         rv.addItemDecoration(itemDecoration2);
     }
 
@@ -294,7 +280,7 @@
         int padding = 0;
         padding += rv.getPaddingLeft();
         padding += rv.getPaddingRight();
-        itemWidth = getItemWidth(activity, 3, padding);
+       // itemWidth = getItemWidth(activity, 3, padding);
         rv.addItemDecoration(itemDecoration3);
         rv.getItemDecorationCount();
     }
@@ -422,15 +408,15 @@
                     else
                         itemClickListener.onClick(info);
                 }
-            }, info, columns);
+            }, info, columns,-1);
 
 
         } else if (viewHolder instanceof RecommendVideoAdHolder) {//骞垮憡
             final RecommendVideoAdHolder holder = (RecommendVideoAdHolder) viewHolder;
             if (columns == 2) {
-                holder.rl_container.setRatio(0.625f);
+                holder.rl_container.setRatio(0.562f);
             } else if (columns == 3) {
-                holder.rl_container.setRatio(1.4f);
+                holder.rl_container.setRatio(1.39f);
             }
             ExpressAdContainer ad = content.getAd();
             View v = inflater.inflate(R.layout.item_ad_list_small_gdt2, null);

--
Gitblit v1.8.0