Skip to content

R
RvApp
Commit a82c93e8 authored by linfeng's avatar linfeng
Browse files
Options

bug修复

parent ba44058c
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 34 deletions
RvClient/build.gradle
View file @ a82c93e8
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 143
versionName "1.4.3"
versionCode 142
versionName "1.4.2"
multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ a82c93e8
......@@ -49,6 +49,7 @@ import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.LoginRvActivity;
import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPriceBean;
import com.umeng.socialize.UMShareAPI;
import com.umeng.socialize.bean.SHARE_MEDIA;
import com.umeng.socialize.shareboard.SnsPlatform;
......@@ -128,7 +129,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
.subscribe(new Observer<IDCardCertificationEvent>(disposable) {
@Override
public void onNext(IDCardCertificationEvent event) {
startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
getOrderPrice();
}
});
......@@ -174,6 +175,10 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
case 0:
userInfoData((UserInfoBean) result);
break;
case 1:
OrderPriceBean priceBean = (OrderPriceBean) result;
startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime"), priceBean));
break;
}
}
......@@ -224,7 +229,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
super.onNewIntent(intent);
int type = intent.getIntExtra("type", 0);
if (type == 1) {
startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
getOrderPrice();
finish();
}
}
......@@ -263,15 +268,33 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
startActivity(LoginRvActivity.getIntent(mActivity, 0));
return;
}
// BeanUserInfo.UserInfo userInfo = getUserInfo();
// if (userInfo != null) {
// if (userInfo.getCertificationStatus() == 0) {
// ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
// return;
// }
// }
startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
BeanUserInfo.UserInfo userInfo = getUserInfo();
if (userInfo != null) {
if (userInfo.getCertificationStatus() == 0) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
return;
}
}
getOrderPrice();
}
}
/**
* 获得订单价格
*/
private void getOrderPrice() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
Map<String, Object> map = new LinkedHashMap<>();
map.put("driverType", 1);
map.put("modelId", dataBean.getModelId());
map.put("startTime", dataBean.getStartTime());
map.put("endTime", dataBean.getEndTime());
map.put("dayNum", dataBean.getDayNum());
mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_GET_ORDER_PRICE, OrderPriceBean.class, map, headMap, true);
}
//添加收藏
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @ a82c93e8
......@@ -72,6 +72,7 @@ import com.xxrv.coupon.api.CouponApi;
import com.xxrv.coupon.bean.CarCouponBean;
import com.yuyife.okgo.OkGoUtil;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.LinkedHashMap;
......@@ -190,12 +191,13 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
private List<CarCouponBean.DataBean.CarCouponTypeDataBean.CarCouponDataBean> selectCouponList = null;
private OrderMemberBean.DataBean memberData;
public static Intent getIntent(Context context, OrderDataBean bean, CarTypeListBean.DataBeanX.DataBean carBean, String startTime, String endTime) {
public static Intent getIntent(Context context, OrderDataBean bean, CarTypeListBean.DataBeanX.DataBean carBean, String startTime, String endTime, OrderPriceBean beanPrice) {
return new Intent(context, ConfirmOrderActivity.class)
.putExtra("bean", bean)
.putExtra("carBean", carBean)
.putExtra("startTime", startTime)
.putExtra("endTime", endTime);
.putExtra("endTime", endTime)
.putExtra("priceBean", beanPrice);
}
@Override
......@@ -209,6 +211,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
api = WXAPIFactory.createWXAPI(this, RvFrameConfig.APP_ID);
dataBean = (OrderDataBean) intent.getSerializableExtra("bean");
mCarBean = (CarTypeListBean.DataBeanX.DataBean) intent.getSerializableExtra("carBean");
priceBean = (OrderPriceBean) intent.getSerializableExtra("priceBean");
intiView();
initRxBus();
......@@ -285,14 +288,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
priceBean = (OrderPriceBean) result;
if (priceBean.getData() != null) {
tvXinDrivingPrice.setText(String.format("(¥%1$s%2$s", priceBean.getData().getDriverPrice(), "/天)"));
tvCarNotHurtMoney.setText(String.format("¥%1$s%2$s", priceBean.getData().getDamageSafePrice(), "/天"));
tvDeposit.setText(String.format("¥%1$s%2$s", priceBean.getData().getDeposit(), mActivity.getString(R.string.rv_rb)));
// orderPriceDetailBean = new Gson().fromJson(priceBean.getData().getCostDetail(), OrderPriceDetailBean.class);
getPayMoney();
}
// priceBean = (OrderPriceBean) result;
break;
case 1:
ConfirmOrderBean orderBean = (ConfirmOrderBean) result;
......@@ -316,7 +312,8 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
mCarBean.getVehicleModel().setMember(orderMemberBean.getData());
}
intiView();
getOrderPrice();
getPayMoney();
// getOrderPrice();
break;
}
}
......@@ -667,6 +664,14 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
tvFreeCarDays.setText("（剩余" + memberData.getRentFreeDays() + "天）");
}
if (priceBean.getData() != null) {
tvXinDrivingPrice.setText(String.format("(¥%1$s%2$s", priceBean.getData().getDriverPrice(), "/天)"));
tvCarNotHurtMoney.setText(String.format("¥%1$s%2$s", priceBean.getData().getDamageSafePrice(), "/天"));
tvDeposit.setText(String.format("¥%1$s%2$s", priceBean.getData().getDeposit(), mActivity.getString(R.string.rv_rb)));
// orderPriceDetailBean = new Gson().fromJson(priceBean.getData().getCostDetail(), OrderPriceDetailBean.class);
}
swbtnMember.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/OrderPriceBean.java
View file @ a82c93e8
......@@ -2,13 +2,15 @@ package com.rv.home.rv.module.ui.main.home.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
/**
* Created :Auser
* Date: 2019/5/28.
* Desc:获取订单价格
*/
public class OrderPriceBean extends BaseBean{
public class OrderPriceBean extends BaseBean implements Serializable {
/**
* data : {"orderAmount":90000.02,"goodsAmount":70000.02,"vehicleAmount":70000.02,"driverAmount":0,"deposit":20000}
......@@ -34,7 +36,7 @@ public class OrderPriceBean extends BaseBean{
this.rel = rel;
}
public static class DataBean {
public static class DataBean implements Serializable {
/**
* orderAmount : 90000.02
* goodsAmount : 70000.02
......
module_home/src/main/res/layout/rv_act_confim_order.xml
View file @ a82c93e8
......@@ -47,7 +47,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="大通自行式C型房车（旅居版）"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
......@@ -58,7 +58,7 @@
android:layout_marginTop="@dimen/size_3"
android:ellipsize="end"
android:maxLines="1"
android:text="大通自行式C型房车（旅居版）"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
......@@ -80,7 +80,7 @@
android:layout_marginTop="@dimen/size_3"
android:ellipsize="end"
android:maxLines="1"
android:text="￥3500天"
android:text="￥0天"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
</LinearLayout>
......@@ -112,7 +112,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="2019-06-12 10:00~2019-06-15 18:00"
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" />
......@@ -122,7 +122,7 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_rv_bg_shallow_yellow_small_circle"
android:padding="@dimen/size_5"
android:text="3天"
android:text="0天"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" />
......@@ -441,7 +441,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:gravity="right"
android:text="¥20000元"
android:text="¥0元"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
</LinearLayout>
......@@ -637,7 +637,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_weight="1"
android:text="￥100/日"
android:text="￥0/日"
android:textColor="@color/colorBg"
android:textSize="@dimen/text_14" />
</RelativeLayout>
......@@ -876,7 +876,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="￥22555"
android:text="￥0"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
......
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ a82c93e8
......@@ -140,7 +140,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
tvTitleCenter.setText("旅游详情");
webUrl = TourismApi.TRAVEL_DETAILS + "?id=" + id + "?v=1";
webUrl = TourismApi.TRAVEL_DETAILS + "?id=" + id + "&v=1";
initWeb();
initRxbus();
if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(url)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment