diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PropMallActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PropMallActivity.kt index 77f64114..3745c10a 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PropMallActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PropMallActivity.kt @@ -170,7 +170,12 @@ class PropMallActivity : BaseMvpActivity?) { - mBinding.banner.setBannerData(R.layout.index_image_banner, bannerModels!!) + if (bannerModels!=null) { + mBinding.banner.visibility= View.VISIBLE + mBinding.banner.setBannerData(R.layout.index_image_banner, bannerModels!!) + }else{ + mBinding.banner.visibility= View.GONE + } } override fun getPersonaltyListBean(personaltyListBeans: List?) { diff --git a/MainModule/src/main/res/layout/activity_prop_mall.xml b/MainModule/src/main/res/layout/activity_prop_mall.xml index d8c3806d..ca80b5a6 100644 --- a/MainModule/src/main/res/layout/activity_prop_mall.xml +++ b/MainModule/src/main/res/layout/activity_prop_mall.xml @@ -22,8 +22,8 @@ android:paddingLeft="16dp" android:paddingTop="@dimen/dp_10" android:paddingRight="16dp" - app:layout_scrollFlags="scroll|enterAlways"> - + app:layout_scrollFlags="exitUntilCollapsed" + > diff --git a/MainModule/src/main/res/layout/item_personalty.xml b/MainModule/src/main/res/layout/item_personalty.xml index 1e204461..d9a18d4b 100644 --- a/MainModule/src/main/res/layout/item_personalty.xml +++ b/MainModule/src/main/res/layout/item_personalty.xml @@ -5,6 +5,7 @@ android:id="@+id/zb_bg_ll" android:layout_width="@dimen/dp_87" android:layout_height="@dimen/dp_142" + android:layout_marginBottom="@dimen/dp_10" android:background="@mipmap/room_gift_bjx" android:orientation="vertical" > @@ -40,6 +41,12 @@ android:textColor="@color/color_FF333333" android:textSize="13sp" android:textStyle="bold" + android:maxLines="1" + android:ellipsize="marquee" + android:marqueeRepeatLimit="marquee_forever" + android:focusable="true" + android:focusableInTouchMode="true" + android:singleLine="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/iv_img"