From edeef504e654415c25d3816a4609f43edc79fbb3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 07 四月 2021 19:13:14 +0800
Subject: [PATCH] androidx兼容，新版轮播图样式
---
library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java b/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java
index da6adc6..405a4f2 100644
--- a/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java
+++ b/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java
@@ -4,10 +4,10 @@
import android.graphics.Color;
import android.graphics.Rect;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.Gravity;
import android.view.View;
@@ -56,13 +56,26 @@
private int viewType;
+ private boolean showAd;
- public static BaiDuCPUContentFragment newInstance(BaiDuCPUType spinnerItem, int viewType) {
+ private BaiduCPUContentAdapter.IBaiDuCPUItemClickListener baiDuCPUItemClickListener;
+
+ public void setBaiDuCPUItemClickListener(BaiduCPUContentAdapter.IBaiDuCPUItemClickListener baiDuCPUItemClickListener) {
+ this.baiDuCPUItemClickListener = baiDuCPUItemClickListener;
+ }
+
+
+ public static BaiDuCPUContentFragment newInstance(BaiDuCPUType spinnerItem, int viewType, boolean showAd, int refreshColor, BaiduCPUContentAdapter.IBaiDuCPUItemClickListener baiDuCPUItemClickListener) {
BaiDuCPUContentFragment fragment = new BaiDuCPUContentFragment();
Bundle bundle = new Bundle();
bundle.putSerializable("item", spinnerItem);
bundle.putInt("viewType", viewType);
+ bundle.putBoolean("showAd", showAd);
+ bundle.putInt("refreshColor", refreshColor);
+
+
fragment.setArguments(bundle);
+ fragment.setBaiDuCPUItemClickListener(baiDuCPUItemClickListener);
return fragment;
}
@@ -108,7 +121,7 @@
ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
footerView.setLayoutParams(params);
footerView.setText("鍔姏鍔犺浇涓�...");
- footerView.setTextColor(Color.WHITE);
+ footerView.setTextColor(Color.parseColor("#9FA5B3"));
int padding = DimenUtils.dip2px(getContext(), 10);
footerView.setPadding(padding, padding, padding, padding);
footerView.setGravity(Gravity.CENTER);
@@ -166,6 +179,9 @@
if (item == null)
return;
viewType = bundle.getInt("viewType");
+ showAd = bundle.getBoolean("showAd", true);
+ srl_news.setColorSchemeColors(bundle.getInt("refreshColor"));
+
bundle.clear();
mChannelId = item.getId();
@@ -175,7 +191,7 @@
*/
mCpuManager.setLpFontSize(CpuLpFontSize.SMALL);
mCpuManager.setLpDarkMode(true);
- adapter = new BaiduCPUContentAdapter(getContext(), viewType, nrAdList);
+ adapter = new BaiduCPUContentAdapter(getContext(), viewType, nrAdList, baiDuCPUItemClickListener);
rv_news.setAdapter(adapter);
if (viewType == VIEW_TYPE_SMALLVIDEO) {
@@ -242,7 +258,8 @@
for (int i = list.size() - 1; i >= 0; i--) {
if ("ad".equalsIgnoreCase(list.get(i).getType())) {
list.remove(i--);
- break;
+ if (showAd)
+ break;
}
}
@@ -270,6 +287,10 @@
@Override
public void onNoAd(String s, int i) {
onLoadFinish();
+ if (currentPage == 1) {
+ nrAdList.clear();
+ adapter.notifyDataSetChanged();
+ }
}
@Override
--
Gitblit v1.8.0