租车下单逻辑修改

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java

@@ -158,6 +158,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
                     @Override
                     public void onNext(PaymentSuccessfulEvent event) {
                         getUserData();
+                        finish();
                     }
                 });
 
@@ -167,6 +168,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
                     @Override
                     public void onNext(PaymentFailedEvent event) {
                         getUserData();
+                        finish();
                     }
                 });
     }
@@ -339,7 +341,6 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
     }
 
 
-
     private void initWeb() {
         WebSettings webSettings = mWebView.getSettings();
         if (webSettings == null) return;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java

@@ -15,6 +15,10 @@ import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.bus.Observer;
+import com.frame.base.bus.PaymentFailedEvent;
+import com.frame.base.bus.PaymentSuccessfulEvent;
+import com.frame.base.bus.RxBus;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -50,6 +54,8 @@ import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created :Auser
@@ -166,6 +172,28 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
                 }
             }
         });
+
+        initRxbus();
+    }
+
+    private void initRxbus() {
+        RxBus.tObservable(PaymentSuccessfulEvent.class)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
+                    @Override
+                    public void onNext(PaymentSuccessfulEvent event) {
+                        onFresh();
+                    }
+                });
+
+        RxBus.tObservable(PaymentFailedEvent.class)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<PaymentFailedEvent>(disposable) {
+                    @Override
+                    public void onNext(PaymentFailedEvent event) {
+                        onFresh();
+                    }
+                });
     }
 
 
@@ -292,7 +320,7 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
             headMap.put("Authorization", OkGoUtil.getToken());
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("start", begDate);
-        map.put("end",endDate);
+        map.put("end", endDate);
         mPresenter.getData(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_CALENDAR_PRICE + id, CarRentalPriceBean.class, map, headMap, true);
     }
 

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

@@ -30,6 +30,8 @@ import com.baidu.mapapi.model.LatLng;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.base.bus.IDCardCertificationEvent;
 import com.frame.base.bus.Observer;
+import com.frame.base.bus.PaymentFailedEvent;
+import com.frame.base.bus.PaymentSuccessfulEvent;
 import com.frame.base.bus.RxBus;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.CommonApi;
@@ -161,18 +163,24 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
                         llItemBottom.setVisibility(View.GONE);
                     }
                 });
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            mWebView.setOnScrollChangeListener(new View.OnScrollChangeListener() {
-                @Override
-                public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
 
-                    Log.d("scroll", "scrollX=" + scrollX);
-                    Log.d("scroll", "scrollY=" + scrollY);
-                    Log.d("scroll", "oldScrollX=" + oldScrollX);
-                    Log.d("scroll", "oldScrollY=" + oldScrollY);
+        RxBus.tObservable(PaymentSuccessfulEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
+                    @Override
+                    public void onNext(PaymentSuccessfulEvent event) {
+                        finish();
                     }
                 });
+
+        RxBus.tObservable(PaymentFailedEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Observer<PaymentFailedEvent>(disposable) {
+                    @Override
+                    public void onNext(PaymentFailedEvent event) {
+                        finish();
                     }
+                });
     }
 
     @OnClick({R2.id.iv_back, R2.id.tv_appointment, R2.id.iv_collect, R2.id.iv_share, R2.id.tv_customer_service})