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

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

@@ -3,7 +3,6 @@ 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;
@@ -39,14 +38,14 @@ public class TravelerListAdapter extends BaseQuickAdapter<TravelerListBean.DataB
             helper.itemView.findViewById(R.id.cb_draveler).setVisibility(View.GONE);
         } else {
             if (item.getStatus()) {
-                helper.setChecked(R.id.cb_draveler, true);
+                helper.setImageResource(R.id.cb_draveler, R.drawable.common_icon_select);
             } else {
-                helper.setChecked(R.id.cb_draveler, false);
+                helper.setImageResource(R.id.cb_draveler, R.drawable.common_icon_unselect);
             }
 
-            helper.setOnCheckedChangeListener(R.id.cb_draveler, new CompoundButton.OnCheckedChangeListener() {
+            helper.itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
-                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                public void onClick(View view) {
                     boolean status = item.getStatus();
                     boolean result = false;
                     if (mListener != null) {
@@ -58,26 +57,7 @@ public class TravelerListAdapter extends BaseQuickAdapter<TravelerListBean.DataB
                     } 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;
-//                        item.setStatus(status);
-//                    } else {
-//                        mListener.showError();
-//                    }
-                    ((CheckBox) helper.itemView.findViewById(R.id.cb_draveler)).setChecked(!item.getStatus());
+                    helper.setImageResource(R.id.cb_draveler, status ? R.drawable.common_icon_select :  R.drawable.common_icon_unselect);
                 }
             });
         }

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

@@ -17,13 +17,10 @@
         android:layout_marginBottom="@dimen/size_15"
         android:orientation="horizontal">
 
-        <CheckBox
-            android:checked="false"
-            android:focusable="false"
-            android:focusableInTouchMode="false"
+        <ImageView
             android:id="@+id/cb_draveler"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/size_15"
+            android:layout_height="@dimen/size_15"
             android:layout_gravity="center_vertical" />
 
         <LinearLayout

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

@@ -8,6 +8,7 @@ import android.support.annotation.Nullable;
 import android.support.v4.widget.PopupWindowCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -150,7 +151,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
             double childPrice = dataBean.getChildPrice();
             double adultPrice = dataBean.getPrice();
             price = Arith.mul(Double.valueOf(childNum), Double.valueOf(childPrice)) + Arith.mul(Double.valueOf(adultNum), Double.valueOf(adultPrice));
-            tvPaymentAmount.setText(String.format("¥%1$s",new BigDecimal(price).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
+            tvPaymentAmount.setText(String.format("¥%1$s", new BigDecimal(price).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
 
             for (int i = 0; i < Integer.valueOf(dataBean.getAdultNum()); i++) {
                 BeanVisitorInformation travelMember = new BeanVisitorInformation();
@@ -175,18 +176,24 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 mPosition = position;
                 tourist = (BeanVisitorInformation) adapter.getItem(position);
-                StringBuffer buffer = new StringBuffer();
+                StringBuffer bufferAdults = new StringBuffer();
+                StringBuffer bufferChilds = new StringBuffer();
                 for (BeanVisitorInformation information : mVisitorInformationAdapter.getData()) {
                     if (information != null) {
-                        buffer.append(information.getIdCard())
-                                .append(";");
+                        if ("0".equals(information.getIsChild()) && !TextUtils.isEmpty(information.getId())) {
+                            bufferAdults.append(information.getId()).append(";");
+                        } else if("1".equals(information.getIsChild()) && !TextUtils.isEmpty(information.getId())) {
+                            bufferChilds.append(information.getId()).append(";");
+                        }
                     }
                 }
+
                 ARouter.getInstance().build(Constance.ACTIVITY_URL_CHOOSEAVISITOR)
                         .withInt("adult_number", Integer.valueOf(dataBean.getAdultNum()))
                         .withInt("child_number", Integer.valueOf(dataBean.getChildNum()))
+                        .withString("hasChoiceAdults", bufferAdults.length() == 0 ? "" : bufferAdults.substring(0, bufferAdults.length() - 1))
+                        .withString("hasChoiceChilds", bufferChilds.length() == 0 ? "" : bufferChilds.substring(0, bufferChilds.length() - 1))
                         .withInt("openType", 1)
-                        .withString("hasChoice", buffer.toString())
                         .navigation(mActivity, 104);
             }
         });
@@ -296,7 +303,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
             childrenBean3.setVal("¥" + info.getData().getInsurePrice() * (adultNum + childNum) * day);
             childrenBeanList.add(childrenBean3);
 
-            tvPaymentAmount.setText(String.format("¥%1$s",  new BigDecimal(price + (info.getData().getInsurePrice() * (adultNum + childNum) * day)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
+            tvPaymentAmount.setText(String.format("¥%1$s", new BigDecimal(price + (info.getData().getInsurePrice() * (adultNum + childNum) * day)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
         } else {
             tvPaymentAmount.setText(String.format("¥%1$s", new BigDecimal(price).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
         }

plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java

@@ -130,6 +130,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
                 .subscribe(new Consumer<PaymentSuccessfulEvent>() {
                     @Override
                     public void accept(PaymentSuccessfulEvent payEvent) throws Exception {
+                        Class aClass = Class.forName("com.rv.rvmine.rxbusevent.UserInfoEvent");
+                        RxBus.post(aClass.newInstance());
                         startActivityForResult(OrderListActivity.getIntent(MemberCenterActivity.this, 3), REQUEST_PAY);
                     }
                 });