From be882c861fe47e6e320d762dee8464a54e85d691 Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 29 Jul 2022 11:02:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E6=89=AE=E5=95=86=E5=9F=8E=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=85=85=E5=80=BC=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/DecorationCommonFragment.kt | 4 ++ .../view/DecorationStoreActivity.kt | 37 ++++++++---- .../yizhuan/erban/home/fragment/MeFragment.kt | 5 +- .../res/layout/activity_decoration_store.xml | 60 ++++++++++++++++--- .../res/layout/item_decoration_common.xml | 4 +- .../decoration/DecorationModel.kt | 2 +- 6 files changed, 90 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt index 9808aa890..cfb6562cd 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt @@ -52,6 +52,7 @@ class DecorationCommonFragment : BaseViewBindingFragment() .setAdapter(decorationAdapter) .setRecyclerView(binding.recyclerView) + .setRefreshLayout(binding.swipeRefresh) .setEmptyView(EmptyViewHelper.createEmptyView(mContext, "暂无装扮")) .setLayoutManager( if (dressType == DecorationStoreActivity.TAB_USER_CARD) { @@ -61,6 +62,9 @@ class DecorationCommonFragment : BaseViewBindingFragment(), @@ -47,6 +54,7 @@ class DecorationStoreActivity : BaseViewBindingActivity = ArrayList(5) @@ -90,15 +102,6 @@ class DecorationStoreActivity : BaseViewBindingActivity(R.id.car_badge_garage).visibility = - View.GONE - } - } - }) viewPager.currentItem = mPosition } @@ -106,6 +109,12 @@ class DecorationStoreActivity : BaseViewBindingActivity - + android:background="@color/bg_normal_1c1b22" + android:orientation="vertical"> + android:layout_height="0dp" + android:layout_weight="1" /> - + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_decoration_common.xml b/app/src/main/res/layout/item_decoration_common.xml index 7d7c12e14..b8e479250 100644 --- a/app/src/main/res/layout/item_decoration_common.xml +++ b/app/src/main/res/layout/item_decoration_common.xml @@ -22,7 +22,9 @@