From d8f043ad717b82f4d75a2ff9603ff91cfe4c104a Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Thu, 2 Nov 2017 16:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=88=97=E8=A1=A8=E5=BC=80?= =?UTF-8?q?=E6=9C=8D=E4=BF=A1=E6=81=AF=20=E9=87=8D=E5=86=99=E5=88=B0ViewHo?= =?UTF-8?q?lder=E7=B1=BB=E6=9C=AC=E8=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/InstallFragmentAdapter.java | 24 +--------- .../viewholder/GameTestViewHolder.java | 21 --------- .../adapter/viewholder/GameViewHolder.java | 28 ++++++++++++ .../gamecenter/game/GameFragmentAdapter.java | 22 +-------- .../gh/gamecenter/game/GamePluginAdapter.java | 23 +--------- .../SearchGameDetailFragmentAdapter.java | 24 +--------- .../search/SearchGameListFragmentAdapter.java | 24 +--------- .../gh/gamecenter/subject/SubjectAdapter.java | 45 +------------------ 8 files changed, 35 insertions(+), 176 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java index c02b300627..5eea883b44 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -392,6 +392,8 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { private void initGameNormal(final GameNormalSwipeViewHolder holder, final GameEntity gameEntity, final int i) { + holder.initServerType(gameEntity, mContext); + holder.swipeText.setPadding(0, 0, DisplayUtils.dip2px(mContext, 15), 0); ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); @@ -428,28 +430,6 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { } }); - - int paddRight = 0; - String serverType = gameEntity.getServerType(); - if (TextUtils.isEmpty(serverType)) { - holder.gameServerType.setVisibility(View.GONE); - } else { - holder.gameServerType.setVisibility(View.VISIBLE); - holder.gameServerType.setText(serverType); - if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) { - holder.gameServerType.setBackgroundResource(R.drawable.textview_server_tag); - if ("删档内测".equals(serverType)) { - paddRight = DisplayUtils.dip2px(mContext, 50); - } else { - paddRight = DisplayUtils.dip2px(mContext, 60); - } - } else { - holder.gameServerType.setBackgroundResource(R.drawable.textview_orange_up); - paddRight = DisplayUtils.dip2px(mContext, 30); - } - } - holder.gameName.setPadding(0, 0, paddRight, 0); - DownloadItemUtils.setOnClickListener(mContext, holder.gameDownloadBtn, gameEntity, i, this, "(我的光环:我的游戏)", "我的光环-我的游戏" + ":" + gameEntity.getName()); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java index 104ab03e49..49698a4c5c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java @@ -84,27 +84,6 @@ public class GameTestViewHolder extends GameViewHolder { gameOrder.setVisibility(View.GONE); } -// int paddRight = 0; -// String serverType = gameEntity.getServerType(); -// if (TextUtils.isEmpty(serverType)) { -// gameServerType.setVisibility(View.GONE); -// } else { -// gameServerType.setVisibility(View.VISIBLE); -// gameServerType.setText(serverType); -// if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) { -// gameServerType.setBackgroundResource(R.drawable.textview_server_tag); -// if ("删档内测".equals(serverType)) { -// paddRight = DisplayUtils.dip2px(context, 50); -// } else { -// paddRight = DisplayUtils.dip2px(context, 60); -// } -// } else { -// gameServerType.setBackgroundResource(R.drawable.textview_orange_up); -// paddRight = DisplayUtils.dip2px(context, 30); -// } -// } -// gameName.setPadding(0, 0, paddRight, 0); - ImageUtils.Companion.display(gameThumb, gameEntity.getIcon()); gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java index 3d44c025f1..eb8749f0a6 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java @@ -1,5 +1,7 @@ package com.gh.gamecenter.adapter.viewholder; +import android.content.Context; +import android.text.TextUtils; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; @@ -8,6 +10,9 @@ import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.BaseRecyclerViewHolder; +import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.R; +import com.gh.gamecenter.entity.GameEntity; public class GameViewHolder extends BaseRecyclerViewHolder { @@ -29,4 +34,27 @@ public class GameViewHolder extends BaseRecyclerViewHolder { super(itemView); } + public void initServerType(GameEntity gameEntity, Context context) { + int paddRight = 0; + String serverType = gameEntity.getServerType(); + if (TextUtils.isEmpty(serverType)) { + gameServerType.setVisibility(View.GONE); + } else { + gameServerType.setVisibility(View.VISIBLE); + gameServerType.setText(serverType); + if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) { + gameServerType.setBackgroundResource(R.drawable.textview_server_tag); + if ("删档内测".equals(serverType)) { + paddRight = DisplayUtils.dip2px(context, 50); + } else { + paddRight = DisplayUtils.dip2px(context, 60); + } + } else { + gameServerType.setBackgroundResource(R.drawable.textview_orange_up); + paddRight = DisplayUtils.dip2px(context, 30); + } + } + gameName.setPadding(0, 0, paddRight, 0); + } + } diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index da61b27d11..329d133d5a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -781,6 +781,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { private void initGameNormal(GameNormalViewHolder holder, final GameEntity gameEntity, final int i, final SubjectEntity subjectEntity) { + holder.initServerType(gameEntity, mContext); if (subjectEntity.isOrder()) { holder.gameOrder.setVisibility(View.VISIBLE); @@ -789,27 +790,6 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { holder.gameOrder.setVisibility(View.GONE); } - int paddRight = 0; - String serverType = gameEntity.getServerType(); - if (TextUtils.isEmpty(serverType)) { - holder.gameServerType.setVisibility(View.GONE); - } else { - holder.gameServerType.setVisibility(View.VISIBLE); - holder.gameServerType.setText(serverType); - if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) { - holder.gameServerType.setBackgroundResource(R.drawable.textview_server_tag); - if ("删档内测".equals(serverType)) { - paddRight = DisplayUtils.dip2px(mContext, 50); - } else { - paddRight = DisplayUtils.dip2px(mContext, 60); - } - } else { - holder.gameServerType.setBackgroundResource(R.drawable.textview_orange_up); - paddRight = DisplayUtils.dip2px(mContext, 30); - } - } - holder.gameName.setPadding(0, 0, paddRight, 0); - ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); if (gameEntity.isPluggable() && gameEntity.getApk().size() > 0) { holder.gameName.setText(String.format("%s - %s", gameEntity.getName(), diff --git a/app/src/main/java/com/gh/gamecenter/game/GamePluginAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GamePluginAdapter.java index 5336b26e16..ae6d6b3a31 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GamePluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GamePluginAdapter.java @@ -2,13 +2,11 @@ package com.gh.gamecenter.game; import android.content.Context; import android.support.v7.widget.RecyclerView; -import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; import com.gh.common.util.DataCollectionUtils; 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; @@ -53,26 +51,7 @@ public class GamePluginAdapter extends BaseRecyclerAdapter { private void initGameNormalViewHolder(GameNormalViewHolder holder, int position) { final GameEntity gameEntity = mPluginList.get(position); - int paddRight = 0; - String serverType = gameEntity.getServerType(); - if (TextUtils.isEmpty(serverType)) { - holder.gameServerType.setVisibility(View.GONE); - } else { - holder.gameServerType.setVisibility(View.VISIBLE); - holder.gameServerType.setText(serverType); - if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) { - holder.gameServerType.setBackgroundResource(R.drawable.textview_server_tag); - if ("删档内测".equals(serverType)) { - paddRight = DisplayUtils.dip2px(mContext, 50); - } else { - paddRight = DisplayUtils.dip2px(mContext, 60); - } - } else { - holder.gameServerType.setBackgroundResource(R.drawable.textview_orange_up); - paddRight = DisplayUtils.dip2px(mContext, 30); - } - } - holder.gameName.setPadding(0, 0, paddRight, 0); + holder.initServerType(gameEntity, mContext); ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); if (gameEntity.isPluggable() && gameEntity.getApk().size() > 0) { diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index 4cc06de4e3..d171960795 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -13,7 +13,6 @@ import android.view.inputmethod.InputMethodManager; import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.ApkActiveUtils; -import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; @@ -140,6 +139,7 @@ class SearchGameDetailFragmentAdapter extends BaseRecyclerAdapter { final GameNormalViewHolder viewHolder = (GameNormalViewHolder) holder; final GameEntity gameEntity = gameList.get(position); + viewHolder.initServerType(gameEntity, mContext); ImageUtils.Companion.display(viewHolder.gameThumb, gameEntity.getIcon()); viewHolder.gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { @@ -150,28 +150,6 @@ class SearchGameDetailFragmentAdapter extends BaseRecyclerAdapter { GameViewUtils.setLabelList(mContext, viewHolder.gameLabelList, gameEntity.getTag(), ""); - int paddRight = 0; - String serverType = gameEntity.getServerType(); - if (TextUtils.isEmpty(serverType)) { - viewHolder.gameServerType.setVisibility(View.GONE); - } else { - // TODO 这个重复出现多次--抽离 - viewHolder.gameServerType.setVisibility(View.VISIBLE); - viewHolder.gameServerType.setText(serverType); - if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) { - viewHolder.gameServerType.setBackgroundResource(R.drawable.textview_server_tag); - if ("删档内测".equals(serverType)) { - paddRight = DisplayUtils.dip2px(mContext, 50); - } else { - paddRight = DisplayUtils.dip2px(mContext, 60); - } - } else { - viewHolder.gameServerType.setBackgroundResource(R.drawable.textview_orange_up); - paddRight = DisplayUtils.dip2px(mContext, 30); - } - } - viewHolder.gameName.setPadding(0, 0, paddRight, 0); - viewHolder.itemView.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index 07b5930465..9eb781baf0 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -13,7 +13,6 @@ import android.view.inputmethod.InputMethodManager; import com.gh.base.OnRequestCallBackListener; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ApkActiveUtils; -import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; @@ -149,6 +148,7 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter { if (holder instanceof GameNormalViewHolder && position == 0) { final GameNormalViewHolder viewHolder = (GameNormalViewHolder) holder; + viewHolder.initServerType(gameEntity, mContext); ImageUtils.Companion.display(((GameNormalViewHolder) holder).gameThumb, gameEntity.getIcon()); viewHolder.gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { @@ -177,28 +177,6 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter { } }); - - int paddRight = 0; - String serverType = gameEntity.getServerType(); - if (TextUtils.isEmpty(serverType)) { - viewHolder.gameServerType.setVisibility(View.GONE); - } else { - viewHolder.gameServerType.setVisibility(View.VISIBLE); - viewHolder.gameServerType.setText(serverType); - if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) { - viewHolder.gameServerType.setBackgroundResource(R.drawable.textview_server_tag); - if ("删档内测".equals(serverType)) { - paddRight = DisplayUtils.dip2px(mContext, 50); - } else { - paddRight = DisplayUtils.dip2px(mContext, 60); - } - } else { - viewHolder.gameServerType.setBackgroundResource(R.drawable.textview_orange_up); - paddRight = DisplayUtils.dip2px(mContext, 30); - } - } - viewHolder.gameName.setPadding(0, 0, paddRight, 0); - viewHolder.gameDownloadBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java index 8b27c242c9..2f989662d8 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java @@ -14,7 +14,6 @@ import com.gh.common.constant.ItemViewType; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; 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; @@ -307,27 +306,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { holder.gameDes.setText(String.format("%s %s", gameEntity.getApk().get(0).getSize(), gameEntity.getBrief())); } - int paddRight = 0; - String serverType = gameEntity.getServerType(); - if (TextUtils.isEmpty(serverType)) { - holder.gameServerType.setVisibility(View.GONE); - } else { - holder.gameServerType.setVisibility(View.VISIBLE); - holder.gameServerType.setText(serverType); - if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) { - holder.gameServerType.setBackgroundResource(R.drawable.textview_server_tag); - if ("删档内测".equals(serverType)) { - paddRight = DisplayUtils.dip2px(mContext, 50); - } else { - paddRight = DisplayUtils.dip2px(mContext, 60); - } - } else { - holder.gameServerType.setBackgroundResource(R.drawable.textview_orange_up); - paddRight = DisplayUtils.dip2px(mContext, 30); - } - } - holder.gameName.setPadding(0, 0, paddRight, 0); - + holder.initServerType(gameEntity, mContext); GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag(), mTagType); holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -368,7 +347,6 @@ public class SubjectAdapter extends BaseRecyclerAdapter { final GameEntity gameEntity = mSubjectList.get(position); -// holder.gameThumb.setImageURI(gameEntity.getIcon()); ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); holder.gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { @@ -382,27 +360,6 @@ public class SubjectAdapter extends BaseRecyclerAdapter { holder.gameTestTime.setText(GameViewUtils.getGameTestDate(gameEntity.getTest().getStart())); } -// int paddRight = 0; -// String serverType = gameEntity.getServerType(); -// if (TextUtils.isEmpty(serverType)) { -// holder.gameServerType.setVisibility(View.GONE); -// } else { -// holder.gameServerType.setVisibility(View.VISIBLE); -// holder.gameServerType.setText(serverType); -// if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) { -// holder.gameServerType.setBackgroundResource(R.drawable.textview_server_tag); -// if ("删档内测".equals(serverType)) { -// paddRight = DisplayUtils.dip2px(mContext, 50); -// } else { -// paddRight = DisplayUtils.dip2px(mContext, 60); -// } -// } else { -// holder.gameServerType.setBackgroundResource(R.drawable.textview_orange_up); -// paddRight = DisplayUtils.dip2px(mContext, 30); -// } -// } -// holder.gameName.setPadding(0, 0, paddRight, 0); - String type = gameEntity.getTest().getType(); KaiFuUtils.setKaiFuType(holder.gameTestType, type);