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/BrandRebate/FragmentBrandFragment2.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/FragmentBrandFragment2.java b/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/FragmentBrandFragment2.java
index 6f3b228..70a8762 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/FragmentBrandFragment2.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/FragmentBrandFragment2.java
@@ -25,6 +25,8 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
+import com.tejia.lijin.app.ShoppingApplication;
+import com.tejia.lijin.app.util.user.UserUtil;
 import com.viewpagerindicator.CirclePageIndicator;
 import com.wpc.library.content.ConnectivityChangeHelper;
 import com.wpc.library.util.NetUtils;
@@ -170,7 +172,7 @@
                     if (last == total - 1 && mList.size() < count && isLoad) {
                         page++;
                         isLoad = false;
-                        tv_loading.setText("姝e湪鍔犺浇鏇村鏁版嵁");
+                        tv_loading.setText(getResources().getString(R.string.loading_more_text));
                         iv_loading.setVisibility(View.VISIBLE);
                         getGoodsList();
                     }
@@ -387,7 +389,7 @@
 
         //绮鹃��
         SharedPreferences sp = fragment_brand_fragment_sf.getContext().getSharedPreferences("user", MODE_PRIVATE);
-        ShoppingApi.getShopList(fragment_brand_fragment_sf.getContext(), page + "", mBundle.getString("id"), (sp.getBoolean("isLogin", false) ? sp.getString("uid", "0") : null), new BasicTextHttpResponseHandler() {
+        ShoppingApi.getShopList(fragment_brand_fragment_sf.getContext(), page + "", mBundle.getString("id"), UserUtil.getUid(ShoppingApplication.application), new BasicTextHttpResponseHandler() {
             @Override
             public void onStart() {
                 super.onStart();
@@ -509,7 +511,7 @@
         refresh2 = false;
         //绮鹃��
         SharedPreferences sp = getActivity().getSharedPreferences("user", MODE_PRIVATE);
-        ShoppingApi.getHistory(fragment_brand_fragment_sf.getContext(), "1", (sp.getBoolean("isLogin", false) ? sp.getString("uid", "0") : null), "1", new BasicTextHttpResponseHandler() {
+        ShoppingApi.getHistory(fragment_brand_fragment_sf.getContext(), "1", UserUtil.getUid(ShoppingApplication.application), "1", new BasicTextHttpResponseHandler() {
             @Override
             public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
                 refresh2 = true;

--
Gitblit v1.8.0