同步代码

component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/DishDetailBean.java

@@ -10,7 +10,7 @@ import lombok.Data;
 @Data
 public class DishDetailBean {
 
-  private int id;
+  private Integer id;
   private int biFoodId;//	非必须		菜品ID
   private String dishesName;//	非必须		菜品名称
   private int brandId;//	 number	非必须

component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/DishesFragment.java

@@ -4,8 +4,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -13,7 +11,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.chad.library.adapter.base.entity.node.BaseNode;
-import com.gingersoft.gsa.cloud.common.constans.AppConstant;
 import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
 import com.gingersoft.gsa.cloud.common.utils.log.LogUtil;
 import com.gingersoft.supply_chain.R;
@@ -22,14 +19,12 @@ import com.gingersoft.supply_chain.di.component.DaggerDishesComponent;
 import com.gingersoft.supply_chain.mvp.bean.BuyIngredientsBean;
 import com.gingersoft.supply_chain.mvp.bean.DishDetailBean;
 import com.gingersoft.supply_chain.mvp.bean.DishDetailResultBean;
-import com.gingersoft.supply_chain.mvp.bean.DishesResultBean;
 import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean;
 import com.gingersoft.supply_chain.mvp.contract.DishesContract;
 import com.gingersoft.supply_chain.mvp.presenter.DishesPresenter;
 import com.gingersoft.supply_chain.mvp.ui.adapter.dishes.DishDetailAdapter;
 import com.gingersoft.supply_chain.mvp.ui.adapter.dishes.DishNode;
 import com.gingersoft.supply_chain.mvp.ui.adapter.dishes.DishesGroupNode;
-import com.gingersoft.supply_chain.mvp.ui.adapter.dishes.DishesGroupProvider;
 import com.gingersoft.supply_chain.mvp.ui.adapter.dishes.DishesTreeAdapter;
 import com.gingersoft.supply_chain.mvp.ui.fragment.food.OtherFunctionFragment;
 import com.jess.arms.di.component.AppComponent;
@@ -48,7 +43,6 @@ import butterknife.BindView;
  */
 public class DishesFragment extends BaseSupplyChainFragment<DishesPresenter> implements DishesContract.View {
 
-
     @BindView(R2.id.topbar_food_ingredients)
     QMUITopBar topbarFoodIngredients;
     @BindView(R2.id.rv_dishes)
@@ -90,25 +84,24 @@ public class DishesFragment extends BaseSupplyChainFragment<DishesPresenter> imp
     }
     private void initDishDetail(DishDetailResultBean dishesResultBean){
         List<DishDetailBean> foods=dishesResultBean.getData();
-        View footer;
-        if (CollectionUtils.isNullOrEmpty(foods)) {
-            dishDetailAdapter=new DishDetailAdapter(requireContext(),new ArrayList<>());
-            footer=getFooterView(false);
-        }else {
-            dishDetailAdapter=new DishDetailAdapter(requireContext(),foods);
-            footer=getFooterView(true);
+        if (dishDetailAdapter == null) {
+            dishDetailAdapter = new DishDetailAdapter(requireContext(), new ArrayList<>());
+            rvDishes.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false));
+            dishDetailAdapter.addFooterView(getFooterView(CollectionUtils.isNotNullOrEmpty(foods)));
+            rvDishes.setAdapter(dishDetailAdapter);
+            LogUtil.e("ZJS", " initDishDetail==");
         }
-       LinearLayout parent = dishDetailAdapter.getFooterLayout();
-        if (parent==null) {
-            dishDetailAdapter.removeAllFooterView();
-            dishDetailAdapter.addFooterView(footer);
-        }else {
-            parent.removeAllViews();
-            dishDetailAdapter.addFooterView(footer);
+        if (CollectionUtils.isNullOrEmpty(foods)) {
+            dishDetailAdapter.setList(foods);
         }
 
-        rvDishes.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false));
-        rvDishes.setAdapter(dishDetailAdapter);
+        LogUtil.e("ZJS"," dishDetailAdapter count=="+dishDetailAdapter.getItemCount());
+        int count=dishDetailAdapter.getItemCount();
+        int size=dishDetailAdapter.getData().size();
+        getFooterView(size>0);
+        LogUtil.e("ZJS"," dishDetailAdapter count== " +count+"  size="+size);
+
+
     }
 
     private View getFooterView(boolean showDone) {