修改出游人选择的问题

component_utils/src/main/java/com/rv/component/utils/StringUtils.java

+package com.rv.component.utils;
+
+import android.text.TextUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+public class StringUtils {
+
+    public static boolean isChinaPhone(String str)
+            throws PatternSyntaxException {
+        if (TextUtils.isEmpty(str)) {
+            return false;
+        }
+        String regExp = "^1(3[0-9]|4[57]|5[0-35-9]|8[0-9]|70)\\d{8}$";
+        Pattern p = Pattern.compile(regExp);
+        Matcher m = p.matcher(str);
+        return m.matches();
+    }
+}

module_mine/src/main/java/com/rv/rvmine/adapter/TravelerListAdapter.java

@@ -3,6 +3,7 @@ package com.rv.rvmine.adapter;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.Toast;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -17,27 +18,23 @@ import java.util.List;
  */
 
 public class TravelerListAdapter extends BaseQuickAdapter<TravelerListBean.DataBean, BaseViewHolder> {
-//    private TravelerListBean.DataBean hasSelectBean = null;
 
     private int openType;
+    private SelectListener mListener = null;
 
-    public TravelerListAdapter(int openType) {
+    public TravelerListAdapter(int openType, SelectListener listener) {
         super(R.layout.rv_item_traveler_list);
         this.openType = openType;
+        this.mListener = listener;
     }
 
     @Override
     protected void convert(final BaseViewHolder helper, final TravelerListBean.DataBean item) {
         helper.setText(R.id.tv_name, item.getName());
         helper.setText(R.id.tv_phone, item.getPhone());
+        helper.setText(R.id.tv_travel_type, item.getIsChild() == 0 ? "(成人)" : "(儿童)");
         helper.setText(R.id.tv_id_card, item.getIdCard());
-//        if (hasSelectBean == null || hasSelectBean != item) {
-//            helper.setChecked(R.id.cb_draveler, false);
-//        } else {
-//            helper.setChecked(R.id.cb_draveler, true);
-//        }
         helper.addOnClickListener(R.id.tv_edit);
-
         if (openType == 0) {
             helper.itemView.findViewById(R.id.cb_draveler).setVisibility(View.GONE);
         } else {
@@ -46,23 +43,43 @@ public class TravelerListAdapter extends BaseQuickAdapter<TravelerListBean.DataB
             } else {
                 helper.setChecked(R.id.cb_draveler, false);
             }
-            helper.itemView.findViewById(R.id.cb_draveler).setEnabled(false);
-//            helper.setOnCheckedChangeListener(R.id.cb_draveler, new CompoundButton.OnCheckedChangeListener() {
-//                @Override
-//                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-//
+
+            helper.setOnCheckedChangeListener(R.id.cb_draveler, new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    boolean status = item.getStatus();
+                    boolean result = false;
+                    if (mListener != null) {
+                        result = mListener.select(item, status ? 0 : 1);
+                    }
+                    if (result) { // 动作成功
+                        status = !status;
+                        item.setStatus(status);
+                    } else {
+                        mListener.showError();
+                    }
+                    ((CheckBox) helper.itemView.findViewById(R.id.cb_draveler)).setChecked(status);
+                }
+            });
+
+            helper.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+//                    ((CheckBox)helper.itemView.findViewById(R.id.cb_draveler)).setChecked(item.getStatus());
 //                    boolean status = item.getStatus();
+//                    boolean result = false;
+//                    if (mListener != null) {
+//                        result = mListener.select(item, status ? 0 : 1);
+//                    }
+//                    if (result) { // 动作成功
 //                        status = !status;
-//                    ((CheckBox) helper.itemView.findViewById(R.id.cb_draveler)).setChecked(status);
 //                        item.setStatus(status);
-//                    if (status) {
-//                        hasSelectBean = item;
 //                    } else {
-//                        hasSelectBean = null;
+//                        mListener.showError();
 //                    }
-////                notifyDataSetChanged();
-//                }
-//            });
+                    ((CheckBox) helper.itemView.findViewById(R.id.cb_draveler)).setChecked(!item.getStatus());
+                }
+            });
         }
     }
 
@@ -70,10 +87,6 @@ public class TravelerListAdapter extends BaseQuickAdapter<TravelerListBean.DataB
         return mData.indexOf(item);
     }
 
