diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java index df14a13..c45b522 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java @@ -22,6 +22,7 @@ import android.widget.TextView; import com.azhon.appupdate.listener.OnButtonClickListener; import com.azhon.appupdate.listener.OnDownloadListener; import com.azhon.appupdate.manager.DownloadManager; +import com.bjzc.yfdxj.BuildConfig; import com.bjzc.yfdxj.base.BaseCallBackNoProgress; import com.bjzc.yfdxj.R; import com.bjzc.yfdxj.base.BaseActivity; @@ -187,12 +188,13 @@ public class LoginActivity extends BaseActivity { } } -// etUse.setText("161619"); -// etPwd.setText("lgy12345"); + if (BuildConfig.LOG_ERROR) { + etUse.setText("161619"); + etPwd.setText("lgy12345"); // etUse.setText("161619"); // etPwd.setText("161619"); - + } //使用完一定记得关闭 电源 mt.RFIDclose(); mt.IRTclose(); diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java index 29c1760..43f460d 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java @@ -562,13 +562,21 @@ public class ScxsjhFragment extends BaseFragment { MeasureDialog measureDialog = new MeasureDialog(context, "你确定要删除?", new MeasureDialog.AuditDialogListener() { @Override public void confirm() { - for (int i = 0; i < dbxjjh.size(); i++) { - if (dbxjjh.get(i).isChecked()) { - DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ? and username = ?", dbxjjh.get(i).getZxid(), username); - DataSupport.deleteAll(XSJJHDataBean.class, "zxid = ? and username = ?", dbxjjh.get(i).getZxid(), username); - DataSupport.deleteAll(Xjjh.class, "zxid = ? and username = ?", dbxjjh.get(i).getZxid(), username); + dbxjjh.removeIf((item) -> { + if (item.isChecked()) { + DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ? and username = ?", item.getZxid(), username); + DataSupport.deleteAll(XSJJHDataBean.class, "zxid = ? and username = ?", item.getZxid(), username); + DataSupport.deleteAll(Xjjh.class, "zxid = ? and username = ?", item.getZxid(), username); } - } + return item.isChecked(); + }); + + //不对的,有坑,禁止使用foreach删除、增加List元素 +// for (int i = 0; i < dbxjjh.size(); i++) { +// if (dbxjjh.get(i).isChecked()) { +// dbxjjh.remove(dbxjjh.get(i)); +// } +// } //刷新页面 initData();