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(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(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"