From 65928255f26522850378da9d83326c48903d0b5d Mon Sep 17 00:00:00 2001
From: wlh <646507849@qq.com>
Date: Thu, 29 Feb 2024 11:07:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BA=8C=E6=9C=9F?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91-bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zj365/dc/adapter/HomeTopLayoutAdapter.kt     |  4 ++--
 .../com/zj365/dc/adapter/shop/ShopCategoryAdapter.kt | 12 +++++++++---
 app/src/main/res/layout/item_shop_categroy.xml       |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt b/app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt
index c97c311..7c6d8b0 100644
--- a/app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt
+++ b/app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt
@@ -19,11 +19,11 @@ class HomeTopLayoutAdapter(var mContext: Context): BaseAdapter<HomeLayoutBean.Ho
 
         var screenWidth = context.resources.displayMetrics.widthPixels
         val layoutParam = holder.getView<LinearLayout>(R.id.root).layoutParams
-        if (data.size < 4){
+        if (data.size <= 4){
             layoutParam.width = screenWidth /4
 
         }else{
-            layoutParam.width = screenWidth /data.size
+            layoutParam.width = screenWidth /5
 
         }
 
diff --git a/app/src/main/java/com/zj365/dc/adapter/shop/ShopCategoryAdapter.kt b/app/src/main/java/com/zj365/dc/adapter/shop/ShopCategoryAdapter.kt
index 87da7ff..4583e45 100644
--- a/app/src/main/java/com/zj365/dc/adapter/shop/ShopCategoryAdapter.kt
+++ b/app/src/main/java/com/zj365/dc/adapter/shop/ShopCategoryAdapter.kt
@@ -30,10 +30,16 @@ class ShopCategoryAdapter : BaseAdapter<ShopCategoryBean>(R.layout.item_shop_cat
             categoryName.setTextColor(context.getColor(R.color.col_313))
 
         }
-        item.pic?.let {
-            img.setImage(context,it)
+        img.setImage(context,item.pic)
+        /*if (item.pic == null){
+
+        }else{
+            item.pic?.let {
+                img.setImage(context,it)
+
+            }
+        }*/
 
-        }
         holder.setText(R.id.tv_category,item.categoryName)
 
     }
diff --git a/app/src/main/res/layout/item_shop_categroy.xml b/app/src/main/res/layout/item_shop_categroy.xml
index 0b353bb..dd0e7c0 100644
--- a/app/src/main/res/layout/item_shop_categroy.xml
+++ b/app/src/main/res/layout/item_shop_categroy.xml
@@ -13,7 +13,7 @@
         android:id="@+id/img_category"
         android:layout_width="@dimen/dp_47"
         android:layout_height="@dimen/dp_47"
-        android:background="@mipmap/icon_default_avator"
+
         app:is_circle="true"
         app:border_color="@color/white"
         android:scaleType="centerCrop"