From a181292f80bde5174945b83fab71354e09c8723d Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Mon, 10 Aug 2020 18:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=B8=E6=88=8F=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E8=A7=92=E6=A0=87=E7=9A=84=E5=A4=8D=E7=94=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/databind/BindingAdapters.java | 2 +- .../main/java/com/gh/common/view/GameIconView.kt | 15 +++++++++++---- .../gh/gamecenter/adapter/LibaoDetailAdapter.java | 6 ++---- .../gamecenter/adapter/MessageDetailAdapter.java | 6 ++---- .../java/com/gh/gamecenter/amway/AmwayAdapter.kt | 3 +-- .../download/GameDownloadFragmentAdapter.java | 4 ++-- .../download/GameUpdateFragmentAdapter.java | 1 + .../download/InstalledGameFragmentAdapter.java | 2 ++ .../gamedetail/desc/GameRelatedVersionAdapter.kt | 3 +-- .../gamedetail/myrating/MyRatingAdapter.kt | 3 +-- .../com/gh/gamecenter/info/ConcernAdapter.java | 7 ++----- .../gamecenter/libao/Libao2FragmentAdapter.java | 4 +--- .../gamecenter/libao/Libao3FragmentAdapter.java | 5 +---- .../gh/gamecenter/libao/LibaoHistoryAdapter.java | 4 +--- .../com/gh/gamecenter/libao/LibaoNewAdapter.kt | 3 +-- .../com/gh/gamecenter/libao/LibaoSearchAdapter.kt | 3 +-- .../personalhome/InstalledGameAdapter.kt | 3 +-- .../com/gh/gamecenter/qa/CommunityFragment.kt | 3 +-- .../qa/article/edit/ArticleSelectGameAdapter.kt | 4 +--- .../com/gh/gamecenter/qa/select/OpenedAdapter.kt | 7 ++----- .../qa/select/SelectGameDialogAdapter.java | 5 ++--- .../gh/gamecenter/qa/select/VotingAdapter.java | 4 +--- .../gamecenter/search/SearchDefaultHotAdapter.kt | 3 +-- .../suggest/SuggestSelectGameAdapter.java | 1 + .../gamecenter/video/detail/DetailPlayerView.kt | 3 +-- .../gh/gamecenter/video/game/GameVideoActivity.kt | 3 +-- 26 files changed, 43 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index 99909c6d23..ba5d6f9f00 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -318,7 +318,7 @@ public class BindingAdapters { @BindingAdapter("game") public static void setGame(View view, GameEntity gameEntity) { if (gameEntity != null && view instanceof GameIconView) { - ((GameIconView) view).setGameEntity(gameEntity); + ((GameIconView) view).displayGameIcon(gameEntity); } } diff --git a/app/src/main/java/com/gh/common/view/GameIconView.kt b/app/src/main/java/com/gh/common/view/GameIconView.kt index ade455ce0f..bef2a96191 100644 --- a/app/src/main/java/com/gh/common/view/GameIconView.kt +++ b/app/src/main/java/com/gh/common/view/GameIconView.kt @@ -9,6 +9,7 @@ import com.facebook.drawee.generic.RoundingParams import com.facebook.drawee.view.SimpleDraweeView import com.gh.common.util.DisplayUtils import com.gh.common.util.ImageUtils +import com.gh.common.util.goneIf import com.gh.gamecenter.R import com.gh.gamecenter.entity.GameEntity import kotlinx.android.synthetic.main.layout_game_icon.view.* @@ -21,6 +22,7 @@ class GameIconView : ConstraintLayout { constructor(context: Context, attrs: AttributeSet) : super(context, attrs, 0) { initView(attrs) } + constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { initView(attrs) } @@ -37,15 +39,20 @@ class GameIconView : ConstraintLayout { gameIconDecoratorIv.hierarchy.roundingParams = roundingParams } - fun setGameEntity(game: GameEntity) { + fun displayGameIcon(game: GameEntity) { if (!TextUtils.isEmpty(game.rawIcon)) { - ImageUtils.display(gameIconIv, game.rawIcon) - ImageUtils.display(gameIconDecoratorIv, game.iconSubscript) + displayGameIcon(game.rawIcon ?: "", game.iconSubscript) } else { - ImageUtils.display(gameIconIv, game.icon) + displayGameIcon(game.icon ?: "", null) } } + fun displayGameIcon(icon: String?, iconSubscript: String?) { + ImageUtils.displayIcon(gameIconIv, icon) + ImageUtils.displayIcon(gameIconDecoratorIv, iconSubscript) + gameIconDecoratorIv.goneIf(TextUtils.isEmpty(iconSubscript)) + } + fun getIconIv(): SimpleDraweeView = gameIconIv fun getIconDecoratorIv(): SimpleDraweeView = gameIconDecoratorIv diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index 7737d63e14..2552bd9e14 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -15,7 +15,6 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder; import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.StringUtils; @@ -179,10 +178,9 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { }); if (mLibaoEntity.getGame() != null) { - ImageUtils.display(holder.libaoGameIcon.getIconIv(), mLibaoEntity.getGame().getIcon()); - ImageUtils.display(holder.libaoGameIcon.getIconDecoratorIv(), mLibaoEntity.getGame().getIconSubscript()); + holder.libaoGameIcon.displayGameIcon(mLibaoEntity.getGame().getIcon(), mLibaoEntity.getGame().getIconSubscript()); } else { - ImageUtils.display(holder.libaoGameIcon.getIconIv(), mLibaoEntity.getIcon()); + holder.libaoGameIcon.displayGameIcon(mLibaoEntity.getIcon(), null); } holder.libaoName.setText(mLibaoEntity.getName()); if (TextUtils.isEmpty(mLibaoEntity.getPlatform())) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index d515c19f1a..f7a6ec8d21 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -13,7 +13,6 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; import com.gh.common.constant.Config; -import com.gh.common.databind.BindingAdapters; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.CommentUtils; import com.gh.common.util.ConcernContentUtils; @@ -279,10 +278,9 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { } if (mConcernEntity.getGame() != null) { - ImageUtils.display(viewHolder.thumb.getIconIv(), mConcernEntity.getGame().getIcon()); - ImageUtils.display(viewHolder.thumb.getIconDecoratorIv(), mConcernEntity.getGame().getIconSubscript()); + viewHolder.thumb.displayGameIcon(mConcernEntity.getGame().getIcon(), mConcernEntity.getGame().getIconSubscript()); } else { - ImageUtils.display(viewHolder.thumb.getIconIv(), mConcernEntity.getGameIcon()); + viewHolder.thumb.displayGameIcon(mConcernEntity.getGameIcon(), null); } viewHolder.title.setText(mConcernEntity.getGameName()); NewsUtils.setNewsPublishOn(viewHolder.time, mConcernEntity.getTime()); diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt index b7e8136a08..2adff39012 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt @@ -191,8 +191,7 @@ class AmwayAdapter(context: Context, MtaHelper.onEvent("安利墙", "点击", "评论${blockPosition}_${amway.game.name}_游戏") } - ImageUtils.display(binding.gameIconView.getIconIv(), amway.game.rawIcon ?: amway.game.icon) - ImageUtils.display(binding.gameIconView.getIconDecoratorIv(), amway.game.iconSubscript) + binding.gameIconView.displayGameIcon(amway.game.rawIcon ?: amway.game.icon, amway.game.iconSubscript) amway.game.tag?.let { val tags = it.take(3) diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index e81a696180..c8e9382a34 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -118,11 +118,11 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { if (!TextUtils.isEmpty(icon)) { if (!TextUtils.isEmpty(rawIcon)) { icon = rawIcon; - ImageUtils.display(viewHolder.dmIcon.getIconDecoratorIv(), ExtensionsKt.getMetaExtra(downloadEntity, Constants.GAME_ICON_SUBSCRIPT)); } - ImageUtils.display(viewHolder.dmIcon.getIconIv(), icon); + viewHolder.dmIcon.displayGameIcon(icon, ExtensionsKt.getMetaExtra(downloadEntity, Constants.GAME_ICON_SUBSCRIPT)); } else { ImageUtils.display(viewHolder.dmIcon.getIconIv(), R.mipmap.logo); + viewHolder.dmIcon.getIconDecoratorIv().setVisibility(View.GONE); } String downloadTitle; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index 07eb934ccd..56e277c0f6 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -316,6 +316,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen if (updateEntity.getName().contains("光环助手")) { ImageUtils.display(viewHolder.guIcon.getIconIv(), R.mipmap.logo); + viewHolder.guIcon.getIconDecoratorIv().setVisibility(View.GONE); } else { BindingAdapters.setGame(viewHolder.guIcon, updateEntity.transformGameEntity()); } diff --git a/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragmentAdapter.java index ec7b150fd0..e96ee67b97 100644 --- a/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragmentAdapter.java @@ -1,6 +1,7 @@ package com.gh.gamecenter.download; import android.text.TextUtils; +import android.view.View; import android.view.ViewGroup; import androidx.annotation.Nullable; @@ -284,6 +285,7 @@ public class InstalledGameFragmentAdapter extends BaseRecyclerAdapter { holder.binding.relatedVersion = relatedVersion GameViewUtils.setLabelList(context, holder.binding.gameLabelLl, "type", relatedVersion.gameTags) - ImageUtils.display(holder.binding.gameIconView.getIconIv(), relatedVersion.game?.getIcon()) - ImageUtils.display(holder.binding.gameIconView.getIconDecoratorIv(), relatedVersion.game?.iconSubscript) + holder.binding.gameIconView.displayGameIcon(relatedVersion.game?.getIcon(), relatedVersion.game?.iconSubscript) holder.itemView.setOnClickListener { MtaHelper.onEvent("游戏详情_新", "相关游戏版本", "${gameName}+${relatedVersion.gameName}") GameDetailActivity.startGameDetailActivity(context, relatedVersion.gameId, diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt index 27d68113fe..f03a0bb6c1 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt @@ -51,8 +51,7 @@ class MyRatingAdapter(context: Context, holder.itemView.tv_comment.setExpandMaxLines(maxDesLines) holder.itemView.tv_comment.setIsExpanded(Int.MAX_VALUE == maxDesLines) - ImageUtils.display(holder.binding.gameIcon.getIconIv(), rating.game.getRawIconIfExisted()) - ImageUtils.display(holder.binding.gameIcon.getIconDecoratorIv(), rating.game.iconSubscript) + holder.binding.gameIcon.displayGameIcon(rating.game.getRawIconIfExisted(), rating.game.iconSubscript) val m = Pattern.compile(RatingEditActivity.LABEL_REGEX).matcher(rating.content) if (m.find()) { diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java index 567ede57fa..02e8e8b740 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java @@ -12,10 +12,8 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder; import com.gh.base.OnListClickListener; import com.gh.base.OnRequestCallBackListener; import com.gh.common.constant.ItemViewType; -import com.gh.common.databind.BindingAdapters; import com.gh.common.util.ConcernContentUtils; import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.NumberUtils; @@ -354,10 +352,9 @@ class ConcernAdapter extends BaseRecyclerAdapter { viewHolder.setClickData(concernEntity); if (concernEntity.getGame() != null) { - ImageUtils.display(viewHolder.thumb.getIconIv(), concernEntity.getGame().getIcon()); - ImageUtils.display(viewHolder.thumb.getIconDecoratorIv(), concernEntity.getGame().getIconSubscript()); + viewHolder.thumb.displayGameIcon(concernEntity.getGame().getIcon(), concernEntity.getGame().getIconSubscript()); } else { - ImageUtils.display(viewHolder.thumb.getIconIv(), concernEntity.getGameIcon()); + viewHolder.thumb.displayGameIcon(concernEntity.getGameIcon(), null); } viewHolder.title.setText(concernEntity.getGameName()); NewsUtils.setNewsPublishOn(viewHolder.time, concernEntity.getTime()); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index 89647d0cf0..34ebd85ea5 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -11,7 +11,6 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder; import com.gh.base.OnListClickListener; import com.gh.base.OnRequestCallBackListener; import com.gh.common.constant.ItemViewType; -import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.PlatformUtils; import com.gh.gamecenter.R; @@ -210,8 +209,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { LibaoEntity libaoEntity = mLibaoList.get(position - 1); holder.setClickData(libaoEntity); holder.libaoName.setText(libaoEntity.getName()); - ImageUtils.display(holder.libaoGameIcon.getIconIv(), libaoEntity.getIcon()); - ImageUtils.display(holder.libaoGameIcon.getIconDecoratorIv(), libaoEntity.getIconSubscript()); + holder.libaoGameIcon.displayGameIcon(libaoEntity.getIcon(), libaoEntity.getIconSubscript()); if (TextUtils.isEmpty(libaoEntity.getPlatform())) { holder.libaoGameName.setText(libaoEntity.getGame().getName()); } else { diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index 7b9238eb6d..f9972e2316 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -11,7 +11,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.DialogUtils; -import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.PlatformUtils; import com.gh.gamecenter.LibaoDetailActivity; @@ -191,9 +190,7 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter LibaoNormalViewHolder holder = (LibaoNormalViewHolder) viewHolder; final LibaoEntity libaoEntity = mLibaoList.get(position); holder.libaoName.setText(libaoEntity.getName()); - - ImageUtils.display(holder.libaoGameIcon.getIconIv(), libaoEntity.getIcon()); - ImageUtils.display(holder.libaoGameIcon.getIconDecoratorIv(), libaoEntity.getIconSubscript()); + holder.libaoGameIcon.displayGameIcon(libaoEntity.getIcon(), libaoEntity.getIconSubscript()); if (TextUtils.isEmpty(libaoEntity.getPlatform())) { holder.libaoGameName.setText(libaoEntity.getGame().getName()); diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index 555104202f..1a8d823c98 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -13,7 +13,6 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder; import com.gh.base.OnRequestCallBackListener; import com.gh.common.constant.ItemViewType; import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.UrlFilterUtils; import com.gh.gamecenter.R; @@ -158,8 +157,7 @@ public class LibaoHistoryAdapter extends BaseRecyclerAdapter { viewHolder.libaoName.setText(libaoEntity.getName()); viewHolder.libaoDes.setText(libaoEntity.getContent()); viewHolder.libaoGameName.setText(libaoEntity.getGame().getName()); - ImageUtils.display(viewHolder.libaoGameIcon.getIconIv(), libaoEntity.getIcon()); - ImageUtils.display(viewHolder.libaoGameIcon.getIconDecoratorIv(), libaoEntity.getIconSubscript()); + viewHolder.libaoGameIcon.displayGameIcon(libaoEntity.getIcon(), libaoEntity.getIconSubscript()); //领取状态 LibaoUtils.setLiBaoBtnStatusRound(viewHolder.libaoBtnStatus diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt index 221e749a65..336ca64f61 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -191,8 +191,7 @@ class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListe holder.libaoGameName.text = StringUtils.buildString(libaoEntity.game?.name, " - ", PlatformUtils.getInstance(mContext) .getPlatformName(libaoEntity.platform)) } - ImageUtils.display(holder.libaoGameIcon.getIconIv(), libaoEntity.getIcon()) - ImageUtils.display(holder.libaoGameIcon.getIconDecoratorIv(), libaoEntity.getIconSubscript()) + holder.libaoGameIcon.displayGameIcon(libaoEntity.getIcon(), libaoEntity.getIconSubscript()) val content: String if (libaoEntity.content!!.contains("
")) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt index 84659ab880..4c37584133 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -204,8 +204,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, holder.libaoGameName.text = StringUtils.buildString(libaoEntity.game?.name, " - ", PlatformUtils.getInstance(mContext) .getPlatformName(libaoEntity.platform)) } - ImageUtils.display(holder.libaoGameIcon.getIconIv(), libaoEntity.getIcon()) - ImageUtils.display(holder.libaoGameIcon.getIconDecoratorIv(), libaoEntity.getIconSubscript()) + holder.libaoGameIcon.displayGameIcon(libaoEntity.getIcon(), libaoEntity.getIconSubscript()) val content: String if (libaoEntity.content!!.contains("
")) { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameAdapter.kt index 63d3c92ff0..a6c29f0491 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameAdapter.kt @@ -22,8 +22,7 @@ class InstalledGameAdapter(mContext: Context, val games: ArrayList) override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { val gameInstall = games[position] holder.itemView.apply { - ImageUtils.display(game_icon.getIconIv(), gameInstall.icon) - ImageUtils.display(game_icon.getIconDecoratorIv(), gameInstall.iconSubScript) + game_icon.displayGameIcon(gameInstall.icon, gameInstall.iconSubScript) game_name.text = gameInstall.name } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/CommunityFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/CommunityFragment.kt index 35f38fb09f..e2fc91fa6f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/CommunityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/CommunityFragment.kt @@ -131,8 +131,7 @@ class CommunityFragment : BaseLazyTabFragment() { || (!status.isActive && !channel.contains("TEST"))) { showCommunitySelectFragment() } else { - ImageUtils.display(mAskSelectCommunity.getIconIv(), UserManager.getInstance().community.icon) - ImageUtils.display(mAskSelectCommunity.getIconDecoratorIv(), UserManager.getInstance().community.iconSubscript) + mAskSelectCommunity.displayGameIcon(UserManager.getInstance().community.icon, UserManager.getInstance().community.iconSubscript) showAvailableInfo() mViewPager.currentItem = INDEX_RECOMMEND diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleSelectGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleSelectGameAdapter.kt index cdf80a1411..8031311d3c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleSelectGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleSelectGameAdapter.kt @@ -5,7 +5,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ProgressBar import com.gh.common.util.CommunityHelper -import com.gh.common.util.ImageUtils import com.gh.common.util.UrlFilterUtils import com.gh.gamecenter.R import com.gh.gamecenter.qa.entity.CommunitySelectEntity @@ -54,8 +53,7 @@ class ArticleSelectGameAdapter(context: Context, loading: ProgressBar, override fun onBindViewHolder(holder: SelectGameViewHolder, position: Int) { val entity = mList[position] - ImageUtils.display(holder.gameIcon.getIconIv(), entity.game.getRawIconIfExisted()) - ImageUtils.display(holder.gameIcon.getIconDecoratorIv(), entity.game.iconSubscript) + holder.gameIcon.displayGameIcon(entity.game.getRawIconIfExisted(), entity.game.iconSubscript) holder.gameName.text = entity.name holder.itemView.setOnClickListener { callback.invoke(entity) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt index 3043e4ce6f..eeb3cc1d14 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt @@ -132,11 +132,8 @@ class OpenedAdapter(context: Context, val mListViewModel: OpenedViewModel) : Lis holder.bind.isSelectLeft = isSelectLeft holder.bind.isSelectRight = isSelectRight - ImageUtils.display(holder.bind.gameIconLeft.getIconIv(), entity.leftData?.game?.getRawIconIfExisted()) - ImageUtils.display(holder.bind.gameIconLeft.getIconDecoratorIv(), entity.leftData?.game?.iconSubscript) - - ImageUtils.display(holder.bind.gameIconRight.getIconIv(), entity.rightData?.game?.getRawIconIfExisted()) - ImageUtils.display(holder.bind.gameIconRight.getIconDecoratorIv(), entity.rightData?.game?.iconSubscript) + holder.bind.gameIconLeft.displayGameIcon(entity.leftData?.game?.getRawIconIfExisted(), entity.leftData?.game?.iconSubscript) + holder.bind.gameIconRight.displayGameIcon(entity.rightData?.game?.getRawIconIfExisted(), entity.rightData?.game?.iconSubscript) if (isSelectLeft) { holder.bind.communityNameLeft.setTextColor(R.color.theme_font.toColor()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java index e38f73c927..5bafb8b1a5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java @@ -14,7 +14,6 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import com.gh.common.util.BitmapUtils; -import com.gh.common.util.ImageUtils; import com.gh.common.util.UrlFilterUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.GameInstall; @@ -171,12 +170,12 @@ public class SelectGameDialogAdapter extends BaseRecyclerAdapter { AskSelectGameItemViewHolder bodyHolder = (AskSelectGameItemViewHolder) holder; entity = mEntityList.get(position - TOP_ITEM_COUNT); CommunitiesGameEntity game = entity.getGame(); - ImageUtils.display(bodyHolder.mIcon.getIconIv(), game.getRawIconIfExisted()); - ImageUtils.display(bodyHolder.mIcon.getIconDecoratorIv(), game.getIconSubscript()); + bodyHolder.mIcon.displayGameIcon(game.getRawIconIfExisted(), game.getIconSubscript()); bodyHolder.setClickData(entity); bodyHolder.mName.setText(game.getName()); bodyHolder.mVotecount.setText(entity.getVote() + "票"); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultHotAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultHotAdapter.kt index 717c19bd31..422d1ad88c 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultHotAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultHotAdapter.kt @@ -29,8 +29,7 @@ class SearchDefaultHotAdapter(context: Context, holder.binding.run { entity = hotSearch - ImageUtils.display(icon.getIconIv(), hotSearch.rawIcon ?: hotSearch.icon) - ImageUtils.display(icon.getIconDecoratorIv(), hotSearch.iconSubscript) + icon.displayGameIcon(hotSearch.rawIcon ?: hotSearch.icon, hotSearch.iconSubscript) index.text = (position + 1).toString() when (position) { diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java index 91c830ecbc..1d5d57c863 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java @@ -108,6 +108,7 @@ public class SuggestSelectGameAdapter extends BaseRecyclerAdapter listener.loadDone(installGameEntity)); diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt index fda6dc8c1f..ac466087bd 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt @@ -189,8 +189,7 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib likeCountTv.text = videoEntity.vote.toString() commentCountTv.text = videoEntity.commentCount.toString() - ImageUtils.display(gameIconView.getIconIv(), videoEntity.game?.rawIcon ?: videoEntity.gameIcon) - ImageUtils.display(gameIconView.getIconDecoratorIv(), videoEntity.game?.iconSubscript) + gameIconView.displayGameIcon(videoEntity.game?.rawIcon ?: videoEntity.gameIcon, videoEntity.game?.iconSubscript) ImageUtils.display(userIconIv, videoEntity.user.icon) usernameTv.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt index f8da8d1120..9363532e9c 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt @@ -66,8 +66,7 @@ class GameVideoActivity : ToolBarActivity() { mViewModel = ViewModelProviders.of(this, factory).get(GameVideoViewModel::class.java) mViewModel.gameViewInfo.observeNonNull(this, callback = { if (it.status == Status.SUCCESS) { - ImageUtils.display(mBinding.gameIcon.getIconIv(), it.data?.game?.getIcon() ?: it.data?.gameIcon) - ImageUtils.display(mBinding.gameIcon.getIconDecoratorIv(), it.data?.game?.iconSubscript) + mBinding.gameIcon.displayGameIcon(it.data?.game?.getIcon() ?: it.data?.gameIcon, it.data?.game?.iconSubscript) mBinding.gameName.text = it.data?.gameName mBinding.likeCount.text = NumberUtils.transSimpleCount(it.data?.likeCount ?: 0) mBinding.videoCount.text = NumberUtils.transSimpleCount(it.data?.videoCount ?: 0)