优化体验

app/build.gradle

@@ -102,7 +102,7 @@ dependencies {
 
     // 圆角图片
     //implementation 'de.hdodenhof:circleimageview:3.1.0'
-    //implementation 'com.makeramen:roundedimageview:2.3.0'
+    implementation 'com.makeramen:roundedimageview:2.3.0'
 
     // 文字对齐
     //implementation 'me.codeboy.android:align-text-view:2.3.2'

app/src/main/java/com/itant/shibei/constant/ConstantString.java

@@ -9,7 +9,7 @@ package com.itant.shibei.constant;
  */
 public interface ConstantString {
     String MONEY_RMB = "¥%s";
-    String SALES_PER_MONTH = "月销 %s";
+    String COMMENT_NUM = "评论 %s";
     String GOOD_COMMENT = "%s%%";
     String MONEY_GAME = "¥%s";
     String WELCOME_HELLO = "%s好，%s";

app/src/main/java/com/itant/shibei/tool/DataTool.java

@@ -87,6 +87,7 @@ public class DataTool {
         goodsBean.salesPerMonth = 1022;
         goodsBean.goodCommentPercent = 0.97d;
         goodsBean.isLocal = true;
+        goodsBean.enable = true;
         goodsList.add(goodsBean);
         return goodsList;
     }

app/src/main/java/com/itant/shibei/tool/StringTool.java

@@ -42,4 +42,20 @@ public class StringTool {
         BigDecimal yuanDecimal = centDecimal.divide(exchangeNum, 2, RoundingMode.UNNECESSARY);
         return yuanDecimal.toPlainString();
     }
+
+    public static String getNumberString(long number) {
+        if (number > 100000) {
+            return "10w+";
+        }
+
+        if (number > 10000) {
+            return "1w+";
+        }
+
+        if (number > 1000) {
+            return "1k+";
+        }
+
+        return String.valueOf(number);
+    }
 }

app/src/main/java/com/itant/shibei/ui/home/coupon/TemplateAdapter.java

@@ -70,6 +70,10 @@ public class TemplateAdapter extends BaseQuickAdapter<CouponBean, BaseViewHolder
                         public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
                             //iv_template.setScaleType(ImageView.ScaleType.CENTER_CROP);
                             //iv_template.setImageDrawable(resource);
+                            if (resource == null) {
+                                iv_template.setImageResource(R.mipmap.logo_gray);
+                                return;
+                            }
 
                             String coverUrl = null;
                             try {

app/src/main/java/com/itant/shibei/ui/home/goods/GoodsAdapter.java

@@ -11,7 +11,6 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatImageView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
@@ -25,6 +24,7 @@ import com.itant.shibei.base.ItemLongClickListener;
 import com.itant.shibei.constant.ConstantString;
 import com.itant.shibei.manager.UserInfoManager;
 import com.itant.shibei.tool.StringTool;
+import com.makeramen.roundedimageview.RoundedImageView;
 import com.miekir.common.utils.ActivityTool;
 import com.miekir.common.utils.ToastTool;
 
@@ -56,9 +56,9 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
         holder.setText(R.id.tv_good_comment,
                 String.format(ConstantString.GOOD_COMMENT, Math.round(goodsBean.goodCommentPercent*100)));
 
-        // 月销
-        holder.setText(R.id.tv_sales_per_month,
-                String.format(ConstantString.SALES_PER_MONTH, String.valueOf(goodsBean.salesPerMonth)));
+        // 评论条数
+        holder.setText(R.id.tv_comment_num,
+                String.format(ConstantString.COMMENT_NUM, StringTool.getNumberString(goodsBean.commentNum)));
 
         // 返现
         TextView tv_rebate = holder.getView(R.id.tv_rebate);
@@ -101,7 +101,7 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
         });
 
         // 解决图片错乱
-        AppCompatImageView aciv_goods = holder.getView(R.id.aciv_goods);
+        RoundedImageView aciv_goods = holder.getView(R.id.aciv_goods);
         aciv_goods.setTag(R.id.aciv_goods, goodsBean.coverImageUrl);
         Glide.with(mContext).load(goodsBean.coverImageUrl)
                 .apply(RequestOptions.bitmapTransform(new RoundedCorners(mRadius)))
@@ -113,6 +113,11 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
                 .into(new SimpleTarget<Drawable>() {
                     @Override
                     public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
+                        if (resource == null) {
+                            aciv_goods.setImageResource(R.mipmap.logo_gray);
+                            return;
+                        }
+
                         String coverUrl = null;
                         try {
                             coverUrl = (String) aciv_goods.getTag(R.id.aciv_goods);

app/src/main/java/com/itant/shibei/widget/DividerItemDecoration.java

@@ -23,14 +23,18 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
             parent.setClipToPadding(false);
         }*/
 
-        outRect.top = halfSpace;
         outRect.left = halfSpace;
         outRect.right = halfSpace;
-
-        if (parent.getChildAdapterPosition(view) == parent.getAdapter().getItemCount() - 1) {
-            outRect.bottom = halfSpace;
+        outRect.bottom = 0;
+        /*if (parent.getChildAdapterPosition(view) == parent.getAdapter().getItemCount() - 1) {
+            outRect.bottom = 0;
         } else {
             outRect.bottom = 0;
+        }*/
+        if (parent.getChildAdapterPosition(view) == 0) {
+            outRect.top = halfSpace;
+        } else {
+            outRect.top = 0;
         }
     }
 }

app/src/main/res/layout/item_goods.xml

@@ -23,11 +23,12 @@
             android:orientation="horizontal"
             android:padding="@dimen/margin_s">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <com.makeramen.roundedimageview.RoundedImageView
                 android:id="@+id/aciv_goods"
                 android:layout_width="@dimen/size_image_list"
                 android:layout_height="@dimen/size_image_list"
                 android:scaleType="center"
+                app:riv_corner_radius="4dp"
                 android:src="@mipmap/logo_gray"/>
 
 
@@ -211,7 +212,7 @@
 
 
                         <TextView
-                            android:id="@+id/tv_sales_per_month"
+                            android:id="@+id/tv_comment_num"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:gravity="end"