From e5ca87e89fef96c827ec37d1d91082f626cbb17d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 11 五月 2021 18:50:09 +0800
Subject: [PATCH] 特价新版UI改造

---
 app/src/main/java/com/tejia/lijin/app/util/goods/GoodsDetailListUtil.java |   55 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/tejia/lijin/app/util/goods/GoodsDetailListUtil.java b/app/src/main/java/com/tejia/lijin/app/util/goods/GoodsDetailListUtil.java
index d0f8750..ca0e41d 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/goods/GoodsDetailListUtil.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/goods/GoodsDetailListUtil.java
@@ -21,8 +21,6 @@
 
     public static void setGoodsDetail(Context mContext, TaoBaoGoodsBrief info, GoodsRightViewHolder viewHolder) {
 
-        viewHolder.tv_sale_num2.setVisibility(View.GONE);
-
         if (viewHolder.ll_labels.getChildCount() > 0) {
             viewHolder.ll_labels.removeAllViews();
         }
@@ -35,51 +33,56 @@
             viewHolder.ll_labels.setVisibility(View.GONE);
         }
 
-        ImageUtil.showImageFace(mContext, info.getTitle(), info.getShopType(), viewHolder.tv_name1);
-        viewHolder.tv_normal_price1.setText("楼" + info.getZkPrice());
-        viewHolder.tv_normal_price1.setPaintFlags(viewHolder.tv_normal_price1.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+        ImageUtil.showImageFace(mContext, info.getTitle(), info.getShopType(), viewHolder.tv_name);
+        viewHolder.tv_price.setText("楼" + info.getZkPrice());
+        viewHolder.tv_price.setPaintFlags(viewHolder.tv_price.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
 
         if (info.getGoodsType() != Constant.GOODS_TYPE_VIP) {
-            viewHolder.tv_sale_num1.setText(info.getSalesType() == 1 ? "鏈堥攢 " + info.getSalesCount() :
+            viewHolder.tv_sale_num.setText(info.getSalesType() == 1 ? "鏈堥攢 " + info.getSalesCount() :
                     info.getSalesType() == 2 ? "2灏忔椂閿�閲� " + info.getSalesCount() : info.getSalesType() == 3 ?
                             "浠婃棩閿�閲� " + info.getSalesCount() : "鎬婚攢閲� " + info.getSalesCount());
-            viewHolder.ll_discount.setVisibility(View.GONE);
-            viewHolder.tv_discount.setText("");
         } else {
-            viewHolder.tv_sale_num1.setText("");
-            viewHolder.ll_discount.setVisibility(View.VISIBLE);
-            viewHolder.tv_discount.setText(info.getDiscount() + "");
+            viewHolder.tv_sale_num.setText("");
         }
 
-        info.setShopInfo(null);
+//        info.setShopInfo(null);
         if (info.getShopInfo() != null) {
-            viewHolder.ll_shop1.setVisibility(View.VISIBLE);
-            viewHolder.tv_shop_name1.setText(info.getShopInfo().getShopName());
+            viewHolder.tv_shop_name.setVisibility(View.VISIBLE);
+            viewHolder.tv_shop_name.setText(info.getShopInfo().getShopName());
         } else {
-            viewHolder.ll_shop1.setVisibility(View.GONE);
+            viewHolder.tv_shop_name.setVisibility(View.GONE);
         }
-        viewHolder.tv_price1.setTextColor(mContext.getResources().getColor(R.color.theme));
 
-        viewHolder.tv_favourable1.setText((info.getMoneyInfo().getMoneyType() == 1 ? "杩�1 " : "濂� ") + info.getMoneyInfo().getFanliMoney());
-        viewHolder.tv_favourable1.setVisibility(View.GONE);
+        //杩斿埄
+        if (info.getMoneyInfo().getFanliMoney() != null) {
+            viewHolder.tv_fanli_amount.setText("-" + info.getMoneyInfo().getFanliMoney());
+            viewHolder.tv_fanli_amount.setVisibility(View.VISIBLE);
+        } else {
+            viewHolder.tv_fanli_amount.setVisibility(View.GONE);
+        }
+
         String disCount;
         if (info.isHasCoupon()) {
             disCount = "楼 " + info.getCouponPrice();
-            viewHolder.ll_coupon_bg1.setVisibility(View.VISIBLE);
-            viewHolder.tv_coupon_price1.setText("楼 " + info.getCouponInfo().getAmount());
+            viewHolder.tv_coupon_amount.setVisibility(View.VISIBLE);
+            viewHolder.tv_coupon_amount.setText("-楼 " + info.getCouponInfo().getAmount());
         } else {
             if (info.getGoodsType() == Constant.GOODS_TYPE_VIP) {
                 disCount = "楼 " + info.getCouponPrice();
             } else
                 disCount = "楼 " + info.getZkPrice();
-            viewHolder.ll_coupon_bg1.setVisibility(View.GONE);
+            viewHolder.tv_coupon_amount.setVisibility(View.GONE);
         }
-        Spannable span = new SpannableString(disCount);
-        span.setSpan(new RelativeSizeSpan(1.4f), 1, disCount.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        span.setSpan(new StyleSpan(Typeface.BOLD), 1, disCount.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        viewHolder.tv_price1.setText(span);
 
-        viewHolder.tv_sale_num1.setTextColor((info.getSalesType() == 1 || info.getSalesType() == 4) ?
+        int startIndex = disCount.indexOf(".");
+        if (startIndex > -1) {
+            viewHolder.tv_actual_price1.setText(disCount.substring(0, startIndex + 1));
+            viewHolder.tv_actual_price2.setText(disCount.substring(startIndex + 1));
+        } else {
+            viewHolder.tv_actual_price2.setText("");
+            viewHolder.tv_actual_price1.setText(disCount);
+        }
+        viewHolder.tv_sale_num.setTextColor((info.getSalesType() == 1 || info.getSalesType() == 4) ?
                 mContext.getResources().getColor(R.color.gray5) : info.getSalesType() == 2 ?
                 mContext.getResources().getColor(R.color.goods_sale_num_text_color_orange) :
                 mContext.getResources().getColor(R.color.goods_sale_num_text_color_blue));

--
Gitblit v1.8.0