浏览商品列表，重新进行筛选；我的订单界面只保留淘宝和拼多多

app/build.gradle

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

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

@@ -249,7 +249,7 @@ public class BalanceActivity extends BaseActivity implements IMoneyView, IRealNa
         //加一个实名认证的提示弹框
         TipsDialog dialog = new TipsDialog(this);
         dialog.setTipsMsg("提现属于公民个人收入，按照税法需要完成实名后进行个税申报。");
-        dialog.setConfirmButton("去填写", R.color.red);
+        dialog.setConfirmButton("去填写", getResources().getColor(R.color.red));
         dialog.setButtonClick(new TipsDialog.ButtonClick() {
             @Override
             public void buttonClick(boolean confirm) {

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,22 +198,22 @@ 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 4:
-                        pType = 5;
-                        pIndex = 3;
-                        break;
-                    case 5:
-                        pType = 7;
-                        pIndex = 5;
-                        break;
+//                    case 4:
+//                        pType = 5;
+//                        pIndex = 3;
+//                        break;
+//                    case 5:
+//                        pType = 7;
+//                        pIndex = 5;
+//                        break;
                 }
                 if (action == 1) {
                     presenter.incomeListNew(pType, 1, detailType, yearMonthDay, selectDate ? 1 : 2);

app/src/main/java/com/kx/liedouYX/ui/activity/welcome/WelcomeActivity.java

@@ -96,7 +96,7 @@ public class WelcomeActivity extends AppCompatActivity implements IHomePageSubVi
         LogUtil.e("程序启动 " + activitySize);
         MyCrashHandler.getInstance().init(this);
         //是不是华为的设备
-        Constants.isHuaWeiPhone = true;
+        Constants.isHuaWeiPhone = false;
 
         boolean initSDK = SPUtils.getInstance().getBoolean("initSDK", false);
         if (initSDK) {

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

@@ -16,6 +16,7 @@ import com.kx.liedouYX.R;
 import com.kx.liedouYX.entity.StockBean;
 import com.kx.liedouYX.utils.RecycleViewUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
@@ -48,18 +49,20 @@ 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);
+        List<StockBean> newStockBeans = new ArrayList<>();
         for (StockBean stockBean : stockBeans) {
-            if (TextUtils.isEmpty(stockBean.getGoods_id())) {
-//                stockBeans.remove(stockBean);
-                LogUtil.e("失效的商品：" + stockBean.toString());
+            if (!TextUtils.isEmpty(stockBean.getGoods_id())) {
+                newStockBeans.add(stockBean);
             }
         }
-        holder.recordDate.setText(stockBeans.get(0).getAdd_time());
-        LinearLayoutManager manager = new LinearLayoutManager(context);
-        manager.setOrientation(RecyclerView.VERTICAL);
-        RecordListAdapter adapter = new RecordListAdapter(context, stockBeans);
-        holder.recordList.setLayoutManager(manager);
-        holder.recordList.setAdapter(adapter);
+        if (newStockBeans.size() > 0) {
+            holder.recordDate.setText(newStockBeans.get(0).getAdd_time());
+            LinearLayoutManager manager = new LinearLayoutManager(context);
+            manager.setOrientation(RecyclerView.VERTICAL);
+            RecordListAdapter adapter = new RecordListAdapter(context, newStockBeans);
+            holder.recordList.setLayoutManager(manager);
+            holder.recordList.setAdapter(adapter);
+        }
     }
 
     @Override

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

@@ -113,7 +113,7 @@ public class LljlFragment extends LazyFragment implements IYhfkView {
                             }
                             beanList1.add(beanList2);
                         }
-                        initAdapter(beanList1);
+                        initAdapter(data);
                     }
                 }
             }