Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

module_mine/src/main/java/com/rv/rvmine/traveler/ChooseAVisitorActivity.java

@@ -159,8 +159,14 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
         int id = view.getId();
         if (id == R.id.btn_confirm) {
             if (mAdapter != null) {
-                int remainAdult = adultNumber - adults.size();
-                int remainChild = childBumber - childs.size();
+                int remainChild = 0;
+                int remainAdult = 0;
+                if (childs != null) {
+                    remainChild = childBumber - childs.size();
+                }
+                if (adults != null) {
+                    remainAdult = adultNumber - adults.size();
+                }
                 if (remainAdult != 0 || remainChild != 0) {
                     showToast("你还有" + (remainAdult + remainChild) + "位出游人还未选择");
                     return;
@@ -169,19 +175,21 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
                 ArrayList<String> phones = new ArrayList<>();
                 ArrayList<String> idcards = new ArrayList<>();
                 ArrayList<String> ids = new ArrayList<>();
-                for (TravelerListBean.DataBean bean : adults) {
-                    names.add(bean.getName());
-                    phones.add(bean.getPhone());
-                    idcards.add(bean.getIdCard());
-                    ids.add(bean.getId() + "");
-                }
+                if (adults != null)
+                    for (TravelerListBean.DataBean bean : adults) {
+                        names.add(bean.getName());
+                        phones.add(bean.getPhone());
+                        idcards.add(bean.getIdCard());
+                        ids.add(bean.getId() + "");
+                    }
 
-                for (TravelerListBean.DataBean bean : childs) {
-                    names.add(bean.getName());
-                    phones.add(bean.getPhone());
-                    idcards.add(bean.getIdCard());
-                    ids.add(bean.getId() + "");
-                }
+                if (childs != null)
+                    for (TravelerListBean.DataBean bean : childs) {
+                        names.add(bean.getName());
+                        phones.add(bean.getPhone());
+                        idcards.add(bean.getIdCard());
+                        ids.add(bean.getId() + "");
+                    }
                 Intent intent1 = getIntent();
                 intent1.putStringArrayListExtra("name", names);
                 intent1.putStringArrayListExtra("phone", phones);
@@ -233,8 +241,10 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
                             visitors.remove(index);
                             mAdapter.notifyDataSetChanged();
                         }
-                        adults.remove(deletBean);
-                        childs.remove(deletBean);
+                        if (adults != null)
+                            adults.remove(deletBean);
+                        if (childs != null)
+                            childs.remove(deletBean);
                         deletBean = null;
                     }
                 }
@@ -276,12 +286,14 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
                     if (adults == null && adultNumber > 0) {
                         adults = new ArrayList<>(adultNumber);
                     }
-                    adults.add(b);
+                    if (adults != null)
+                        adults.add(b);
                 } else {
                     if (childs == null && childBumber > 0) {
                         childs = new ArrayList<>(childBumber);
                     }
-                    childs.add(b);
+                    if (childs != null)
+                        childs.add(b);
                 }
             }
             visitors.add(b);
@@ -321,6 +333,9 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
                     if (adults == null && adultNumber > 0) {
                         adults = new ArrayList<>(adultNumber);
                     }
+                    if (adultNumber == 0) {
+                        return false;
+                    }
                     if (action == 0) { // 取消选中
                         return adults.remove(bean);
                     } else {  // 选中
@@ -333,6 +348,9 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
                         return adults.add(bean);
                     }
                 } else {  // 儿童
+                    if (childBumber == 0) {
+                        return false;
+                    }
                     if (childs == null && childBumber > 0) {
                         childs = new ArrayList<>(childBumber);
                     }
@@ -355,7 +373,7 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
         @Override
         public void showError() {
             StringBuilder builder = new StringBuilder();
-            builder.append("只可选择").append(adultNumber).append("未成人");
+            builder.append("只可选择").append(adultNumber).append("位成人");
             if (childBumber > 0) {
                 builder.append(",").append(childBumber).append("位儿童");
             }