Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-GHZS-277' into 'dev-5.16.0'

Browse Source 
fix: 【V5.16.0】猜你喜欢-发现页优化—1118UI测试 https://jira.shanqu.cc/browse/GHZS-277

See merge request halo/android/assistant-android!450
This commit is contained in:
张玉久
2022-11-21 11:55:01 +08:00
parent c70f1aa267 ba1a7d874f
commit ecbdbf57db
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt
View File

@ -267,7 +267,7 @@ class DiscoveryFragment : LazyListFragment<DiscoveryItemData, DiscoveryViewModel
}
binding.contentView.visibility = View.INVISIBLE
binding.contentView.post {
val (windowPosition, isNeedShowUp) = getWindowPosition(view, binding.contentView, 32F.dip2px())
val (windowPosition, isNeedShowUp) = getWindowPosition(view, binding.contentView, 36F.dip2px())
(binding.contentView.layoutParams as RelativeLayout.LayoutParams).run {
topMargin = windowPosition[1]
binding.contentView.layoutParams = this
@ -280,11 +280,13 @@ class DiscoveryFragment : LazyListFragment<DiscoveryItemData, DiscoveryViewModel
private fun getPopupItem(reason: String): TextView {
return TextView(requireContext()).apply {
height = 32F.dip2px()
text = reason
textSize = 12F
includeFontPadding = false
setTextColor(R.color.text_subtitle.toColor(requireContext()))
setPadding(12F.dip2px(), 10F.dip2px(), 12F.dip2px(), 10F.dip2px())
gravity = Gravity.CENTER
setPadding(12F.dip2px(), 0F.dip2px(), 12F.dip2px(), 0F.dip2px())
background = R.drawable.bg_shape_space_radius_8.toDrawable(requireContext())
}
}

2
module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java
View File

@ -398,7 +398,7 @@ public class Constants {
public static final int DATA_AMOUNT = 20;
public static final String[] REPORT_LIST = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其他原因"};
public static final String[] FEEDBACK_REASON_LIST = new String[]{"重复推荐", "不感兴趣", "游戏太旧", "已经玩过了", "游戏质量差", "与推荐描述不符"};
public static final String[] FEEDBACK_REASON_LIST = new String[]{"重复推荐", "不感兴趣", "与推荐描述不符", "已经玩过了", "游戏质量差", "游戏太旧"};
public static final String ENTRANCE_UNKNOWN = "(unknown)";