文件整理

This commit is contained in:
huangzhuanghua
2016-09-02 17:14:05 +08:00
parent b1df05ea47
commit 6dd0c75cdc
84 changed files with 2020 additions and 1190 deletions

View File

@ -21,11 +21,13 @@ import com.gh.base.AppController;
import com.gh.common.constant.Config;
import com.gh.common.constant.Constants;
import com.gh.common.util.DataUtils;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.DownloadItemUtils;
import com.gh.common.util.GameViewUtils;
import com.gh.common.util.ImageUtils;
import com.gh.common.util.TimestampUtils;
import com.gh.common.util.Utils;
import com.gh.common.view.CardLinearLayout;
import com.gh.download.DownloadEntry;
import com.gh.gamecenter.GameDetailsActivity;
import com.gh.gamecenter.NewsActivity;
@ -300,19 +302,19 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
if (viewType == ITEM_TYPE.HEAD) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.image_card_game_head_item, parent, false);
.inflate(R.layout.home_game_head_item, parent, false);
return new GameHeadViewHolder(view);
} else if (viewType == ITEM_TYPE.IMAGE) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.image_card_home_game_image_item, parent, false);
.inflate(R.layout.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.image_card_home_game_test_item, parent, false);
.inflate(R.layout.game_test_item, parent, false);
return new GameTestViewHolder(view);
} else {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.image_card_home_game_normal_item, parent, false);
.inflate(R.layout.game_normal_item, parent, false);
return new GameNormalViewHolder(view);
}
}
@ -342,13 +344,14 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
gameEntity = subjectList.get(i).getData().get(index);
if (position == offset && TextUtils.isEmpty(gameEntity.getImage())
|| position == offset + 1 && !TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())) {
if (TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())
&& i == 0) {
((CardLinearLayout) holder.itemView).setmTop(DisplayUtils.dip2px(context, 8));
} else {
((CardLinearLayout) holder.itemView).setmTop(0);
}
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.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);
@ -388,7 +391,7 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
if (subjectList.get(i).getData().get(0).getImage() != null) {
order--;
}
initGameNormal(holder, gameEntity, order, subjectList.get(i).getOrder(), subjectList.get(i).getName());
initGameNormal(holder, gameEntity, order, subjectList.get(i));
break;
}
}
@ -397,8 +400,23 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
}
private void initGameNormal(GameNormalViewHolder holder, GameEntity entity,
final int i, boolean order, final String name) {
if (order) {
final int i, final SubjectEntity subjectEntity) {
// 最后一个
((CardLinearLayout) holder.itemView).setBottom(false);
if (TextUtils.isEmpty(subjectEntity.getData().get(0).getImage())) {
if (i + 1 == subjectEntity.getData().size()) {
((CardLinearLayout) holder.itemView).setmBottom(DisplayUtils.dip2px(context, 8));
} else {
((CardLinearLayout) holder.itemView).setmBottom(0);
}
} else {
if (i + 2 == subjectEntity.getData().size()) {
((CardLinearLayout) holder.itemView).setmBottom(DisplayUtils.dip2px(context, 8));
} else {
((CardLinearLayout) holder.itemView).setmBottom(0);
}
}
if (subjectEntity.getOrder()) {
holder.home1_game_order.setVisibility(View.VISIBLE);
holder.home1_game_order.setText(String.valueOf(i + 1));
} else {
@ -422,11 +440,11 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
Map<String, Object> kv = new HashMap<String, Object>();
kv.put("名字", gameInfoEntity.getName());
kv.put("位置", i + 1);
DataUtils.onEvent(context, "点击", "游戏-推荐-" + name, kv);
DataUtils.onEvent(context, "点击", "游戏-推荐-" + subjectEntity.getName(), kv);
AppController.put("GameEntity", gameInfoEntity);
Intent intent = new Intent(context, GameDetailsActivity.class);
intent.putExtra("entrance", "游戏-推荐-" + name);
intent.putExtra("entrance", "游戏-推荐-" + subjectEntity.getName());
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
}
@ -434,8 +452,8 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
DownloadItemUtils.setOnClickListener(context, holder.downloadBtn,
holder.download_speed, holder.download_percentage, entity, i,
Game2FragmentAdapter.this,
statusMap, platformMap, "游戏-推荐-" + name,
dismissEntity, "游戏-推荐-" + name + ":" + entity.getName());
statusMap, platformMap, "游戏-推荐-" + subjectEntity.getName(),
dismissEntity, "游戏-推荐-" + subjectEntity.getName() + ":" + entity.getName());
DownloadItemUtils.updateItem(context, holder.gameDes,
holder.game_progressbar, holder.game_ll_info, holder.download_speed,
@ -458,7 +476,7 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
if (subjectList.get(i).getData().get(0).getImage() != null) {
order--;
}
initGameTest(holder, gameEntity, order, subjectList.get(i).getOrder(), subjectList.get(i).getName());
initGameTest(holder, gameEntity, order, subjectList.get(i));
break;
}
}
@ -467,8 +485,25 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
}
private void initGameTest(GameTestViewHolder holder, final GameEntity gameEntity,
final int i, boolean order, final String name) {
if (order) {
final int i, final SubjectEntity subjectEntity) {
// 最后一个
((CardLinearLayout) holder.itemView).setBottom(false);
if (TextUtils.isEmpty(subjectEntity.getData().get(0).getImage())) {
if (i + 1 == subjectEntity.getData().size()) {
((CardLinearLayout) holder.itemView).setmBottom(DisplayUtils.dip2px(context, 8));
} else {
((CardLinearLayout) holder.itemView).setmBottom(0);
}
} else {
if (i + 2 == subjectEntity.getData().size()) {
((CardLinearLayout) holder.itemView).setmBottom(DisplayUtils.dip2px(context, 8));
} else {
((CardLinearLayout) holder.itemView).setmBottom(0);
}
}
if (subjectEntity.getOrder()) {
holder.home2_game_order.setVisibility(View.VISIBLE);
holder.home2_game_order.setText(String.valueOf(i + 1));
} else {
@ -492,14 +527,14 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
@Override
public void onClick(View v) {
Map<String, Object> kv = new HashMap<String, Object>();
Map<String, Object> kv = new HashMap<>();
kv.put("名字", gameEntity.getName());
kv.put("位置", i + 1);
DataUtils.onEvent(context, "点击", "游戏-推荐-" + name, kv);
DataUtils.onEvent(context, "点击", "游戏-推荐-" + subjectEntity.getName(), kv);
AppController.put("GameEntity", gameEntity);
Intent intent = new Intent(context, GameDetailsActivity.class);
intent.putExtra("entrance", "游戏-推荐-" + name);
intent.putExtra("entrance", "游戏-推荐-" + subjectEntity.getName());
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
}
@ -514,11 +549,10 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
holder.downloadBtn, holder.download_speed,
holder.download_percentage, gameEntity, i,
Game2FragmentAdapter.this,
statusMap, platformMap, "游戏-推荐-" + name,
dismissEntity, "游戏-推荐-" + name + ":" + gameEntity.getName());
statusMap, platformMap, "游戏-推荐-" + subjectEntity.getName(),
dismissEntity, "游戏-推荐-" + subjectEntity.getName() + ":" + gameEntity.getName());
} else {
long endTime = Long.valueOf(gameEntity.getTest().getEnd()
+ "000");
long endTime = Long.valueOf(gameEntity.getTest().getEnd() + "000");
long todayTime = new Date().getTime();
if (todayTime > endTime) {
// 测试时间已过
@ -530,8 +564,8 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
holder.downloadBtn, holder.download_speed,
holder.download_percentage, gameEntity, i,
Game2FragmentAdapter.this, statusMap, platformMap,
"游戏-推荐-" + name, dismissEntity,
"游戏-推荐-" + name + ":" + gameEntity.getName());
"游戏-推荐-" + subjectEntity.getName(), dismissEntity,
"游戏-推荐-" + subjectEntity.getName() + ":" + gameEntity.getName());
}
}
}
@ -553,15 +587,15 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
}
gameEntity = subjectList.get(i).getData().get(index);
if (position == offset && !TextUtils.isEmpty(gameEntity.getImage())) {
if (i == 0) {
((CardLinearLayout) holder.itemView).setmTop(DisplayUtils.dip2px(context, 8));
} else {
((CardLinearLayout) holder.itemView).setmTop(0);
}
final GameEntity entity = gameEntity;
final String name = subjectList.get(i).getName();
final int ii = index;
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);//默认应该设置占位符,防止图片混乱
ImageUtils.getInstance(context).display(entity.getImage(), holder.image, -1, context);//默认应该设置占位符,防止图片混乱
holder.image.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {