Commit 0f47068d authored by jianglx's avatar jianglx

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

parent 12ec70de
...@@ -159,8 +159,14 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter> ...@@ -159,8 +159,14 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
int id = view.getId(); int id = view.getId();
if (id == R.id.btn_confirm) { if (id == R.id.btn_confirm) {
if (mAdapter != null) { if (mAdapter != null) {
int remainAdult = adultNumber - adults.size(); int remainChild = 0;
int remainChild = childBumber - childs.size(); int remainAdult = 0;
if (childs != null) {
remainChild = childBumber - childs.size();
}
if (adults != null) {
remainAdult = adultNumber - adults.size();
}
if (remainAdult != 0 || remainChild != 0) { if (remainAdult != 0 || remainChild != 0) {
showToast("你还有" + (remainAdult + remainChild) + "位出游人还未选择"); showToast("你还有" + (remainAdult + remainChild) + "位出游人还未选择");
return; return;
...@@ -169,19 +175,21 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter> ...@@ -169,19 +175,21 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
ArrayList<String> phones = new ArrayList<>(); ArrayList<String> phones = new ArrayList<>();
ArrayList<String> idcards = new ArrayList<>(); ArrayList<String> idcards = new ArrayList<>();
ArrayList<String> ids = new ArrayList<>(); ArrayList<String> ids = new ArrayList<>();
for (TravelerListBean.DataBean bean : adults) { if (adults != null)
names.add(bean.getName()); for (TravelerListBean.DataBean bean : adults) {
phones.add(bean.getPhone()); names.add(bean.getName());
idcards.add(bean.getIdCard()); phones.add(bean.getPhone());
ids.add(bean.getId() + ""); idcards.add(bean.getIdCard());
} ids.add(bean.getId() + "");
}
for (TravelerListBean.DataBean bean : childs) { if (childs != null)
names.add(bean.getName()); for (TravelerListBean.DataBean bean : childs) {
phones.add(bean.getPhone()); names.add(bean.getName());
idcards.add(bean.getIdCard()); phones.add(bean.getPhone());
ids.add(bean.getId() + ""); idcards.add(bean.getIdCard());
} ids.add(bean.getId() + "");
}
Intent intent1 = getIntent(); Intent intent1 = getIntent();
intent1.putStringArrayListExtra("name", names); intent1.putStringArrayListExtra("name", names);
intent1.putStringArrayListExtra("phone", phones); intent1.putStringArrayListExtra("phone", phones);
......
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