Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev

This commit is contained in:
kehaoyuan
2019-01-28 17:59:06 +08:00

View File

@ -268,7 +268,6 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter implements IExposable {
if (holder instanceof GameTestViewHolder) {
GameEntity gameEntity = mEntityList.get(position);
GameTestViewHolder viewHolder = (GameTestViewHolder) holder;
initGameTestViewHolder(gameEntity, viewHolder);
String day;
String fixedTop = "";
@ -293,6 +292,8 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter implements IExposable {
null,
ExposureType.EXPOSURE);
mExposureEventArray.put(position, exposureEvent);
initGameTestViewHolder(gameEntity, viewHolder);
} else if (holder instanceof KaiFuTimeViewHolder) {
GameEntity gameEntity = mEntityList.get(position);
if (gameEntity.getFixedTopHint()) {
@ -365,7 +366,8 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter implements IExposable {
DownloadItemUtils.setOnClickListener(mContext,
viewHolder.gameDownloadBtn, gameEntity, viewHolder.getAdapterPosition(), KaiFuVpAdapter.this,
StringUtils.buildString(entrance, "+(开服表[", String.valueOf(viewHolder.getAdapterPosition()), "])"),
StringUtils.buildString("开服表:", gameEntity.getName()));
StringUtils.buildString("开服表:", gameEntity.getName()),
mExposureEventArray.get(viewHolder.getAdapterPosition()));
DownloadItemUtils.updateItem(mContext, gameEntity, viewHolder, true);