app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "com.kx.liedouYX"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 113
-        versionName "1.0.13"
+        versionCode 115
+        versionName "1.0.15"
 
         ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         multiDexEnabled true

app/src/main/java/com/kx/liedouYX/entity/StockBean.java

@@ -428,6 +428,13 @@ public class StockBean implements Serializable {
         public void setUrl(String url) {
             this.url = url;
         }
+
+        @Override
+        public String toString() {
+            return "ImgListBean{" +
+                    "url='" + url + '\'' +
+                    '}';
+        }
     }
 
     public static class VideoListBean {

app/src/main/java/com/kx/liedouYX/ui/activity/mine/MyOrderActivity.java

@@ -184,7 +184,7 @@ public class MyOrderActivity extends BaseActivity implements IOrderView {
     }
 
     private void initScrollTab() {
-        String[] strings = new String[]{"全部", "淘宝",  "拼多多", "抖音", "唯品会"};
+        String[] strings = new String[]{"全部", "淘宝", "京东", "拼多多", "抖音", "唯品会"};
         TabCreateUtils.setOrangeTab(this, indicator, strings, new TabCreateUtils.onTitleClickListener() {
             @Override
             public void onTitleClick(int index) {
@@ -198,19 +198,19 @@ public class MyOrderActivity extends BaseActivity implements IOrderView {
                         pType = 1;
                         pIndex = 1;
                         break;
-//                    case 2:
-//                        pType = 4;
-//                        pIndex = 2;
-//                        break;
                     case 2:
+                        pType = 4;
+                        pIndex = 2;
+                        break;
+                    case 3:
                         pType = 6;
                         pIndex = 4;
                         break;
-                    case 3:
+                    case 4:
                         pType = 5;
                         pIndex = 3;
                         break;
-                    case 4:
+                    case 5:
                         pType = 7;
                         pIndex = 5;
                         break;

app/src/main/java/com/kx/liedouYX/ui/activity/search/SearchShopActivity.java

@@ -102,7 +102,7 @@ public class SearchShopActivity extends BaseActivity implements ISearchView, Fra
 
     @Override
     protected void initData() {
-        String[] strings = new String[]{"全部", "淘宝", "拼多多", "抖音", "唯品会"};
+        String[] strings = new String[]{"全部", "淘宝", "拼多多"};
         TabCreateUtils.setOrangeTab(this, indicatorSearch, strings, new TabCreateUtils.onTitleClickListener() {
             @Override
             public void onTitleClick(int index) {

app/src/main/java/com/kx/liedouYX/ui/adapter/MyScAdpter.java

@@ -3,6 +3,7 @@ package com.kx.liedouYX.ui.adapter;
 import android.content.Context;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -25,6 +26,7 @@ import com.kx.liedouYX.ui.activity.detail.DetailsActivity;
 import com.kx.liedouYX.utils.IntentUtils;
 import com.kx.liedouYX.utils.NumberUtils;
 import com.kx.liedouYX.utils.Textutils;
+import com.kx.liedouYX.utils.ToastUtils;
 
 import java.util.List;
 
@@ -95,15 +97,19 @@ public class MyScAdpter extends RecyclerView.Adapter<MyScAdpter.MyViewHolder> {
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                StockBean stockBean = new StockBean();
-                stockBean.setGoods_id(dataBean.getGoods_id());
-                stockBean.setCoupon_price(dataBean.getCoupon_price());
-                stockBean.setDiscount_price(dataBean.getDiscount_price() + "");
-                stockBean.setPrice(dataBean.getPrice() + "");
-                stockBean.setIs_coupon((int) dataBean.getIs_coupon());
-                stockBean.setCommission_price(dataBean.getCommission_rate() + "");
-                stockBean.setShop_type(dataBean.getShop_type());
-                IntentUtils.getInstance().toJumpDetailsUI(context, DetailsActivity.class, stockBean, Constants.collectAction, dataBean.getId() + "");
+                if (!TextUtils.isEmpty(dataBean.getFull_goods_id())) {
+                    StockBean stockBean = new StockBean();
+                    stockBean.setGoods_id(dataBean.getGoods_id());
+                    stockBean.setCoupon_price(dataBean.getCoupon_price());
+                    stockBean.setDiscount_price(dataBean.getDiscount_price() + "");
+                    stockBean.setPrice(dataBean.getPrice() + "");
+                    stockBean.setIs_coupon((int) dataBean.getIs_coupon());
+                    stockBean.setCommission_price(dataBean.getCommission_rate() + "");
+                    stockBean.setShop_type(dataBean.getShop_type());
+                    IntentUtils.getInstance().toJumpDetailsUI(context, DetailsActivity.class, stockBean, Constants.collectAction, dataBean.getId() + "");
+                } else {
+                    ToastUtils.showToast(context, "该商品已下架！");
+                }
             }
         });
     }

app/src/main/java/com/kx/liedouYX/ui/adapter/RecordDateAdapter.java

@@ -1,6 +1,7 @@
 package com.kx.liedouYX.ui.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,6 +11,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.kx.lib_core.utils.LogUtil;
 import com.kx.liedouYX.R;
 import com.kx.liedouYX.entity.StockBean;
 import com.kx.liedouYX.utils.RecycleViewUtils;
@@ -46,6 +48,12 @@ public class RecordDateAdapter extends RecyclerView.Adapter<RecordDateAdapter.My
     public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
         RecycleViewUtils.setListRecycleGood(context, holder.recordList);
         List<StockBean> stockBeans = data.get(position);
+        for (StockBean stockBean : stockBeans) {
+            if (TextUtils.isEmpty(stockBean.getGoods_id())) {
+//                stockBeans.remove(stockBean);
+                LogUtil.e("失效的商品：" + stockBean.toString());
+            }
+        }
         holder.recordDate.setText(stockBeans.get(0).getAdd_time());
         LinearLayoutManager manager = new LinearLayoutManager(context);
         manager.setOrientation(RecyclerView.VERTICAL);

app/src/main/java/com/kx/liedouYX/ui/adapter/RecordListAdapter.java

@@ -24,6 +24,7 @@ import com.kx.liedouYX.ui.activity.detail.DetailsActivity;
 import com.kx.liedouYX.utils.IntentUtils;
 import com.kx.liedouYX.utils.NumberUtils;
 import com.kx.liedouYX.utils.Textutils;
+import com.kx.liedouYX.utils.ToastUtils;
 
 import java.util.List;
 
@@ -80,7 +81,7 @@ public class RecordListAdapter extends RecyclerView.Adapter<RecordListAdapter.My
                 Drawable drawable = context.getResources().getDrawable(R.mipmap.wph_icon);
                 Textutils.setDrawableText(holder.shopTitle, " " + goods.getTitle(), drawable);
             }
-            holder.discountPrice.setText("￥" +NumberUtils.formatStringNumber( goods.getDiscount_price()));
+            holder.discountPrice.setText("￥" + NumberUtils.formatStringNumber(goods.getDiscount_price()));
             //给文字中间画条横线
             holder.price.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG | Paint.ANTI_ALIAS_FLAG);
             holder.price.setText("￥" + NumberUtils.formatStringNumber(goods.getPrice()));
@@ -93,13 +94,17 @@ public class RecordListAdapter extends RecyclerView.Adapter<RecordListAdapter.My
             holder.itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    if (goods.getShop_type() == 0 || goods.getShop_type() == 1 || goods.getShop_type() == 6) {
 //                    goods_id, coupon_price, discount_price, price, is_coupon, commission_rate
-                    /**
-                     * @auth lkj
-                     * @Date 2023/7/20 14:06
-                     * @Describe 跳转到商品详情界面
-                     */
-                    IntentUtils.getInstance().toJumpDetailsUI(context, DetailsActivity.class, goods, Constants.HistoryAction, goods.getId() + "");
+                        /**
+                         * @auth lkj
+                         * @Date 2023/7/20 14:06
+                         * @Describe 跳转到商品详情界面
+                         */
+                        IntentUtils.getInstance().toJumpDetailsUI(context, DetailsActivity.class, goods, Constants.HistoryAction, goods.getId() + "");
+                    } else {
+                        ToastUtils.showToast(context, "该商品已下架！");
+                    }
                 }
             });
         } else {

app/src/main/java/com/kx/liedouYX/ui/fragment/home_page/HomePageFragment.java

@@ -251,8 +251,8 @@ public class HomePageFragment extends LazyFragment {
         strings.add(strTB);
 //        strings.add(strJD);
         strings.add(strPDD);
-        strings.add(strDY);
-        strings.add(strWPH);
+//        strings.add(strDY);
+//        strings.add(strWPH);
         LinearLayoutManager manager = new LinearLayoutManager(getActivity());
         manager.setOrientation(RecyclerView.HORIZONTAL);
         HomePageCenterTabAdapter centerTabAdapter = new HomePageCenterTabAdapter(getActivity(), strings);

app/src/main/java/com/kx/liedouYX/ui/fragment/home_page/home_page_sub/jd/JDFragment.java

@@ -63,12 +63,12 @@ public class JDFragment extends LazyFragment implements ITBView {
             case 1:
                 jdPresenter.pddGoodsRecommend("", 1, 10);
                 break;
-            case 2:
-                jdPresenter.dyGoodsList("", "", "", 1, 10);
-                break;
-            case 3:
-                jdPresenter.wphGoodsList(1, 10);
-                break;
+//            case 2:
+//                jdPresenter.dyGoodsList("", "", "", 1, 10);
+//                break;
+//            case 3:
+//                jdPresenter.wphGoodsList(1, 10);
+//                break;
         }
     }
 
@@ -104,12 +104,12 @@ public class JDFragment extends LazyFragment implements ITBView {
                 case 1:
                     jdPresenter.pddGoodsRecommend("", 1, 10);
                     break;
-                case 2:
-                    jdPresenter.dyGoodsList("", "", "", page, 10);
-                    break;
-                case 3:
-                    jdPresenter.wphGoodsList(page, 10);
-                    break;
+//                case 2:
+//                    jdPresenter.dyGoodsList("", "", "", page, 10);
+//                    break;
+//                case 3:
+//                    jdPresenter.wphGoodsList(page, 10);
+//                    break;
             }
         }
     }
