1、修復PRJ查詢重印BUG 2、修改餐廳配置頁面優化

Signed-off-by: Wyh <1239658231>

delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/PrjQueryActivity.java

@@ -188,7 +188,8 @@ public class PrjQueryActivity extends BaseActivity<PrjQueryPresenter> implements
                 List<PrjBean.DataBean.Bean> prjData = prjQueryBean.getData();
                 List<PrjBean.DataBean.Bean> prjData = prjQueryBean.getData();
                 if (prjData.get(position).getParentId() == 0) {
                 if (prjData.get(position).getParentId() == 0) {
                     //是主食品，判斷有沒有子食品，如果沒有子食品，直接打印主食品
                     //是主食品，判斷有沒有子食品，如果沒有子食品，直接打印主食品
-                    if (position + 1 > prjData.size() || prjData.get(position + 1).getParentId() == 0) {
+                    if (position + 1 > prjData.size() ||
+                            (position + 1 < prjData.size() && prjData.get(position + 1).getParentId() == 0)) {
                         //沒有子食品
                         //沒有子食品
                         //直接打印
                         //直接打印
                         List<PrjBean.DataBean.Bean> printDatas = new ArrayList<>();
                         List<PrjBean.DataBean.Bean> printDatas = new ArrayList<>();

main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/ExpandListPresenter.java

@@ -90,6 +90,7 @@ public class ExpandListPresenter extends BasePresenter<ExpandListContract.Model,
                             mRootView.showMessage(result.getErrMsg());
                             mRootView.showMessage(result.getErrMsg());
                         }
                         }
                         if (result.isSuccess()) {
                         if (result.isSuccess()) {
+                            mRootView.showMessage("保存成功");
                             mRootView.killMyself();
                             mRootView.killMyself();
                         }
                         }
                     }
                     }

main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/ExpandListActivity.java

@@ -138,7 +138,7 @@ public class ExpandListActivity extends BaseActivity<ExpandListPresenter> implem
             }
             }
             if (updateDate.size() > 0) {
             if (updateDate.size() > 0) {
                 //調用接口批量修改
                 //調用接口批量修改
-
+                mPresenter.updateExpandInfo(updateDate);
             } else {
             } else {
                 killMyself();
                 killMyself();
             }
             }

main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/adapter/ExpandListAdapter.java

@@ -28,9 +28,6 @@ public class ExpandListAdapter extends BaseQuickAdapter<ExpandInfo, BaseViewHold
 
 
     public ExpandListAdapter(List<ExpandInfo> data) {
     public ExpandListAdapter(List<ExpandInfo> data) {
         super(R.layout.main_expand_item, data);
         super(R.layout.main_expand_item, data);
-        for (int i = 0; i < data.size(); i++) {
-            data.get(i).setDataType(i);
-        }
     }
     }
 
 
     @Override
     @Override

main-module/src/main/res/layout/main_expand_item.xml

@@ -35,6 +35,8 @@
                 android:id="@+id/ed_expand_edit"
                 android:id="@+id/ed_expand_edit"
                 android:layout_width="match_parent"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_20"
+                android:paddingRight="@dimen/dp_10"
                 android:gravity="right"
                 android:gravity="right"
                 android:visibility="gone" />
                 android:visibility="gone" />