From 01e23be6118d68d38a71d186296d440eadcaa197 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 07 六月 2021 18:23:41 +0800
Subject: [PATCH] 特价bug修复

---
 app/src/main/java/com/tejia/lijin/app/util/goods/GoodsDetailListUtil.java |   73 ++++++++++++++++++++++++------------
 1 files changed, 49 insertions(+), 24 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 ca0e41d..0cc3af1 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
@@ -1,11 +1,13 @@
 package com.tejia.lijin.app.util.goods;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
 import android.view.View;
@@ -15,22 +17,25 @@
 import com.tejia.lijin.app.util.Constant;
 import com.tejia.lijin.app.util.ImageUtil;
 import com.tejia.lijin.app.util.SetLabels;
+import com.tejia.lijin.app.util.downutil.StringUtils;
 import com.tejia.lijin.app.util.ui.GoodsRightViewHolder;
 
 public class GoodsDetailListUtil {
 
     public static void setGoodsDetail(Context mContext, TaoBaoGoodsBrief info, GoodsRightViewHolder viewHolder) {
 
-        if (viewHolder.ll_labels.getChildCount() > 0) {
-            viewHolder.ll_labels.removeAllViews();
-        }
-        if (info.getLabels() != null &&
-                info.getLabels().size() > 0) {
-            viewHolder.ll_labels.setVisibility(View.VISIBLE);
-            SetLabels.addLabel(mContext, viewHolder.ll_labels,
-                    info.getLabels());
-        } else {
-            viewHolder.ll_labels.setVisibility(View.GONE);
+        if (viewHolder.ll_labels != null) {
+            if (viewHolder.ll_labels.getChildCount() > 0) {
+                viewHolder.ll_labels.removeAllViews();
+            }
+            if (info.getLabels() != null &&
+                    info.getLabels().size() > 0) {
+                viewHolder.ll_labels.setVisibility(View.VISIBLE);
+                SetLabels.addLabel(mContext, viewHolder.ll_labels,
+                        info.getLabels());
+            } else {
+                viewHolder.ll_labels.setVisibility(View.GONE);
+            }
         }
 
         ImageUtil.showImageFace(mContext, info.getTitle(), info.getShopType(), viewHolder.tv_name);
@@ -46,11 +51,13 @@
         }
 
 //        info.setShopInfo(null);
-        if (info.getShopInfo() != null) {
-            viewHolder.tv_shop_name.setVisibility(View.VISIBLE);
-            viewHolder.tv_shop_name.setText(info.getShopInfo().getShopName());
-        } else {
-            viewHolder.tv_shop_name.setVisibility(View.GONE);
+        if (viewHolder.tv_shop_name != null) {
+            if (info.getShopInfo() != null) {
+                viewHolder.tv_shop_name.setVisibility(View.VISIBLE);
+                viewHolder.tv_shop_name.setText(info.getShopInfo().getShopName());
+            } else {
+                viewHolder.tv_shop_name.setVisibility(View.GONE);
+            }
         }
 
         //杩斿埄
@@ -61,27 +68,45 @@
             viewHolder.tv_fanli_amount.setVisibility(View.GONE);
         }
 
-        String disCount;
-        if (info.isHasCoupon()) {
-            disCount = "楼 " + info.getCouponPrice();
-            viewHolder.tv_coupon_amount.setVisibility(View.VISIBLE);
-            viewHolder.tv_coupon_amount.setText("-楼 " + info.getCouponInfo().getAmount());
+        if (info.getMoneyInfo().getHongBaoMoney() != null) {
+            viewHolder.tv_hongbao_amount.setText("-" + info.getMoneyInfo().getHongBaoMoney());
+            viewHolder.tv_hongbao_amount.setVisibility(View.VISIBLE);
         } else {
-            if (info.getGoodsType() == Constant.GOODS_TYPE_VIP) {
-                disCount = "楼 " + info.getCouponPrice();
-            } else
-                disCount = "楼 " + info.getZkPrice();
+            viewHolder.tv_hongbao_amount.setVisibility(View.GONE);
+        }
+
+
+        String disCount = info.getMoneyInfo().getFinalMoney();
+        if (info.isHasCoupon()) {
+            if (StringUtils.isNullOrEmpty(disCount))
+                disCount = "楼" + info.getCouponPrice();
+            viewHolder.tv_coupon_amount.setVisibility(View.VISIBLE);
+            viewHolder.tv_coupon_amount.setText("-楼" + info.getCouponInfo().getAmount());
+        } else {
+            if (StringUtils.isNullOrEmpty(disCount))
+                if (info.getGoodsType() == Constant.GOODS_TYPE_VIP) {
+                    disCount = "楼" + info.getCouponPrice();
+                } else
+                    disCount = "楼" + info.getZkPrice();
             viewHolder.tv_coupon_amount.setVisibility(View.GONE);
         }
 
         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);
         }
+
+        SpannableString spannableString = new SpannableString(viewHolder.tv_actual_price1.getText());
+        spannableString.setSpan(new RelativeSizeSpan(0.5f), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        viewHolder.tv_actual_price1.setText(spannableString);
+
+
         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) :

--
Gitblit v1.8.0