From 79cbb44d51fdd43b4e183d6077ff3d79bfbbd1ec Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Wed, 3 Jun 2020 16:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E6=B5=AE=E7=AA=97=E6=B6=88=E5=A4=B1=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20https://gitlab.ghzs.com/pm/halo-app-issues/-/issues?= =?UTF-8?q?/878?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt | 7 ++++--- .../com/gh/gamecenter/gamedetail/entity/DetailEntity.kt | 3 +-- app/src/main/res/layout/gamedetail_item_custom_column.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt index e624da746f..8fdbc95bf7 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt @@ -138,13 +138,15 @@ class DescFragment : BaseFragment() { if (i < 0) continue if (mAdapter.getItemViewType(i) == DescAdapter.CUSTOM_COLUMN - && mAdapter.descItemList.get(i).customColumn?.showExpandTagsHint == true) { + && mAdapter.descItemList[i].customColumn?.showExpandTagsHint == true) { + // 触发了一次完整可见不需等待是否满足三秒，下次进入不再显示 + SPUtils.setBoolean(Constants.SP_HAS_SHOWN_EXPANDED_GAME_DETAIL_TAGS_HINT, true) + // 可视三秒后隐藏自定义栏目的标签展开浮窗提示 mDisplayHintDisposable?.dispose() mDisplayHintDisposable = countDownTimer(3L) { isFinish, _ -> if (isFinish && activity?.isFinishing != true && isThisPositionVisible(i)) { tryWithDefaultCatch { - SPUtils.setBoolean(Constants.SP_HAS_SHOWN_EXPANDED_GAME_DETAIL_TAGS_HINT, true) mAdapter.descItemList[i].customColumn?.showExpandTagsHint = false mAdapter.notifyItemChanged(i) } @@ -191,5 +193,4 @@ class DescFragment : BaseFragment() { } } - } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/DetailEntity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/DetailEntity.kt index ec1997ae7c..8a0479c206 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/DetailEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/DetailEntity.kt @@ -99,8 +99,7 @@ data class CustomColumn( var infoTag: List? = listOf(), var time: Long? = 0, // 是否显示自定义栏目的提示浮窗 (本地字段) - var showExpandTagsHint: Boolean? = false - ) + var showExpandTagsHint: Boolean? = false) @Keep data class Title(var icon: String, var value: String, var color: String) diff --git a/app/src/main/res/layout/gamedetail_item_custom_column.xml b/app/src/main/res/layout/gamedetail_item_custom_column.xml index 8836342b47..6677d79d3f 100644 --- a/app/src/main/res/layout/gamedetail_item_custom_column.xml +++ b/app/src/main/res/layout/gamedetail_item_custom_column.xml @@ -256,7 +256,7 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_marginTop="12dp" - android:text="点击展开更多" + android:text="点击查看说明" android:textColor="@color/white" android:textSize="12sp" />