Skip to content

Commit 3adc867

Browse files
committed
结构微调
1 parent 35e73be commit 3adc867

4 files changed

Lines changed: 15 additions & 13 deletions

File tree

diycode-app/src/main/java/com/gcssloop/diycode/activity/MainActivity.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,23 @@ public void initViews(ViewHolder holder, View root) {
7979
private void initViewPager(ViewHolder holder) {
8080
ViewPager mViewPager = holder.get(R.id.view_pager);
8181
TabLayout mTabLayout = holder.get(R.id.tab_layout);
82-
mViewPager.setOffscreenPageLimit(2); // 防止滑动到第三个页面时,第一个页面被销毁
82+
mViewPager.setOffscreenPageLimit(1); // 防止滑动到第三个页面时,第一个页面被销毁
83+
84+
final TopicListFragment mFragment1 = TopicListFragment.newInstance();
85+
final NewsListFragment mFragment2 = NewsListFragment.newInstance();
86+
final SitesListFragment mFragment3 = SitesListFragment.newInstance();
87+
8388
mViewPager.setAdapter(new FragmentPagerAdapter(getSupportFragmentManager()) {
8489
String[] types = {"Topics", "News", "Sites"};
8590

8691
@Override
8792
public Fragment getItem(int position) {
8893
if (position == 0)
89-
return TopicListFragment.newInstance();
94+
return mFragment1;
9095
if (position == 1)
91-
return NewsListFragment.newInstance();
96+
return mFragment2;
9297
if (position == 2)
93-
return SitesListFragment.newInstance();
98+
return mFragment3;
9499
return TextFragment.newInstance(types[position]);
95100
}
96101

diycode-app/src/main/java/com/gcssloop/diycode/fragment/NewsListFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import android.content.Intent;
2727
import android.net.Uri;
2828
import android.os.Bundle;
29-
import android.os.Handler;
3029
import android.support.v4.util.ArrayMap;
3130
import android.support.v4.widget.NestedScrollView;
3231
import android.support.v4.widget.SwipeRefreshLayout;
@@ -42,12 +41,12 @@
4241
import com.gcssloop.diycode.base.recyclerview.GcsViewHolder;
4342
import com.gcssloop.diycode.utils.DataCache;
4443
import com.gcssloop.diycode.utils.RecyclerViewUtil;
44+
import com.gcssloop.diycode.utils.TimeUtil;
4545
import com.gcssloop.diycode.utils.UrlUtil;
4646
import com.gcssloop.diycode_sdk.api.Diycode;
4747
import com.gcssloop.diycode_sdk.api.news.bean.New;
4848
import com.gcssloop.diycode_sdk.api.news.event.GetNewsListEvent;
4949
import com.gcssloop.diycode_sdk.api.user.bean.User;
50-
import com.gcssloop.diycode.utils.TimeUtil;
5150

5251
import org.greenrobot.eventbus.EventBus;
5352
import org.greenrobot.eventbus.Subscribe;
@@ -109,6 +108,7 @@ private void loadData() {
109108
if (null != news && news.size() > 0) {
110109
mAdapter.addDatas(news);
111110
mFooter.setText(FOOTER_NORMAL);
111+
/*
112112
if (isFirstLunch){
113113
mRefreshLayout.setEnabled(true);
114114
mRefreshLayout.setRefreshing(true);
@@ -118,7 +118,7 @@ public void run() {
118118
}
119119
}, 1000);
120120
isFirstLunch = false;
121-
}
121+
}*/
122122
} else {
123123
loadMore();
124124
mFooter.setText(FOOTER_LOADING);

diycode-app/src/main/java/com/gcssloop/diycode/fragment/SitesListFragment.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,9 @@ protected void initViews(ViewHolder holder, View root) {
9191
private void initRecyclerView(final Context context, ViewHolder holder) {
9292
RecyclerView recyclerView = holder.get(R.id.recycler_view);
9393

94-
Logger.e("初始化Adapter");
9594
mAdapter = new MultiTypeAdapter();
9695
mAdapter.register(SiteItem.class, new SiteProvider(getContext()));
9796
mAdapter.register(SitesItem.class, new SitesProvider(getContext()));
98-
Logger.e("结束初始化Adapter");
9997

10098
GridLayoutManager layoutManager = new GridLayoutManager(getContext(), 2);
10199
layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
@@ -116,7 +114,6 @@ public int getSpanSize(int position) {
116114

117115
// 加载数据
118116
private void loadData() {
119-
Logger.e("加载数据");
120117
List<Sites> sitesList = mDataCache.getSites();
121118
if (sitesList != null) {
122119
convertData(sitesList);

diycode-app/src/main/java/com/gcssloop/diycode/fragment/TopicListFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import android.content.Context;
2626
import android.os.Bundle;
27-
import android.os.Handler;
2827
import android.support.v4.util.ArrayMap;
2928
import android.support.v4.widget.NestedScrollView;
3029
import android.support.v4.widget.SwipeRefreshLayout;
@@ -109,11 +108,12 @@ protected void initViews(ViewHolder holder, View root) {
109108

110109
// 加载数据,默认从缓存加载
111110
private void loadData() {
111+
mRefreshLayout.setEnabled(true);
112112
List<Topic> topics = mDataCache.getTopicsList();
113113
if (null != topics && topics.size() > 0) {
114114
mAdapter.addDatas(topics);
115115
mFooter.setText(FOOTER_NORMAL);
116-
mRefreshLayout.setEnabled(true);
116+
/*
117117
if (isFirstLaunch) {
118118
mRefreshLayout.setRefreshing(true); // 自动刷新一次
119119
new Handler().postDelayed(new Runnable() { // 延迟 1s,防闪屏
@@ -122,7 +122,7 @@ public void run() {
122122
}
123123
}, 1000);
124124
isFirstLaunch = false;
125-
}
125+
}*/
126126
} else {
127127
loadMore();
128128
mFooter.setText(FOOTER_LOADING);

0 commit comments

Comments
 (0)