-//    public TravelerListBean.DataBean getHasSelectBean() {
-//        return hasSelectBean;
-//    }
-
     /**
      * 获取选中的出游人数据
      *
@@ -89,4 +102,17 @@ public class TravelerListAdapter extends BaseQuickAdapter<TravelerListBean.DataB
         return list;
     }
 
+    public interface SelectListener {
+
+        /*****
+         *
+         * @param bean
+         * @param action 0 取消选中；1 选中
+         * @return
+         */
+        boolean select(TravelerListBean.DataBean bean, int action);
+
+        void showError();
+    }
+
 }

module_mine/src/main/java/com/rv/rvmine/bean/AddTraveler.java

+package com.rv.rvmine.bean;
+
+public class AddTraveler {
+    private Integer id;
+    private String name;
+    private Integer sex;  //1男  0女
+    private String phone;
+    private String idCard;
+    private Integer isChild;
+
+    public AddTraveler(Integer id, String name, Integer sex, String phone, String idCard, Integer isChild) {
+        this.id = id;
+        this.name = name;
+        this.sex = sex;
+        this.phone = phone;
+        this.idCard = idCard;
+        this.isChild = isChild;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public Integer getIsChild() {
+        return isChild;
+    }
+
+    public void setIsChild(Integer isChild) {
+        this.isChild = isChild;
+    }
+
+}

module_mine/src/main/java/com/rv/rvmine/bean/TravelerListBean.java

 package com.rv.rvmine.bean;
 
+import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.ruiwenliu.wrapper.base.BaseBean;
 
 import java.io.Serializable;
@@ -9,7 +10,7 @@ import java.util.List;
  * Desc:出游人列表
  */
 
-public class TravelerListBean extends BaseBean implements Serializable{
+public class TravelerListBean extends BaseBean implements Serializable {
 
     private List<DataBean> data;
     private int code;
@@ -30,7 +31,7 @@ public class TravelerListBean extends BaseBean implements Serializable{
         this.code = code;
     }
 
-    public static class DataBean implements Serializable {
+    public static class DataBean implements Serializable, Comparable<DataBean> {
 
         private Integer id;//": 5,
         private String userid;//": 14,
@@ -43,6 +44,7 @@ public class TravelerListBean extends BaseBean implements Serializable{
         private String isdel;//": 0,
         private Integer isChild;//": 1
         private boolean status = false; // 默认不选中
+
         public Integer getId() {
             return id;
         }
@@ -130,5 +132,13 @@ public class TravelerListBean extends BaseBean implements Serializable{
         public void setStatus(boolean status) {
             this.status = status;
         }
+
+        @Override
+        public int compareTo(DataBean o) {
+            if (!TextUtil.isEmpty(this.idCard) && this.idCard.equals(o.idCard)) {
+                return 0;
+            }
+            return -1;
+        }
     }
 }

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

@@ -13,15 +13,18 @@ import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.StringUtils;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.rvmine.R;
 import com.rv.rvmine.R2;
+import com.rv.rvmine.bean.AddTraveler;
 import com.rv.rvmine.bean.TravelerListBean;
 import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.regex.PatternSyntaxException;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -31,7 +34,6 @@ import butterknife.OnClick;
  */
 public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
 
-
     @BindView(R2.id.cb_adult)
     CheckBox cbAdult;
     @BindView(R2.id.cb_child)
@@ -75,7 +77,6 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
                 cbAdult.setChecked(false);
                 cbChild.setChecked(true);
             }
-
             if (0 == dataBean.getSex()) {
                 cbMan.setChecked(false);
                 cbGirl.setChecked(true);
@@ -103,15 +104,16 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
                 }
                 String idCard = null, phone = null;
                 idCard = etIdCard.getText().toString().trim();
-                if (TextUtil.isEmpty(idCard)) {
-                    showToast("身份证号不能为空！");
+                if (TextUtil.isEmpty(idCard) || idCard.length() != 18) {
+                    showToast("请输入正确的身份证号码！");
                     return;
                 }
 
                 if (identityType == 0) {
                     phone = etPhone.getText().toString().trim();
-                    if (TextUtil.isEmpty(phone)) {
-                        showToast("手机号码不能为空！");
+
+                    if (!StringUtils.isChinaPhone(phone)) {
+                        showToast("请输入正确的手机号码！");
                         return;
                     }
                 }
@@ -120,8 +122,10 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
         });
     }
 
+
     @Override
     public void onShowResult(int requestType, BaseBean result) {
+        TravelerListBean.DataBean addBean = new TravelerListBean.DataBean();
         setResult(RESULT_OK);
         finish();
     }
@@ -162,7 +166,7 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
      */
     private void addAVisitor(String name, String idCard, String phone) {
 
-        mPresenter.postBodyData(RvFrameConfig.VEHICLE_TOURUSER, 0, ApiConfig.HTTP_URL_ADDANDUPDATE, BaseBean.class, new addTraveler(avisitorId == 0 ? null : avisitorId, name, sexType, phone, idCard, identityType), getHeadMap(), true);
+        mPresenter.postBodyData(RvFrameConfig.VEHICLE_TOURUSER, 0, ApiConfig.HTTP_URL_ADDANDUPDATE, BaseBean.class, new AddTraveler(avisitorId == 0 ? null : avisitorId, name, sexType, phone, idCard, identityType), getHeadMap(), true);
     }
 
     @Override
@@ -179,71 +183,4 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
         return headMap;
     }
 
-
-    private class addTraveler {
-        private Integer id;
-        private String name;
-        private Integer sex;  //1男  0女
-        private String phone;
-        private String idCard;
-        private Integer isChild;
-
-        public addTraveler(Integer id, String name, Integer sex, String phone, String idCard, Integer isChild) {
-            this.id = id;
-            this.name = name;
-            this.sex = sex;
-            this.phone = phone;
-            this.idCard = idCard;
-            this.isChild = isChild;
-        }
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public Integer getSex() {
-            return sex;
-        }
-
-        public void setSex(Integer sex) {
-            this.sex = sex;
-        }
-
-        public String getPhone() {
-            return phone;
-        }
-
-        public void setPhone(String phone) {
-            this.phone = phone;
-        }
-
-        public String getIdCard() {
-            return idCard;
-        }
-
-        public void setIdCard(String idCard) {
-            this.idCard = idCard;
-        }
-
-        public Integer getIsChild() {
-            return isChild;
-        }
-
-        public void setIsChild(Integer isChild) {
-            this.isChild = isChild;
-        }
-    }
-
 }

module_mine/src/main/res/layout/activity_choose_avisitor.xml

@@ -2,6 +2,42 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <include layout="@layout/common_rv"/>
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_select_result"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_40"
+        android:layout_alignParentTop="true"
+        android:background="#fff7d8"
+        android:gravity="left|center_vertical"
+        android:paddingLeft="@dimen/size_20"
+        android:textColor="#EEA254"
+        android:visibility="gone" />
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <include layout="@layout/common_rv" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom"
+        android:layout_margin="@dimen/dp_10"
+        android:background="@drawable/shape_rv_bg_yellow"
+        android:gravity="center"
+        android:text="确定"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_16"
+        android:visibility="gone" />
+
+
 </LinearLayout>
\ No newline at end of file

module_mine/src/main/res/layout/rv_item_traveler_list.xml

@@ -2,53 +2,67 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:background="@color/colorWrite"
     android:orientation="vertical"
     android:paddingLeft="@dimen/size_15"
     android:paddingTop="@dimen/size_15"
     android:paddingRight="@dimen/size_15"
-    android:layout_height="wrap_content"
     tools:ignore="MissingDefaultResource">
 
     <LinearLayout
         android:id="@+id/ll_item_draveler"
-        android:orientation="horizontal"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/size_15"
-        android:layout_height="wrap_content">
+        android:orientation="horizontal">
+
         <CheckBox
+            android:checked="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
             android:id="@+id/cb_draveler"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical" />
 
         <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/size_15"
             android:layout_weight="1"
-           android:orientation="vertical"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content">
+            android:orientation="vertical">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
+
                 <TextView
                     android:id="@+id/tv_name"
-                   android:textSize="@dimen/text_14"
-                   android:textColor="@color/colorMain"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="李伟"
-                   />
+                    android:textColor="@color/colorMain"
+                    android:textSize="@dimen/text_14" />
 
                 <TextView
                     android:id="@+id/tv_phone"
-                   android:textSize="@dimen/text_14"
-                   android:textColor="@color/textGray"
                     android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/size_8"
+                    android:text="15946512558"
+                    android:textColor="@color/textGray"
+                    android:textSize="@dimen/text_14" />
+
+                <TextView
+                    android:id="@+id/tv_travel_type"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                   android:text="15946512558" />
+                    android:layout_marginLeft="@dimen/size_3"
+                    android:text="(成人)"
+                    android:textColor="@color/textLightGrey"
+                    android:textSize="@dimen/text_14" />
             </LinearLayout>
 
             <LinearLayout
@@ -56,55 +70,56 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/size_3"
                 android:orientation="horizontal">
+
                 <TextView
-                   android:textSize="@dimen/text_14"
-                   android:textColor="@color/colorMain"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                   android:text=" 身份证号" />
+                    android:text=" 身份证号"
+                    android:textColor="@color/colorMain"
+                    android:textSize="@dimen/text_14" />
 
                 <TextView
                     android:id="@+id/tv_id_card"
-                   android:textSize="@dimen/text_14"
-                   android:textColor="@color/textGray"
                     android:layout_width="wrap_content"
-                   android:maxLines="1"
-                   android:layout_marginLeft="@dimen/size_8"
                     android:layout_height="wrap_content"
-                   android:text="54112019880210" />
+                    android:layout_marginLeft="@dimen/size_8"
+                    android:maxLines="1"
+                    android:text="54112019880210"
+                    android:textColor="@color/textGray"
+                    android:textSize="@dimen/text_14" />
             </LinearLayout>
         </LinearLayout>
 
         <TextView
-            android:visibility="gone"
             android:id="@+id/tv_default"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/shape_rv_bg_yellow"
-            android:padding="@dimen/size_5"
             android:layout_gravity="center_vertical"
             android:layout_marginRight="@dimen/size_8"
+            android:background="@drawable/shape_rv_bg_yellow"
+            android:padding="@dimen/size_5"
+            android:text="默认"
             android:textColor="@color/gray_FBB336"
-            android:text="默认"/>
+            android:visibility="gone" />
 
         <View
-            android:layout_marginRight="@dimen/size_5"
-            android:layout_gravity="center_vertical"
             android:layout_width="@dimen/size_half"
             android:layout_height="@dimen/size_25"
-            android:background="@color/colorGray"
-            />
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="@dimen/size_5"
+            android:background="@color/colorGray" />
+
         <TextView
-            android:layout_below="@id/tv_edit"
-            android:textSize="@dimen/text_14"
-            android:textColor="@color/textGray"
+            android:id="@+id/tv_edit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_below="@id/tv_edit"
             android:layout_gravity="center_vertical"
-            android:id="@+id/tv_edit"
             android:text="@string/rv_edit"
-            />
+            android:textColor="@color/textGray"
+            android:textSize="@dimen/text_14" />
     </LinearLayout>
-    <include layout="@layout/common_line"/>
+
+    <include layout="@layout/common_line" />
 </LinearLayout>
 

module_tourism/src/main/java/com/rv/tourism/other/TravelerConfirmOrderActivity.java

@@ -176,13 +176,14 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
                 tourist = (BeanVisitorInformation) adapter.getItem(position);
                 StringBuffer buffer = new StringBuffer();
                 for (BeanVisitorInformation information : mVisitorInformationAdapter.getData()) {
-                    if (information != null && information.getIsChild() == tourist.getIsChild()) {
+                    if (information != null) {
                         buffer.append(information.getIdCard())
                                 .append(";");
                     }
                 }
                 ARouter.getInstance().build(Constance.ACTIVITY_URL_CHOOSEAVISITOR)
-                        .withInt("visitorType", Integer.valueOf(tourist.getIsChild()))
+                        .withInt("adult_number", Integer.valueOf(dataBean.getAdultNum()))
+                        .withInt("child_number", Integer.valueOf(dataBean.getChildNum()))
                         .withInt("openType", 1)
                         .withString("hasChoice", buffer.toString())
                         .navigation(mActivity, 104);
@@ -431,11 +432,23 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (104 == requestCode && resultCode == RESULT_OK) {
-            tourist.setName(data.getStringExtra("name"));
-            tourist.setPhone(data.getStringExtra("phone"));
-            tourist.setIdCard(data.getStringExtra("idcard"));
-            tourist.setId(String.valueOf(data.getIntExtra("id", 0)));
-            mVisitorInformationAdapter.notifyItemChanged(mPosition);
+            if (selectData != null) {
+                ArrayList<String> names = data.getStringArrayListExtra("name");
+                ArrayList<String> phones = data.getStringArrayListExtra("phone");
+                ArrayList<String> idcards = data.getStringArrayListExtra("idcard");
+                ArrayList<String> ids = data.getStringArrayListExtra("id");
+                if (selectData.size() != names.size() || selectData.size() != phones.size() || selectData.size() != idcards.size() || selectData.size() != ids.size()) {
+                    return;
+                }
+                for (int i = 0; i < selectData.size(); i++) {
+                    BeanVisitorInformation information = selectData.get(i);
+                    information.setName(names.get(i));
+                    information.setPhone(phones.get(i));
+                    information.setIdCard(idcards.get(i));
+                    information.setId(ids.get(i));
+                }
+            }
+            mVisitorInformationAdapter.notifyDataSetChanged();
         }
     }