Merge branch 'fix-GHZS-1251' into 'dev'

fix: 新增[图标浮层]功能-0214测试(3) https://jira.shanqu.cc/browse/GHZS-1251

See merge request halo/android/assistant-android!707
This commit is contained in:
叶子维
2023-02-14 16:10:24 +08:00

View File

@ -132,13 +132,11 @@ class GameIconView : FrameLayout {
}
mGameIconIv?.display(icon)
mGameIconDecorationIv?.display(iconSubscript, true)
if (iconFloat == null || (iconFloat.upperLeftText.isEmpty() && iconFloat.bottomText.isEmpty())) {
mGameIconDecorationIv?.visibility = View.VISIBLE
mTopLabelContainer?.visibility = View.GONE
mBottomLabelTv?.visibility = View.GONE
mGameIconDecorationIv?.display(iconSubscript, true)
} else {
mGameIconDecorationIv?.visibility = View.GONE
if (iconFloat.upperLeftText.isNotEmpty() && iconFloat.upperLeftColor.isNotEmpty()) {
mTopLabelContainer?.visibility = View.VISIBLE
mTopLabelTv?.text = iconFloat.upperLeftText