From 8039a1b2fbfa3471b6f726d3e839d7867c81a84f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 10 十月 2020 18:51:24 +0800
Subject: [PATCH] 资讯与小说集成

---
 library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuVideosFragment.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuVideosFragment.java b/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuVideosFragment.java
index 4ed875b..2bf4fa4 100644
--- a/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuVideosFragment.java
+++ b/library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuVideosFragment.java
@@ -10,6 +10,7 @@
 import android.widget.FrameLayout;
 
 import com.lcjian.library.RetainViewFragment;
+import com.viewpagerindicator.FoundTabPageIndicator;
 import com.viewpagerindicator.MainTabPageIndicator;
 import com.yeshi.ec.library_baiducpu.R;
 import com.yeshi.ec.library_baiducpu.entity.SpinnerItem;
@@ -23,11 +24,10 @@
  */
 public class BaiDuVideosFragment extends RetainViewFragment {
 
-    private FrameLayout fl_indicator;
     private ViewPager viewPager;
     private ContentAdapter contentAdapter;
     private List<SpinnerItem> itemList = new ArrayList<>();
-    private MainTabPageIndicator indicator;
+    private FoundTabPageIndicator indicator;
 
 
     @Override
@@ -36,36 +36,34 @@
     }
 
     private void initView(View contentView) {
-        fl_indicator = contentView.findViewById(R.id.fl_indicator);
         viewPager = contentView.findViewById(R.id.vp_news);
     }
 
-    private void initData() {
-        itemList.add(new SpinnerItem("灏忚棰�", 1085));
-        itemList.add(new SpinnerItem("钀岃悓鍝�", 1065));
-        itemList.add(new SpinnerItem("灏忓搧", 1062));
-        itemList.add(new SpinnerItem("闊充箰", 1058));
-        itemList.add(new SpinnerItem("鎼炵瑧", 1059));
+    private void initData(View contentView) {
         itemList.add(new SpinnerItem("褰辫", 1060));
-        itemList.add(new SpinnerItem("娓告垙", 1067));
-        itemList.add(new SpinnerItem("鐢熸椿", 1066));
+        itemList.add(new SpinnerItem("灏忚棰�", 1085));
+        itemList.add(new SpinnerItem("灏忓搧", 1062));
         itemList.add(new SpinnerItem("瑙傚ぉ涓�", 1064));
+        itemList.add(new SpinnerItem("鎼炵瑧", 1059));
         itemList.add(new SpinnerItem("濞变箰", 1061));
         itemList.add(new SpinnerItem("绀句細", 1063));
+        itemList.add(new SpinnerItem("娓告垙", 1067));
+        itemList.add(new SpinnerItem("鐢熸椿", 1066));
+        itemList.add(new SpinnerItem("闊充箰", 1058));
+        itemList.add(new SpinnerItem("钀岃悓鍝�", 1065));
+
         contentAdapter = new ContentAdapter(
                 getChildFragmentManager(), itemList);
         viewPager.setAdapter(contentAdapter);
-        indicator = new MainTabPageIndicator(
-                viewPager.getContext());
-        indicator.setViewPager(viewPager, 0);
-        fl_indicator.addView(indicator);
+        indicator = contentView.findViewById(R.id.indicator);
+        indicator.setViewPager(viewPager);
     }
 
 
     @Override
     public void onCreateView(View contentView, Bundle savedInstanceState) {
         initView(contentView);
-        initData();
+        initData(contentView);
     }
 
     class ContentAdapter extends FragmentStatePagerAdapter {
@@ -81,8 +79,10 @@
 
         @Override
         public Fragment getItem(int position) {
-            Fragment fragment = BaiDuShortVideosFragment.newInstance(mlist.get(position));
-            return fragment;
+            if (mlist.get(position).getmId()==1085)
+                return BaiDuShortVideosFragment.newInstance(mlist.get(position));
+            else
+                return BaiDuCPUContentFragment.newInstance(mlist.get(position), mlist.get(position).getmId()==1085? BaiDuCPUContentFragment.VIEW_TYPE_SMALLVIDEO : BaiDuCPUContentFragment.VIEW_TYPE_VIDEO);
         }
 
         @Override

--
Gitblit v1.8.0