Commit a8ba5f7b authored by jianglx's avatar jianglx

修改添加出游人闪退的问题

parent 0f47068d
...@@ -241,8 +241,10 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter> ...@@ -241,8 +241,10 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
visitors.remove(index); visitors.remove(index);
mAdapter.notifyDataSetChanged(); mAdapter.notifyDataSetChanged();
} }
adults.remove(deletBean); if (adults != null)
childs.remove(deletBean); adults.remove(deletBean);
if (childs != null)
childs.remove(deletBean);
deletBean = null; deletBean = null;
} }
} }
...@@ -284,12 +286,14 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter> ...@@ -284,12 +286,14 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
if (adults == null && adultNumber > 0) { if (adults == null && adultNumber > 0) {
adults = new ArrayList<>(adultNumber); adults = new ArrayList<>(adultNumber);
} }
adults.add(b); if (adults != null)
adults.add(b);
} else { } else {
if (childs == null && childBumber > 0) { if (childs == null && childBumber > 0) {
childs = new ArrayList<>(childBumber); childs = new ArrayList<>(childBumber);
} }
childs.add(b); if (childs != null)
childs.add(b);
} }
} }
visitors.add(b); visitors.add(b);
...@@ -329,6 +333,9 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter> ...@@ -329,6 +333,9 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
if (adults == null && adultNumber > 0) { if (adults == null && adultNumber > 0) {
adults = new ArrayList<>(adultNumber); adults = new ArrayList<>(adultNumber);
} }
if (adultNumber == 0) {
return false;
}
if (action == 0) { // 取消选中 if (action == 0) { // 取消选中
return adults.remove(bean); return adults.remove(bean);
} else { // 选中 } else { // 选中
...@@ -341,6 +348,9 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter> ...@@ -341,6 +348,9 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
return adults.add(bean); return adults.add(bean);
} }
} else { // 儿童 } else { // 儿童
if (childBumber == 0) {
return false;
}
if (childs == null && childBumber > 0) { if (childs == null && childBumber > 0) {
childs = new ArrayList<>(childBumber); childs = new ArrayList<>(childBumber);
} }
...@@ -363,7 +373,7 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter> ...@@ -363,7 +373,7 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
@Override @Override
public void showError() { public void showError() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append("只可选择").append(adultNumber).append("成人"); builder.append("只可选择").append(adultNumber).append("成人");
if (childBumber > 0) { if (childBumber > 0) {
builder.append(",").append(childBumber).append("位儿童"); builder.append(",").append(childBumber).append("位儿童");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment