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 bb165a6414..72d4fc7b10 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -780,6 +780,34 @@ public class BindingAdapters { } } + @BindingAdapter("setVideoDetailGameTags") + public static void setVideoDetailGameTags(LinearLayout layout, GameEntity gameEntity) { + try { + ArrayList tagStyle = new ArrayList<>(); + TestEntity test = gameEntity.getTest(); + if (test != null + // 这个判断用于开测表列表 + && !"type_tag".equals(test.getGameTag())) { + TagStyleEntity typeTag = new TagStyleEntity(); + typeTag.setName(test.getType() != null ? test.getType() : ""); + typeTag.setBackground("FFF3E0"); + typeTag.setColor("FA8500"); + tagStyle.add(typeTag); + + TagStyleEntity timeTag = new TagStyleEntity(); + timeTag.setName(GameViewUtils.getGameTestDate(test.getStart())); + timeTag.setBackground("E0FFF9"); + timeTag.setColor("00A887"); + tagStyle.add(timeTag); + } else { + tagStyle = gameEntity.getTagStyle(); + } + GameViewUtils.setLabelList(layout.getContext(), layout, tagStyle, 4); + } catch (Exception e) { + e.printStackTrace(); + } + } + @BindingAdapter("isRefreshing") public static void isRefreshing(SwipeRefreshLayout layout, LoadStatus status) { if (status != LoadStatus.INIT_LOADING && status != LoadStatus.LIST_LOADING) { diff --git a/app/src/main/java/com/gh/common/util/GameViewUtils.java b/app/src/main/java/com/gh/common/util/GameViewUtils.java index 7524a0cfac..e13ff8960c 100644 --- a/app/src/main/java/com/gh/common/util/GameViewUtils.java +++ b/app/src/main/java/com/gh/common/util/GameViewUtils.java @@ -34,6 +34,10 @@ import java.util.TimeZone; public class GameViewUtils { public static void setLabelList(Context context, LinearLayout labelLayout, List tagStyle) { + setLabelList(context, labelLayout, tagStyle, 8); + } + + public static void setLabelList(Context context, LinearLayout labelLayout, List tagStyle, int margin) { labelLayout.removeAllViews(); if (tagStyle == null || tagStyle.isEmpty()) { // 没有数据的话默认不显示 @@ -42,7 +46,7 @@ public class GameViewUtils { // labelLayout.addView(getNewGameTagView(context, tagEntity, 0)); } else { for (int i = 0, size = tagStyle.size(); i < size; i++) { - View view = getNewGameTagView(context, tagStyle.get(i), i == size - 1 ? 0 : DisplayUtils.dip2px(context, 8)); + View view = getNewGameTagView(context, tagStyle.get(i), i == size - 1 ? 0 : DisplayUtils.dip2px(context, margin)); labelLayout.addView(view); if (labelLayout.getChildCount() == 3) { break; diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt index 39806a7cb9..f723c3643f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt @@ -239,22 +239,7 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { mBinding.gameIconView.displayGameIcon(gameEntity) mBinding.gameNameTv.text = gameEntity.name mBinding.gameScoreTv.text = gameEntity.star.toString() - - mBaseHandler.postDelayed({ - mBinding.gameTagsContainer.setTags(gameEntity.tagStyle) - }, 5) - mBinding.gameTagsContainer.onClickListener = object : FlexLinearLayout.OnItemClickListener { - override fun onMoreClickListener() { - if (!isVisible) return - GameTagsDialog.showGameTagsDialog(requireActivity(), gameEntity.tagStyle, gameEntity.id, gameEntity.name - ?: "") - } - - override fun onItemClickListener(tag: TagStyleEntity) { - requireContext().startActivity(TagsActivity.getIntent(requireContext(), - tag.name, tag.name, mEntrance, "视频详情")) - } - } + mBinding.game = gameEntity mBinding.gameInfoContainer.setOnClickListener { GameDetailActivity.startGameDetailActivity(requireContext(), gameEntity, "视频详情") } diff --git a/app/src/main/res/layout/fragment_forum_video_detail.xml b/app/src/main/res/layout/fragment_forum_video_detail.xml index c92ab05c37..0c19cf15ec 100644 --- a/app/src/main/res/layout/fragment_forum_video_detail.xml +++ b/app/src/main/res/layout/fragment_forum_video_detail.xml @@ -1,256 +1,261 @@ - + - + + + + + + android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fitsSystemWindows="true" + android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_height="56dp" + android:layout_alignParentBottom="true" + android:background="@color/white" + android:clickable="true" + android:focusable="true" + android:visibility="gone" + tools:visibility="visible"> - + - + - + - + - + - - - - - - \ No newline at end of file + + + \ No newline at end of file