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/recommend/SearchResultHyperMarketFragment.java |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchResultHyperMarketFragment.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchResultHyperMarketFragment.java
index 4ac2418..10a3b5d 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchResultHyperMarketFragment.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchResultHyperMarketFragment.java
@@ -5,12 +5,14 @@
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
 import android.provider.Settings;
+
 import androidx.annotation.Nullable;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.appcompat.widget.LinearLayoutCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -81,7 +83,7 @@
     private LinearLayout ll_no_net, ll_no_data, ll_request_failture,
             ll_price, ll_confirm, ll_filter, ll_has_coupon;
     private ImageView iv_slid_top, iv_price, iv_price_vip,
-            iv_loading, iv_filter, iv_has_coupon,iv_footermark;
+            iv_loading, iv_filter, iv_has_coupon, iv_footermark;
     View bottom;
     LinearLayout ll_price_input;
     //鍞搧浼氫环鏍肩瓫閫�
@@ -341,7 +343,7 @@
                     if ((!isLoad) && last == total - 1 && wList.size() < count) {
                         page++;
                         isLoad = true;
-                        tv_loading.setText("姝e湪鍔犺浇鏇村鏁版嵁");
+                        tv_loading.setText(getResources().getString(R.string.loading_more_text));
                         iv_loading.setVisibility(View.VISIBLE);
                         setData(page);
                     }
@@ -985,10 +987,10 @@
             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("url", jsonshop.getCouponInfo().getLink());
-                    intent.putExtra("id", jsonshop.getGoodsId());
                     intent.putExtra("from", "brand");
                     startActivity(intent);
                 }
@@ -1021,17 +1023,16 @@
             item_brandshoplis_img2.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Intent intent;
+                    Intent intent = new Intent(getContext(), GoodsDetailActivity.class);
                     if (jsonshop2.getGoodsType() == 1) {
-                        intent = new Intent(getContext(), GoodsDetailActivityTB.class);
+                        intent.putExtra("goodsType", Constant.GOODS_TYPE_TB);
                     } else if (jsonshop2.getGoodsType() == 2) {
-                        intent = new Intent(getContext(), GoodsDetailActivityJD.class);
+                        intent.putExtra("goodsType", Constant.GOODS_TYPE_JD);
                     } else {
-                        intent = new Intent(getContext(), GoodsDetailActivityTB.class);
+                        intent.putExtra("goodsType", Constant.GOODS_TYPE_PDD);
                     }
                     intent.putExtra("title", jsonshop2.getTitle());
-//                    intent.putExtra("url", jsonshop2.getCouponInfo().getLink());
-                    intent.putExtra("id", jsonshop2.getGoodsId());
+                    intent.putExtra("goodsId", jsonshop2.getGoodsId());
                     intent.putExtra("from", "brand");
                     startActivity(intent);
                 }
@@ -1066,10 +1067,12 @@
             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("url", jsonshop3.getCouponInfo().getLink());
-                    intent.putExtra("id", jsonshop3.getGoodsId());
                     intent.putExtra("from", "brand");
                     startActivity(intent);
                 }

--
Gitblit v1.8.0