1:修改道具商城，当没有banner的时候，出现报错的问题

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?>?) {

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>

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"