From 06a80d5c4b3a971cdc1ca3d91717ec3f6e03a443 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 17 五月 2021 18:59:39 +0800
Subject: [PATCH] 特价完善

---
 app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/BrandShoplistAdapter.java |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/BrandShoplistAdapter.java b/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/BrandShoplistAdapter.java
index c14bd98..fb101e8 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/BrandShoplistAdapter.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/BrandShoplistAdapter.java
@@ -2,8 +2,10 @@
 
 import android.content.Context;
 import android.content.Intent;
+
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,13 +16,12 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.RequestOptions;
+import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
+import com.tejia.lijin.app.util.Constant;
 import com.wpc.library.util.common.StringUtils;
 import com.tejia.lijin.app.R;
 import com.tejia.lijin.app.entity.BranShopInfo;
 import com.tejia.lijin.app.entity.TaoBaoGoodsBrief;
-import com.tejia.lijin.app.ui.recommend.GoodsDetailActivityJD;
-import com.tejia.lijin.app.ui.recommend.GoodsDetailActivityPDD;
-import com.tejia.lijin.app.ui.recommend.GoodsDetailActivityTB;
 import com.tejia.lijin.app.util.GlideCircleTransform;
 import com.tejia.lijin.app.util.glide.GlideRoundCenterCropTransform;
 import com.tejia.lijin.app.util.glide.GlideRoundedCornersTransform;
@@ -116,7 +117,7 @@
             Glide.with(viewHolder.item_brandshoplis_bg.getContext())
                     .load(BrandFragment.navBgPicture)
                     .placeholder(R.drawable.shape_addzfb_top_hint)
-                    .apply(new RequestOptions().optionalTransform(new GlideRoundedCornersTransform(viewHolder.item_brandshoplis_bg.getContext(),7.0f, GlideRoundedCornersTransform.CornerType.TOP)))
+                    .apply(new RequestOptions().optionalTransform(new GlideRoundedCornersTransform(viewHolder.item_brandshoplis_bg.getContext(), 7.0f, GlideRoundedCornersTransform.CornerType.TOP)))
                     .into(viewHolder.item_brandshoplis_bg);
 
 
@@ -145,7 +146,7 @@
                 return;
             //-------------------------
             RequestOptions myOptions = new RequestOptions()
-                    .transform(new GlideRoundCenterCropTransform(mContext,5));
+                    .transform(new GlideRoundCenterCropTransform(mContext, 5));
 
             //搴楅摵鍟嗗搧
             if (info.getListGoods().size() > 0 && info.getListGoods().get(0) != null) {//绗竴鍊嬪晢鍝�
@@ -174,9 +175,10 @@
                 viewHolder.item_brandshoplis_img.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        Intent intent= GoodsDetailJumpUtil.getGoodsDetailIntent(mContext,jsonshop.getGoodsType());
+                        Intent intent= new Intent(mContext, GoodsDetailActivity.class);
+                        intent.putExtra("goodsId", jsonshop.getGoodsId());
+                        intent.putExtra("goodsType", jsonshop.getGoodsType());
                         intent.putExtra("title", jsonshop.getTitle());
-                        intent.putExtra("id", jsonshop.getGoodsId());
                         intent.putExtra("from", "brand");
                         mContext.startActivity(intent);
                     }
@@ -209,16 +211,11 @@
                 viewHolder.item_brandshoplis_img2.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        Intent intent;
-                        if (jsonshop2.getGoodsType() == 1) {
-                            intent = new Intent(mContext, GoodsDetailActivityTB.class);
-                        } else if (jsonshop2.getGoodsType() == 2) {
-                            intent = new Intent(mContext, GoodsDetailActivityJD.class);
-                        } else {
-                            intent = new Intent(mContext, GoodsDetailActivityPDD.class);
-                        }
+                        Intent intent = new Intent(mContext, GoodsDetailActivity.class);
                         intent.putExtra("title", jsonshop2.getTitle());
-                        intent.putExtra("id", jsonshop2.getGoodsId());
+                        intent.putExtra("goodsId", jsonshop2.getGoodsId());
+                        intent.putExtra("goodsType", Constant.GOODS_TYPE_TB);
+
                         intent.putExtra("from", "brand");
                         mContext.startActivity(intent);
                     }
@@ -250,9 +247,10 @@
                 viewHolder.item_brandshoplis_img3.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        Intent intent= GoodsDetailJumpUtil.getGoodsDetailIntent(mContext,jsonshop3.getGoodsType());
+                        Intent intent =new Intent(mContext,GoodsDetailActivity.class);
+                        intent.putExtra("goodsId", jsonshop3.getGoodsId());
+                        intent.putExtra("goodsType", jsonshop3.getGoodsType());
                         intent.putExtra("title", jsonshop3.getTitle());
-                        intent.putExtra("id", jsonshop3.getGoodsId());
                         intent.putExtra("from", "brand");
                         mContext.startActivity(intent);
                     }

--
Gitblit v1.8.0