@@ -131,12 +131,12 @@ public class JDFragment extends LazyFragment implements ITBView {
                 case 1:
                     jdPresenter.pddGoodsRecommend("", page, 10);
                     break;
-                case 2:
-                    jdPresenter.dyGoodsList("", "", "", page, 10);
-                    break;
-                case 3:
-                    jdPresenter.wphGoodsList(page, 10);
-                    break;
+//                case 2:
+//                    jdPresenter.dyGoodsList("", "", "", page, 10);
+//                    break;
+//                case 3:
+//                    jdPresenter.wphGoodsList(page, 10);
+//                    break;
             }
         }
     }

app/src/main/java/com/kx/liedouYX/ui/fragment/mine/scll/LljlFragment.java

@@ -2,6 +2,7 @@ package com.kx.liedouYX.ui.fragment.mine.scll;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -24,6 +25,8 @@ import com.kx.liedouYX.ui.fragment.mine.yhfk.YhfkPresenter;
 import com.kx.liedouYX.utils.FloatBtnCtrlUtil;
 import com.kx.liedouYX.utils.RecycleViewUtils;
 
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import butterknife.BindView;
@@ -99,8 +102,18 @@ public class LljlFragment extends LazyFragment implements IYhfkView {
                 if (recordListBean.getErrno().equals("0") && recordListBean.getErr().equals("成功")) {
                     RecordListBean.RstBean rst = recordListBean.getRst();
                     if (rst != null) {
+                        List<List<StockBean>> beanList1 = new ArrayList<>();
+                        List<StockBean> beanList2 = new ArrayList<>();
                         List<List<StockBean>> data = rst.getData();
-                        initAdapter(data);
+                        for (List<StockBean> datum : data) {
+                            for (StockBean stockBean : datum) {
+                                if (!TextUtils.isEmpty(stockBean.getGoods_id())) {
+                                    beanList2.add(stockBean);
+                                }
+                            }
+                            beanList1.add(beanList2);
+                        }
+                        initAdapter(beanList1);
                     }
                 }
             }

magicindicator/magicindicator.iml

@@ -31,10 +31,10 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />