修改订单取消闪退的问题；修改会员模块购买记录只能是会员的购买；请求失败没有错误提示的问题；购买会员需要实名验证的问题；

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseActivity.java

@@ -80,8 +80,8 @@ public abstract class BaseActivity<P extends MvpPresenter> extends BaseWrapperAc
 
     @Override
     public void onShowError(String errorMsg, int errorType) {
-        if(!TextUtils.isEmpty(errorMsg)){
-            showToast(errorMsg+errorType);
+        if (!TextUtils.isEmpty(errorMsg)) {
+            showToast(errorMsg);
         }
 
     }

RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java

@@ -42,7 +42,7 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
         if (response.isSuccessful()) {
             try {
                 String result = response.body().string();
-                T bean = new Gson().fromJson(result,baseBean);
+                T bean = new Gson().fromJson(result, baseBean);
                 switch (bean.status) {
                     case RvFrameConstant.HTTP_STATE_SUCCESS:
                         baseView.onShowResult(position, bean);
@@ -54,6 +54,7 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
                         baseView.onShowError("", RvFrameConstant.HTTP_STATE_NOT_REGISTERED);
                         break;
                     case RvFrameConstant.HTTP_STATE_DATA_ALREADY_EXISTS:
+                        baseView.onShowError(bean.message, RvFrameConstant.HTTP_STATE_DATA_ALREADY_EXISTS);
                         break;
                     default:
                         baseView.onShowError(bean.message, bean.status);
@@ -64,8 +65,8 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
                 e.printStackTrace();
             }
 
-        }else {
-            baseView.onShowError("服务器链接失败",response.code());
+        } else {
+            baseView.onShowError("服务器链接失败", response.code());
         }
     }
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/CancelTheTripActivity.java

@@ -7,7 +7,9 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.Toast;
 
+import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.bus.CancelOrderEvent;
 import com.frame.base.bus.RxBus;
@@ -52,13 +54,14 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
     public void onShowResult(int requestType, BaseBean result) {
         switch (requestType) {
             case 0:
+                showToast("取消成功！");
                 RxBus.post(new CancelOrderEvent());
                 finish();
-                showToast("取消成功！");
                 break;
         }
     }
 
+
     @Override
     protected int setLayout() {
         return R.layout.activity_cancel_the_trip;
@@ -85,7 +88,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
 
     @OnClick(R2.id.tv_ok)
     public void onViewClicked() {
-     new TipsDialog(mActivity){
+        new TipsDialog(mActivity) {
             @Override
             public void helper(ViewHolder helper) {
                 super.helper(helper);
@@ -93,7 +96,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
                     @Override
                     public void onClick(View v) {
                         int id = v.getId();
-                        if (id ==R.id.tv_ok) {
+                        if (id == R.id.tv_ok) {
                             if (TextUtils.isEmpty(mAdapter.getSelectName())) {
                                 showToast("请选择取消原因！");
                                 return;
@@ -103,11 +106,11 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
 
                             mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_BASEORDER_CANCEL + no, CancelTheTripBean.class, new cancelReasonBean(mAdapter.getSelectName()), mapHead, true);
                             dismiss();
-                        }else if (id ==R.id.tv_cancel ) {
+                        } else if (id == R.id.tv_cancel) {
                             dismiss();
                         }
                     }
-                },R.id.tv_ok, R.id.tv_cancel);
+                }, R.id.tv_ok, R.id.tv_cancel);
             }
         }.show();
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java

@@ -40,6 +40,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import butterknife.BindView;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
@@ -60,7 +61,6 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
     private int mPage;
     private int countPage;
     private IWXAPI api;
-    private long effTime = 0; // 失效时间
 
     private OrderListBean.DataBeanX.DataBean payBean = null;
     private int payPosition = -1;
@@ -129,10 +129,16 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
 
     }
 
-    private Handler handler = new Handler(Looper.getMainLooper()) {
+    private Disposable disposable;
+
+    @SuppressLint("CheckResult")
+    private void initRxBus() {
+
+        disposable = RxBus.tObservable(PaymentSuccessfulEvent.class)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<PaymentSuccessfulEvent>() {
                     @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
+                    public void accept(PaymentSuccessfulEvent payEvent) throws Exception {
                         if (payPosition != -1) {
                             if (mAdapter != null && !mAdapter.getData().isEmpty()) {
                                 mAdapter.getData().remove(payPosition);
@@ -143,26 +149,12 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
                             mListener.switchTab(3);
                         }
                     }
-    };
-    private Disposable disposable;
-
-    @SuppressLint("CheckResult")
-    private void initRxBus() {
-
-        disposable = RxBus.tObservable(PaymentSuccessfulEvent.class)
-                .observeOn(Schedulers.io())
-                .subscribe(new Consumer<PaymentSuccessfulEvent>() {
-                    @Override
-                    public void accept(PaymentSuccessfulEvent payEvent) throws Exception {
-                        handler.sendEmptyMessage(0);
-                    }
                 });
     }
 
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        handler.removeCallbacksAndMessages(null);
         if (disposable != null && !disposable.isDisposed()) {
             disposable.dispose();
         }

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java

 package com.rv.home.rv.module.ui.main.home.order;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -19,6 +20,7 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.frame.base.bus.CancelOrderEvent;
 import com.frame.base.bus.Observer;
+import com.frame.base.bus.PaymentSuccessfulEvent;
 import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -46,6 +48,8 @@ import java.util.Map;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
@@ -128,6 +132,10 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
 //        mWebView.addJavascriptInterface(new AndroidJs(),"AndroidJs");
         mWebView.destroy();// 生命周期销毁
 
+        if (paySucDisposable != null && !paySucDisposable.isDisposed()) {
+            paySucDisposable.dispose();
+        }
+
     }
 
 
@@ -184,6 +192,9 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
         }
     }
 
+
+    private Disposable paySucDisposable;
+
     @SuppressLint("CheckResult")
     private void initRxBus() {
 
@@ -192,10 +203,20 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
                 .subscribe(new Observer<CancelOrderEvent>(disposable) {
                     @Override
                     public void onNext(CancelOrderEvent event) {
+                        setResult(Activity.RESULT_OK);
                         finish();
                     }
                 });
 
+        paySucDisposable = RxBus.tObservable(PaymentSuccessfulEvent.class)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<PaymentSuccessfulEvent>() {
+                    @Override
+                    public void accept(PaymentSuccessfulEvent paymentSuccessfulEvent) throws Exception {
+                        setResult(Activity.RESULT_OK);
+                        finish();
+                    }
+                });
     }
 
     @Override
@@ -402,7 +423,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
         // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
         webSettings.setAllowUniversalAccessFromFileURLs(true);
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
-        mWebView.setWebViewClient(new WebViewClient(){
+        mWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 return false;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java

@@ -51,8 +51,6 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
         return new Intent(context, OrderListActivity.class).putExtra("position", position);
     }
 
-    ;
-
 
     @Override
     protected int setLayout() {
@@ -165,4 +163,5 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
     public interface SwitchListener {
         void switchTab(int position);
     }
+
 }

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java

@@ -30,6 +30,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import butterknife.BindView;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
@@ -105,7 +106,7 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
     @SuppressLint("CheckResult")
     private void initRxBus() {
         RxBus.tObservable(CancelOrderEvent.class)
-                .observeOn(Schedulers.newThread())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<CancelOrderEvent>(disposable) {
                     @Override
                     public void onNext(CancelOrderEvent event) {

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

@@ -335,7 +335,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
         @Override
         public void pay(final MemberListBean.MemberCard card) {
             if (!isLogin()) return;
-            if (!isVerified()) return;
+//            if (!isVerified()) return;
             new PaymentTypeSelection(MemberCenterActivity.this) {
                 @Override
                 public void helper(final ViewHolder helper) {

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

@@ -106,6 +106,7 @@ public class PurchaseRecordActivity extends BaseStatusActivity<CommonPresenter>
         mapData.put("page", page);
         mapData.put("limit", 10);
         mapData.put("status", 6);
+        mapData.put("type", 3);
         mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
     }