diff --git a/.idea/libraries/animated_vector_drawable_23_4_0.xml b/.idea/libraries/animated_vector_drawable_23_4_0.xml index 5235d412fc19a6f05ea0ea6076946cc467c6edd8..c7190d33df02756ac3796d471f79d2c27f75c963 100644 --- a/.idea/libraries/animated_vector_drawable_23_4_0.xml +++ b/.idea/libraries/animated_vector_drawable_23_4_0.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/appcompat_v7_23_4_0.xml b/.idea/libraries/appcompat_v7_23_4_0.xml index aa3ba543afbcd0de4b7d28e2f2ae4a52926ffd4f..0932cf54c09c98ef78d2c389f080da4ecead31b6 100644 --- a/.idea/libraries/appcompat_v7_23_4_0.xml +++ b/.idea/libraries/appcompat_v7_23_4_0.xml @@ -1,12 +1,12 @@ - + - - + + diff --git a/.idea/libraries/support_v4_23_4_0.xml b/.idea/libraries/support_v4_23_4_0.xml index 04bec5c232ca099377caf0ad0a2f795f4bf9c494..1d2d97f2de06e49c6750f6d4f95f86cff3a8d617 100644 --- a/.idea/libraries/support_v4_23_4_0.xml +++ b/.idea/libraries/support_v4_23_4_0.xml @@ -2,8 +2,8 @@ - + diff --git a/.idea/libraries/support_vector_drawable_23_4_0.xml b/.idea/libraries/support_vector_drawable_23_4_0.xml index 863c9f9301f9ecfde64261ff27ffaff0348d9d8b..ec4bf90c135f447157dce714cdb1f1749e480447 100644 --- a/.idea/libraries/support_vector_drawable_23_4_0.xml +++ b/.idea/libraries/support_vector_drawable_23_4_0.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..94a25f7f4cb416c083d265558da75d457237d671 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/arms/src/main/java/com/jess/arms/base/AdapterViewPager.java b/arms/src/main/java/com/jess/arms/base/AdapterViewPager.java index d70bb3157d454bc25b23ae7c6a5ba3b9d15abebc..86fb4138ec5a437467adec2c9193cc92a6f51332 100644 --- a/arms/src/main/java/com/jess/arms/base/AdapterViewPager.java +++ b/arms/src/main/java/com/jess/arms/base/AdapterViewPager.java @@ -10,47 +10,48 @@ import android.view.ViewGroup; import java.util.List; public class AdapterViewPager extends FragmentStatePagerAdapter { - private List list; - private String[] mLitles; + private List list; + private CharSequence[] mTitles; - public AdapterViewPager(FragmentManager fragmentManager) { - super(fragmentManager); - } - - public void bindData(List list) { - this.list = list; - notifyDataSetChanged(); - } - public void bindData(List list, String[] titles) { - this.list = list; - this.mLitles = titles; - notifyDataSetChanged(); - } + public AdapterViewPager(FragmentManager fragmentManager) { + super(fragmentManager); + } + + public void bindData(List list) { + this.list = list; + notifyDataSetChanged(); + } + + public void bindData(List list, CharSequence[] titles) { + this.list = list; + this.mTitles = titles; + notifyDataSetChanged(); + } + + @Override + public Fragment getItem(int position) { + return list.get(position); + } - @Override - public Fragment getItem(int position) { - return list.get(position); - } + @Override + public CharSequence getPageTitle(int position) { + if (mTitles != null) { + return mTitles[position]; + } + return super.getPageTitle(position); + } + + @Override + public int getCount() { + return list.size(); + } - @Override - public CharSequence getPageTitle(int position) { - if (mLitles!=null){ - return mLitles[position]; - } - return super.getPageTitle(position); - } + @Override + public Parcelable saveState() { + return null; + } - @Override - public int getCount() { - return list.size(); - } - - @Override - public Parcelable saveState() { - return null; - } - - @Override + @Override public Object instantiateItem(ViewGroup container, int position) { Fragment f = (Fragment) super.instantiateItem(container, position); View view = f.getView();