From 0b9cfeb895c91a6dae9b45d7590b5a231446189d Mon Sep 17 00:00:00 2001 From: hwf452 Date: Wed, 16 Aug 2023 15:26:14 +0800 Subject: [PATCH] =?UTF-8?q?for=20=E5=BE=AA=E7=8E=AFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bhdxj/activity/sbxdj/DjdscFragment.java | 115 +++++++++++------- .../bhdxj/activity/sbxj/ScxsjhFragment.java | 69 ++++++----- 2 files changed, 110 insertions(+), 74 deletions(-) diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/DjdscFragment.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/DjdscFragment.java index 711bbc9..6e4632b 100755 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/DjdscFragment.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/DjdscFragment.java @@ -10,6 +10,9 @@ import android.widget.Toast; import com.rehome.bhdxj.DBModel.Djjh; import com.rehome.bhdxj.DBModel.QYDDATABean; import com.rehome.bhdxj.DBModel.XDJJHXZDataBean; +import com.rehome.bhdxj.DBModel.XSJJHDataBean; +import com.rehome.bhdxj.DBModel.XSJJHXZDataBean; +import com.rehome.bhdxj.DBModel.Xjjh; import com.rehome.bhdxj.R; import com.rehome.bhdxj.adapter.ScjhAdapter; import com.rehome.bhdxj.base.BaseFragment; @@ -47,6 +50,8 @@ public class DjdscFragment extends BaseFragment { Button btn_del; TextView tvNodata; + static int uploadCecked = 0; + static int uploadSuccess = 0; private View headView; private View head; @@ -191,15 +196,25 @@ public class DjdscFragment extends BaseFragment { } private void uploadData() { + uploadCecked = 0; + uploadSuccess = 0; String USERNAME = (String) SPUtils.get(context, Contans.USERID, ""); - ScdjjhBean scdjjhbean = new ScdjjhBean(); - scdjjhbean.setAction("DJ_GWSC_SET"); - scdjjhbean.setYHID(USERNAME); - List djDataList = new ArrayList<>(); - List qydjDataList = new ArrayList<>(); for (int i = 0; i < xdjjhxzDataList.size(); i++) { - ScdjjhBean.DJ_DATA dhdata = new ScdjjhBean.DJ_DATA(); if (xdjjhxzDataList.get(i).isChecked()) { + uploadCecked++; + } + } + for (int i = 0; i < xdjjhxzDataList.size(); i++) { + if (xdjjhxzDataList.get(i).isChecked()) { + ScdjjhBean scdjjhbean = new ScdjjhBean(); + scdjjhbean.setAction("DJ_GWSC_SET"); + scdjjhbean.setYHID(USERNAME); + + List djDataList = new ArrayList<>(); + List qydjDataList = new ArrayList<>(); + + ScdjjhBean.DJ_DATA dhdata = new ScdjjhBean.DJ_DATA(); + final List qyddataBeanList = qydDataBeanMap.get(xdjjhxzDataList.get(i).getGWID()); scdjjhbean.setGWID(xdjjhxzDataList.get(i).getGWID()); scdjjhbean.setGWMC(xdjjhxzDataList.get(i).getGWMC()); @@ -242,61 +257,77 @@ public class DjdscFragment extends BaseFragment { sCData(json); } } - } private void sCData(String json) { Request request = NoHttp.createStringRequest(Contans.IP + Contans.DJJHSC, RequestMethod.POST); request.setDefineRequestBodyForJson(json); - queue.add(1, request, new HttpResponseListener<>(getActivity(), request, callback, false, true, "上传数据中...请稍等...")); - } - private HttpListener callback = new HttpListener() { - @Override - public void onSucceed(int what, Response response) { - StatusInfo2 info = GsonUtils.GsonToBean(response.get(), StatusInfo2.class); - try { - if (what == 1) { - if (info.getState() == 1) { - for (int i = 0; i < xdjjhxzDataList.size(); i++) { - if (xdjjhxzDataList.get(i).isChecked()) { - DataSupport.deleteAll(XDJJHXZDataBean.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); - DataSupport.deleteAll(QYDDATABean.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); - DataSupport.deleteAll(Djjh.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); - xdjjhxzDataList.remove(xdjjhxzDataList.get(i)); + queue.add(1, request, new HttpResponseListener<>(getActivity(), request, new HttpListener() { + @Override + public void onSucceed(int what, Response response) { + StatusInfo2 info = GsonUtils.GsonToBean(response.get(), StatusInfo2.class); + uploadSuccess++; + try { + if (what == 1) { + if (info.getState() == 1) { + if(uploadCecked == uploadSuccess){ + xdjjhxzDataList.removeIf((item) -> { + if (item.isChecked()) { + DataSupport.deleteAll(XDJJHXZDataBean.class, "GWID = ?", item.getGWID()); + DataSupport.deleteAll(QYDDATABean.class, "GWID = ?", item.getGWID()); + DataSupport.deleteAll(Djjh.class, "GWID = ?", item.getGWID()); + } + return item.isChecked(); + }); + +// for (int i = 0; i < xdjjhxzDataList.size(); i++) { +// if (xdjjhxzDataList.get(i).isChecked()) { +// DataSupport.deleteAll(XDJJHXZDataBean.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); +// DataSupport.deleteAll(QYDDATABean.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); +// DataSupport.deleteAll(Djjh.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); +// xdjjhxzDataList.remove(xdjjhxzDataList.get(i)); +// } +// } + adapter.notifyDataSetChanged(); } + } else { + showToast(info.getMsg()); } - adapter.notifyDataSetChanged(); - } else { - showToast(info.getMsg()); } + } catch (Exception e) { + showToast(UiUtlis.getString(context, R.string.data_error)); } - } catch (Exception e) { - showToast(UiUtlis.getString(context, R.string.data_error)); - } - } - @Override - public void onFailed(int what, Response response) { + @Override + public void onFailed(int what, Response response) { + uploadSuccess++; + } + }, false, true, "上传数据中...请稍等...")); + } - } - }; private void deleteData() { AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle("提示"); builder.setTitle("你确定要删除？"); builder.setNegativeButton("取消", (dialog, which) -> dialog.dismiss()); builder.setPositiveButton("确定", (dialog, which) -> { - for (int i = 0; i < xdjjhxzDataList.size(); i++) { - if (xdjjhxzDataList.get(i).isChecked()) { - DataSupport.deleteAll(XDJJHXZDataBean.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); - DataSupport.deleteAll(QYDDATABean.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); - DataSupport.deleteAll(Djjh.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); + xdjjhxzDataList.removeIf((item) -> { + if (item.isChecked()) { + DataSupport.deleteAll(XDJJHXZDataBean.class, "GWID = ?", item.getGWID()); + DataSupport.deleteAll(QYDDATABean.class, "GWID = ?", item.getGWID()); + DataSupport.deleteAll(Djjh.class, "GWID = ?", item.getGWID()); } - } + return item.isChecked(); + }); +// for (int i = 0; i < xdjjhxzDataList.size(); i++) { +// if (xdjjhxzDataList.get(i).isChecked()) { +// DataSupport.deleteAll(XDJJHXZDataBean.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); +// DataSupport.deleteAll(QYDDATABean.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); +// DataSupport.deleteAll(Djjh.class, "GWID = ?", xdjjhxzDataList.get(i).getGWID()); +// } +// } getDataInSQL(); - if (adapter != null) { - adapter.notifyDataSetChanged(); - } + adapter.notifyDataSetChanged(); }); builder.show(); } diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/ScxsjhFragment.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/ScxsjhFragment.java index d3c0e58..c8d0ccd 100755 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/ScxsjhFragment.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/ScxsjhFragment.java @@ -9,6 +9,9 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; +import com.rehome.bhdxj.DBModel.Djjh; +import com.rehome.bhdxj.DBModel.QYDDATABean; +import com.rehome.bhdxj.DBModel.XDJJHXZDataBean; import com.rehome.bhdxj.DBModel.XSJJHDataBean; import com.rehome.bhdxj.DBModel.XSJJHXZDataBean; import com.rehome.bhdxj.DBModel.Xjjh; @@ -30,11 +33,14 @@ import com.yolanda.nohttp.RequestMethod; import com.yolanda.nohttp.rest.Request; import com.yolanda.nohttp.rest.RequestQueue; import com.yolanda.nohttp.rest.Response; + import org.litepal.crud.DataSupport; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import androidx.appcompat.app.AlertDialog; /** @@ -112,7 +118,6 @@ public class ScxsjhFragment extends BaseFragment { } }); - } @@ -124,7 +129,8 @@ public class ScxsjhFragment extends BaseFragment { public void initData() { queue = NoHttp.newRequestQueue(1); getDataInSQL();//获取数据 - setListData();//显示数据 + //显示数据 + setListData(); } @@ -296,8 +302,6 @@ public class ScxsjhFragment extends BaseFragment { queue.add(1, request, new HttpResponseListener<>(getActivity(), request, new HttpListener() { @Override public void onSucceed(int what, Response response) { - - StatusInfo2 info = GsonUtils.GsonToBean(response.get(), StatusInfo2.class); try { @@ -306,18 +310,21 @@ public class ScxsjhFragment extends BaseFragment { showToast("上传数据成功"); - //这里处理那个删除item，更新UI - DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ?", zxidUpload); - - DataSupport.deleteAll(XSJJHDataBean.class, "zxid = ?", zxidUpload); - - DataSupport.deleteAll(Xjjh.class, "zxid = ?", zxidUpload); - - for (XSJJHXZDataBean item: xsjhxzdatalist) { - if(item.getZxid().equals(zxidUpload)){ - xsjhxzdatalist.remove(item); + xsjhxzdatalist.removeIf((item) -> { + if (item.getZxid().equals(zxidUpload)) { + //这里处理那个删除item，更新UI + DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ?", zxidUpload); + DataSupport.deleteAll(XSJJHDataBean.class, "zxid = ?", zxidUpload); + DataSupport.deleteAll(Xjjh.class, "zxid = ?", zxidUpload); } - } + return item.getZxid().equals(zxidUpload); + }); + +// for (XSJJHXZDataBean item : xsjhxzdatalist) { +// if (item.getZxid().equals(zxidUpload)) { +// xsjhxzdatalist.remove(item); +// } +// } adapter.notifyDataSetChanged(); @@ -418,29 +425,27 @@ public class ScxsjhFragment extends BaseFragment { @Override public void onClick(DialogInterface dialog, int which) { - for (int i = 0; i < xsjhxzdatalist.size(); i++) { - - if (xsjhxzdatalist.get(i).isChecked()) { - - DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ?", xsjhxzdatalist.get(i).getZxid()); - - DataSupport.deleteAll(XSJJHDataBean.class, "zxid = ?", xsjhxzdatalist.get(i).getZxid()); - - DataSupport.deleteAll(Xjjh.class, "zxid = ?", xsjhxzdatalist.get(i).getZxid()); + xsjhxzdatalist.removeIf((item) -> { + if (item.isChecked()) { + DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ?", item.getZxid()); + DataSupport.deleteAll(XSJJHDataBean.class, "zxid = ?", item.getZxid()); + DataSupport.deleteAll(Xjjh.class, "zxid = ?", item.getZxid()); } - } + return item.isChecked(); + }); +// for (int i = 0; i < xsjhxzdatalist.size(); i++) { +// if (xsjhxzdatalist.get(i).isChecked()) { +// DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ?", xsjhxzdatalist.get(i).getZxid()); +// DataSupport.deleteAll(XSJJHDataBean.class, "zxid = ?", xsjhxzdatalist.get(i).getZxid()); +// DataSupport.deleteAll(Xjjh.class, "zxid = ?", xsjhxzdatalist.get(i).getZxid()); +// } +// } //刷新界面 getDataInSQL(); - - if (adapter != null) { - - adapter.notifyDataSetChanged(); - } + adapter.notifyDataSetChanged(); } }); builder.show(); - } - } \ No newline at end of file