From 688dc3bc3d25b6df870e20fd53feb7a78ac72ed9 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 1 Apr 2024 10:40:17 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=8E=BB=E6=8E=89=E8=B4=B5?= =?UTF-8?q?=E6=97=8F=E8=BF=94=E5=88=A9=E5=88=97=E8=A1=A8=E7=9A=84=E6=B3=A2?= =?UTF-8?q?=E7=BA=B9=E5=8A=A8=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt | 1 + app/src/module_labour_union/res/layout/activity_vip_main.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt index c072d7edf..e6a368e35 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt @@ -489,6 +489,7 @@ class VipMainActivity : BaseViewBindingActivity(), rebateAdapter.onGetListener = { vipViewModel.getVipRebate(it) } + binding.rvRebate.isNestedScrollingEnabled = false binding.rvRebate.adapter = rebateAdapter } diff --git a/app/src/module_labour_union/res/layout/activity_vip_main.xml b/app/src/module_labour_union/res/layout/activity_vip_main.xml index 2e689fa87..fa6bf849d 100644 --- a/app/src/module_labour_union/res/layout/activity_vip_main.xml +++ b/app/src/module_labour_union/res/layout/activity_vip_main.xml @@ -275,6 +275,8 @@ android:minHeight="@dimen/dp_20" android:layout_height="wrap_content" android:orientation="vertical" + android:overScrollMode="never" + android:scrollbars="none" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constraintEnd_toEndOf="@id/tv_table_column_rebate_operation" app:layout_constraintStart_toStartOf="@id/tv_table_column_rebate_date"