liujiangyao před 7 roky
rodič
revize
38f114aa02

+ 12 - 5
app/src/main/java/com/kfzs/duanduan/adp/ViewPagerFragmentStateAdapter.java

@@ -1,9 +1,11 @@
 package com.kfzs.duanduan.adp;
 
+import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -11,14 +13,14 @@ import java.util.List;
  */
 
 public class ViewPagerFragmentStateAdapter extends FragmentStatePagerAdapter {
-    private List<Fragment> mList;
+    private List<Fragment> mList = new ArrayList<>();;
+
     public ViewPagerFragmentStateAdapter(FragmentManager fm) {
         super(fm);
     }
-
-    public ViewPagerFragmentStateAdapter(FragmentManager fm, List<Fragment> mList) {
-        super(fm);
-        this.mList = mList;
+    public void addAll(List<Fragment> fragmentList) {
+        mList.clear();
+        mList.addAll(fragmentList);
     }
 
     @Override
@@ -30,4 +32,9 @@ public class ViewPagerFragmentStateAdapter extends FragmentStatePagerAdapter {
     public int getCount() {
         return mList != null ? mList.size() : 0;
     }
+
+    @Override
+    public Parcelable saveState() {
+        return null;
+    }
 }

+ 2 - 2
app/src/main/java/com/kfzs/duanduan/fragment/FgtFind.java

@@ -55,10 +55,10 @@ public class FgtFind extends BaseCompatFragment {
     @BindView(R.id.pager)
     ViewPager pager;
 
-    private AdpTryMakemoney mAdapter;
+    private GiftpackListAdapter mAdapter;
 
     private void initView() {
-        mAdapter = new AdpTryMakemoney(getFragmentManager(), SheepApp.getInstance());
+        mAdapter = new GiftpackListAdapter(getFragmentManager(), SheepApp.getInstance());
         mAdapter.add(FgtFindChild.newInstance(0), "全部");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);

+ 5 - 1
app/src/main/java/com/kfzs/duanduan/mine/GiftpackListAdapter.java

@@ -1,6 +1,7 @@
 package com.kfzs.duanduan.mine;
 
 import android.content.Context;
+import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
@@ -46,5 +47,8 @@ public class GiftpackListAdapter extends FragmentPagerAdapter {
         return (CharSequence) mTitles.get(position);
     }
 
-
+    @Override
+    public Parcelable saveState() {
+        return null;
+    }
 }

+ 30 - 33
app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -101,41 +101,38 @@ public class TabsHelper {
             view.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    try {
-                        long currentTime = System.currentTimeMillis();
-                        if (currentTime - lastClickTime > MIN_CLICK_DELAY_TIME) {
-                            lastClickTime = currentTime;
-
-                            checkViewState(position);
-                            view_pager_container.setCurrentItem(position, false);
-                            int sheepPosition = MainTab.FgtSmallSheep.ordinal();
-                            int personnalPosition = MainTab.FgtPersonnalCenter.ordinal();
-                            int auditPosition = MainTab.FgtMainAudit.ordinal();
-                            int fPosition = MainTab.Fgt_Find.ordinal();
-                            FgtSmallSheep fgtSmallSheep = (FgtSmallSheep) fragmentList.get(sheepPosition);
-                            FgtPersonalCenter personnalCenter = (FgtPersonalCenter) fragmentList.get(personnalPosition);
-                            FgtMainAudit auditFgt = (FgtMainAudit) fragmentList.get(auditPosition);
-                            FgtFind findFgt = (FgtFind) fragmentList.get(fPosition);
-                            if(position == sheepPosition){
-                                fgtSmallSheep.onResume();
-                            } else {
-                                fgtSmallSheep.onPause();
-                            }
-                            if(position == personnalPosition){
-                                personnalCenter.onResume();
-                            }
-                            if(position == auditPosition){
-                                auditFgt.onResume();
-                            }
-                            if(position == fPosition){
-                                findFgt.onResume();
-                            }
-                            checkWhichPage(position);
+                    long currentTime = System.currentTimeMillis();
+                    if (currentTime - lastClickTime > MIN_CLICK_DELAY_TIME) {
+                        lastClickTime = currentTime;
+
+                        checkViewState(position);
+                        view_pager_container.setCurrentItem(position, false);
+                        int sheepPosition = MainTab.FgtSmallSheep.ordinal();
+                        int personnalPosition = MainTab.FgtPersonnalCenter.ordinal();
+                        int auditPosition = MainTab.FgtMainAudit.ordinal();
+                        int fPosition = MainTab.Fgt_Find.ordinal();
+                        FgtSmallSheep fgtSmallSheep = (FgtSmallSheep) fragmentList.get(sheepPosition);
+                        FgtPersonalCenter personnalCenter = (FgtPersonalCenter) fragmentList.get(personnalPosition);
+                        FgtMainAudit auditFgt = (FgtMainAudit) fragmentList.get(auditPosition);
+                        FgtFind findFgt = (FgtFind) fragmentList.get(fPosition);
+                        if(position == sheepPosition){
+                            fgtSmallSheep.onResume();
+                        } else {
+                            fgtSmallSheep.onPause();
                         }
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                        if(position == personnalPosition){
+                            personnalCenter.onResume();
+                        }
+                        if(position == auditPosition){
+                            auditFgt.onResume();
+                        }
+                        if(position == fPosition){
+                            findFgt.onResume();
+                        }
+                        checkWhichPage(position);
                     }
 
+
                 }
             });
             index++;
@@ -195,7 +192,7 @@ public class TabsHelper {
 
     private void initViewPager() {
         LogUtil.logI("fragmentList.size---"+fragmentList.size());
-        ViewPagerFragmentStateAdapter mViewPagerFragmentAdapter = new ViewPagerFragmentStateAdapter(activity.getSupportFragmentManager(), fragmentList);
+        ViewPagerFragmentAdapter mViewPagerFragmentAdapter = new ViewPagerFragmentAdapter(activity.getSupportFragmentManager(),fragmentList);
         view_pager_container.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
             @Override