From 43ea35d3a232829707ca95d7f2b7ed0f21e5c5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Sun, 4 Jan 2026 18:38:48 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E9=81=93=E5=85=B7=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=EF=BC=8C=E5=BD=93=E6=B2=A1=E6=9C=89banner=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E5=87=BA=E7=8E=B0=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modulemain/activity/user/activity/PropMallActivity.kt  | 7 ++++++-
 MainModule/src/main/res/layout/activity_prop_mall.xml      | 7 ++++---
 MainModule/src/main/res/layout/item_personalty.xml         | 7 +++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

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<PersonalityPresenter, ActivityPropMallB
     }
 
     override fun setBanners(bannerModels: List<BannerModel?>?) {
-        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<PersonaltyListBean?>?) {
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"
+                >
                 <com.xscm.moduleutil.widget.CustomTopBar
                     android:id="@+id/top_bar"
                     android:layout_width="match_parent"
@@ -37,10 +37,11 @@
                     android:layout_marginTop="@dimen/dp_12"
                     app:AutoPlayTime="3000"
                     app:isAutoPlay="true"
+                    app:layout_constraintTop_toBottomOf="@+id/top_bar"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/top_bar"
+
                     app:pointsVisibility="false" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
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"