From e3668c1b8d71267633fa2876af39f3d88c460dce Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Wed, 31 Aug 2022 21:33:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=8F=90=E7=A4=BA=E5=BC=82=E5=B8=B8=E5=87=BA?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tieba/post/adapters/OKSignProgressAdapter.kt | 3 ++- .../tieba/post/fragments/MainForumListFragment.kt | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/OKSignProgressAdapter.kt b/app/src/main/java/com/huanchengfly/tieba/post/adapters/OKSignProgressAdapter.kt index 7305c4fa..8fcaf6be 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/OKSignProgressAdapter.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/OKSignProgressAdapter.kt @@ -4,6 +4,7 @@ import android.content.Context import android.util.Log import android.view.ViewGroup import androidx.work.Data +import androidx.work.hasKeyWithValueOfType import com.alibaba.android.vlayout.DelegateAdapter import com.alibaba.android.vlayout.LayoutHelper import com.alibaba.android.vlayout.layout.SingleLayoutHelper @@ -42,7 +43,7 @@ class OKSignProgressAdapter( override fun onBindViewHolder(holder: MyViewHolder, position: Int) { Log.i("OKSignProgressAdapter", "${holder.itemView}") data.let { - if (it == null || closed) { + if (it == null || !it.hasKeyWithValueOfType(DATA_SUCCESS) || closed) { holder.setVisibility(R.id.oksign_progress, false) return@let } diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/MainForumListFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/MainForumListFragment.kt index 59634bd3..f1fcb949 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/MainForumListFragment.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/MainForumListFragment.kt @@ -198,9 +198,14 @@ class MainForumListFragment : BaseFragment(), Refreshable, Toolbar.OnMenuItemCli appPreferences.oksignWorkId = id.toString() okSignProgressAdapter.data = null okSignProgressAdapter.closed = false - } else { - okSignProgressData = workInfo.progress } + val progressData = workInfo.progress + okSignProgressData = + if (progressData.hasKeyWithValueOfType(DATA_SUCCESS)) { + progressData + } else { + null + } val workInfoLiveData = WorkManager.getInstance(attachContext).getWorkInfoByIdLiveData(id) workInfoLiveData.observe(viewLifecycleOwner) {