From 399ac289f80b7a40aa4210341db6b447cacdcf14 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 八月 2022 17:42:33 +0800
Subject: [PATCH] 广告升级，隐私政策整改
---
app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchResultHyperMarketFragment.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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 6bf0f01..74ab065 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;
@@ -33,6 +35,8 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import com.tejia.lijin.app.ShoppingApplication;
+import com.tejia.lijin.app.util.user.UserUtil;
import com.wpc.library.RetainViewFragment;
import com.wpc.library.content.ConnectivityChangeHelper;
import com.wpc.library.recyclerviewhelper.DividerItemDecoration;
@@ -79,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;
//鍞搧浼氫环鏍肩瓫閫�
@@ -291,7 +295,7 @@
ll_confirm.setOnClickListener(this);
fl_default.setOnClickListener(this);
fl_discount.setOnClickListener(this);
-
+ iv_footermark.setOnClickListener(this);
ll_price_input_vip.setOnClickListener(this);
ll_price_vip.setOnClickListener(this);
ll_confirm_vip.setOnClickListener(this);
@@ -339,7 +343,7 @@
if ((!isLoad) && last == total - 1 && wList.size() < count) {
page++;
isLoad = true;
- tv_loading.setText("姝ｅ湪鍔犺浇鏇村鏁版嵁");
+ tv_loading.setText(getResources().getString(R.string.loading_more_text));
iv_loading.setVisibility(View.VISIBLE);
setData(page);
}
@@ -516,9 +520,8 @@
Gson gson = new GsonBuilder().serializeNulls().create();
String filters = gson.toJson(filter);
- String uid = tv_filter.getContext().getSharedPreferences("user", Context.MODE_PRIVATE).getString("uid", "");
ShoppingApi.search(bottom.getContext(), isCopy ? getActivity().getIntent().getStringExtra("link") : kw.trim(),
- page + "", filters, goodsType + "", order + "", uid, PREFIX_NOTIFY_TYPE + goodsType,
+ page + "", filters, goodsType + "", order + "", UserUtil.getUid(ShoppingApplication.application), PREFIX_NOTIFY_TYPE + goodsType,
new BasicTextHttpResponseHandler() {
@Override
public void onStart() {
@@ -984,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);
}
@@ -1020,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);
}
@@ -1065,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