From c8e32fd968d8cd466ef0bb72fa6c8efc10e690f5 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Thu, 22 Nov 2018 19:17:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=B8=B8=E6=88=8F=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=BC=80=E6=9C=8D=E6=A0=87=E7=AD=BE=E7=9A=84=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/game/GameFragmentAdapter.kt | 2 +- .../gh/gamecenter/game/GameItemViewHolder.kt | 37 ++++++------------- .../SearchGameDetailFragmentAdapter.java | 2 +- .../search/SearchGameListFragmentAdapter.java | 2 +- .../gh/gamecenter/subject/SubjectAdapter.kt | 2 +- .../fragment/game/GamePluginAdapter.java | 2 +- app/src/main/res/layout/game_item.xml | 19 +++++----- 7 files changed, 25 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index 31e56cdd63..12348fa8ee 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -181,7 +181,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName: } holder.binding.game = gameEntity holder.binding.subjectTag = subjectData?.tag - holder.initServerType(gameEntity, mContext) + holder.initServerType(gameEntity!!) holder.binding.executePendingBindings() if (subjectData?.isOrder!!) { diff --git a/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt index 9893c4cfbf..5b48fef62c 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt @@ -1,10 +1,8 @@ package com.gh.gamecenter.game -import android.content.Context import android.text.TextUtils import android.view.View import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.DisplayUtils import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameItemBinding import com.gh.gamecenter.entity.GameEntity @@ -13,41 +11,28 @@ class GameItemViewHolder(bind: GameItemBinding) : BaseRecyclerViewHolder(bi var binding = bind - fun initServerType(gameEntity: GameEntity?, context: Context) { - if (gameEntity == null) return - var paddRight = 0 + fun initServerType(gameEntity: GameEntity) { val serverRemark = gameEntity.serverRemark if (gameEntity.test != null) { - binding.gameKaifuType.setVisibility(View.GONE) + binding.gameKaifuType.visibility = View.GONE + binding.gameKaifuType.text = "" } else if (TextUtils.isEmpty(serverRemark)) { val serverGenre = gameEntity.serverGenre if (TextUtils.isEmpty(serverGenre)) { - binding.gameKaifuType.setVisibility(View.GONE) + binding.gameKaifuType.visibility = View.GONE + binding.gameKaifuType.text = "" } else { - binding.gameKaifuType.setVisibility(View.VISIBLE) - binding.gameKaifuType.setText(serverGenre) + binding.gameKaifuType.visibility = View.VISIBLE + binding.gameKaifuType.text = serverGenre binding.gameKaifuType.setBackgroundResource(R.drawable.textview_yellow_bg) - val i: Int - if (serverGenre!!.length <= 2) - i = 30 - else if (serverGenre.length <= 4) - i = 50 - else - i = 60 - paddRight = DisplayUtils.dip2px(context!!, i.toFloat()) } } else { - binding.gameKaifuType.setVisibility(View.VISIBLE) - binding.gameKaifuType.setText(serverRemark) + binding.gameKaifuType.visibility = View.VISIBLE + binding.gameKaifuType.text = serverRemark binding.gameKaifuType.setBackgroundResource(R.drawable.textview_orange_up) - val i: Float = when { - serverRemark!!.length <= 2 -> 30F - serverRemark.length <= 4 -> 50F - else -> 60F - } - paddRight = DisplayUtils.dip2px(context, i) } - binding.gameName.setPadding(0, 0, paddRight, 0) + + binding.gameName.requestLayout() } } \ No newline at end of file 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 0443863abb..030e7b5482 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -138,7 +138,7 @@ class SearchGameDetailFragmentAdapter extends BaseRecyclerAdapter { final GameItemBinding binding = gameItemViewHolder.getBinding(); final GameEntity gameEntity = gameList.get(position); binding.setGame(gameEntity); - gameItemViewHolder.initServerType(gameEntity, mContext); + gameItemViewHolder.initServerType(gameEntity); binding.getRoot().setOnClickListener(v -> { if (searchMap.get(gameEntity.getId()) == null) { EventBus.getDefault().post(new EBSearch("search", gameEntity.getId(), gameEntity.getName())); 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 30e3a08e23..8231ba5058 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -154,7 +154,7 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter { final GameItemViewHolder viewHolder = (GameItemViewHolder) holder; GameItemBinding binding = viewHolder.getBinding(); binding.setGame(gameEntity); - viewHolder.initServerType(gameEntity, mContext); + viewHolder.initServerType(gameEntity); holder.itemView.setOnClickListener(v -> { if (searchMap.get(gameEntity.getId()) == null) { diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.kt index 90c0432edf..77cc01f2ba 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.kt @@ -89,7 +89,7 @@ class SubjectAdapter(context: Context, holder.binding.game = gameEntity holder.binding.subjectTag = subjectData.tagType - holder.initServerType(gameEntity, mContext) + holder.initServerType(gameEntity) holder.binding.executePendingBindings() if (subjectData.isOrder!!) { diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java index 20845a25fd..75143ca0ec 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java @@ -48,7 +48,7 @@ public class GamePluginAdapter extends BaseRecyclerAdapter { private void initGameNormalViewHolder(GameItemViewHolder holder, int position) { final GameEntity gameEntity = mPluginList.get(position); - holder.initServerType(gameEntity, mContext); + holder.initServerType(gameEntity); GameItemBinding binding = holder.getBinding(); binding.setGame(gameEntity); binding.setIsShowPlatform(true); diff --git a/app/src/main/res/layout/game_item.xml b/app/src/main/res/layout/game_item.xml index 49e1c24f47..225d5f0e53 100644 --- a/app/src/main/res/layout/game_item.xml +++ b/app/src/main/res/layout/game_item.xml @@ -39,7 +39,6 @@ android:maxLength = "3" android:textColor = "@color/title" android:textSize = "15sp" - android:text="1" android:visibility = "visible" /> - + android:layout_width = "wrap_content" + android:layout_height = "wrap_content" + android:gravity = "center_vertical" > - +