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

Merge branch '2.0' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.0

Browse Source 
Conflicts:
	app/src/main/java/com/gh/common/util/ImageUtils.java
	app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
	app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
	app/src/main/java/com/gh/gamecenter/game/GameListAdapter.java
	app/src/main/java/com/gh/gamecenter/game/NewGame2FragmentAdapter.java
	app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java
	app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java
	app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java
	app/src/main/res/drawable/border_white_bg.xml
	app/src/main/res/layout/game_news_type_list_item.xml
	app/src/main/res/layout/home_consolegame_item.xml
	app/src/main/res/layout/home_game_test_item.xml
This commit is contained in:
huangzhuanghua
2016-08-31 14:46:50 +08:00
parent efc19441cd 803ec482fb
commit a270946ce2
44 changed files with 2293 additions and 5591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
View File

@ -300,19 +300,19 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
if (viewType == ITEM_TYPE.HEAD) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.home_game_head_item, parent, false);
.inflate(R.layout.image_card_game_head_item, parent, false);
return new GameHeadViewHolder(view);
} else if (viewType == ITEM_TYPE.IMAGE) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.home_game_image_item, parent, false);
.inflate(R.layout.image_card_home_game_image_item, parent, false);
return new GameImageViewHolder(view);
} else if (viewType == ITEM_TYPE.GAME_TEST) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.home_game_test_item, parent, false);
.inflate(R.layout.image_card_home_game_test_item, parent, false);
return new GameTestViewHolder(view);
} else {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.home_game_normal_item, parent, false);
.inflate(R.layout.image_card_home_game_normal_item, parent, false);
return new GameNormalViewHolder(view);
}
}
@ -344,12 +344,13 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
|| position == offset + 1 && !TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())) {
holder.thumb.setVisibility(View.GONE);
holder.title.setText(subjectList.get(i).getName());
// if (TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())&&position!=0){
// holder.headTop.setVisibility(View.VISIBLE);
// }else {
// holder.headTop.setVisibility(View.GONE);
// }
if (subjectList.get(i).getData().size()>=Integer.parseInt(subjectList.get(i).getMore())){
if (TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())&&position!=0){
holder.frameTop.setVisibility(View.VISIBLE);
}else {
holder.frameTop.setVisibility(View.GONE);
}
if (subjectList.get(i).getData().size()>= Integer.parseInt(subjectList.get(i).getMore())){
holder.link.setVisibility(View.GONE);
}else {
holder.link.setVisibility(View.VISIBLE);
@ -555,12 +556,12 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
final GameEntity entity = gameEntity;
final String name = subjectList.get(i).getName();
final int ii = index;
// if (position == 0){
// holder.top.setVisibility(View.GONE);
// }else {
// holder.top.setVisibility(View.VISIBLE);
// }
ImageUtils.getInstance(context).display(entity.getImage(), holder.image, -1,context);//默认应该设置占位符，防止图片混乱
if (position == 0){
holder.frameTop.setVisibility(View.GONE);
}else {
holder.frameTop.setVisibility(View.VISIBLE);
}
ImageUtils.getInstance(context).display(entity.getImage(), holder.image, -1,context,holder.rlImage,position);//默认应该设置占位符，防止图片混乱
holder.image.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {