diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt index d9e8fd926e..5bfa594c6c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt @@ -127,7 +127,7 @@ class FuLiFragment : BaseFragment() { val lastVisibleItemPosition = layoutManager!!.findLastVisibleItemPosition() if (lastVisibleItemPosition >= getServerPosition()) { indexHeight += dy - if (DisplayUtils.px2dip(context!!, indexHeight.toFloat()) >= 45) { + if (DisplayUtils.px2dip(context!!, indexHeight.toFloat()) >= 20) { EventBus.getDefault().post(EBReuse("hideKaifuHint")) } else { EventBus.getDefault().post(EBReuse("showKaifuHint")) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt index 0fa49e07e9..5eee7f8a34 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt @@ -172,6 +172,7 @@ class FuLiViewModel(application: Application, fun transformationItemData() { val itemList = ArrayList() var isExistServer = false + var index = 0 if (gameDetail.notice != null && gameDetail.notice!!.isNotEmpty()) { val fuLiData = FuLiItemData() fuLiData.notice = gameDetail.notice @@ -181,6 +182,7 @@ class FuLiViewModel(application: Application, val fuLiData = FuLiItemData() fuLiData.article = mArticleList itemList.add(fuLiData) + index++ } val contact = gameDetail.contact if (!TextUtils.isEmpty(gameDetail.fulishuoming) @@ -189,16 +191,19 @@ class FuLiViewModel(application: Application, val fuLiData = FuLiItemData() fuLiData.fuLiDesc = gameDetail.contact itemList.add(fuLiData) + index++ } if (mToolsList != null) { val fuLiData = FuLiItemData() fuLiData.tools = mToolsList itemList.add(fuLiData) + index++ } if (mLiBaoList != null) { val fuLiData = FuLiItemData() fuLiData.libao = mLiBaoList itemList.add(fuLiData) + index++ } if (checkServerData()) { val fuLiData = FuLiItemData() @@ -214,7 +219,7 @@ class FuLiViewModel(application: Application, fuFiDataLD.postValue(itemList) - if (itemList.size > 2 && isExistServer) EventBus.getDefault().post(EBReuse("canShowKaifuHint")) + if (index >= 2 && isExistServer) EventBus.getDefault().post(EBReuse("canShowKaifuHint")) } // 检查开服信息, 防止开服信息都是上一个月以前的,造成开服日历空白的问题 diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java index 865031e2b1..e86299177d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java @@ -301,7 +301,7 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { public void onComplete() { ViewGroup.LayoutParams params = mBinding.kaifuRl.getLayoutParams(); params.height = ((mCurDayData.size() / 7) - 1) * DisplayUtils.dip2px(mContext, 45) - + DisplayUtils.dip2px(mContext, 25.5F); + + DisplayUtils.dip2px(mContext, 26); mBinding.kaifuRl.setLayoutParams(params); notifyDataSetChanged(); }