From ddff7888bf7e754d12fb5fc85a58f3012f456490 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 六月 2021 17:26:03 +0800
Subject: [PATCH] 特价完善

---
 app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/BrandFootprintInfoActivity.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/BrandFootprintInfoActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/BrandFootprintInfoActivity.java
index fa02931..085e650 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/BrandFootprintInfoActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/BrandRebate/BrandFootprintInfoActivity.java
@@ -26,6 +26,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.okhttp.OkHttpUtils;
 import com.wpc.library.util.NetUtils;
 import com.tejia.lijin.app.BasicTextHttpResponseHandler;
@@ -105,7 +107,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);
                         getHistory();
                     }
@@ -142,7 +144,7 @@
 
     private void getHistory() {
         SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
-        ShoppingApi.getHistory(this, page + "", (sp.getBoolean("isLogin", false) ? sp.getString("uid", "0") : null), "2", new BasicTextHttpResponseHandler() {
+        ShoppingApi.getHistory(this, page + "", UserUtil.getUid(ShoppingApplication.application), "2", new BasicTextHttpResponseHandler() {
             @Override
             public void onStart() {
                 super.onStart();
@@ -348,7 +350,7 @@
      */
     private void deleteHistory(String sid) {
         SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
-        ShoppingApi.deleteHistory(this, sid, (sp.getBoolean("isLogin", false) ? sp.getString("uid", "0") : null), new BasicTextHttpResponseHandler() {
+        ShoppingApi.deleteHistory(this, sid, UserUtil.getUid(ShoppingApplication.application), new BasicTextHttpResponseHandler() {
             @Override
             public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
                 if (jsonObject.optInt("code") == 0) {

--
Gitblit v1.8.0