Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0' into 2.0

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
This commit is contained in:
khy
2016-09-20 18:36:56 +08:00
parent f6371537ed 5a31813a45
commit 560dee201f
34 changed files with 1176 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
View File

@ -51,7 +51,6 @@ import java.util.Map;
public class NewsDetailActivity extends DetailActivity implements OnClickListener {
private NewsDetailAdapter adapter;
private LinearLayoutManager linearLayoutManager;
private String newsId;
@ -77,8 +76,7 @@ public class NewsDetailActivity extends DetailActivity implements OnClickListene
getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
detail_rv_show.setHasFixedSize(true);
linearLayoutManager = new LinearLayoutManager(this);
detail_rv_show.setLayoutManager(linearLayoutManager);
detail_rv_show.setLayoutManager(new LinearLayoutManager(this));
adapter = new NewsDetailAdapter(this, entrance);
detail_rv_show.setAdapter(adapter);
@ -440,7 +438,6 @@ public class NewsDetailActivity extends DetailActivity implements OnClickListene
super.onDestroy();
AppController.canclePendingRequests(NewsDetailActivity.class);
adapter = null;
linearLayoutManager = null;
}
}